Title: [154813] trunk/Source/WebCore
- Revision
- 154813
- Author
- [email protected]
- Date
- 2013-08-29 09:20:43 -0700 (Thu, 29 Aug 2013)
Log Message
Buildfix after r154806 for !ENABLE(CSS_REGIONS) platforms.
https://bugs.webkit.org/show_bug.cgi?id=120461
Patch by Tamas Czene <[email protected]> on 2013-08-29
Reviewed by Csaba Osztrogonác.
moveToFlowThreadIfNeeded() is used only inside of ENABLE(CSS_REGIONS)
block (and only once), so it should be guarded too.
* style/StyleResolveTree.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154812 => 154813)
--- trunk/Source/WebCore/ChangeLog 2013-08-29 15:47:19 UTC (rev 154812)
+++ trunk/Source/WebCore/ChangeLog 2013-08-29 16:20:43 UTC (rev 154813)
@@ -1,3 +1,15 @@
+2013-08-29 Tamas Czene <[email protected]>
+
+ Buildfix after r154806 for !ENABLE(CSS_REGIONS) platforms.
+ https://bugs.webkit.org/show_bug.cgi?id=120461
+
+ Reviewed by Csaba Osztrogonác.
+
+ moveToFlowThreadIfNeeded() is used only inside of ENABLE(CSS_REGIONS)
+ block (and only once), so it should be guarded too.
+
+ * style/StyleResolveTree.cpp:
+
2013-08-29 David Kilzer <[email protected]>
BUILD FIX (r154778): AXSearchFieldCancelButtonText() is not defined on iOS
Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (154812 => 154813)
--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2013-08-29 15:47:19 UTC (rev 154812)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2013-08-29 16:20:43 UTC (rev 154813)
@@ -171,6 +171,7 @@
return false;
}
+#if ENABLE(CSS_REGIONS)
static RenderNamedFlowThread* moveToFlowThreadIfNeeded(Element& element, const RenderStyle& style)
{
if (!element.shouldMoveToFlowThread(style))
@@ -180,6 +181,7 @@
flowThreadController.registerNamedFlowContentNode(&element, &parentFlowRenderer);
return &parentFlowRenderer;
}
+#endif
static void createRendererIfNeeded(Element& element, const AttachContext& context)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
