Changeset 139962 in webkit

Timestamp:

Jan 16, 2013 9:13:00 PM (11 years ago)

Author:

shinyak@chromium.org

Message:

[Refactoring] HTMLTextFormControlElement should use shadowHost instead of shadowAncestorNode
​https://bugs.webkit.org/show_bug.cgi?id=106533

Reviewed by Kent Tamura.

Since Node::shadowAncestorNode() is deprecated, we would like to use Node::shadowHost().

No new tests, simple refactoring.

• html/HTMLTextFormControlElement.cpp:

(WebCore::HTMLTextFormControlElement::setSelectionRange): Here, startPosition and endPosition is in ShadowDOM,
converting shadowAncestorNode to shadowHost is safe.
(WebCore::enclosingTextFormControl): Actually ASSERT in this method is wrong since shadowAncestorNode() does not
return NULL. This should be shadowHost().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLTextFormControlElement.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-16  Shinya Kawanaka  <shinyak@chromium.org>
+
+        [Refactoring] HTMLTextFormControlElement should use shadowHost instead of shadowAncestorNode
+        https://bugs.webkit.org/show_bug.cgi?id=106533
+
+        Reviewed by Kent Tamura.
+
+        Since Node::shadowAncestorNode() is deprecated, we would like to use Node::shadowHost().
+
+        No new tests, simple refactoring.
+
+        * html/HTMLTextFormControlElement.cpp:
+        (WebCore::HTMLTextFormControlElement::setSelectionRange): Here, startPosition and endPosition is in ShadowDOM,
+        converting shadowAncestorNode to shadowHost is safe.
+        (WebCore::enclosingTextFormControl): Actually ASSERT in this method is wrong since shadowAncestorNode() does not
+        return NULL. This should be shadowHost().
+
 2013-01-16  Tony Gentilcore  <tonyg@chromium.org>
 

trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp

@@ -331 +331 @@
     // "-webkit-user-select: none" style attribute is specified.
     if (startPosition.isNotNull() && endPosition.isNotNull()) {
-        ASSERT(startPosition.deepEquivalent().deprecatedNode()->shadowAncestorNode() == this
-            && endPosition.deepEquivalent().deprecatedNode()->shadowAncestorNode() == this);
+        ASSERT(startPosition.deepEquivalent().deprecatedNode()->shadowHost() == this
+            && endPosition.deepEquivalent().deprecatedNode()->shadowHost() == this);
     }
     VisibleSelection newSelection;
@@ -640 +640 @@
 {
     ASSERT(position.isNull() || position.anchorType() == Position::PositionIsOffsetInAnchor
-           || position.containerNode() || !position.anchorNode()->shadowAncestorNode());
+        || position.containerNode() || !position.anchorNode()->shadowHost());
     Node* container = position.containerNode();
     if (!container)
         return 0;
-    Node* ancestor = container->shadowAncestorNode();
-    return ancestor != container ? toTextFormControl(ancestor) : 0;
+    Node* ancestor = container->shadowHost();
+    return ancestor ? toTextFormControl(ancestor) : 0;
 }