Unreviewed. Attempting to fix the AppleWin build after r194577.
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 Jan 2016 17:31:46 +0000 (17:31 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 Jan 2016 17:31:46 +0000 (17:31 +0000)
Add the ClipStack.cpp build target alongside the TextureMapperGL.cpp
one, since both include GraphicsContext3D.h and ANGLEWebKitBridge.h
indirectly, the latter requiring specific include flags.

* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformWinCairo.cmake:

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

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformEfl.cmake
Source/WebCore/PlatformGTK.cmake
Source/WebCore/PlatformWinCairo.cmake

index b6f6ce2..84c6d58 100644 (file)
@@ -2243,7 +2243,6 @@ set(WebCore_SOURCES
 
     platform/graphics/opentype/OpenTypeMathData.cpp
 
-    platform/graphics/texmap/ClipStack.cpp
     platform/graphics/texmap/TextureMapper.cpp
     platform/graphics/texmap/TextureMapperAnimation.cpp
     platform/graphics/texmap/TextureMapperBackingStore.cpp
index 5b8f103..fefd84e 100644 (file)
@@ -1,3 +1,16 @@
+2016-01-05  Zan Dobersek  <zdobersek@igalia.com>
+
+        Unreviewed. Attempting to fix the AppleWin build after r194577.
+
+        Add the ClipStack.cpp build target alongside the TextureMapperGL.cpp
+        one, since both include GraphicsContext3D.h and ANGLEWebKitBridge.h
+        indirectly, the latter requiring specific include flags.
+
+        * CMakeLists.txt:
+        * PlatformEfl.cmake:
+        * PlatformGTK.cmake:
+        * PlatformWinCairo.cmake:
+
 2016-01-05  Antti Koivisto  <antti@apple.com>
 
         Move StyleChange enum into a separate file
index abacfeb..ca2edb0 100644 (file)
@@ -207,6 +207,7 @@ list(APPEND WebCore_SOURCES
     platform/graphics/texmap/BitmapTexture.cpp
     platform/graphics/texmap/BitmapTextureGL.cpp
     platform/graphics/texmap/BitmapTexturePool.cpp
+    platform/graphics/texmap/ClipStack.cpp
     platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
     platform/graphics/texmap/TextureMapperGL.cpp
     platform/graphics/texmap/TextureMapperShaderProgram.cpp
index bc7b1da..da82cb4 100644 (file)
@@ -421,6 +421,7 @@ if (USE_TEXTURE_MAPPER)
     if (USE_TEXTURE_MAPPER_GL)
         list(APPEND WebCore_SOURCES
             platform/graphics/texmap/BitmapTextureGL.cpp
+            platform/graphics/texmap/ClipStack.cpp
             platform/graphics/texmap/TextureMapperGL.cpp
             platform/graphics/texmap/TextureMapperShaderProgram.cpp
         )
index 4d4a22e..e5b73c8 100644 (file)
@@ -59,6 +59,7 @@ list(APPEND WebCore_SOURCES
     platform/graphics/texmap/BitmapTexture.cpp
     platform/graphics/texmap/BitmapTextureGL.cpp
     platform/graphics/texmap/BitmapTexturePool.cpp
+    platform/graphics/texmap/ClipStack.cpp
     platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
     platform/graphics/texmap/TextureMapper.cpp
     platform/graphics/texmap/TextureMapperAnimation.cpp