Changeset 87227 in webkit

Timestamp:

May 24, 2011 4:19:55 PM (13 years ago)

Author:

tkent@chromium.org

Message:

2011-05-24 Kent Tamura <​tkent@chromium.org>

Reviewed by Dimitri Glazkov.

Node::shadowAncestorNode() and shadowTreeRootNode() should be const.
​https://bugs.webkit.org/show_bug.cgi?id=61398

shadowAncestorNode() and shadowTreeRootNode() should be const
though they can return 'this' pointer.

No new tests. This doesn't change any visible behavior.

• dom/Node.cpp: (WebCore::Node::shadowAncestorNode): Make this const. (WebCore::Node::shadowTreeRootNode): ditto.
• dom/Node.h: Update declarations.
• html/shadow/TextControlInnerElements.h: (WebCore::SpinButtonElement::isEnabledFormControl): Need no const_cast<>. (WebCore::SpinButtonElement::isReadOnlyFormControl): ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Node.cpp (modified) (3 diffs)
• dom/Node.h (modified) (1 diff)
• html/shadow/TextControlInnerElements.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-24  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Node::shadowAncestorNode() and shadowTreeRootNode() should be const.
+        https://bugs.webkit.org/show_bug.cgi?id=61398
+
+        shadowAncestorNode() and shadowTreeRootNode() should be const
+        though they can return 'this' pointer.
+
+        No new tests. This doesn't change any visible behavior.
+
+        * dom/Node.cpp:
+        (WebCore::Node::shadowAncestorNode): Make this const.
+        (WebCore::Node::shadowTreeRootNode): ditto.
+        * dom/Node.h: Update declarations.
+        * html/shadow/TextControlInnerElements.h:
+        (WebCore::SpinButtonElement::isEnabledFormControl): Need no const_cast<>.
+        (WebCore::SpinButtonElement::isReadOnlyFormControl): ditto.
+
 2011-05-24  James Simonsen  <simonjam@chromium.org>
 

trunk/Source/WebCore/dom/Node.cpp

@@ -1539 +1539 @@
 #endif
 
-Node* Node::shadowAncestorNode()
+Node* Node::shadowAncestorNode() const
 {
 #if ENABLE(SVG)
@@ -1547 +1547 @@
     // shadow tree concept. (This function _could_ be made virtual - opinions?)
     if (isSVGElement())
-        return this;
+        return const_cast<Node*>(this);
 #endif
 
@@ -1553 +1553 @@
     if (root)
         return root->shadowHost();
-    return this;
-}
-
-Node* Node::shadowTreeRootNode()
-{
-    Node* root = this;
+    return const_cast<Node*>(this);
+}
+
+Node* Node::shadowTreeRootNode() const
+{
+    Node* root = const_cast<Node*>(this);
     while (root) {
         if (root->isShadowRoot() || root->isSVGShadowRoot())

trunk/Source/WebCore/dom/Node.h

@@ -215 +215 @@
     virtual bool canHaveLightChildRendererWithShadow() const { return false; }
 
-    Node* shadowAncestorNode();
+    Node* shadowAncestorNode() const;
     // Returns 0, a ShadowRoot, or a legacy shadow root.
-    Node* shadowTreeRootNode();
+    Node* shadowTreeRootNode() const;
     // Returns 0, a child of ShadowRoot, or a legacy shadow root.
     Node* nonBoundaryShadowTreeRootNode();

trunk/Source/WebCore/html/shadow/TextControlInnerElements.h

@@ -107 +107 @@
     virtual void detach();
     virtual bool isSpinButtonElement() const { return true; }
-    // FIXME: shadowAncestorNode() should be const.
-    virtual bool isEnabledFormControl() const { return static_cast<Element*>(const_cast<SpinButtonElement*>(this)->shadowAncestorNode())->isEnabledFormControl(); }
-    virtual bool isReadOnlyFormControl() const { return static_cast<Element*>(const_cast<SpinButtonElement*>(this)->shadowAncestorNode())->isReadOnlyFormControl(); }
+    virtual bool isEnabledFormControl() const { return static_cast<Element*>(shadowAncestorNode())->isEnabledFormControl(); }
+    virtual bool isReadOnlyFormControl() const { return static_cast<Element*>(shadowAncestorNode())->isReadOnlyFormControl(); }
     virtual void defaultEventHandler(Event*);
     void startRepeatingTimer();