[cmake] Consolidate TextureMapper file and include dir lists.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 Feb 2016 19:52:22 +0000 (19:52 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 Feb 2016 19:52:22 +0000 (19:52 +0000)
https://bugs.webkit.org/show_bug.cgi?id=154106

Patch by Konstantin Tokarev <annulen@yandex.ru> on 2016-02-11
Reviewed by Michael Catanzaro.

.:

* Source/cmake/OptionsEfl.cmake: Expose USE_TEXTURE_MAPPER_GL to
CMake code.
* Source/cmake/OptionsWinCairo.cmake: Ditto.

Source/WebCore:

No new tests needed.

* CMakeLists.txt: Moved texmap include dir and source list to
TextureMapper.cmake, removed non-existent include dir "filters/texmap".
* PlatformEfl.cmake: Moved texmap and coordinatedgraphics include
dirs and source list to TextureMapper.cmake.
* PlatformGTK.cmake: Ditto, also removed non-existent include dir
"texmap/threadedcompositor"
* PlatformWinCairo.cmake: Moved texmap files to TextureMapper.cmake.
* platform/TextureMapper.cmake: Added.

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

ChangeLog
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformEfl.cmake
Source/WebCore/PlatformGTK.cmake
Source/WebCore/PlatformWinCairo.cmake
Source/WebCore/platform/TextureMapper.cmake [new file with mode: 0644]
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsWinCairo.cmake

index 1c588ee..62d09c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2016-02-11  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [cmake] Consolidate TextureMapper file and include dir lists.
+        https://bugs.webkit.org/show_bug.cgi?id=154106
+
+        Reviewed by Michael Catanzaro.
+
+        * Source/cmake/OptionsEfl.cmake: Expose USE_TEXTURE_MAPPER_GL to
+        CMake code.
+        * Source/cmake/OptionsWinCairo.cmake: Ditto.
+
 2016-02-09  Csaba Osztrogon√°c  <ossy@webkit.org>
 
         [GTK][EFL] Fix several build configuration related to SamplingProfiler after r196245
index d1240a8..7b52306 100644 (file)
@@ -74,11 +74,9 @@ set(WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/graphics/cpu/arm/filters"
     "${WEBCORE_DIR}/platform/graphics/displaylists"
     "${WEBCORE_DIR}/platform/graphics/filters"
-    "${WEBCORE_DIR}/platform/graphics/filters/texmap"
     "${WEBCORE_DIR}/platform/graphics/harfbuzz"
     "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
     "${WEBCORE_DIR}/platform/graphics/opentype"
-    "${WEBCORE_DIR}/platform/graphics/texmap"
     "${WEBCORE_DIR}/platform/graphics/transforms"
     "${WEBCORE_DIR}/platform/mediastream"
     "${WEBCORE_DIR}/platform/mock"
@@ -2274,15 +2272,6 @@ set(WebCore_SOURCES
 
     platform/graphics/opentype/OpenTypeMathData.cpp
 
-    platform/graphics/texmap/TextureMapper.cpp
-    platform/graphics/texmap/TextureMapperAnimation.cpp
-    platform/graphics/texmap/TextureMapperBackingStore.cpp
-    platform/graphics/texmap/TextureMapperFPSCounter.cpp
-    platform/graphics/texmap/TextureMapperLayer.cpp
-    platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp
-    platform/graphics/texmap/TextureMapperTile.cpp
-    platform/graphics/texmap/TextureMapperTiledBackingStore.cpp
-
     platform/graphics/transforms/AffineTransform.cpp
     platform/graphics/transforms/Matrix3DTransformOperation.cpp
     platform/graphics/transforms/MatrixTransformOperation.cpp
index df58c9b..d6a4085 100644 (file)
@@ -1,3 +1,21 @@
+2016-02-11  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [cmake] Consolidate TextureMapper file and include dir lists.
+        https://bugs.webkit.org/show_bug.cgi?id=154106
+
+        Reviewed by Michael Catanzaro.
+
+        No new tests needed.
+
+        * CMakeLists.txt: Moved texmap include dir and source list to
+        TextureMapper.cmake, removed non-existent include dir "filters/texmap".
+        * PlatformEfl.cmake: Moved texmap and coordinatedgraphics include
+        dirs and source list to TextureMapper.cmake.
+        * PlatformGTK.cmake: Ditto, also removed non-existent include dir
+        "texmap/threadedcompositor"
+        * PlatformWinCairo.cmake: Moved texmap files to TextureMapper.cmake.
+        * platform/TextureMapper.cmake: Added.
+
 2016-02-11  Chris Dumez  <cdumez@apple.com>
 
         Move 'length' property to the prototype
index 055d9ea..0d9c358 100644 (file)
@@ -1,4 +1,5 @@
 include(platform/ImageDecoders.cmake)
+include(platform/TextureMapper.cmake)
 
 list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
@@ -24,7 +25,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${THIRDPARTY_DIR}/ANGLE/include/KHR"
     "${WEBCORE_DIR}/editing/atk"
     "${WEBCORE_DIR}/page/efl"
-    "${WEBCORE_DIR}/page/scrolling/coordinatedgraphics"
     "${WEBCORE_DIR}/platform/cairo"
     "${WEBCORE_DIR}/platform/efl"
     "${WEBCORE_DIR}/platform/geoclue"
@@ -38,8 +38,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/graphics/surfaces"
     "${WEBCORE_DIR}/platform/graphics/surfaces/efl"
     "${WEBCORE_DIR}/platform/graphics/surfaces/glx"
-    "${WEBCORE_DIR}/platform/graphics/texmap"
-    "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
     "${WEBCORE_DIR}/platform/graphics/x11"
     "${WEBCORE_DIR}/platform/linux"
     "${WEBCORE_DIR}/platform/mediastream/openwebrtc"
@@ -86,9 +84,6 @@ list(APPEND WebCore_SOURCES
 
     page/scrolling/AxisScrollSnapOffsets.cpp
 
-    page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp
-    page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp
-
     platform/KillRingNone.cpp
 
     platform/audio/efl/AudioBusEfl.cpp
@@ -206,23 +201,6 @@ list(APPEND WebCore_SOURCES
 
     platform/graphics/surfaces/glx/X11Helper.cpp
 
-    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
-
-    platform/graphics/texmap/coordinated/AreaAllocator.cpp
-    platform/graphics/texmap/coordinated/CompositingCoordinator.cpp
-    platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
-    platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp
-    platform/graphics/texmap/coordinated/CoordinatedSurface.cpp
-    platform/graphics/texmap/coordinated/Tile.cpp
-    platform/graphics/texmap/coordinated/TiledBackingStore.cpp
-    platform/graphics/texmap/coordinated/UpdateAtlas.cpp
-
     platform/graphics/x11/PlatformDisplayX11.cpp
     platform/graphics/x11/XUniqueResource.cpp
 
index 1dd9434..c4b8498 100644 (file)
@@ -1,4 +1,5 @@
 include(platform/ImageDecoders.cmake)
+include(platform/TextureMapper.cmake)
 
 set(WebCore_OUTPUT_NAME WebCoreGTK)
 
@@ -394,54 +395,6 @@ if (ENABLE_MEDIA_STREAM)
     )
 endif ()
 
-if (USE_TEXTURE_MAPPER)
-    list(APPEND WebCore_INCLUDE_DIRECTORIES
-        "${WEBCORE_DIR}/platform/graphics/texmap"
-    )
-    list(APPEND WebCore_SOURCES
-        platform/graphics/texmap/BitmapTexture.cpp
-        platform/graphics/texmap/BitmapTexturePool.cpp
-        platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
-    )
-
-    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
-        )
-    endif ()
-endif ()
-
-if (ENABLE_THREADED_COMPOSITOR)
-    list(APPEND WebCore_INCLUDE_DIRECTORIES
-        "${WEBCORE_DIR}/page/scrolling/coordinatedgraphics"
-        "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
-        "${WEBCORE_DIR}/platform/graphics/texmap/threadedcompositor"
-    )
-    list(APPEND WebCore_SOURCES
-        page/scrolling/ScrollingStateStickyNode.cpp
-        page/scrolling/ScrollingThread.cpp
-        page/scrolling/ScrollingTreeNode.cpp
-        page/scrolling/ScrollingTreeScrollingNode.cpp
-
-        page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp
-        page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp
-
-        platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp
-        platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp
-        platform/graphics/texmap/coordinated/AreaAllocator.cpp
-        platform/graphics/texmap/coordinated/CompositingCoordinator.cpp
-        platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
-        platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp
-        platform/graphics/texmap/coordinated/CoordinatedSurface.cpp
-        platform/graphics/texmap/coordinated/Tile.cpp
-        platform/graphics/texmap/coordinated/TiledBackingStore.cpp
-        platform/graphics/texmap/coordinated/UpdateAtlas.cpp
-    )
-endif ()
-
 
 if (USE_OPENGL_ES_2)
     list(APPEND WebCore_SOURCES
index 98e6e19..c3e4859 100644 (file)
@@ -1,4 +1,5 @@
 include(platform/ImageDecoders.cmake)
+include(platform/TextureMapper.cmake)
 
 list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
@@ -58,22 +59,6 @@ list(APPEND WebCore_SOURCES
     platform/graphics/cairo/RefPtrCairo.cpp
     platform/graphics/cairo/TransformationMatrixCairo.cpp
 
-    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
-    platform/graphics/texmap/TextureMapperBackingStore.cpp
-    platform/graphics/texmap/TextureMapperFPSCounter.cpp
-    platform/graphics/texmap/TextureMapperGL.cpp
-    platform/graphics/texmap/TextureMapperLayer.cpp
-    platform/graphics/texmap/TextureMapperShaderProgram.cpp
-    platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp
-    platform/graphics/texmap/TextureMapperTile.cpp
-    platform/graphics/texmap/TextureMapperTiledBackingStore.cpp
-
     platform/graphics/win/DIBPixelData.cpp
     platform/graphics/win/FontCacheWin.cpp
     platform/graphics/win/FontCustomPlatformDataCairo.cpp
diff --git a/Source/WebCore/platform/TextureMapper.cmake b/Source/WebCore/platform/TextureMapper.cmake
new file mode 100644 (file)
index 0000000..e190fa3
--- /dev/null
@@ -0,0 +1,52 @@
+list(APPEND WebCore_INCLUDE_DIRECTORIES
+    "${WEBCORE_DIR}/platform/graphics/texmap"
+)
+list(APPEND WebCore_SOURCES
+    platform/graphics/texmap/BitmapTexture.cpp
+    platform/graphics/texmap/BitmapTexturePool.cpp
+    platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
+    platform/graphics/texmap/TextureMapper.cpp
+    platform/graphics/texmap/TextureMapperAnimation.cpp
+    platform/graphics/texmap/TextureMapperBackingStore.cpp
+    platform/graphics/texmap/TextureMapperFPSCounter.cpp
+    platform/graphics/texmap/TextureMapperLayer.cpp
+    platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp
+    platform/graphics/texmap/TextureMapperTile.cpp
+    platform/graphics/texmap/TextureMapperTiledBackingStore.cpp
+)
+
+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
+    )
+endif ()
+
+if (USE_COORDINATED_GRAPHICS)
+    list(APPEND WebCore_INCLUDE_DIRECTORIES
+        "${WEBCORE_DIR}/page/scrolling/coordinatedgraphics"
+        "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
+    )
+    list(APPEND WebCore_SOURCES
+        page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp
+        page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp
+
+        platform/graphics/texmap/coordinated/AreaAllocator.cpp
+        platform/graphics/texmap/coordinated/CompositingCoordinator.cpp
+        platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
+        platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp
+        platform/graphics/texmap/coordinated/CoordinatedSurface.cpp
+        platform/graphics/texmap/coordinated/Tile.cpp
+        platform/graphics/texmap/coordinated/TiledBackingStore.cpp
+        platform/graphics/texmap/coordinated/UpdateAtlas.cpp
+    )
+endif ()
+
+if (ENABLE_THREADED_COMPOSITOR)
+    list(APPEND WebCore_SOURCES
+        platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp
+        platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp
+    )
+endif ()
index 37196e9..5e00c16 100644 (file)
@@ -244,6 +244,7 @@ SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS TRUE)
 SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_MULTIPROCESS TRUE)
 SET_AND_EXPOSE_TO_BUILD(USE_GRAPHICS_SURFACE TRUE)
 SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE)
+SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL TRUE)
 
 option(ENABLE_GLES2 "Enable GLES Support")
 if (ENABLE_GLES2)
index 16c38d9..47620ea 100644 (file)
@@ -5,6 +5,7 @@ include(OptionsWin)
 set(USE_CF 1)
 set(USE_CURL 1)
 set(USE_ICU_UNICODE 1)
+set(USE_TEXTURE_MAPPER_GL 1)
 
 set(ENABLE_GRAPHICS_CONTEXT_3D 1)