Title: [154200] trunk/Source/WebCore
- Revision
- 154200
- Author
- [email protected]
- Date
- 2013-08-16 12:20:36 -0700 (Fri, 16 Aug 2013)
Log Message
<https://webkit.org/b/119891> [WinCairo] Compile error.
Patch by [email protected] <[email protected]> on 2013-08-16
Reviewed by Brent Fulgham.
* rendering/FlowThreadController.cpp: Need USE(ACCELERATED_COMPOSITING) guard.
* rendering/FlowThreadController.h: Need USE(ACCELERATED_COMPOSITING) guard.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154199 => 154200)
--- trunk/Source/WebCore/ChangeLog 2013-08-16 19:15:31 UTC (rev 154199)
+++ trunk/Source/WebCore/ChangeLog 2013-08-16 19:20:36 UTC (rev 154200)
@@ -1,3 +1,12 @@
+2013-08-16 [email protected] <[email protected]>
+
+ <https://webkit.org/b/119891> [WinCairo] Compile error.
+
+ Reviewed by Brent Fulgham.
+
+ * rendering/FlowThreadController.cpp: Need USE(ACCELERATED_COMPOSITING) guard.
+ * rendering/FlowThreadController.h: Need USE(ACCELERATED_COMPOSITING) guard.
+
2013-08-16 Zan Dobersek <[email protected]>
<https://webkit.org/b/119887> [Soup] The testing NetworkStorageSession should have a proper SoupSession
Modified: trunk/Source/WebCore/rendering/FlowThreadController.cpp (154199 => 154200)
--- trunk/Source/WebCore/rendering/FlowThreadController.cpp 2013-08-16 19:15:31 UTC (rev 154199)
+++ trunk/Source/WebCore/rendering/FlowThreadController.cpp 2013-08-16 19:20:36 UTC (rev 154200)
@@ -266,6 +266,7 @@
}
}
+#if USE(ACCELERATED_COMPOSITING)
void FlowThreadController::updateRenderFlowThreadLayersIfNeeded()
{
// Walk the flow chain in reverse order because RenderRegions might become RenderLayers for the following flow threads.
@@ -274,6 +275,7 @@
flowRenderer->updateLayerToRegionMappingsIfNeeded();
}
}
+#endif
bool FlowThreadController::isContentNodeRegisteredWithAnyNamedFlow(const Node* contentNode) const
{
Modified: trunk/Source/WebCore/rendering/FlowThreadController.h (154199 => 154200)
--- trunk/Source/WebCore/rendering/FlowThreadController.h 2013-08-16 19:15:31 UTC (rev 154199)
+++ trunk/Source/WebCore/rendering/FlowThreadController.h 2013-08-16 19:20:36 UTC (rev 154200)
@@ -79,7 +79,9 @@
void updateFlowThreadsIntoMeasureContentPhase();
void updateFlowThreadsIntoFinalPhase();
+#if USE(ACCELERATED_COMPOSITING)
void updateRenderFlowThreadLayersIfNeeded();
+#endif
#ifndef NDEBUG
bool isAutoLogicalHeightRegionsCountConsistent() const;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
