<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196429] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196429">196429</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-11 11:52:22 -0800 (Thu, 11 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[cmake] Consolidate TextureMapper file and include dir lists.
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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWinCairocmake">trunk/Source/WebCore/PlatformWinCairo.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsWinCairocmake">trunk/Source/cmake/OptionsWinCairo.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformTextureMappercmake">trunk/Source/WebCore/platform/TextureMapper.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (196428 => 196429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-02-11 19:49:38 UTC (rev 196428)
+++ trunk/ChangeLog 2016-02-11 19:52:22 UTC (rev 196429)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-02-09 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [GTK][EFL] Fix several build configuration related to SamplingProfiler after r196245
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (196428 => 196429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-02-11 19:49:38 UTC (rev 196428)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-02-11 19:52:22 UTC (rev 196429)
</span><span class="lines">@@ -74,11 +74,9 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/cpu/arm/filters"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/displaylists"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/filters"
</span><del>- "${WEBCORE_DIR}/platform/graphics/filters/texmap"
</del><span class="cx"> "${WEBCORE_DIR}/platform/graphics/harfbuzz"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/opentype"
</span><del>- "${WEBCORE_DIR}/platform/graphics/texmap"
</del><span class="cx"> "${WEBCORE_DIR}/platform/graphics/transforms"
</span><span class="cx"> "${WEBCORE_DIR}/platform/mediastream"
</span><span class="cx"> "${WEBCORE_DIR}/platform/mock"
</span><span class="lines">@@ -2274,15 +2272,6 @@
</span><span class="cx">
</span><span class="cx"> platform/graphics/opentype/OpenTypeMathData.cpp
</span><span class="cx">
</span><del>- 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
-
</del><span class="cx"> platform/graphics/transforms/AffineTransform.cpp
</span><span class="cx"> platform/graphics/transforms/Matrix3DTransformOperation.cpp
</span><span class="cx"> platform/graphics/transforms/MatrixTransformOperation.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196428 => 196429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-11 19:49:38 UTC (rev 196428)
+++ trunk/Source/WebCore/ChangeLog 2016-02-11 19:52:22 UTC (rev 196429)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-02-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Move 'length' property to the prototype
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (196428 => 196429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2016-02-11 19:49:38 UTC (rev 196428)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2016-02-11 19:52:22 UTC (rev 196429)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> include(platform/ImageDecoders.cmake)
</span><ins>+include(platform/TextureMapper.cmake)
</ins><span class="cx">
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
</span><span class="lines">@@ -24,7 +25,6 @@
</span><span class="cx"> "${THIRDPARTY_DIR}/ANGLE/include/KHR"
</span><span class="cx"> "${WEBCORE_DIR}/editing/atk"
</span><span class="cx"> "${WEBCORE_DIR}/page/efl"
</span><del>- "${WEBCORE_DIR}/page/scrolling/coordinatedgraphics"
</del><span class="cx"> "${WEBCORE_DIR}/platform/cairo"
</span><span class="cx"> "${WEBCORE_DIR}/platform/efl"
</span><span class="cx"> "${WEBCORE_DIR}/platform/geoclue"
</span><span class="lines">@@ -38,8 +38,6 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/surfaces"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/surfaces/efl"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/surfaces/glx"
</span><del>- "${WEBCORE_DIR}/platform/graphics/texmap"
- "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
</del><span class="cx"> "${WEBCORE_DIR}/platform/graphics/x11"
</span><span class="cx"> "${WEBCORE_DIR}/platform/linux"
</span><span class="cx"> "${WEBCORE_DIR}/platform/mediastream/openwebrtc"
</span><span class="lines">@@ -86,9 +84,6 @@
</span><span class="cx">
</span><span class="cx"> page/scrolling/AxisScrollSnapOffsets.cpp
</span><span class="cx">
</span><del>- page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp
- page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp
-
</del><span class="cx"> platform/KillRingNone.cpp
</span><span class="cx">
</span><span class="cx"> platform/audio/efl/AudioBusEfl.cpp
</span><span class="lines">@@ -206,23 +201,6 @@
</span><span class="cx">
</span><span class="cx"> platform/graphics/surfaces/glx/X11Helper.cpp
</span><span class="cx">
</span><del>- 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
-
</del><span class="cx"> platform/graphics/x11/PlatformDisplayX11.cpp
</span><span class="cx"> platform/graphics/x11/XUniqueResource.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (196428 => 196429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2016-02-11 19:49:38 UTC (rev 196428)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-02-11 19:52:22 UTC (rev 196429)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> include(platform/ImageDecoders.cmake)
</span><ins>+include(platform/TextureMapper.cmake)
</ins><span class="cx">
</span><span class="cx"> set(WebCore_OUTPUT_NAME WebCoreGTK)
</span><span class="cx">
</span><span class="lines">@@ -394,55 +395,7 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-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
- )
</del><span class="cx">
</span><del>- 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 ()
-
-
</del><span class="cx"> if (USE_OPENGL_ES_2)
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> platform/graphics/opengl/Extensions3DOpenGLES.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWinCairocmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (196428 => 196429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWinCairo.cmake 2016-02-11 19:49:38 UTC (rev 196428)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2016-02-11 19:52:22 UTC (rev 196429)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> include(platform/ImageDecoders.cmake)
</span><ins>+include(platform/TextureMapper.cmake)
</ins><span class="cx">
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
</span><span class="lines">@@ -58,22 +59,6 @@
</span><span class="cx"> platform/graphics/cairo/RefPtrCairo.cpp
</span><span class="cx"> platform/graphics/cairo/TransformationMatrixCairo.cpp
</span><span class="cx">
</span><del>- 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
-
</del><span class="cx"> platform/graphics/win/DIBPixelData.cpp
</span><span class="cx"> platform/graphics/win/FontCacheWin.cpp
</span><span class="cx"> platform/graphics/win/FontCustomPlatformDataCairo.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformTextureMappercmake"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/TextureMapper.cmake (0 => 196429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/TextureMapper.cmake (rev 0)
+++ trunk/Source/WebCore/platform/TextureMapper.cmake 2016-02-11 19:52:22 UTC (rev 196429)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+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 ()
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (196428 => 196429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2016-02-11 19:49:38 UTC (rev 196428)
+++ trunk/Source/cmake/OptionsEfl.cmake 2016-02-11 19:52:22 UTC (rev 196429)
</span><span class="lines">@@ -244,6 +244,7 @@
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_MULTIPROCESS TRUE)
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_GRAPHICS_SURFACE TRUE)
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE)
</span><ins>+SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL TRUE)
</ins><span class="cx">
</span><span class="cx"> option(ENABLE_GLES2 "Enable GLES Support")
</span><span class="cx"> if (ENABLE_GLES2)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWinCairocmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWinCairo.cmake (196428 => 196429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWinCairo.cmake 2016-02-11 19:49:38 UTC (rev 196428)
+++ trunk/Source/cmake/OptionsWinCairo.cmake 2016-02-11 19:52:22 UTC (rev 196429)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> set(USE_CF 1)
</span><span class="cx"> set(USE_CURL 1)
</span><span class="cx"> set(USE_ICU_UNICODE 1)
</span><ins>+set(USE_TEXTURE_MAPPER_GL 1)
</ins><span class="cx">
</span><span class="cx"> set(ENABLE_GRAPHICS_CONTEXT_3D 1)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>