Changeset 155109 in webkit

Timestamp:

Sep 5, 2013 3:33:05 AM (11 years ago)

Author:

mihnea@adobe.com

Message:

Replace node() calls with generatingNode() for RenderRegion code
​https://bugs.webkit.org/show_bug.cgi?id=120397

Reviewed by Darin Adler.

As regions will become anonymous blocks nested inside elements with the flow-from property, a first step
would be to change the calls to node() with calls to generatingNode(). In the case of regions, generatingNode()
will always return an Element* and not a Node*. Therefore, to get rid of toElement() casts, i created
a specific method RenderRegion::generatingElement that will return the generating node as Element.
No new tests as no functional change was introduced.

Original patch by Catalin Badea.

• css/ElementRuleCollector.cpp:

(WebCore::ElementRuleCollector::collectMatchingRulesForRegion):

• dom/WebKitNamedFlow.cpp:

(WebCore::WebKitNamedFlow::getRegionsByContent):
(WebCore::WebKitNamedFlow::getRegions):

• rendering/RenderRegion.cpp:

(WebCore::RenderRegion::regionOversetState):
(WebCore::RenderRegion::setRegionOversetState):
(WebCore::RenderRegion::checkRegionStyle):

• rendering/RenderRegion.h:

(WebCore::RenderRegion::generatingElement):

• rendering/RenderTreeAsText.cpp:

(WebCore::writeRenderRegionList): For pseudo-elements as regions, i want to print
{pseudo} instead of {div} marker for the parent.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/ElementRuleCollector.cpp (modified) (1 diff)
• dom/WebKitNamedFlow.cpp (modified) (2 diffs)
• rendering/RenderRegion.cpp (modified) (2 diffs)
• rendering/RenderRegion.h (modified) (2 diffs)
• rendering/RenderTreeAsText.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-05  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        Replace node() calls with generatingNode() for RenderRegion code
+        https://bugs.webkit.org/show_bug.cgi?id=120397
+
+        Reviewed by Darin Adler.
+
+        As regions will become anonymous blocks nested inside elements with the flow-from property, a first step
+        would be to change the calls to node() with calls to generatingNode(). In the case of regions, generatingNode()
+        will always return an Element* and not a Node*. Therefore, to get rid of toElement() casts, i created
+        a specific method RenderRegion::generatingElement that will return the generating node as Element.
+        No new tests as no functional change was introduced.
+
+        Original patch by Catalin Badea.
+
+        * css/ElementRuleCollector.cpp:
+        (WebCore::ElementRuleCollector::collectMatchingRulesForRegion):
+        * dom/WebKitNamedFlow.cpp:
+        (WebCore::WebKitNamedFlow::getRegionsByContent):
+        (WebCore::WebKitNamedFlow::getRegions):
+        * rendering/RenderRegion.cpp:
+        (WebCore::RenderRegion::regionOversetState):
+        (WebCore::RenderRegion::setRegionOversetState):
+        (WebCore::RenderRegion::checkRegionStyle):
+        * rendering/RenderRegion.h:
+        (WebCore::RenderRegion::generatingElement):
+        * rendering/RenderTreeAsText.cpp:
+        (WebCore::writeRenderRegionList): For pseudo-elements as regions, i want to print
+        {pseudo} instead of {div} marker for the parent.
+
 2013-09-05  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/css/ElementRuleCollector.cpp

@@ -183 +183 @@
     for (unsigned i = 0; i < size; ++i) {
         const CSSSelector* regionSelector = matchRequest.ruleSet->regionSelectorsAndRuleSets().at(i).selector;
-        if (checkRegionSelector(regionSelector, toElement(m_regionForStyling->node()))) {
+        if (checkRegionSelector(regionSelector, m_regionForStyling->generatingElement())) {
             RuleSet* regionRules = matchRequest.ruleSet->regionSelectorsAndRuleSets().at(i).ruleSet.get();
             ASSERT(regionRules);

trunk/Source/WebCore/dom/WebKitNamedFlow.cpp

@@ -141 +141 @@
                 continue;
             if (m_parentFlowThread->objectInFlowRegion(contentNode->renderer(), renderRegion))
-                regionNodes.append(renderRegion->node());
+                regionNodes.append(renderRegion->generatingElement());
         }
     }
@@ -168 +168 @@
         if (renderRegion->isPseudoElement())
             continue;
-        regionNodes.append(renderRegion->node());
+        regionNodes.append(renderRegion->generatingElement());
     }
 

trunk/Source/WebCore/rendering/RenderRegion.cpp

@@ -140 +140 @@
 RegionOversetState RenderRegion::regionOversetState() const
 {
-    ASSERT(node());
+    ASSERT(generatingElement());
 
     if (!isValid())
         return RegionUndefined;
 
-    if (Element* element = toElement(node()))
-        return element->regionOversetState();
-    
-    return RegionUndefined;
+    return generatingElement()->regionOversetState();
 }
 
 void RenderRegion::setRegionOversetState(RegionOversetState state)
 {
-    ASSERT(node());
-
-    if (Element* element = toElement(node()))
-        element->setRegionOversetState(state);
+    ASSERT(generatingElement());
+
+    generatingElement()->setRegionOversetState(state);
 }
 
@@ -232 +228 @@
 
     // FIXME: Region styling doesn't work for pseudo elements.
-    if (node()) {
-        Element* regionElement = toElement(node());
-        customRegionStyle = view().document().ensureStyleResolver().checkRegionStyle(regionElement);
-    }
+    if (!isPseudoElement())
+        customRegionStyle = view().document().ensureStyleResolver().checkRegionStyle(generatingElement());
     setHasCustomRegionStyle(customRegionStyle);
     m_flowThread->checkRegionsWithStyling();

trunk/Source/WebCore/rendering/RenderRegion.h

@@ -36 +36 @@
 namespace WebCore {
 
+class Element;
 struct LayerFragment;
 typedef Vector<LayerFragment, 1> LayerFragments;
@@ -152 +153 @@
 
     LayoutRect rectFlowPortionForBox(const RenderBox*, const LayoutRect&) const;
+
+    Element* generatingElement() const { return toElement(RenderObject::generatingNode()); }
 
 protected:

trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

@@ -670 +670 @@
         writeIndent(ts, indent + 2);
         ts << "RenderRegion";
-        if (renderRegion->generatingNode()) {
-            String tagName = getTagName(renderRegion->generatingNode());
+        if (renderRegion->generatingElement()) {
+            String tagName = getTagName(renderRegion->node());
             if (!tagName.isEmpty())
                 ts << " {" << tagName << "}";
-            if (renderRegion->generatingNode()->isElementNode() && toElement(renderRegion->generatingNode())->hasID()) {
-                Element* element = toElement(renderRegion->generatingNode());
-                ts << " #" << element->idForStyleResolution();
-            }
+            if (renderRegion->generatingElement()->hasID())
+                ts << " #" << renderRegion->generatingElement()->idForStyleResolution();
             if (renderRegion->hasLayer())
                 ts << " hasLayer";