<!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>[173112] 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/173112">173112</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-29 03:05:25 -0700 (Fri, 29 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Remove non Coordinated Graphics code path from cmake build system after <a href="http://trac.webkit.org/projects/webkit/changeset/142169">r142169</a>
https://bugs.webkit.org/show_bug.cgi?id=135560
Patch by Eva Balazsfalvi <evab.u-szeged@partner.samsung.com> on 2014-08-29
Reviewed by Gyuyoung Kim.
.:
* Source/cmake/OptionsEfl.cmake: Removed TILED_BACKING_STORE guard.
Source/WebCore:
No new tests required, no new functionality.
* PlatformEfl.cmake: Removed TEXTURE_MAPPER and 3D_GRAPHICS guards.
* platform/graphics/efl/GraphicsContext3DEfl.cpp: Removed TEXTURE_MAPPER_GL and GRAPHICS_SURFACE guards.
(WebCore::GraphicsContext3D::platformLayer):
(WebCore::GraphicsContext3D::createGraphicsSurfaces):
* platform/graphics/efl/GraphicsContext3DPrivate.cpp: Removed TEXTURE_MAPPER_GL and GRAPHICS_SURFACE guards.
(WebCore::GraphicsContext3DPrivate::initialize):
(WebCore::GraphicsContext3DPrivate::releaseResources):
(WebCore::GraphicsContext3DPrivate::paintToTextureMapper):
(WebCore::GraphicsContext3DPrivate::graphicsSurfaceFlags):
* platform/graphics/efl/GraphicsContext3DPrivate.h: Removed TEXTURE_MAPPER_GL and GRAPHICS_SURFACE guards.
* platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp: Removed GRAPHICS_SURFACE guard.
Tools:
* Scripts/webkitperl/FeatureList.pm: Removed TILED_BACKING_STORE guard.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</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="#trunkSourceWebCoreplatformgraphicseflGraphicsContext3DEflcpp">trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicseflGraphicsContext3DPrivatecpp">trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicseflGraphicsContext3DPrivateh">trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicssurfaceseflGraphicsSurfaceCommoncpp">trunk/Source/WebCore/platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (173111 => 173112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-08-29 08:06:03 UTC (rev 173111)
+++ trunk/ChangeLog 2014-08-29 10:05:25 UTC (rev 173112)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-08-29 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ [EFL] Remove non Coordinated Graphics code path from cmake build system after r142169
+ https://bugs.webkit.org/show_bug.cgi?id=135560
+
+ Reviewed by Gyuyoung Kim.
+
+ * Source/cmake/OptionsEfl.cmake: Removed TILED_BACKING_STORE guard.
+
</ins><span class="cx"> 2014-08-28 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> WebInspectorUI.framework is not built for the "All Source" Xcode scheme
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173111 => 173112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-29 08:06:03 UTC (rev 173111)
+++ trunk/Source/WebCore/ChangeLog 2014-08-29 10:05:25 UTC (rev 173112)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-08-29 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ [EFL] Remove non Coordinated Graphics code path from cmake build system after r142169
+ https://bugs.webkit.org/show_bug.cgi?id=135560
+
+ Reviewed by Gyuyoung Kim.
+
+ No new tests required, no new functionality.
+
+ * PlatformEfl.cmake: Removed TEXTURE_MAPPER and 3D_GRAPHICS guards.
+ * platform/graphics/efl/GraphicsContext3DEfl.cpp: Removed TEXTURE_MAPPER_GL and GRAPHICS_SURFACE guards.
+ (WebCore::GraphicsContext3D::platformLayer):
+ (WebCore::GraphicsContext3D::createGraphicsSurfaces):
+ * platform/graphics/efl/GraphicsContext3DPrivate.cpp: Removed TEXTURE_MAPPER_GL and GRAPHICS_SURFACE guards.
+ (WebCore::GraphicsContext3DPrivate::initialize):
+ (WebCore::GraphicsContext3DPrivate::releaseResources):
+ (WebCore::GraphicsContext3DPrivate::paintToTextureMapper):
+ (WebCore::GraphicsContext3DPrivate::graphicsSurfaceFlags):
+ * platform/graphics/efl/GraphicsContext3DPrivate.h: Removed TEXTURE_MAPPER_GL and GRAPHICS_SURFACE guards.
+ * platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp: Removed GRAPHICS_SURFACE guard.
+
</ins><span class="cx"> 2014-08-29 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> RenderThemeGtk depends on classes outside of platform
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (173111 => 173112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2014-08-29 08:06:03 UTC (rev 173111)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2014-08-29 10:05:25 UTC (rev 173112)
</span><span class="lines">@@ -10,7 +10,12 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/freetype"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/harfbuzz/"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
</span><ins>+ "${WEBCORE_DIR}/platform/graphics/opengl"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/graphics/opentype"
</span><ins>+ "${WEBCORE_DIR}/platform/graphics/surfaces"
+ "${WEBCORE_DIR}/platform/graphics/surfaces/efl"
+ "${WEBCORE_DIR}/platform/graphics/surfaces/glx"
+ "${WEBCORE_DIR}/platform/graphics/texmap"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
</span><span class="cx"> "${WEBCORE_DIR}/platform/linux"
</span><span class="cx"> "${WEBCORE_DIR}/platform/mediastream/gstreamer"
</span><span class="lines">@@ -106,6 +111,7 @@
</span><span class="cx">
</span><span class="cx"> platform/graphics/cairo/BitmapImageCairo.cpp
</span><span class="cx"> platform/graphics/cairo/CairoUtilities.cpp
</span><ins>+ platform/graphics/cairo/DrawingBufferCairo.cpp
</ins><span class="cx"> platform/graphics/cairo/FontCairo.cpp
</span><span class="cx"> platform/graphics/cairo/FontCairoHarfbuzzNG.cpp
</span><span class="cx"> platform/graphics/cairo/GradientCairo.cpp
</span><span class="lines">@@ -122,6 +128,10 @@
</span><span class="cx"> platform/graphics/cairo/TransformationMatrixCairo.cpp
</span><span class="cx">
</span><span class="cx"> platform/graphics/efl/CairoUtilitiesEfl.cpp
</span><ins>+ platform/graphics/efl/EvasGLContext.cpp
+ platform/graphics/efl/EvasGLSurface.cpp
+ platform/graphics/efl/GraphicsContext3DEfl.cpp
+ platform/graphics/efl/GraphicsContext3DPrivate.cpp
</ins><span class="cx"> platform/graphics/efl/IconEfl.cpp
</span><span class="cx"> platform/graphics/efl/ImageEfl.cpp
</span><span class="cx"> platform/graphics/efl/IntPointEfl.cpp
</span><span class="lines">@@ -154,8 +164,25 @@
</span><span class="cx"> platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp
</span><span class="cx"> platform/graphics/harfbuzz/HarfBuzzShaper.cpp
</span><span class="cx">
</span><ins>+ platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
+ platform/graphics/opengl/GLPlatformContext.cpp
+ platform/graphics/opengl/GLPlatformSurface.cpp
+ platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
+ platform/graphics/opengl/TemporaryOpenGLSetting.cpp
+
</ins><span class="cx"> platform/graphics/opentype/OpenTypeVerticalData.cpp
</span><span class="cx">
</span><ins>+ platform/graphics/surfaces/GLTransportSurface.cpp
+ platform/graphics/surfaces/GraphicsSurface.cpp
+
+ platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp
+
+ platform/graphics/surfaces/glx/X11Helper.cpp
+
+ platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
+ platform/graphics/texmap/TextureMapperGL.cpp
+ platform/graphics/texmap/TextureMapperShaderProgram.cpp
+
</ins><span class="cx"> platform/graphics/texmap/coordinated/AreaAllocator.cpp
</span><span class="cx"> platform/graphics/texmap/coordinated/CompositingCoordinator.cpp
</span><span class="cx"> platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp
</span><span class="lines">@@ -254,12 +281,6 @@
</span><span class="cx"> ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsApple.css
</span><span class="cx"> )
</span><span class="cx">
</span><del>-if (WTF_USE_TEXTURE_MAPPER)
- list(APPEND WebCore_SOURCES
- platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
- )
-endif ()
-
</del><span class="cx"> set(WebCore_USER_AGENT_SCRIPTS
</span><span class="cx"> ${WEBCORE_DIR}/English.lproj/mediaControlsLocalizedStrings.js
</span><span class="cx"> ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsApple.js
</span><span class="lines">@@ -291,6 +312,7 @@
</span><span class="cx"> ${LIBXSLT_LIBRARIES}
</span><span class="cx"> ${PNG_LIBRARIES}
</span><span class="cx"> ${SQLITE_LIBRARIES}
</span><ins>+ ${X11_X11_LIB}
</ins><span class="cx"> ${ZLIB_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -358,90 +380,51 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WTF_USE_3D_GRAPHICS)
</del><ins>+if (WTF_USE_EGL)
</ins><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><del>- "${WEBCORE_DIR}/platform/graphics/opengl"
- "${WEBCORE_DIR}/platform/graphics/surfaces"
- "${WEBCORE_DIR}/platform/graphics/surfaces/efl"
- "${WEBCORE_DIR}/platform/graphics/surfaces/glx"
- "${WEBCORE_DIR}/platform/graphics/texmap"
</del><ins>+ ${EGL_INCLUDE_DIR}
+ "${WEBCORE_DIR}/platform/graphics/surfaces/egl"
</ins><span class="cx"> )
</span><ins>+endif ()
</ins><span class="cx">
</span><del>- if (WTF_USE_EGL)
- list(APPEND WebCore_INCLUDE_DIRECTORIES
- ${EGL_INCLUDE_DIR}
- "${WEBCORE_DIR}/platform/graphics/surfaces/egl"
</del><ins>+if (WTF_USE_EGL)
+ list(APPEND WebCore_SOURCES
+ platform/graphics/surfaces/egl/EGLConfigSelector.cpp
+ platform/graphics/surfaces/egl/EGLContext.cpp
+ platform/graphics/surfaces/egl/EGLHelper.cpp
+ platform/graphics/surfaces/egl/EGLSurface.cpp
+ platform/graphics/surfaces/egl/EGLXSurface.cpp
</ins><span class="cx"> )
</span><del>- endif ()
</del><ins>+else ()
+ list(APPEND WebCore_SOURCES
+ platform/graphics/surfaces/glx/GLXContext.cpp
+ platform/graphics/surfaces/glx/GLXSurface.cpp
+ )
+endif ()
</ins><span class="cx">
</span><ins>+if (WTF_USE_OPENGL_ES_2)
</ins><span class="cx"> list(APPEND WebCore_SOURCES
</span><del>- platform/graphics/cairo/DrawingBufferCairo.cpp
</del><ins>+ platform/graphics/opengl/Extensions3DOpenGLES.cpp
+ platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
+ )
+else ()
+ list(APPEND WebCore_SOURCES
+ platform/graphics/OpenGLShims.cpp
</ins><span class="cx">
</span><del>- platform/graphics/efl/EvasGLContext.cpp
- platform/graphics/efl/EvasGLSurface.cpp
- platform/graphics/efl/GraphicsContext3DEfl.cpp
- platform/graphics/efl/GraphicsContext3DPrivate.cpp
-
- platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
- platform/graphics/opengl/GLPlatformContext.cpp
- platform/graphics/opengl/GLPlatformSurface.cpp
- platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
- platform/graphics/opengl/TemporaryOpenGLSetting.cpp
-
- platform/graphics/surfaces/GLTransportSurface.cpp
- platform/graphics/surfaces/GraphicsSurface.cpp
-
- platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp
-
- platform/graphics/surfaces/glx/X11Helper.cpp
-
- platform/graphics/texmap/TextureMapperGL.cpp
- platform/graphics/texmap/TextureMapperShaderProgram.cpp
</del><ins>+ platform/graphics/opengl/Extensions3DOpenGL.cpp
+ platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
</ins><span class="cx"> )
</span><ins>+endif ()
</ins><span class="cx">
</span><del>- if (WTF_USE_EGL)
- list(APPEND WebCore_SOURCES
- platform/graphics/surfaces/egl/EGLConfigSelector.cpp
- platform/graphics/surfaces/egl/EGLContext.cpp
- platform/graphics/surfaces/egl/EGLHelper.cpp
- platform/graphics/surfaces/egl/EGLSurface.cpp
- platform/graphics/surfaces/egl/EGLXSurface.cpp
- )
- else ()
- list(APPEND WebCore_SOURCES
- platform/graphics/surfaces/glx/GLXContext.cpp
- platform/graphics/surfaces/glx/GLXSurface.cpp
- )
- endif ()
-
- if (WTF_USE_OPENGL_ES_2)
- list(APPEND WebCore_SOURCES
- platform/graphics/opengl/Extensions3DOpenGLES.cpp
- platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
- )
- else ()
- list(APPEND WebCore_SOURCES
- platform/graphics/OpenGLShims.cpp
-
- platform/graphics/opengl/Extensions3DOpenGL.cpp
- platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
- )
- endif ()
-
</del><ins>+if (WTF_USE_EGL)
</ins><span class="cx"> list(APPEND WebCore_LIBRARIES
</span><del>- ${X11_X11_LIB}
</del><ins>+ ${EGL_LIBRARY}
</ins><span class="cx"> )
</span><del>-
- if (WTF_USE_EGL)
- list(APPEND WebCore_LIBRARIES
- ${EGL_LIBRARY}
- )
- elseif (X11_Xcomposite_FOUND AND X11_Xrender_FOUND)
- list(APPEND WebCore_LIBRARIES
- ${X11_Xcomposite_LIB}
- ${X11_Xrender_LIB}
- )
- endif ()
</del><ins>+elseif (X11_Xcomposite_FOUND AND X11_Xrender_FOUND)
+ list(APPEND WebCore_LIBRARIES
+ ${X11_Xcomposite_LIB}
+ ${X11_Xrender_LIB}
+ )
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEB_AUDIO)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicseflGraphicsContext3DEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp (173111 => 173112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp 2014-08-29 08:06:03 UTC (rev 173111)
+++ trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp 2014-08-29 10:05:25 UTC (rev 173112)
</span><span class="lines">@@ -175,12 +175,7 @@
</span><span class="cx">
</span><span class="cx"> PlatformLayer* GraphicsContext3D::platformLayer() const
</span><span class="cx"> {
</span><del>-#if USE(TEXTURE_MAPPER_GL)
</del><span class="cx"> return m_private.get();
</span><del>-#else
- notImplemented();
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool GraphicsContext3D::makeContextCurrent()
</span><span class="lines">@@ -230,12 +225,10 @@
</span><span class="cx"> context->restore();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
</del><span class="cx"> void GraphicsContext3D::createGraphicsSurfaces(const IntSize& size)
</span><span class="cx"> {
</span><span class="cx"> m_private->didResizeCanvas(size);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> GraphicsContext3D::ImageExtractor::~ImageExtractor()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicseflGraphicsContext3DPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp (173111 => 173112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp 2014-08-29 08:06:03 UTC (rev 173111)
+++ trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp 2014-08-29 10:05:25 UTC (rev 173112)
</span><span class="lines">@@ -68,9 +68,7 @@
</span><span class="cx">
</span><span class="cx"> if (!makeContextCurrent())
</span><span class="cx"> return false;
</span><del>-#if USE(GRAPHICS_SURFACE)
</del><span class="cx"> m_surfaceOperation = CreateSurface;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -87,7 +85,6 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Release the current context and drawable only after destroying any associated gl resources.
</span><del>-#if USE(GRAPHICS_SURFACE)
</del><span class="cx"> if (m_previousGraphicsSurface)
</span><span class="cx"> m_previousGraphicsSurface = nullptr;
</span><span class="cx">
</span><span class="lines">@@ -95,7 +92,6 @@
</span><span class="cx"> m_graphicsSurface = nullptr;
</span><span class="cx">
</span><span class="cx"> m_surfaceHandle = GraphicsSurfaceToken();
</span><del>-#endif
</del><span class="cx"> if (m_offScreenSurface)
</span><span class="cx"> m_offScreenSurface->destroy();
</span><span class="cx">
</span><span class="lines">@@ -163,14 +159,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL)
</del><span class="cx"> void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper*, const FloatRect& /* target */, const TransformationMatrix&, float /* opacity */)
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
</del><span class="cx"> void GraphicsContext3DPrivate::createGraphicsSurface()
</span><span class="cx"> {
</span><span class="cx"> static PendingSurfaceOperation pendingOperation = DeletePreviousSurface | Resize | CreateSurface;
</span><span class="lines">@@ -264,6 +257,5 @@
</span><span class="cx">
</span><span class="cx"> return TextureMapperPlatformLayer::graphicsSurfaceFlags();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicseflGraphicsContext3DPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.h (173111 => 173112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.h 2014-08-29 08:06:03 UTC (rev 173111)
+++ trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.h 2014-08-29 10:05:25 UTC (rev 173112)
</span><span class="lines">@@ -22,18 +22,11 @@
</span><span class="cx"> #define GraphicsContext3DPrivate_h
</span><span class="cx">
</span><span class="cx"> #include "GraphicsContext3D.h"
</span><del>-
-#if USE(TEXTURE_MAPPER_GL)
</del><span class="cx"> #include <texmap/TextureMapperPlatformLayer.h>
</span><del>-#endif
-
</del><span class="cx"> #include "GLPlatformContext.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-class GraphicsContext3DPrivate
-#if USE(TEXTURE_MAPPER_GL)
- : public TextureMapperPlatformLayer
-#endif
</del><ins>+class GraphicsContext3DPrivate: public TextureMapperPlatformLayer
</ins><span class="cx"> {
</span><span class="cx"> public:
</span><span class="cx"> static std::unique_ptr<GraphicsContext3DPrivate> create(GraphicsContext3D*, HostWindow*);
</span><span class="lines">@@ -43,20 +36,15 @@
</span><span class="cx">
</span><span class="cx"> PlatformGraphicsContext3D platformGraphicsContext3D() const;
</span><span class="cx"> void setContextLostCallback(std::unique_ptr<GraphicsContext3D::ContextLostCallback>);
</span><del>-#if USE(TEXTURE_MAPPER_GL)
</del><span class="cx"> virtual void paintToTextureMapper(TextureMapper*, const FloatRect&, const TransformationMatrix&, float) override;
</span><del>-#endif
-#if USE(GRAPHICS_SURFACE)
</del><span class="cx"> virtual IntSize platformLayerSize() const override;
</span><span class="cx"> virtual uint32_t copyToGraphicsSurface() override;
</span><span class="cx"> virtual GraphicsSurfaceToken graphicsSurfaceToken() const override;
</span><span class="cx"> virtual GraphicsSurface::Flags graphicsSurfaceFlags() const override;
</span><span class="cx"> void didResizeCanvas(const IntSize&);
</span><del>-#endif
</del><span class="cx"> bool makeContextCurrent() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-#if USE(GRAPHICS_SURFACE)
</del><span class="cx"> enum PendingOperation {
</span><span class="cx"> Default = 0x00, // No Pending Operation.
</span><span class="cx"> CreateSurface = 0x01,
</span><span class="lines">@@ -65,7 +53,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef unsigned PendingSurfaceOperation;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool initialize();
</span><span class="cx"> void createGraphicsSurface();
</span><span class="lines">@@ -76,12 +63,10 @@
</span><span class="cx"> HostWindow* m_hostWindow;
</span><span class="cx"> std::unique_ptr<GLPlatformContext> m_offScreenContext;
</span><span class="cx"> std::unique_ptr<GLPlatformSurface> m_offScreenSurface;
</span><del>-#if USE(GRAPHICS_SURFACE)
</del><span class="cx"> GraphicsSurfaceToken m_surfaceHandle;
</span><span class="cx"> RefPtr<GraphicsSurface> m_graphicsSurface;
</span><span class="cx"> RefPtr<GraphicsSurface> m_previousGraphicsSurface;
</span><span class="cx"> PendingSurfaceOperation m_surfaceOperation : 3;
</span><del>-#endif
</del><span class="cx"> std::unique_ptr<GraphicsContext3D::ContextLostCallback> m_contextLostCallback;
</span><span class="cx"> ListHashSet<GC3Denum> m_syntheticErrors;
</span><span class="cx"> IntSize m_size;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicssurfaceseflGraphicsSurfaceCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp (173111 => 173112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp 2014-08-29 08:06:03 UTC (rev 173111)
+++ trunk/Source/WebCore/platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp 2014-08-29 10:05:25 UTC (rev 173112)
</span><span class="lines">@@ -25,9 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "GraphicsSurface.h"
</span><del>-
-#if USE(GRAPHICS_SURFACE)
-
</del><span class="cx"> #include "GLPlatformContext.h"
</span><span class="cx"> #include "GLTransportSurface.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="lines">@@ -267,4 +264,3 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
</del></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (173111 => 173112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2014-08-29 08:06:03 UTC (rev 173111)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-08-29 10:05:25 UTC (rev 173112)
</span><span class="lines">@@ -221,50 +221,39 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WTF_USE_TILED_BACKING_STORE)
- add_definitions(-DWTF_USE_COORDINATED_GRAPHICS=1)
</del><ins>+add_definitions(-DWTF_USE_COORDINATED_GRAPHICS=1)
</ins><span class="cx">
</span><del>- set(WTF_USE_TEXTURE_MAPPER 1)
- add_definitions(-DWTF_USE_TEXTURE_MAPPER=1)
</del><ins>+add_definitions(-DWTF_USE_TEXTURE_MAPPER=1)
</ins><span class="cx">
</span><del>- set(WTF_USE_3D_GRAPHICS 1)
- add_definitions(-DWTF_USE_3D_GRAPHICS=1)
</del><ins>+set(WTF_USE_3D_GRAPHICS 1)
+add_definitions(-DWTF_USE_3D_GRAPHICS=1)
</ins><span class="cx">
</span><del>- set(ENABLE_3D_RENDERING 1)
- add_definitions(-DENABLE_3D_RENDERING=1)
-else ()
- # Disable 3D graphics and WEBGL if tiled backing is disabled
- set(ENABLE_WEBGL 0)
- set(WTF_USE_3D_GRAPHICS 0)
- add_definitions(-DWTF_USE_3D_GRAPHICS=0)
-endif ()
</del><ins>+set(ENABLE_3D_RENDERING 1)
+add_definitions(-DENABLE_3D_RENDERING=1)
</ins><span class="cx">
</span><del>-if (ENABLE_WEBGL OR WTF_USE_TILED_BACKING_STORE)
- set(USE_GRAPHICS_SURFACE 1)
- add_definitions(-DWTF_USE_GRAPHICS_SURFACE=1)
</del><ins>+add_definitions(-DWTF_USE_GRAPHICS_SURFACE=1)
</ins><span class="cx">
</span><del>- option(ENABLE_GLES2 "Enable GLES Support")
- if (ENABLE_GLES2)
- find_package(GLES REQUIRED)
</del><ins>+option(ENABLE_GLES2 "Enable GLES Support")
+if (ENABLE_GLES2)
+ find_package(GLES REQUIRED)
</ins><span class="cx">
</span><del>- set(WTF_USE_OPENGL_ES_2 1)
- add_definitions(-DWTF_USE_OPENGL_ES_2=1)
- else ()
- find_package(OpenGL REQUIRED)
</del><ins>+ set(WTF_USE_OPENGL_ES_2 1)
+ add_definitions(-DWTF_USE_OPENGL_ES_2=1)
+else ()
+ find_package(OpenGL REQUIRED)
</ins><span class="cx">
</span><del>- set(WTF_USE_OPENGL 1)
- add_definitions(-DWTF_USE_OPENGL=1)
- endif ()
</del><ins>+ set(WTF_USE_OPENGL 1)
+ add_definitions(-DWTF_USE_OPENGL=1)
+endif ()
</ins><span class="cx">
</span><del>- option(ENABLE_EGL "Enable EGL Support")
- if (ENABLE_EGL)
- find_package(EGL REQUIRED)
- set(WTF_USE_EGL 1)
- add_definitions(-DWTF_USE_EGL=1)
- else ()
- CHECK_INCLUDE_FILES("GL/glx.h" OPENGLX_FOUND)
- add_definitions(-DWTF_USE_GLX=1)
- endif ()
</del><ins>+option(ENABLE_EGL "Enable EGL Support")
+if (ENABLE_EGL)
+ find_package(EGL REQUIRED)
+ set(WTF_USE_EGL 1)
+ add_definitions(-DWTF_USE_EGL=1)
+else ()
+ CHECK_INCLUDE_FILES("GL/glx.h" OPENGLX_FOUND)
+ add_definitions(-DWTF_USE_GLX=1)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEBGL AND OPENGLX_FOUND)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173111 => 173112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-08-29 08:06:03 UTC (rev 173111)
+++ trunk/Tools/ChangeLog 2014-08-29 10:05:25 UTC (rev 173112)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-08-29 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ [EFL] Remove non Coordinated Graphics code path from cmake build system after r142169
+ https://bugs.webkit.org/show_bug.cgi?id=135560
+
+ Reviewed by Gyuyoung Kim.
+
+ * Scripts/webkitperl/FeatureList.pm: Removed TILED_BACKING_STORE guard.
+
</ins><span class="cx"> 2014-08-28 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] update-webkit should update auxiliary libs by default
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (173111 => 173112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-08-29 08:06:03 UTC (rev 173111)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-08-29 10:05:25 UTC (rev 173112)
</span><span class="lines">@@ -394,9 +394,6 @@
</span><span class="cx"> { option => "text-autosizing", desc => "Toggle Text Autosizing support",
</span><span class="cx"> define => "ENABLE_TEXT_AUTOSIZING", default => 0, value => \$textAutosizingSupport },
</span><span class="cx">
</span><del>- { option => "tiled-backing-store", desc => "Toggle Tiled Backing Store support",
- define => "WTF_USE_TILED_BACKING_STORE", default => isEfl(), value => \$tiledBackingStoreSupport },
-
</del><span class="cx"> { option => "touch-events", desc => "Toggle Touch Events support",
</span><span class="cx"> define => "ENABLE_TOUCH_EVENTS", default => (isIOSWebKit() || isEfl() || isGtk()), value => \$touchEventsSupport },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>