Changeset 152293 in webkit

Timestamp:

Jul 2, 2013 8:00:31 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[CSSRegions] No other SVG elements except the SVGRoot must have RegionInfo objects attached
​https://bugs.webkit.org/show_bug.cgi?id=118295

Patch by Radu Stavila <​stavila@adobe.com> on 2013-07-02
Reviewed by Antti Koivisto.

Only the SVGRoot element can be collected in a named flow. As such, no SVG element below the root should
be attached to a RenderBoxRegionInfo object.

A larger patch's test (​https://bugs.webkit.org/show_bug.cgi?id=118300) is failing because of this.
This change will be covered by that test.

• rendering/RenderBoxModelObject.h:

(WebCore::RenderBoxModelObject::canHaveBoxInfoInRegion):

• rendering/RenderObject.h:

(WebCore::RenderObject::isRenderSVGBlock):

• rendering/svg/RenderSVGBlock.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBoxModelObject.h (modified) (1 diff)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/svg/RenderSVGBlock.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-02  Radu Stavila  <stavila@adobe.com>
+
+        [CSSRegions] No other SVG elements except the SVGRoot must have RegionInfo objects attached
+        https://bugs.webkit.org/show_bug.cgi?id=118295
+
+        Reviewed by Antti Koivisto.
+
+        Only the SVGRoot element can be collected in a named flow. As such, no SVG element below the root should
+        be attached to a RenderBoxRegionInfo object.
+
+        A larger patch's test (https://bugs.webkit.org/show_bug.cgi?id=118300) is failing because of this.
+        This change will be covered by that test.
+
+        * rendering/RenderBoxModelObject.h:
+        (WebCore::RenderBoxModelObject::canHaveBoxInfoInRegion):
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::isRenderSVGBlock):
+        * rendering/svg/RenderSVGBlock.h:
+
 2013-07-02  Kangil Han  <kangil.han@samsung.com>
 

trunk/Source/WebCore/rendering/RenderBoxModelObject.h

@@ -175 +175 @@
     virtual void setSelectionState(SelectionState s);
 
-    bool canHaveBoxInfoInRegion() const { return !isFloating() && !isReplaced() && !isInline() && !hasColumns() && !isTableCell() && isBlockFlow(); }
+    bool canHaveBoxInfoInRegion() const { return !isFloating() && !isReplaced() && !isInline() && !hasColumns() && !isTableCell() && isBlockFlow() && !isRenderSVGBlock(); }
+
 
     void getGeometryForBackgroundImage(const RenderLayerModelObject* paintContainer, IntRect& destRect, IntPoint& phase, IntSize& tileSize) const;

trunk/Source/WebCore/rendering/RenderObject.h

@@ -354 +354 @@
 #endif
     virtual bool isRenderBlock() const { return false; }
+    virtual bool isRenderSVGBlock() const { return false; };
     virtual bool isRenderButton() const { return false; }
     virtual bool isRenderIFrame() const { return false; }

trunk/Source/WebCore/rendering/svg/RenderSVGBlock.h

@@ -42 +42 @@
     virtual void updateFromStyle() OVERRIDE;
 
+    virtual bool isRenderSVGBlock() const OVERRIDE { return true; };
+
     virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const;