<https://webkit.org/b/119891> [WinCairo] Compile error.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Aug 2013 19:20:36 +0000 (19:20 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Aug 2013 19:20:36 +0000 (19:20 +0000)
Patch by peavo@outlook.com <peavo@outlook.com> on 2013-08-16
Reviewed by Brent Fulgham.

* rendering/FlowThreadController.cpp: Need USE(ACCELERATED_COMPOSITING) guard.
* rendering/FlowThreadController.h: Need USE(ACCELERATED_COMPOSITING) guard.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154200 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/FlowThreadController.cpp
Source/WebCore/rendering/FlowThreadController.h

index 7b6c3b6..881d008 100644 (file)
@@ -1,3 +1,12 @@
+2013-08-16  peavo@outlook.com  <peavo@outlook.com>
+
+        <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  <zdobersek@igalia.com>
 
         <https://webkit.org/b/119887> [Soup] The testing NetworkStorageSession should have a proper SoupSession
 2013-08-16  Zan Dobersek  <zdobersek@igalia.com>
 
         <https://webkit.org/b/119887> [Soup] The testing NetworkStorageSession should have a proper SoupSession
index 8a8872e..2ff4507 100644 (file)
@@ -266,6 +266,7 @@ void FlowThreadController::updateFlowThreadsIntoFinalPhase()
     }
 }
 
     }
 }
 
+#if USE(ACCELERATED_COMPOSITING)
 void FlowThreadController::updateRenderFlowThreadLayersIfNeeded()
 {
     // Walk the flow chain in reverse order because RenderRegions might become RenderLayers for the following flow threads.
 void FlowThreadController::updateRenderFlowThreadLayersIfNeeded()
 {
     // Walk the flow chain in reverse order because RenderRegions might become RenderLayers for the following flow threads.
@@ -274,6 +275,7 @@ void FlowThreadController::updateRenderFlowThreadLayersIfNeeded()
         flowRenderer->updateLayerToRegionMappingsIfNeeded();
     }
 }
         flowRenderer->updateLayerToRegionMappingsIfNeeded();
     }
 }
+#endif
 
 bool FlowThreadController::isContentNodeRegisteredWithAnyNamedFlow(const Node* contentNode) const
 {
 
 bool FlowThreadController::isContentNodeRegisteredWithAnyNamedFlow(const Node* contentNode) const
 {
index 2b45f67..35244e4 100644 (file)
@@ -79,7 +79,9 @@ public:
     void updateFlowThreadsIntoMeasureContentPhase();
     void updateFlowThreadsIntoFinalPhase();
 
     void updateFlowThreadsIntoMeasureContentPhase();
     void updateFlowThreadsIntoFinalPhase();
 
+#if USE(ACCELERATED_COMPOSITING)
     void updateRenderFlowThreadLayersIfNeeded();
     void updateRenderFlowThreadLayersIfNeeded();
+#endif
 
 #ifndef NDEBUG
     bool isAutoLogicalHeightRegionsCountConsistent() const;
 
 #ifndef NDEBUG
     bool isAutoLogicalHeightRegionsCountConsistent() const;