Changeset 152345 in webkit

Timestamp:

Jul 3, 2013 2:02:43 AM (11 years ago)

Author:

Csaba Osztrogonác

Message:

[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 <​zarvai@inf.u-szeged.hu>

Patch by Radu Stavila <​stavila@adobe.com> on 2013-07-03
Reviewed by Csaba Osztrogonác.

Fixed CSS_REGIONS guard.

• dom/Element.h:
• dom/NodeRenderingContext.cpp:

(WebCore::NodeRenderingContext::elementInsideRegionNeedsRenderer):
(WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.h (modified) (1 diff)
• dom/NodeRenderingContext.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-03  Radu Stavila  <stavila@adobe.com>
+
+        [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 <zarvai@inf.u-szeged.hu>
+
+        Reviewed by Csaba Osztrogonác.
+
+        Fixed CSS_REGIONS guard.
+
+        * dom/Element.h:
+        * dom/NodeRenderingContext.cpp:
+        (WebCore::NodeRenderingContext::elementInsideRegionNeedsRenderer):
+        (WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):
+
 2013-07-03  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

trunk/Source/WebCore/dom/Element.h

@@ -636 +636 @@
 
     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;

trunk/Source/WebCore/dom/NodeRenderingContext.cpp

@@ -200 +200 @@
 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())
@@ -215 +217 @@
             element->setIsInsideRegion(true);
     }
+#endif
 
     return elementInsideRegionNeedsRenderer;
@@ -221 +224 @@
 void NodeRenderingContext::moveToFlowThreadIfNeeded()
 {
+#if ENABLE(CSS_REGIONS)
     Element* element = toElement(m_node);
 
@@ -230 +234 @@
     m_parentFlowRenderer = flowThreadController->ensureRenderFlowThreadWithName(m_style->flowThread());
     flowThreadController->registerNamedFlowContentNode(m_node, m_parentFlowRenderer);
+#endif
 }