Changeset 171476 in webkit

Timestamp:

Jul 23, 2014 5:12:36 AM (10 years ago)

Author:

mihnea@adobe.com

Message:

ASSERTION FAILED: generatingElement() in WebCore::RenderNamedFlowFragment::regionOversetState
​https://bugs.webkit.org/show_bug.cgi?id=135153

Reviewed by David Hyatt.

Source/WebCore:
Even though the CSSRegions spec defines the behaviour of a multicolumn region,
we currently do not support this functionality. This patch ensures that a multicolumn
element does not become a region. In the future, when we will implement the multicolumn
as region functionality, ​http://dev.w3.org/csswg/css-regions/#multi-column-regions, we
will remove this restriction.

Test: fast/regions/multicol-as-region-prevented.html

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::createRenderNamedFlowFragmentIfNeeded):

LayoutTests:

• fast/regions/multicol-as-region-prevented-expected.html: Added.
• fast/regions/multicol-as-region-prevented.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/multicol-as-region-prevented-expected.html (added)
• LayoutTests/fast/regions/multicol-as-region-prevented.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockFlow.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-07-23  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        ASSERTION FAILED: generatingElement() in WebCore::RenderNamedFlowFragment::regionOversetState
+        https://bugs.webkit.org/show_bug.cgi?id=135153
+
+        Reviewed by David Hyatt.
+
+        * fast/regions/multicol-as-region-prevented-expected.html: Added.
+        * fast/regions/multicol-as-region-prevented.html: Added.
+
 2014-07-10  Radu Stavila  <stavila@adobe.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-23  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        ASSERTION FAILED: generatingElement() in WebCore::RenderNamedFlowFragment::regionOversetState
+        https://bugs.webkit.org/show_bug.cgi?id=135153
+
+        Reviewed by David Hyatt.
+
+        Even though the CSSRegions spec defines the behaviour of a multicolumn region,
+        we currently do not support this functionality. This patch ensures that a multicolumn
+        element does not become a region. In the future, when we will implement the multicolumn
+        as region functionality, http://dev.w3.org/csswg/css-regions/#multi-column-regions, we
+        will remove this restriction.
+
+        Test: fast/regions/multicol-as-region-prevented.html
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::createRenderNamedFlowFragmentIfNeeded):
+
 2014-07-23  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -3016 +3016 @@
         return;
 
-    if (style().isDisplayRegionType() && style().hasFlowFrom()) {
+    // FIXME: Multicolumn regions not yet supported (http://dev.w3.org/csswg/css-regions/#multi-column-regions)
+    if (style().isDisplayRegionType() && style().hasFlowFrom() && !style().specifiesColumns()) {
         RenderNamedFlowFragment* flowFragment = new RenderNamedFlowFragment(document(), RenderNamedFlowFragment::createStyle(style()));
         flowFragment->initializeStyle();