Title: [152661] branches/safari-537-branch/Source/WebCore

Diff

Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152660 => 152661)


--- branches/safari-537-branch/Source/WebCore/ChangeLog	2013-07-15 22:50:55 UTC (rev 152660)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog	2013-07-15 22:58:41 UTC (rev 152661)
@@ -1,5 +1,25 @@
 2013-07-15  Lucas Forschler  <[email protected]>
 
+        Merge r152345
+
+    2013-07-03  Radu Stavila  <[email protected]>
+
+            [CSS Regions] Improve implementation of elements in region being flowed to another flow thread
+            https://bugs.webkit.org/show_bug.cgi?id=118300
+
+            Based on patch by Zoltán Árvai <[email protected]>
+
+            Reviewed by Csaba Osztrogonác.
+
+            Fixed CSS_REGIONS guard.
+
+            * dom/Element.h:
+            * dom/NodeRenderingContext.cpp:
+            (WebCore::NodeRenderingContext::elementInsideRegionNeedsRenderer):
+            (WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):
+
+2013-07-15  Lucas Forschler  <[email protected]>
+
         Merge r152330
 
     2013-07-02  Ruth Fong  <[email protected]>

Modified: branches/safari-537-branch/Source/WebCore/dom/Element.h (152660 => 152661)


--- branches/safari-537-branch/Source/WebCore/dom/Element.h	2013-07-15 22:50:55 UTC (rev 152660)
+++ branches/safari-537-branch/Source/WebCore/dom/Element.h	2013-07-15 22:58:41 UTC (rev 152661)
@@ -626,8 +626,9 @@
     PassRefPtr<RenderStyle> styleForRenderer();
 
     RenderRegion* renderRegion() const;
+
+#if ENABLE(CSS_REGIONS)
     virtual bool shouldMoveToFlowThread(RenderStyle*) const;
-#if ENABLE(CSS_REGIONS)
     const AtomicString& webkitRegionOverset() const;
     Vector<RefPtr<Range> > webkitGetRegionFlowRanges() const;
 #endif

Modified: branches/safari-537-branch/Source/WebCore/dom/NodeRenderingContext.cpp (152660 => 152661)


--- branches/safari-537-branch/Source/WebCore/dom/NodeRenderingContext.cpp	2013-07-15 22:50:55 UTC (rev 152660)
+++ branches/safari-537-branch/Source/WebCore/dom/NodeRenderingContext.cpp	2013-07-15 22:58:41 UTC (rev 152661)
@@ -199,8 +199,10 @@
 // Check the specific case of elements that are children of regions but are flowed into a flow thread themselves.
 bool NodeRenderingContext::elementInsideRegionNeedsRenderer()
 {
+    bool elementInsideRegionNeedsRenderer = false;
+
+#if ENABLE(CSS_REGIONS)
     Element* element = toElement(m_node);
-    bool elementInsideRegionNeedsRenderer = false;
     RenderObject* parentRenderer = this->parentRenderer();
     if ((parentRenderer && !parentRenderer->canHaveChildren() && parentRenderer->isRenderRegion())
         || (!parentRenderer && element->parentElement() && element->parentElement()->isInsideRegion())) {
@@ -214,12 +216,14 @@
         if (element->rendererIsNeeded(*this))
             element->setIsInsideRegion(true);
     }
+#endif
 
     return elementInsideRegionNeedsRenderer;
 }
 
 void NodeRenderingContext::moveToFlowThreadIfNeeded()
 {
+#if ENABLE(CSS_REGIONS)
     Element* element = toElement(m_node);
 
     if (!element->shouldMoveToFlowThread(m_style.get()))
@@ -229,6 +233,7 @@
     FlowThreadController* flowThreadController = m_node->document()->renderView()->flowThreadController();
     m_parentFlowRenderer = flowThreadController->ensureRenderFlowThreadWithName(m_style->flowThread());
     flowThreadController->registerNamedFlowContentNode(m_node, m_parentFlowRenderer);
+#endif
 }
 
 bool NodeRenderingContext::isOnEncapsulationBoundary() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to