Title: [158100] trunk/Source/WebCore
- Revision
- 158100
- Author
- [email protected]
- Date
- 2013-10-27 18:59:40 -0700 (Sun, 27 Oct 2013)
Log Message
Fix 4 asserting SVG tests after r158097.
RenderElement::setStyle() is, quite surprisingly, a virtual function
with a single override in RenderSVGBlock.
To match the old behavior, we have to rewrite the display type from
any inline type to block instead.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::initializeStyle):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158099 => 158100)
--- trunk/Source/WebCore/ChangeLog 2013-10-28 00:17:44 UTC (rev 158099)
+++ trunk/Source/WebCore/ChangeLog 2013-10-28 01:59:40 UTC (rev 158100)
@@ -1,5 +1,17 @@
2013-10-27 Andreas Kling <[email protected]>
+ Fix 4 asserting SVG tests after r158097.
+
+ RenderElement::setStyle() is, quite surprisingly, a virtual function
+ with a single override in RenderSVGBlock.
+ To match the old behavior, we have to rewrite the display type from
+ any inline type to block instead.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::initializeStyle):
+
+2013-10-27 Andreas Kling <[email protected]>
+
Tone down overzealous assertion from r158097.
RenderElement::initializeStyle() really only cares that there are no
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (158099 => 158100)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2013-10-28 00:17:44 UTC (rev 158099)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2013-10-28 01:59:40 UTC (rev 158100)
@@ -350,6 +350,14 @@
void RenderElement::initializeStyle()
{
+#if ENABLE(SVG)
+ // FIXME: This logic should be in a less ridiculous place. (This is mirrored from RenderSVGBlock::setStyle().)
+ if (isRenderSVGBlock() && m_style->isDisplayInlineType()) {
+ // SVG text layout code expects us to be a block-level style element.
+ m_style->setDisplay(BLOCK);
+ }
+#endif
+
styleWillChange(StyleDifferenceEqual, *style());
m_hasInitializedStyle = true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
