Changeset 166354 in webkit

Timestamp:

Mar 27, 2014 2:45:30 AM (10 years ago)

Author:

mihnea@adobe.com

Message:

[CSSRegions] Rename inNamedFlow flag to isNamedFlowContentNode flag
​https://bugs.webkit.org/show_bug.cgi?id=130731

Reviewed by Andrei Bucur.

Currently, the inNamedFlow flag in Node class tells if a node is a content node, one that has a style with flow-into.
Since it is used only for those nodes and not propagated through hierarchy, i want to renamed it to a more meaningful name.
No new functionality, no new tests.

• dom/ContainerNode.cpp:

(WebCore::destroyRenderTreeIfNeeded):

• dom/Element.cpp:

(WebCore::Element::~Element):
(WebCore::Element::unregisterNamedFlowContentElement):

• dom/Node.h:

(WebCore::Node::isNamedFlowContentNode):
(WebCore::Node::setIsNamedFlowContentNode):
(WebCore::Node::clearIsNamedFlowContentNode):

• rendering/RenderNamedFlowThread.cpp:

(WebCore::RenderNamedFlowThread::clearContentElements):
(WebCore::RenderNamedFlowThread::registerNamedFlowContentElement):
(WebCore::RenderNamedFlowThread::unregisterNamedFlowContentElement):
(WebCore::nextNodeInsideContentElement):

• style/StyleResolveTree.cpp:

(WebCore::Style::attachChildren):
(WebCore::Style::resolveLocal):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ContainerNode.cpp (modified) (1 diff)
• dom/Element.cpp (modified) (2 diffs)
• dom/Node.h (modified) (3 diffs)
• rendering/RenderNamedFlowThread.cpp (modified) (4 diffs)
• style/StyleResolveTree.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-27  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions] Rename inNamedFlow flag to isNamedFlowContentNode flag
+        https://bugs.webkit.org/show_bug.cgi?id=130731
+
+        Reviewed by Andrei Bucur.
+
+        Currently, the inNamedFlow flag in Node class tells if a node is a content node, one that has a style with flow-into.
+        Since it is used only for those nodes and not propagated through hierarchy, i want to renamed it to a more meaningful name.
+        No new functionality, no new tests.
+
+        * dom/ContainerNode.cpp:
+        (WebCore::destroyRenderTreeIfNeeded):
+        * dom/Element.cpp:
+        (WebCore::Element::~Element):
+        (WebCore::Element::unregisterNamedFlowContentElement):
+        * dom/Node.h:
+        (WebCore::Node::isNamedFlowContentNode):
+        (WebCore::Node::setIsNamedFlowContentNode):
+        (WebCore::Node::clearIsNamedFlowContentNode):
+        * rendering/RenderNamedFlowThread.cpp:
+        (WebCore::RenderNamedFlowThread::clearContentElements):
+        (WebCore::RenderNamedFlowThread::registerNamedFlowContentElement):
+        (WebCore::RenderNamedFlowThread::unregisterNamedFlowContentElement):
+        (WebCore::nextNodeInsideContentElement):
+        * style/StyleResolveTree.cpp:
+        (WebCore::Style::attachChildren):
+        (WebCore::Style::resolveLocal):
+
 2014-03-27  Mihnea Ovidenie  <mihnea@adobe.com>
 

trunk/Source/WebCore/dom/ContainerNode.cpp

@@ -96 +96 @@
 {
     // FIXME: Get rid of the named flow test.
-    if (!child.renderer() && !child.inNamedFlow())
+    if (!child.renderer() && !child.isNamedFlowContentNode())
         return;
     if (child.isElementNode())

trunk/Source/WebCore/dom/Element.cpp

@@ -147 +147 @@
         // When the document is not destroyed, an element that was part of a named flow
         // content nodes should have been removed from the content nodes collection
-        // and the inNamedFlow flag reset.
-        ASSERT(!inNamedFlow());
+        // and the isNamedFlowContentNode flag reset.
+        ASSERT(!isNamedFlowContentNode());
     }
 #endif
@@ -1377 +1377 @@
 void Element::unregisterNamedFlowContentElement()
 {
-    if (document().cssRegionsEnabled() && inNamedFlow() && document().renderView())
+    if (document().cssRegionsEnabled() && isNamedFlowContentNode() && document().renderView())
         document().renderView()->flowThreadController().unregisterNamedFlowContentElement(*this);
 }

trunk/Source/WebCore/dom/Node.h

@@ -260 +260 @@
     bool needsNodeRenderingTraversalSlowPath() const;
 
-    bool inNamedFlow() const { return getFlag(InNamedFlowFlag); }
+    bool isNamedFlowContentNode() const { return getFlag(IsNamedFlowContentNodeFlag); }
     bool hasCustomStyleResolveCallbacks() const { return getFlag(HasCustomStyleResolveCallbacksFlag); }
 
@@ -338 +338 @@
     void clearIsLink() { clearFlag(IsLinkFlag); }
 
-    void setInNamedFlow() { setFlag(InNamedFlowFlag); }
-    void clearInNamedFlow() { clearFlag(InNamedFlowFlag); }
+    void setIsNamedFlowContentNode() { setFlag(IsNamedFlowContentNodeFlag); }
+    void clearIsNamedFlowContentNode() { clearFlag(IsNamedFlowContentNodeFlag); }
 
     bool hasEventTargetData() const { return getFlag(HasEventTargetDataFlag); }
@@ -597 +597 @@
         StyleChangeMask = 1 << nodeStyleChangeShift | 1 << (nodeStyleChangeShift + 1) | 1 << (nodeStyleChangeShift + 2),
         IsEditingTextFlag = 1 << 17,
-        InNamedFlowFlag = 1 << 18,
+        IsNamedFlowContentNodeFlag = 1 << 18,
         HasSyntheticAttrChildNodesFlag = 1 << 19,
         HasCustomStyleResolveCallbacksFlag = 1 << 20,

trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp

@@ -76 +76 @@
     for (auto& contentElement : m_contentElements) {
         ASSERT(contentElement);
-        ASSERT(contentElement->inNamedFlow());
+        ASSERT(contentElement->isNamedFlowContentNode());
         ASSERT(&contentElement->document() == &document());
         
-        contentElement->clearInNamedFlow();
+        contentElement->clearIsNamedFlowContentNode();
     }
     
@@ -498 +498 @@
     ASSERT(&contentElement.document() == &document());
 
-    contentElement.setInNamedFlow();
+    contentElement.setIsNamedFlowContentNode();
 
     resetMarkForDestruction();
@@ -519 +519 @@
 {
     ASSERT(m_contentElements.contains(&contentElement));
-    ASSERT(contentElement.inNamedFlow());
+    ASSERT(contentElement.isNamedFlowContentNode());
     ASSERT(&contentElement.document() == &document());
 
-    contentElement.clearInNamedFlow();
+    contentElement.clearIsNamedFlowContentNode();
     m_contentElements.remove(&contentElement);
 
@@ -635 +635 @@
 {
     ASSERT(currNode);
-    ASSERT(contentElement && contentElement->inNamedFlow());
+    ASSERT(contentElement && contentElement->isNamedFlowContentNode());
 
     if (currNode->renderer() && currNode->renderer()->isSVGRoot())

trunk/Source/WebCore/style/StyleResolveTree.cpp

@@ -474 +474 @@
 {
     for (Node* child = current.firstChild(); child; child = child->nextSibling()) {
-        ASSERT((!child->renderer() || child->inNamedFlow()) || current.shadowRoot());
+        ASSERT((!child->renderer() || child->isNamedFlowContentNode()) || current.shadowRoot());
         if (child->renderer()) {
             renderTreePosition.invalidateNextSibling(*child->renderer());
@@ -724 +724 @@
     }
     if (localChange == Detach) {
-        if (current.renderer() || current.inNamedFlow())
+        if (current.renderer() || current.isNamedFlowContentNode())
             detachRenderTree(current, ReattachDetach);
         attachRenderTree(current, renderingParentNode, renderTreePosition, newStyle.release());