Changeset 74406 in webkit

Timestamp:

Dec 21, 2010 1:55:53 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-21 Dominic Cooney <​dominicc@google.com>

Reviewed by Adam Barth.

Rename Node::isShadowNode to isShadowRoot
​https://bugs.webkit.org/show_bug.cgi?id=51060

The method gets whether the node is the root of a shadow tree;
renamed to reflect intent.

A simple rename--no new tests needed.

• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::initForStyleResolve): (WebCore::CSSStyleSelector::SelectorChecker::checkSelector):
• dom/Node.cpp: (WebCore::Node::shadowTreeRootNode): (WebCore::Node::isInShadowTree): (WebCore::eventTargetRespectingSVGTargetRules): (WebCore::Node::getEventAncestors):
• dom/Node.h: (WebCore::Node::isShadowRoot):
• dom/Range.cpp: (WebCore::Range::checkNodeBA):
• page/DragController.cpp: (WebCore::asFileInput):
• page/EventHandler.cpp: (WebCore::EventHandler::handleMousePressEvent): (WebCore::EventHandler::dispatchMouseEvent):
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::hasLineIfEmpty):
• rendering/TextControlInnerElements.cpp: (WebCore::TextControlInnerElement::attachInnerElement):
• svg/SVGStyledElement.cpp: (WebCore::SVGStyledElement::title):
• svg/SVGUseElement.cpp: (WebCore::ShadowTreeUpdateBlocker::while):
• svg/animation/SVGSMILElement.cpp: (WebCore::SVGSMILElement::insertedIntoDocument):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleSelector.cpp (modified) (2 diffs)
• dom/Node.cpp (modified) (5 diffs)
• dom/Node.h (modified) (1 diff)
• dom/Range.cpp (modified) (1 diff)
• page/DragController.cpp (modified) (1 diff)
• page/EventHandler.cpp (modified) (2 diffs)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/TextControlInnerElements.cpp (modified) (1 diff)
• svg/SVGStyledElement.cpp (modified) (1 diff)
• svg/SVGUseElement.cpp (modified) (1 diff)
• svg/animation/SVGSMILElement.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-21  Dominic Cooney  <dominicc@google.com>
+
+        Reviewed by Adam Barth.
+
+        Rename Node::isShadowNode to isShadowRoot
+        https://bugs.webkit.org/show_bug.cgi?id=51060
+
+        The method gets whether the node is the root of a shadow tree;
+        renamed to reflect intent.
+
+        A simple rename--no new tests needed.
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::initForStyleResolve):
+        (WebCore::CSSStyleSelector::SelectorChecker::checkSelector):
+        * dom/Node.cpp:
+        (WebCore::Node::shadowTreeRootNode):
+        (WebCore::Node::isInShadowTree):
+        (WebCore::eventTargetRespectingSVGTargetRules):
+        (WebCore::Node::getEventAncestors):
+        * dom/Node.h:
+        (WebCore::Node::isShadowRoot):
+        * dom/Range.cpp:
+        (WebCore::Range::checkNodeBA):
+        * page/DragController.cpp:
+        (WebCore::asFileInput):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMousePressEvent):
+        (WebCore::EventHandler::dispatchMouseEvent):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::hasLineIfEmpty):
+        * rendering/TextControlInnerElements.cpp:
+        (WebCore::TextControlInnerElement::attachInnerElement):
+        * svg/SVGStyledElement.cpp:
+        (WebCore::SVGStyledElement::title):
+        * svg/SVGUseElement.cpp:
+        (WebCore::ShadowTreeUpdateBlocker::while):
+        * svg/animation/SVGSMILElement.cpp:
+        (WebCore::SVGSMILElement::insertedIntoDocument):
+
 2010-12-20  Mahesh Kulkarni  <mahesh.kulkarni@nokia.com>
 

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -762 +762 @@
 
 #if ENABLE(SVG)
-    if (!m_parentNode && e && e->isSVGElement() && e->isShadowNode())
+    if (!m_parentNode && e && e->isSVGElement() && e->isShadowRoot())
         m_parentNode = e->shadowParentNode();
 #endif
@@ -1893 +1893 @@
     // Spec: CSS2 selectors cannot be applied to the (conceptually) cloned DOM tree
     // because its contents are not part of the formal document structure.
-    if (e->isSVGElement() && e->isShadowNode())
+    if (e->isSVGElement() && e->isShadowRoot())
         return SelectorFailsCompletely;
 #endif

trunk/WebCore/dom/Node.cpp

@@ -1458 +1458 @@
     Node* root = this;
     while (root) {
-        if (root->isShadowNode())
+        if (root->isShadowRoot())
             return root;
         root = root->parentNodeGuaranteedHostFree();
@@ -1468 +1468 @@
 {
     for (Node* n = this; n; n = n->parentNode())
-        if (n->isShadowNode())
+        if (n->isShadowRoot())
             return true;
     return false;
@@ -2523 +2523 @@
     // as a deeply cloned child of the 'use' element, except that events are dispatched to the SVGElementInstance objects
     for (Node* n = referenceNode; n; n = n->parentNode()) {
-        if (!n->isShadowNode() || !n->isSVGElement())
+        if (!n->isShadowRoot() || !n->isSVGElement())
             continue;
 
@@ -2546 +2546 @@
     bool shouldSkipNextAncestor = false;
     while (true) {
-        if (ancestor->isShadowNode()) {
+        if (ancestor->isShadowRoot()) {
             if (behavior == StayInsideShadowDOM)
                 return;
@@ -2560 +2560 @@
 #if ENABLE(SVG)
         // Skip SVGShadowTreeRootElement.
-        shouldSkipNextAncestor = ancestor->isSVGElement() && ancestor->isShadowNode();
+        shouldSkipNextAncestor = ancestor->isSVGElement() && ancestor->isShadowRoot();
         if (shouldSkipNextAncestor)
             continue;

trunk/WebCore/dom/Node.h

@@ -206 +206 @@
     virtual bool isCharacterDataNode() const { return false; }
     bool isDocumentNode() const;
-    bool isShadowNode() const { return getFlag(IsShadowRootFlag); }
+    bool isShadowRoot() const { return getFlag(IsShadowRootFlag); }
     // FIXME: Eliminate all uses, fold into shadowHost.
     ContainerNode* shadowParentNode() const;

trunk/WebCore/dom/Range.cpp

@@ -1189 +1189 @@
         case Node::TEXT_NODE:
         case Node::XPATH_NAMESPACE_NODE:
-            if (root->isShadowNode())
+            if (root->isShadowRoot())
                 break;
             ec = RangeException::INVALID_NODE_TYPE_ERR;

trunk/WebCore/page/DragController.cpp

@@ -256 +256 @@
     // In order to get around this problem we assume any non-FILE input element
     // is this internal button, and try querying the shadow parent node.
-    if (node->hasTagName(HTMLNames::inputTag) && node->isShadowNode() && !static_cast<HTMLInputElement*>(node)->isFileUpload())
+    if (node->hasTagName(HTMLNames::inputTag) && node->isShadowRoot() && !static_cast<HTMLInputElement*>(node)->isFileUpload())
         node = node->shadowParentNode();
 

trunk/WebCore/page/EventHandler.cpp

@@ -1384 +1384 @@
         // we'd like to EventHandler::handleMousePressEvent to pass the event to the widget and thus the
         // event target node can't still be the shadow node.
-        if (mev.targetNode()->isShadowNode() && mev.targetNode()->shadowParentNode()->hasTagName(inputTag)) {
+        if (mev.targetNode()->isShadowRoot() && mev.targetNode()->shadowParentNode()->hasTagName(inputTag)) {
             HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active);
             mev = m_frame->document()->prepareMouseEvent(request, documentPoint, mouseEvent);
@@ -1914 +1914 @@
                 // will set a selection inside it, which will call setFocuseNodeIfNeeded.
                 ExceptionCode ec = 0;
-                Node* n = node->isShadowNode() ? node->shadowParentNode() : node;
+                Node* n = node->isShadowRoot() ? node->shadowParentNode() : node;
                 if (m_frame->selection()->isRange()
                     && m_frame->selection()->toNormalizedRange()->compareNode(n, ec) == Range::NODE_INSIDE

trunk/WebCore/rendering/RenderBlock.cpp

@@ -4902 +4902 @@
         return true;
     
-    if (node()->isShadowNode() && (node()->shadowParentNode()->hasTagName(inputTag)))
+    if (node()->isShadowRoot() && (node()->shadowParentNode()->hasTagName(inputTag)))
         return true;
     

trunk/WebCore/rendering/TextControlInnerElements.cpp

@@ -105 +105 @@
 
     // For elements not yet in shadow DOM, add the node to the DOM normally.
-    if (!isShadowNode()) {
+    if (!isShadowRoot()) {
         // FIXME: This code seems very wrong.  Why are we magically adding |this| to the DOM here?
         //        We shouldn't be calling parser API methods outside of the parser!

trunk/WebCore/svg/SVGStyledElement.cpp

@@ -81 +81 @@
     Node* parent = const_cast<SVGStyledElement*>(this);
     while (parent) {
-        if (!parent->isShadowNode()) {
+        if (!parent->isShadowRoot()) {
             parent = parent->parentNodeGuaranteedHostFree();
             continue;

trunk/WebCore/svg/SVGUseElement.cpp

@@ -494 +494 @@
     ContainerNode* parent = parentNode();
     while (parent) {
-        if (parent->isShadowNode())
+        if (parent->isShadowRoot())
             return;
 
         parent = parent->parentNodeGuaranteedHostFree();
     }
- 
+
     SVGElement* target = 0;
     if (targetElement && targetElement->isSVGElement())

trunk/WebCore/svg/animation/SVGSMILElement.cpp

@@ -149 +149 @@
     // Verify we are not in <use> instance tree.
     for (ContainerNode* n = this; n; n = n->parentNode())
-        ASSERT(!n->isShadowNode());
+        ASSERT(!n->isShadowRoot());
 #endif
     SVGSVGElement* owner = ownerSVGElement();
@@ -962 +962 @@
 
 #endif
-