Commit 6cdb0cd4 authored by Eriko Kurimoto's avatar Eriko Kurimoto Committed by Commit Bot

Rename openShadowRoot to OpenShadowRoot

Bug: 
Change-Id: I87ca0541e15a803d7939a138dc0d4a844182a2e4
Reviewed-on: https://chromium-review.googlesource.com/618430
Commit-Queue: Eriko Kurimoto <elkurin@google.com>
Reviewed-by: default avatarTakayoshi Kochi <kochi@chromium.org>
Reviewed-by: default avatarHayato Ito <hayato@chromium.org>
Cr-Commit-Position: refs/heads/master@{#496602}
parent 286d4289
......@@ -2437,7 +2437,7 @@ ShadowRoot* Element::GetShadowRoot() const {
return &element_shadow->YoungestShadowRoot();
}
ShadowRoot* Element::openShadowRoot() const {
ShadowRoot* Element::OpenShadowRoot() const {
ShadowRoot* root = GetShadowRoot();
if (!root)
return nullptr;
......
......@@ -480,7 +480,7 @@ class CORE_EXPORT Element : public ContainerNode {
ExceptionState&);
ShadowRoot* CreateShadowRootInternal(ShadowRootType, ExceptionState&);
ShadowRoot* openShadowRoot() const;
ShadowRoot* OpenShadowRoot() const;
ShadowRoot* ClosedShadowRoot() const;
ShadowRoot* AuthorShadowRoot() const;
ShadowRoot* UserAgentShadowRoot() const;
......
......@@ -65,7 +65,7 @@ interface Element : Node {
[RaisesException, ImplementedAs=matches, MeasureAs=ElementPrefixedMatchesSelector] boolean webkitMatchesSelector(DOMString selectors); // historical alias of .matches
[RaisesException, CallWith=ScriptState, MeasureAs=ElementAttachShadow] ShadowRoot attachShadow(ShadowRootInit shadowRootInitDict);
[PerWorldBindings, ImplementedAs=openShadowRoot] readonly attribute ShadowRoot? shadowRoot;
[PerWorldBindings, ImplementedAs=OpenShadowRoot] readonly attribute ShadowRoot? shadowRoot;
HTMLCollection getElementsByTagName(DOMString localName);
HTMLCollection getElementsByTagNameNS(DOMString? namespaceURI, DOMString localName);
......
......@@ -129,7 +129,7 @@ TEST_F(FlatTreeTraversalTest, childAt) {
Element* m01 = m0->QuerySelector("#m01");
Element* shadow_host = m0;
ShadowRoot* shadow_root = shadow_host->openShadowRoot();
ShadowRoot* shadow_root = shadow_host->OpenShadowRoot();
Element* s00 = shadow_root->QuerySelector("#s00");
Element* s02 = shadow_root->QuerySelector("#s02");
Element* s03 = shadow_root->QuerySelector("#s03");
......@@ -214,7 +214,7 @@ TEST_F(FlatTreeTraversalTest, commonAncestor) {
Element* m20 = body->QuerySelector("#m20");
Element* m21 = body->QuerySelector("#m21");
ShadowRoot* shadow_root = m1->openShadowRoot();
ShadowRoot* shadow_root = m1->OpenShadowRoot();
Element* s10 = shadow_root->QuerySelector("#s10");
Element* s11 = shadow_root->QuerySelector("#s11");
Element* s12 = shadow_root->QuerySelector("#s12");
......@@ -279,7 +279,7 @@ TEST_F(FlatTreeTraversalTest, nextSkippingChildren) {
Element* m10 = body->QuerySelector("#m10");
Element* m11 = body->QuerySelector("#m11");
ShadowRoot* shadow_root = m1->openShadowRoot();
ShadowRoot* shadow_root = m1->OpenShadowRoot();
Element* s11 = shadow_root->QuerySelector("#s11");
Element* s12 = shadow_root->QuerySelector("#s12");
Element* s120 = shadow_root->QuerySelector("#s120");
......@@ -335,7 +335,7 @@ TEST_F(FlatTreeTraversalTest, lastWithin) {
Element* m10 = body->QuerySelector("#m10");
ShadowRoot* shadow_root = m1->openShadowRoot();
ShadowRoot* shadow_root = m1->OpenShadowRoot();
Element* s11 = shadow_root->QuerySelector("#s11");
Element* s12 = shadow_root->QuerySelector("#s12");
......@@ -380,7 +380,7 @@ TEST_F(FlatTreeTraversalTest, previousPostOrder) {
Element* m10 = body->QuerySelector("#m10");
Element* m11 = body->QuerySelector("#m11");
ShadowRoot* shadow_root = m1->openShadowRoot();
ShadowRoot* shadow_root = m1->OpenShadowRoot();
Element* s11 = shadow_root->QuerySelector("#s11");
Element* s12 = shadow_root->QuerySelector("#s12");
Element* s120 = shadow_root->QuerySelector("#s120");
......@@ -448,12 +448,12 @@ TEST_F(FlatTreeTraversalTest, redistribution) {
Element* m1 = body->QuerySelector("#m1");
Element* m10 = body->QuerySelector("#m10");
ShadowRoot* shadow_root1 = m1->openShadowRoot();
ShadowRoot* shadow_root1 = m1->OpenShadowRoot();
Element* s1 = shadow_root1->QuerySelector("#s1");
AttachV0ShadowRoot(*s1, shadow_html2);
ShadowRoot* shadow_root2 = s1->openShadowRoot();
ShadowRoot* shadow_root2 = s1->OpenShadowRoot();
Element* s21 = shadow_root2->QuerySelector("#s21");
EXPECT_EQ(s21, FlatTreeTraversal::NextSibling(*m10));
......@@ -486,7 +486,7 @@ TEST_F(FlatTreeTraversalTest, v1Simple) {
Element* child2 = body->QuerySelector("#child2");
AttachOpenShadowRoot(*host, shadow_html);
ShadowRoot* shadow_root = host->openShadowRoot();
ShadowRoot* shadow_root = host->OpenShadowRoot();
Element* slot1 = shadow_root->QuerySelector("[name=slot1]");
Element* slot2 = shadow_root->QuerySelector("[name=slot2]");
Element* shadow_child1 = shadow_root->QuerySelector("#shadow-child1");
......@@ -535,7 +535,7 @@ TEST_F(FlatTreeTraversalTest, v1Redistribution) {
Element* d6 = body->QuerySelector("#d6");
AttachOpenShadowRoot(*d1, shadow_html1);
ShadowRoot* shadow_root1 = d1->openShadowRoot();
ShadowRoot* shadow_root1 = d1->OpenShadowRoot();
Element* d11 = shadow_root1->QuerySelector("#d1-1");
Element* d12 = shadow_root1->QuerySelector("#d1-2");
Element* d13 = shadow_root1->QuerySelector("#d1-3");
......@@ -545,7 +545,7 @@ TEST_F(FlatTreeTraversalTest, v1Redistribution) {
Element* d1s2 = shadow_root1->QuerySelector("[name=d1-s2]");
AttachOpenShadowRoot(*d11, shadow_html2);
ShadowRoot* shadow_root2 = d11->openShadowRoot();
ShadowRoot* shadow_root2 = d11->OpenShadowRoot();
Element* d111 = shadow_root2->QuerySelector("#d1-1-1");
Element* d112 = shadow_root2->QuerySelector("#d1-1-2");
Element* d11s1 = shadow_root2->QuerySelector("[name=d1-1-s1]");
......@@ -614,7 +614,7 @@ TEST_F(FlatTreeTraversalTest, v1FallbackContent) {
Element* d1 = body->QuerySelector("#d1");
AttachOpenShadowRoot(*d1, shadow_html);
ShadowRoot* shadow_root = d1->openShadowRoot();
ShadowRoot* shadow_root = d1->OpenShadowRoot();
Element* before = shadow_root->QuerySelector("#before");
Element* after = shadow_root->QuerySelector("#after");
Element* fallback_content = shadow_root->QuerySelector("p");
......@@ -646,7 +646,7 @@ TEST_F(FlatTreeTraversalTest, v1FallbackContentSkippedInTraversal) {
Element* span = body->QuerySelector("span");
AttachOpenShadowRoot(*d1, shadow_html);
ShadowRoot* shadow_root = d1->openShadowRoot();
ShadowRoot* shadow_root = d1->OpenShadowRoot();
Element* before = shadow_root->QuerySelector("#before");
Element* after = shadow_root->QuerySelector("#after");
Element* fallback_content = shadow_root->QuerySelector("p");
......@@ -681,7 +681,7 @@ TEST_F(FlatTreeTraversalTest, v1AllFallbackContent) {
Element* d1 = body->QuerySelector("#d1");
AttachOpenShadowRoot(*d1, shadow_html);
ShadowRoot* shadow_root = d1->openShadowRoot();
ShadowRoot* shadow_root = d1->OpenShadowRoot();
Element* fallback_x = shadow_root->QuerySelector("#x");
Element* fallback_y = shadow_root->QuerySelector("#y");
Element* fallback_z = shadow_root->QuerySelector("#z");
......
......@@ -308,8 +308,8 @@ void TextIteratorAlgorithm<Strategy>::Advance() {
// Enter author shadow roots, from youngest, if any and if necessary.
if (iteration_progress_ < kHandledOpenShadowRoots) {
if (EntersOpenShadowRoots() && node_->IsElementNode() &&
ToElement(node_)->openShadowRoot()) {
ShadowRoot* youngest_shadow_root = ToElement(node_)->openShadowRoot();
ToElement(node_)->OpenShadowRoot()) {
ShadowRoot* youngest_shadow_root = ToElement(node_)->OpenShadowRoot();
DCHECK(youngest_shadow_root->GetType() == ShadowRootType::V0 ||
youngest_shadow_root->GetType() == ShadowRootType::kOpen);
node_ = youngest_shadow_root;
......
......@@ -667,7 +667,7 @@ TEST_F(TextIteratorTest, EndingConditionWithDisplayNoneInShadowTree) {
SetShadowContent(shadow_content, "host");
ShadowRoot* shadow_root =
GetDocument().getElementById("host")->openShadowRoot();
GetDocument().getElementById("host")->OpenShadowRoot();
Node* b_in_shadow_tree = shadow_root->getElementById("end");
Position start(&GetDocument(), 0);
......
......@@ -270,7 +270,7 @@ void TextControlElement::setRangeText(const String& replacement,
String::Number(end) + ").");
return;
}
if (openShadowRoot())
if (OpenShadowRoot())
return;
String text = InnerEditorValue();
......@@ -398,7 +398,7 @@ bool TextControlElement::SetSelectionRange(
unsigned start,
unsigned end,
TextFieldSelectionDirection direction) {
if (openShadowRoot() || !IsTextControl())
if (OpenShadowRoot() || !IsTextControl())
return false;
const unsigned editor_value_length = InnerEditorValue().length();
end = std::min(end, editor_value_length);
......@@ -797,8 +797,8 @@ void TextControlElement::AddPlaceholderBreakElementIfNecessary() {
}
void TextControlElement::SetInnerEditorValue(const String& value) {
DCHECK(!openShadowRoot());
if (!IsTextControl() || openShadowRoot())
DCHECK(!OpenShadowRoot());
if (!IsTextControl() || OpenShadowRoot())
return;
bool text_is_changed = value != InnerEditorValue();
......@@ -828,7 +828,7 @@ void TextControlElement::SetInnerEditorValue(const String& value) {
}
String TextControlElement::InnerEditorValue() const {
DCHECK(!openShadowRoot());
DCHECK(!OpenShadowRoot());
HTMLElement* inner_editor = InnerEditorElement();
if (!inner_editor || !IsTextControl())
return g_empty_string;
......
......@@ -61,7 +61,7 @@ DEFINE_TRACE(ChooserOnlyTemporalInputTypeView) {
void ChooserOnlyTemporalInputTypeView::HandleDOMActivateEvent(Event*) {
if (GetElement().IsDisabledOrReadOnly() || !GetElement().GetLayoutObject() ||
!UserGestureIndicator::ProcessingUserGesture() ||
GetElement().openShadowRoot())
GetElement().OpenShadowRoot())
return;
if (date_time_chooser_)
......
......@@ -166,7 +166,7 @@ void TouchActionTest::RunShadowDOMTest(std::string file) {
ASSERT_GE(host_nodes->length(), 1u);
for (unsigned index = 0; index < host_nodes->length(); index++) {
ShadowRoot* shadow_root = host_nodes->item(index)->openShadowRoot();
ShadowRoot* shadow_root = host_nodes->item(index)->OpenShadowRoot();
RunTestOnTree(shadow_root, web_view, client);
}
......
......@@ -74,7 +74,7 @@ TEST_F(SlotScopedTraversalTest, emptySlot) {
SetupSampleHTML(main_html, shadow_html, 0);
Element* host = GetDocument().QuerySelector("#host");
ShadowRoot* shadow_root = host->openShadowRoot();
ShadowRoot* shadow_root = host->OpenShadowRoot();
Element* slot_element = shadow_root->QuerySelector("slot");
DCHECK(isHTMLSlotElement(slot_element));
HTMLSlotElement* slot = toHTMLSlotElement(slot_element);
......@@ -110,7 +110,7 @@ TEST_F(SlotScopedTraversalTest, simpleSlot) {
Element* host = GetDocument().QuerySelector("#host");
Element* inner1 = GetDocument().QuerySelector("#inner1");
Element* inner2 = GetDocument().QuerySelector("#inner2");
ShadowRoot* shadow_root = host->openShadowRoot();
ShadowRoot* shadow_root = host->OpenShadowRoot();
Element* slot_element = shadow_root->QuerySelector("slot");
DCHECK(isHTMLSlotElement(slot_element));
HTMLSlotElement* slot = toHTMLSlotElement(slot_element);
......@@ -159,7 +159,7 @@ TEST_F(SlotScopedTraversalTest, multipleSlots) {
inner[4] = GetDocument().QuerySelector("#inner4");
inner[5] = GetDocument().QuerySelector("#inner5");
ShadowRoot* shadow_root = host->openShadowRoot();
ShadowRoot* shadow_root = host->OpenShadowRoot();
Element* slot_element[3];
slot_element[0] = shadow_root->QuerySelector("#slot0");
slot_element[1] = shadow_root->QuerySelector("#slot1");
......@@ -237,7 +237,7 @@ TEST_F(SlotScopedTraversalTest, shadowHostAtTopLevel) {
AttachOpenShadowRoot(*inner[i], shadow_html);
ShadowRoot* shadow_root = host->openShadowRoot();
ShadowRoot* shadow_root = host->OpenShadowRoot();
Element* slot_element = shadow_root->QuerySelector("slot");
DCHECK(isHTMLSlotElement(slot_element));
HTMLSlotElement* slot = toHTMLSlotElement(slot_element);
......@@ -345,7 +345,7 @@ TEST_F(SlotScopedTraversalTest, shadowHostAtSecondLevel) {
DCHECK(span[i]);
}
ShadowRoot* shadow_root = host->openShadowRoot();
ShadowRoot* shadow_root = host->OpenShadowRoot();
Element* slot_element = shadow_root->QuerySelector("slot");
DCHECK(isHTMLSlotElement(slot_element));
HTMLSlotElement* slot = toHTMLSlotElement(slot_element);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment