Changeset 170103 in webkit

Timestamp:

Jun 18, 2014 10:20:39 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[WinCairo] Compile errors when trying to compile CA code.
​https://bugs.webkit.org/show_bug.cgi?id=134030

Patch by ​peavo@outlook.com <​peavo@outlook.com> on 2014-06-18
Reviewed by Simon Fraser.

WinCairo does not USE(CA).

• WebCore.vcxproj/WebCore.vcxproj:
• platform/graphics/ca/TileController.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.vcxproj/WebCore.vcxproj (modified) (1 diff)
• platform/graphics/ca/TileController.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-18  peavo@outlook.com  <peavo@outlook.com>
+
+        [WinCairo] Compile errors when trying to compile CA code.
+        https://bugs.webkit.org/show_bug.cgi?id=134030
+
+        Reviewed by Simon Fraser.
+
+        WinCairo does not USE(CA).
+
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * platform/graphics/ca/TileController.h:
+
 2014-06-17  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -7229 +7229 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\platform\graphics\ca\TileCoverageMap.cpp" />
+    <ClCompile Include="..\platform\graphics\ca\TileCoverageMap.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\platform\graphics\ca\TileGrid.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>

trunk/Source/WebCore/platform/graphics/ca/TileController.h

@@ -151 +151 @@
     virtual double retainedTileBackingStoreMemory() const override;
     virtual IntRect tileCoverageRect() const override;
+#if USE(CA)
     virtual PlatformCALayer* tiledScrollingIndicatorLayer() override;
+#endif
     virtual void setScrollingModeIndication(ScrollingModeIndication) override;
     virtual void setTileMargins(int marginTop, int marginBottom, int marginLeft, int marginRight) override;