<!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>[212638] trunk/Source</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/212638">212638</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-20 08:52:46 -0800 (Mon, 20 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove code under USE(GRAPHICS_SURFACE)
https://bugs.webkit.org/show_bug.cgi?id=168592
Patch by Carlos Garcia Campos <cgarcia@igalia.com> on 2017-02-20
Reviewed by Michael Catanzaro.
This was only used by EFL port.
Source/WebCore:
* platform/TextureMapper.cmake:
* platform/graphics/opengl/GLPlatformSurface.cpp: Removed.
* platform/graphics/surfaces/GLTransportSurface.cpp: Removed.
* platform/graphics/surfaces/GLTransportSurface.h: Removed.
* platform/graphics/surfaces/GraphicsSurface.cpp: Removed.
* platform/graphics/surfaces/GraphicsSurface.h: Removed.
* platform/graphics/surfaces/GraphicsSurfaceToken.h: Removed.
* platform/graphics/surfaces/egl/EGLConfigSelector.cpp: Removed.
* platform/graphics/surfaces/egl/EGLConfigSelector.h: Removed.
* platform/graphics/surfaces/egl/EGLContext.cpp: Removed.
* platform/graphics/surfaces/egl/EGLContext.h: Removed.
* platform/graphics/surfaces/egl/EGLHelper.cpp: Removed.
* platform/graphics/surfaces/egl/EGLHelper.h: Removed.
* platform/graphics/surfaces/egl/EGLSurface.cpp: Removed.
* platform/graphics/surfaces/egl/EGLSurface.h: Removed.
* platform/graphics/surfaces/egl/EGLXSurface.cpp: Removed.
* platform/graphics/surfaces/egl/EGLXSurface.h: Removed.
* platform/graphics/surfaces/glx/GLXConfigSelector.h: Removed.
* platform/graphics/surfaces/glx/GLXContext.cpp: Removed.
* platform/graphics/surfaces/glx/GLXContext.h: Removed.
* platform/graphics/surfaces/glx/GLXSurface.cpp: Removed.
* platform/graphics/surfaces/glx/GLXSurface.h: Removed.
* platform/graphics/surfaces/glx/X11Helper.cpp: Removed.
* platform/graphics/surfaces/glx/X11Helper.h: Removed.
* platform/graphics/texmap/TextureMapperBackingStore.cpp:
* platform/graphics/texmap/TextureMapperBackingStore.h:
* platform/graphics/texmap/TextureMapperPlatformLayer.h:
(WebCore::TextureMapperPlatformLayer::setClient):
* platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp: Removed.
* platform/graphics/texmap/TextureMapperSurfaceBackingStore.h: Removed.
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::CoordinatedGraphicsLayer):
(WebCore::CoordinatedGraphicsLayer::setContentsNeedsDisplay):
(WebCore::CoordinatedGraphicsLayer::setContentsToPlatformLayer):
(WebCore::CoordinatedGraphicsLayer::syncPlatformLayer):
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
* platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h:
(WebCore::CoordinatedGraphicsLayerState::CoordinatedGraphicsLayerState):
Source/WebKit2:
* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
(IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::encode):
(IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::decode):
* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h:
* Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
(WebKit::CoordinatedGraphicsScene::syncPlatformLayerIfNeeded):
(WebKit::CoordinatedGraphicsScene::deleteLayer):
(WebKit::CoordinatedGraphicsScene::assignImageBackingToLayer):
(WebKit::CoordinatedGraphicsScene::purgeGLResources):
* Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h:
* Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp:
(WebKit::WebCoordinatedSurface::Handle::encode):
(WebKit::WebCoordinatedSurface::Handle::decode):
(WebKit::WebCoordinatedSurface::create):
(WebKit::WebCoordinatedSurface::createGraphicsContext):
(WebKit::WebCoordinatedSurface::createHandle):
(WebKit::WebCoordinatedSurface::copyToTexture):
* Shared/CoordinatedGraphics/WebCoordinatedSurface.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformTextureMappercmake">trunk/Source/WebCore/platform/TextureMapper.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperBackingStorecpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperBackingStoreh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsStateh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCoderscpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCodersh">trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsScenecpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsSceneh">trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsWebCoordinatedSurfacecpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsWebCoordinatedSurfaceh">trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGLPlatformSurfacecpp">trunk/Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp</a></li>
<li>trunk/Source/WebCore/platform/graphics/surfaces/</li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperSurfaceBackingStorecpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperSurfaceBackingStoreh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperSurfaceBackingStore.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebCore/ChangeLog 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2017-02-20 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Remove code under USE(GRAPHICS_SURFACE)
+ https://bugs.webkit.org/show_bug.cgi?id=168592
+
+ Reviewed by Michael Catanzaro.
+
+ This was only used by EFL port.
+
+ * platform/TextureMapper.cmake:
+ * platform/graphics/opengl/GLPlatformSurface.cpp: Removed.
+ * platform/graphics/surfaces/GLTransportSurface.cpp: Removed.
+ * platform/graphics/surfaces/GLTransportSurface.h: Removed.
+ * platform/graphics/surfaces/GraphicsSurface.cpp: Removed.
+ * platform/graphics/surfaces/GraphicsSurface.h: Removed.
+ * platform/graphics/surfaces/GraphicsSurfaceToken.h: Removed.
+ * platform/graphics/surfaces/egl/EGLConfigSelector.cpp: Removed.
+ * platform/graphics/surfaces/egl/EGLConfigSelector.h: Removed.
+ * platform/graphics/surfaces/egl/EGLContext.cpp: Removed.
+ * platform/graphics/surfaces/egl/EGLContext.h: Removed.
+ * platform/graphics/surfaces/egl/EGLHelper.cpp: Removed.
+ * platform/graphics/surfaces/egl/EGLHelper.h: Removed.
+ * platform/graphics/surfaces/egl/EGLSurface.cpp: Removed.
+ * platform/graphics/surfaces/egl/EGLSurface.h: Removed.
+ * platform/graphics/surfaces/egl/EGLXSurface.cpp: Removed.
+ * platform/graphics/surfaces/egl/EGLXSurface.h: Removed.
+ * platform/graphics/surfaces/glx/GLXConfigSelector.h: Removed.
+ * platform/graphics/surfaces/glx/GLXContext.cpp: Removed.
+ * platform/graphics/surfaces/glx/GLXContext.h: Removed.
+ * platform/graphics/surfaces/glx/GLXSurface.cpp: Removed.
+ * platform/graphics/surfaces/glx/GLXSurface.h: Removed.
+ * platform/graphics/surfaces/glx/X11Helper.cpp: Removed.
+ * platform/graphics/surfaces/glx/X11Helper.h: Removed.
+ * platform/graphics/texmap/TextureMapperBackingStore.cpp:
+ * platform/graphics/texmap/TextureMapperBackingStore.h:
+ * platform/graphics/texmap/TextureMapperPlatformLayer.h:
+ (WebCore::TextureMapperPlatformLayer::setClient):
+ * platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp: Removed.
+ * platform/graphics/texmap/TextureMapperSurfaceBackingStore.h: Removed.
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+ (WebCore::CoordinatedGraphicsLayer::CoordinatedGraphicsLayer):
+ (WebCore::CoordinatedGraphicsLayer::setContentsNeedsDisplay):
+ (WebCore::CoordinatedGraphicsLayer::setContentsToPlatformLayer):
+ (WebCore::CoordinatedGraphicsLayer::syncPlatformLayer):
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h:
+ (WebCore::CoordinatedGraphicsLayerState::CoordinatedGraphicsLayerState):
+
</ins><span class="cx"> 2017-02-20 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Add 'webglcontextchanged' WebGLContextEvent
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformTextureMappercmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/TextureMapper.cmake (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/TextureMapper.cmake 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebCore/platform/TextureMapper.cmake 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -11,7 +11,6 @@
</span><span class="cx"> platform/graphics/texmap/TextureMapperFPSCounter.cpp
</span><span class="cx"> platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp
</span><span class="cx"> platform/graphics/texmap/TextureMapperLayer.cpp
</span><del>- platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp
</del><span class="cx"> platform/graphics/texmap/TextureMapperTile.cpp
</span><span class="cx"> platform/graphics/texmap/TextureMapperTiledBackingStore.cpp
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGLPlatformSurfacecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -1,119 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(GRAPHICS_CONTEXT_3D)
-#include "GLPlatformSurface.h"
-
-#if USE(GLX)
-#include "GLXSurface.h"
-#endif
-
-#if USE(EGL)
-#include "EGLSurface.h"
-#endif
-
-#include "NotImplemented.h"
-
-namespace WebCore {
-
-std::unique_ptr<GLPlatformSurface> GLPlatformSurface::createOffScreenSurface(SurfaceAttributes attributes)
-{
- std::unique_ptr<GLPlatformSurface> surface;
-#if USE(GLX)
- surface = std::make_unique<GLXOffScreenSurface>(attributes);
-#elif USE(EGL) && USE(GRAPHICS_SURFACE)
- surface = EGLOffScreenSurface::createOffScreenSurface(attributes);
-#else
- // FIXME: Need WGL implementation for Windows
- notImplemented();
-#endif
-
- if (surface && surface->drawable())
- return surface;
-
- return nullptr;
-}
-
-GLPlatformSurface::GLPlatformSurface(SurfaceAttributes)
- : m_drawable(0)
- , m_bufferHandle(0)
-{
-}
-
-GLPlatformSurface::~GLPlatformSurface()
-{
-}
-
-PlatformBufferHandle GLPlatformSurface::handle() const
-{
- return m_bufferHandle;
-}
-
-PlatformDrawable GLPlatformSurface::drawable() const
-{
- return m_drawable;
-}
-
-const IntRect& GLPlatformSurface::geometry() const
-{
- return m_rect;
-}
-
-PlatformSurfaceConfig GLPlatformSurface::configuration()
-{
- return 0;
-}
-
-void GLPlatformSurface::swapBuffers()
-{
- notImplemented();
-}
-
-void GLPlatformSurface::onMakeCurrent()
-{
-}
-
-void GLPlatformSurface::updateContents(const uint32_t)
-{
-}
-
-void GLPlatformSurface::setGeometry(const IntRect&)
-{
-}
-
-void GLPlatformSurface::destroy()
-{
-}
-
-GLPlatformSurface::SurfaceAttributes GLPlatformSurface::attributes() const
-{
- return GLPlatformSurface::Default;
-}
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -25,11 +25,6 @@
</span><span class="cx"> #include "ImageBuffer.h"
</span><span class="cx"> #include "TextureMapper.h"
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
-#include "GraphicsSurface.h"
-#include "TextureMapperGL.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> unsigned TextureMapperBackingStore::calculateExposedTileEdges(const FloatRect& totalRect, const FloatRect& tileRect)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -26,10 +26,6 @@
</span><span class="cx"> #include "TextureMapperPlatformLayer.h"
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
-#include "GraphicsSurface.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class GraphicsLayer;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -22,10 +22,6 @@
</span><span class="cx">
</span><span class="cx"> #if USE(TEXTURE_MAPPER)
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
-#include "GraphicsSurface.h"
-#endif
-
</del><span class="cx"> #include "TextureMapper.h"
</span><span class="cx"> #include "TransformationMatrix.h"
</span><span class="cx">
</span><span class="lines">@@ -51,12 +47,6 @@
</span><span class="cx"> {
</span><span class="cx"> m_client = client;
</span><span class="cx"> }
</span><del>-#if USE(GRAPHICS_SURFACE)
- virtual IntSize platformLayerSize() const { return IntSize(); }
- virtual uint32_t copyToGraphicsSurface() { return 0; }
- virtual GraphicsSurfaceToken graphicsSurfaceToken() const { return GraphicsSurfaceToken(); }
- virtual GraphicsSurface::Flags graphicsSurfaceFlags() const { return GraphicsSurface::SupportsTextureTarget | GraphicsSurface::SupportsSharing; }
-#endif
</del><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> TextureMapperPlatformLayer::Client* client() { return m_client; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperSurfaceBackingStorecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -1,54 +0,0 @@
</span><del>-/*
- Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#if USE(GRAPHICS_SURFACE)
-#include "TextureMapperSurfaceBackingStore.h"
-
-#include "GraphicsSurface.h"
-
-namespace WebCore {
-
-void TextureMapperSurfaceBackingStore::setGraphicsSurface(PassRefPtr<GraphicsSurface> surface)
-{
- m_graphicsSurface = surface;
-}
-
-void TextureMapperSurfaceBackingStore::swapBuffersIfNeeded(uint32_t)
-{
- if (m_graphicsSurface)
- m_graphicsSurface->swapBuffers();
-}
-
-RefPtr<BitmapTexture> TextureMapperSurfaceBackingStore::texture() const
-{
- // FIXME: Instead of just returning an empty texture, we should wrap the texture contents into a BitmapTexture.
- RefPtr<BitmapTexture> emptyTexture;
- return emptyTexture;
-}
-
-void TextureMapperSurfaceBackingStore::paintToTextureMapper(TextureMapper& textureMapper, const FloatRect& targetRect, const TransformationMatrix& transform, float opacity)
-{
- if (m_graphicsSurface)
- m_graphicsSurface->paintToTextureMapper(textureMapper, targetRect, transform, opacity);
-}
-
-} // namespace WebCore
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperSurfaceBackingStoreh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperSurfaceBackingStore.h (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperSurfaceBackingStore.h 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperSurfaceBackingStore.h 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-/*
- Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef TextureMapperSurfaceBackingStore_h
-#define TextureMapperSurfaceBackingStore_h
-
-#if USE(GRAPHICS_SURFACE)
-
-#include "GraphicsSurface.h"
-#include "TextureMapperBackingStore.h"
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-class TextureMapper;
-class FloatRect;
-
-class TextureMapperSurfaceBackingStore : public TextureMapperBackingStore {
-public:
- static PassRefPtr<TextureMapperSurfaceBackingStore> create() { return adoptRef(new TextureMapperSurfaceBackingStore); }
- void setGraphicsSurface(PassRefPtr<GraphicsSurface>);
- void swapBuffersIfNeeded(uint32_t frontBuffer);
- virtual RefPtr<BitmapTexture> texture() const;
- virtual void paintToTextureMapper(TextureMapper&, const FloatRect&, const TransformationMatrix&, float);
- virtual ~TextureMapperSurfaceBackingStore() { }
-
-private:
- TextureMapperSurfaceBackingStore()
- : TextureMapperBackingStore()
- { }
-
- RefPtr<GraphicsSurface> m_graphicsSurface;
-};
-
-}
-
-#endif
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -120,10 +120,6 @@
</span><span class="cx"> , m_movingVisibleRect(false)
</span><span class="cx"> , m_pendingContentsScaleAdjustment(false)
</span><span class="cx"> , m_pendingVisibleRectAdjustment(false)
</span><del>-#if USE(GRAPHICS_SURFACE)
- , m_isValidPlatformLayer(false)
- , m_pendingPlatformLayerOperation(None)
-#endif
</del><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> , m_shouldSyncPlatformLayer(false)
</span><span class="cx"> , m_shouldUpdatePlatformLayer(false)
</span><span class="lines">@@ -379,11 +375,8 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsLayer::setContentsNeedsDisplay()
</span><span class="cx"> {
</span><del>-#if USE(GRAPHICS_SURFACE)
</del><ins>+#if USE(COORDINATED_GRAPHICS_THREADED)
</ins><span class="cx"> if (m_platformLayer)
</span><del>- m_pendingPlatformLayerOperation |= SyncPlatformLayer;
-#elif USE(COORDINATED_GRAPHICS_THREADED)
- if (m_platformLayer)
</del><span class="cx"> m_shouldUpdatePlatformLayer = true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -393,30 +386,7 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsLayer::setContentsToPlatformLayer(PlatformLayer* platformLayer, ContentsLayerPurpose)
</span><span class="cx"> {
</span><del>-#if USE(GRAPHICS_SURFACE)
- if (m_platformLayer) {
- ASSERT(m_platformLayerToken.isValid());
- if (!platformLayer) {
- m_pendingPlatformLayerOperation |= DestroyPlatformLayer;
- m_pendingPlatformLayerOperation &= ~CreatePlatformLayer;
- } else if ((m_platformLayerSize != platformLayer->platformLayerSize()) || (m_platformLayerToken != platformLayer->graphicsSurfaceToken())) {
- // m_platformLayerToken can be different to platformLayer->graphicsSurfaceToken(), even if m_platformLayer equals platformLayer.
- m_pendingPlatformLayerOperation |= RecreatePlatformLayer;
- }
- } else {
- if (platformLayer)
- m_pendingPlatformLayerOperation |= CreateAndSyncPlatformLayer;
- }
-
- m_platformLayer = platformLayer;
- // m_platformLayerToken is updated only here.
- // In detail, when GraphicsContext3D is changed or reshaped, m_platformLayerToken is changed and setContentsToPlatformLayer() is always called.
- m_platformLayerSize = m_platformLayer ? m_platformLayer->platformLayerSize() : IntSize();
- m_platformLayerToken = m_platformLayer ? m_platformLayer->graphicsSurfaceToken() : GraphicsSurfaceToken();
- ASSERT(!(!m_platformLayerToken.isValid() && m_platformLayer));
-
- notifyFlushRequired();
-#elif USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS_THREADED)
</ins><span class="cx"> if (m_platformLayer != platformLayer)
</span><span class="cx"> m_shouldSyncPlatformLayer = true;
</span><span class="cx">
</span><span class="lines">@@ -724,22 +694,7 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsLayer::syncPlatformLayer()
</span><span class="cx"> {
</span><del>-#if USE(GRAPHICS_SURFACE)
- destroyPlatformLayerIfNeeded();
- createPlatformLayerIfNeeded();
-
- if (!(m_pendingPlatformLayerOperation & SyncPlatformLayer))
- return;
-
- m_pendingPlatformLayerOperation &= ~SyncPlatformLayer;
-
- if (!m_isValidPlatformLayer)
- return;
-
- ASSERT(m_platformLayer);
- m_layerState.platformLayerFrontBuffer = m_platformLayer->copyToGraphicsSurface();
- m_layerState.platformLayerShouldSwapBuffers = true;
-#elif USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS_THREADED)
</ins><span class="cx"> if (!m_shouldSyncPlatformLayer)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -762,39 +717,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
-void CoordinatedGraphicsLayer::destroyPlatformLayerIfNeeded()
-{
- if (!(m_pendingPlatformLayerOperation & DestroyPlatformLayer))
- return;
-
- if (m_isValidPlatformLayer) {
- m_isValidPlatformLayer = false;
- m_layerState.platformLayerToken = GraphicsSurfaceToken();
- m_layerState.platformLayerChanged = true;
- }
-
- m_pendingPlatformLayerOperation &= ~DestroyPlatformLayer;
-}
-
-void CoordinatedGraphicsLayer::createPlatformLayerIfNeeded()
-{
- if (!(m_pendingPlatformLayerOperation & CreatePlatformLayer))
- return;
-
- ASSERT(m_platformLayer);
- if (!m_isValidPlatformLayer) {
- m_layerState.platformLayerSize = m_platformLayer->platformLayerSize();
- m_layerState.platformLayerToken = m_platformLayer->graphicsSurfaceToken();
- m_layerState.platformLayerSurfaceFlags = m_platformLayer->graphicsSurfaceFlags();
- m_layerState.platformLayerChanged = true;
- m_isValidPlatformLayer = true;
- }
-
- m_pendingPlatformLayerOperation &= ~CreatePlatformLayer;
-}
-#endif
-
</del><span class="cx"> void CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly()
</span><span class="cx"> {
</span><span class="cx"> // When we have a transform animation, we need to update visible rect every frame to adjust the visible rect of a backing store.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -35,9 +35,6 @@
</span><span class="cx"> #include "TiledBackingStore.h"
</span><span class="cx"> #include "TiledBackingStoreClient.h"
</span><span class="cx"> #include "TransformationMatrix.h"
</span><del>-#if USE(GRAPHICS_SURFACE)
-#include "GraphicsSurfaceToken.h"
-#endif
</del><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -151,19 +148,6 @@
</span><span class="cx"> private:
</span><span class="cx"> bool isCoordinatedGraphicsLayer() const override { return true; }
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
- enum PendingPlatformLayerOperation {
- None = 0x00,
- CreatePlatformLayer = 0x01,
- DestroyPlatformLayer = 0x02,
- SyncPlatformLayer = 0x04,
- CreateAndSyncPlatformLayer = CreatePlatformLayer | SyncPlatformLayer,
- RecreatePlatformLayer = CreateAndSyncPlatformLayer | DestroyPlatformLayer
- };
-
- void destroyPlatformLayerIfNeeded();
- void createPlatformLayerIfNeeded();
-#endif
</del><span class="cx"> void syncPlatformLayer();
</span><span class="cx"> void updatePlatformLayer();
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="lines">@@ -232,10 +216,6 @@
</span><span class="cx"> bool m_movingVisibleRect : 1;
</span><span class="cx"> bool m_pendingContentsScaleAdjustment : 1;
</span><span class="cx"> bool m_pendingVisibleRectAdjustment : 1;
</span><del>-#if USE(GRAPHICS_SURFACE)
- bool m_isValidPlatformLayer : 1;
- unsigned m_pendingPlatformLayerOperation : 3;
-#endif
</del><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> bool m_shouldSyncPlatformLayer : 1;
</span><span class="cx"> bool m_shouldUpdatePlatformLayer : 1;
</span><span class="lines">@@ -250,10 +230,6 @@
</span><span class="cx"> RefPtr<CoordinatedImageBacking> m_coordinatedImageBacking;
</span><span class="cx">
</span><span class="cx"> PlatformLayer* m_platformLayer;
</span><del>-#if USE(GRAPHICS_SURFACE)
- IntSize m_platformLayerSize;
- GraphicsSurfaceToken m_platformLayerToken;
-#endif
</del><span class="cx"> Timer m_animationStartedTimer;
</span><span class="cx"> TextureMapperAnimations m_animations;
</span><span class="cx"> double m_lastAnimationStartTime;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -39,11 +39,6 @@
</span><span class="cx"> #include "TextureMapperAnimation.h"
</span><span class="cx"> #include "TransformationMatrix.h"
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
-#include "GraphicsSurface.h"
-#include "GraphicsSurfaceToken.h"
-#endif
-
</del><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> #include "TextureMapperPlatformLayerProxy.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -131,9 +126,6 @@
</span><span class="cx"> , replica(InvalidCoordinatedLayerID)
</span><span class="cx"> , mask(InvalidCoordinatedLayerID)
</span><span class="cx"> , imageID(InvalidCoordinatedImageBackingID)
</span><del>-#if USE(GRAPHICS_SURFACE)
- , platformLayerFrontBuffer(0)
-#endif
</del><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> , platformLayerProxy(0)
</span><span class="cx"> #endif
</span><span class="lines">@@ -164,13 +156,6 @@
</span><span class="cx"> unsigned repaintCount;
</span><span class="cx"> Vector<TileUpdateInfo> tilesToUpdate;
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
- IntSize platformLayerSize;
- GraphicsSurfaceToken platformLayerToken;
- uint32_t platformLayerFrontBuffer;
- GraphicsSurface::Flags platformLayerSurfaceFlags;
-#endif
-
</del><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> RefPtr<TextureMapperPlatformLayerProxy> platformLayerProxy;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2017-02-20 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ Remove code under USE(GRAPHICS_SURFACE)
+ https://bugs.webkit.org/show_bug.cgi?id=168592
+
+ Reviewed by Michael Catanzaro.
+
+ This was only used by EFL port.
+
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+ (IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::encode):
+ (IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::decode):
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h:
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
+ (WebKit::CoordinatedGraphicsScene::syncPlatformLayerIfNeeded):
+ (WebKit::CoordinatedGraphicsScene::deleteLayer):
+ (WebKit::CoordinatedGraphicsScene::assignImageBackingToLayer):
+ (WebKit::CoordinatedGraphicsScene::purgeGLResources):
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h:
+ * Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp:
+ (WebKit::WebCoordinatedSurface::Handle::encode):
+ (WebKit::WebCoordinatedSurface::Handle::decode):
+ (WebKit::WebCoordinatedSurface::create):
+ (WebKit::WebCoordinatedSurface::createGraphicsContext):
+ (WebKit::WebCoordinatedSurface::createHandle):
+ (WebKit::WebCoordinatedSurface::copyToTexture):
+ * Shared/CoordinatedGraphics/WebCoordinatedSurface.h:
+
+2017-02-20 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> Reduce platform ifdefs in WebKit2 custom protocols implementation
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165028
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -51,10 +51,6 @@
</span><span class="cx"> #include <WebCore/TransformationMatrix.h>
</span><span class="cx"> #include <WebCore/TranslateTransformOperation.h>
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
-#include <WebCore/GraphicsSurface.h>
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="lines">@@ -585,17 +581,6 @@
</span><span class="cx"> return decoder.decode(animations.animations());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
-void ArgumentCoder<WebCore::GraphicsSurfaceToken>::encode(Encoder& encoder, const WebCore::GraphicsSurfaceToken& token)
-{
-#if OS(DARWIN)
- encoder << Attachment(token.frontBufferHandle, MACH_MSG_TYPE_MOVE_SEND);
- encoder << Attachment(token.backBufferHandle, MACH_MSG_TYPE_MOVE_SEND);
-#elif OS(LINUX)
- encoder << token.frontBufferHandle;
-#endif
-}
-
</del><span class="cx"> bool ArgumentCoder<WebCore::GraphicsSurfaceToken>::decode(Decoder& decoder, WebCore::GraphicsSurfaceToken& token)
</span><span class="cx"> {
</span><span class="cx"> #if OS(DARWIN)
</span><span class="lines">@@ -692,15 +677,6 @@
</span><span class="cx">
</span><span class="cx"> encoder << state.tilesToUpdate;
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
- if (state.platformLayerChanged) {
- encoder << state.platformLayerSize;
- encoder << state.platformLayerToken;
- encoder << state.platformLayerFrontBuffer;
- encoder << state.platformLayerSurfaceFlags;
- }
-#endif
-
</del><span class="cx"> if (state.committedScrollOffsetChanged)
</span><span class="cx"> encoder << state.committedScrollOffset;
</span><span class="cx"> }
</span><span class="lines">@@ -780,22 +756,6 @@
</span><span class="cx"> if (!decoder.decode(state.tilesToUpdate))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
- if (state.platformLayerChanged) {
- if (!decoder.decode(state.platformLayerSize))
- return false;
-
- if (!decoder.decode(state.platformLayerToken))
- return false;
-
- if (!decoder.decode(state.platformLayerFrontBuffer))
- return false;
-
- if (!decoder.decode(state.platformLayerSurfaceFlags))
- return false;
- }
-#endif
-
</del><span class="cx"> if (state.committedScrollOffsetChanged && !decoder.decode(state.committedScrollOffset))
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -45,10 +45,6 @@
</span><span class="cx"> struct Length;
</span><span class="cx">
</span><span class="cx"> class FilterOperations;
</span><del>-
-#if USE(GRAPHICS_SURFACE)
-struct GraphicsSurfaceToken;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="lines">@@ -73,13 +69,6 @@
</span><span class="cx"> static bool decode(Decoder&, WebCore::TextureMapperAnimation&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
-template<> struct ArgumentCoder<WebCore::GraphicsSurfaceToken> {
- static void encode(Encoder&, const WebCore::GraphicsSurfaceToken&);
- static bool decode(Decoder&, WebCore::GraphicsSurfaceToken&);
-};
-#endif
-
</del><span class="cx"> template<> struct ArgumentCoder<WebCore::SurfaceUpdateInfo> {
</span><span class="cx"> static void encode(Encoder&, const WebCore::SurfaceUpdateInfo&);
</span><span class="cx"> static bool decode(Decoder&, WebCore::SurfaceUpdateInfo&);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsScenecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -177,21 +177,7 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::syncPlatformLayerIfNeeded(TextureMapperLayer* layer, const CoordinatedGraphicsLayerState& state)
</span><span class="cx"> {
</span><del>-#if USE(GRAPHICS_SURFACE)
- ASSERT(m_textureMapper);
-
- if (state.platformLayerChanged) {
- destroyPlatformLayerIfNeeded(layer, state);
- createPlatformLayerIfNeeded(layer, state);
- }
-
- if (state.platformLayerShouldSwapBuffers) {
- ASSERT(m_surfaceBackingStores.contains(layer));
- SurfaceBackingStoreMap::iterator it = m_surfaceBackingStores.find(layer);
- RefPtr<TextureMapperSurfaceBackingStore> platformLayerBackingStore = it->value;
- platformLayerBackingStore->swapBuffersIfNeeded(state.platformLayerFrontBuffer);
- }
-#elif USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS_THREADED)
</ins><span class="cx"> if (!state.platformLayerChanged)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -213,28 +199,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
-void CoordinatedGraphicsScene::createPlatformLayerIfNeeded(TextureMapperLayer* layer, const CoordinatedGraphicsLayerState& state)
-{
- if (!state.platformLayerToken.isValid())
- return;
-
- RefPtr<TextureMapperSurfaceBackingStore> platformLayerBackingStore(TextureMapperSurfaceBackingStore::create());
- m_surfaceBackingStores.set(layer, platformLayerBackingStore);
- platformLayerBackingStore->setGraphicsSurface(GraphicsSurface::create(state.platformLayerSize, state.platformLayerSurfaceFlags, state.platformLayerToken));
- layer->setContentsLayer(platformLayerBackingStore.get());
-}
-
-void CoordinatedGraphicsScene::destroyPlatformLayerIfNeeded(TextureMapperLayer* layer, const CoordinatedGraphicsLayerState& state)
-{
- if (state.platformLayerToken.isValid())
- return;
-
- m_surfaceBackingStores.remove(layer);
- layer->setContentsLayer(0);
-}
-#endif
-
</del><span class="cx"> void CoordinatedGraphicsScene::setLayerRepaintCountIfNeeded(TextureMapperLayer* layer, const CoordinatedGraphicsLayerState& state)
</span><span class="cx"> {
</span><span class="cx"> if (!layer->isShowingRepaintCounter() || !state.repaintCountChanged)
</span><span class="lines">@@ -380,9 +344,6 @@
</span><span class="cx">
</span><span class="cx"> m_backingStores.remove(layer.get());
</span><span class="cx"> m_fixedLayers.remove(layerID);
</span><del>-#if USE(GRAPHICS_SURFACE)
- m_surfaceBackingStores.remove(layer.get());
-#endif
</del><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> if (auto platformLayerProxy = m_platformLayerProxies.take(layer.get()))
</span><span class="cx"> platformLayerProxy->invalidate();
</span><span class="lines">@@ -568,11 +529,6 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::assignImageBackingToLayer(TextureMapperLayer* layer, CoordinatedImageBackingID imageID)
</span><span class="cx"> {
</span><del>-#if USE(GRAPHICS_SURFACE)
- if (m_surfaceBackingStores.contains(layer))
- return;
-#endif
-
</del><span class="cx"> if (imageID == InvalidCoordinatedImageBackingID) {
</span><span class="cx"> layer->setContentsLayer(0);
</span><span class="cx"> return;
</span><span class="lines">@@ -672,9 +628,6 @@
</span><span class="cx">
</span><span class="cx"> m_imageBackings.clear();
</span><span class="cx"> m_releasedImageBackings.clear();
</span><del>-#if USE(GRAPHICS_SURFACE)
- m_surfaceBackingStores.clear();
-#endif
</del><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> for (auto& proxy : m_platformLayerProxies.values())
</span><span class="cx"> proxy->invalidate();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsSceneh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -40,11 +40,6 @@
</span><span class="cx"> #include <wtf/ThreadingPrimitives.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
-#include <WebCore/GraphicsSurface.h>
-#include <WebCore/TextureMapperSurfaceBackingStore.h>
-#endif
-
</del><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> #include <WebCore/TextureMapperPlatformLayerProxy.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -102,10 +97,6 @@
</span><span class="cx"> void setLayerFiltersIfNeeded(WebCore::TextureMapperLayer*, const WebCore::CoordinatedGraphicsLayerState&);
</span><span class="cx"> void setLayerAnimationsIfNeeded(WebCore::TextureMapperLayer*, const WebCore::CoordinatedGraphicsLayerState&);
</span><span class="cx"> void syncPlatformLayerIfNeeded(WebCore::TextureMapperLayer*, const WebCore::CoordinatedGraphicsLayerState&);
</span><del>-#if USE(GRAPHICS_SURFACE)
- void createPlatformLayerIfNeeded(WebCore::TextureMapperLayer*, const WebCore::CoordinatedGraphicsLayerState&);
- void destroyPlatformLayerIfNeeded(WebCore::TextureMapperLayer*, const WebCore::CoordinatedGraphicsLayerState&);
-#endif
</del><span class="cx"> void setLayerRepaintCountIfNeeded(WebCore::TextureMapperLayer*, const WebCore::CoordinatedGraphicsLayerState&);
</span><span class="cx">
</span><span class="cx"> void syncUpdateAtlases(const WebCore::CoordinatedGraphicsState&);
</span><span class="lines">@@ -167,11 +158,6 @@
</span><span class="cx">
</span><span class="cx"> HashSet<RefPtr<CoordinatedBackingStore>> m_backingStoresWithPendingBuffers;
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
- typedef HashMap<WebCore::TextureMapperLayer*, RefPtr<WebCore::TextureMapperSurfaceBackingStore>> SurfaceBackingStoreMap;
- SurfaceBackingStoreMap m_surfaceBackingStores;
-#endif
-
</del><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> typedef HashMap<WebCore::TextureMapperLayer*, RefPtr<WebCore::TextureMapperPlatformLayerProxy>> PlatformLayerProxyMap;
</span><span class="cx"> PlatformLayerProxyMap m_platformLayerProxies;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsWebCoordinatedSurfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -43,11 +43,6 @@
</span><span class="cx"> void WebCoordinatedSurface::Handle::encode(IPC::Encoder& encoder) const
</span><span class="cx"> {
</span><span class="cx"> encoder << m_size << m_flags;
</span><del>-#if USE(GRAPHICS_SURFACE)
- encoder << m_graphicsSurfaceToken;
- if (m_graphicsSurfaceToken.isValid())
- return;
-#endif
</del><span class="cx"> encoder << m_bitmapHandle;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -57,12 +52,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(handle.m_flags))
</span><span class="cx"> return false;
</span><del>-#if USE(GRAPHICS_SURFACE)
- if (!decoder.decode(handle.m_graphicsSurfaceToken))
- return false;
- if (handle.m_graphicsSurfaceToken.isValid())
- return true;
-#endif
</del><span class="cx"> if (!decoder.decode(handle.m_bitmapHandle))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -71,11 +60,6 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCoordinatedSurface> WebCoordinatedSurface::create(const IntSize& size, CoordinatedSurface::Flags flags)
</span><span class="cx"> {
</span><del>-#if USE(GRAPHICS_SURFACE)
- if (auto surface = createWithSurface(size, flags))
- return surface;
-#endif
-
</del><span class="cx"> if (auto bitmap = ShareableBitmap::createShareable(size, (flags & SupportsAlpha) ? ShareableBitmap::SupportsAlpha : ShareableBitmap::NoFlags))
</span><span class="cx"> return create(size, flags, WTFMove(bitmap));
</span><span class="cx">
</span><span class="lines">@@ -82,34 +66,8 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
-RefPtr<WebCoordinatedSurface> WebCoordinatedSurface::createWithSurface(const IntSize& size, CoordinatedSurface::Flags flags)
-{
- GraphicsSurface::Flags surfaceFlags =
- GraphicsSurface::SupportsSoftwareWrite
- | GraphicsSurface::SupportsCopyToTexture
- | GraphicsSurface::SupportsSharing;
-
- if (flags & SupportsAlpha)
- surfaceFlags |= GraphicsSurface::SupportsAlpha;
-
- // This might return null, if the system is unable to provide a new graphics surface.
- // In that case, this function would return null and allow falling back to ShareableBitmap.
- RefPtr<GraphicsSurface> surface = GraphicsSurface::create(size, surfaceFlags);
- if (!surface)
- return nullptr;
-
- return adoptRef(new WebCoordinatedSurface(size, flags, WTFMove(surface)));
-}
-#endif
-
</del><span class="cx"> std::unique_ptr<GraphicsContext> WebCoordinatedSurface::createGraphicsContext(const IntRect& rect)
</span><span class="cx"> {
</span><del>-#if USE(GRAPHICS_SURFACE)
- if (isBackedByGraphicsSurface())
- return m_graphicsSurface->beginPaint(rect, 0 /* Write without retaining pixels*/);
-#endif
-
</del><span class="cx"> ASSERT(m_bitmap);
</span><span class="cx"> auto graphicsContext = m_bitmap->createGraphicsContext();
</span><span class="cx"> graphicsContext->clip(rect);
</span><span class="lines">@@ -128,19 +86,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
-WebCoordinatedSurface::WebCoordinatedSurface(const WebCore::IntSize& size, CoordinatedSurface::Flags flags, RefPtr<WebCore::GraphicsSurface> surface)
- : CoordinatedSurface(size, flags)
- , m_graphicsSurface(surface)
-{
-}
-
-Ref<WebCoordinatedSurface> WebCoordinatedSurface::create(const IntSize& size, CoordinatedSurface::Flags flags, RefPtr<GraphicsSurface> surface)
-{
- return adoptRef(*new WebCoordinatedSurface(size, flags, surface));
-}
-#endif
-
</del><span class="cx"> WebCoordinatedSurface::~WebCoordinatedSurface()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -147,17 +92,6 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCoordinatedSurface> WebCoordinatedSurface::create(const Handle& handle)
</span><span class="cx"> {
</span><del>-#if USE(GRAPHICS_SURFACE)
- if (handle.graphicsSurfaceToken().isValid()) {
- GraphicsSurface::Flags surfaceFlags = 0;
- if (handle.m_flags & SupportsAlpha)
- surfaceFlags |= GraphicsSurface::SupportsAlpha;
- RefPtr<GraphicsSurface> surface = GraphicsSurface::create(handle.m_size, surfaceFlags, handle.m_graphicsSurfaceToken);
- if (surface)
- return adoptRef(new WebCoordinatedSurface(handle.m_size, handle.m_flags, WTFMove(surface)));
- }
-#endif
-
</del><span class="cx"> RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(handle.m_bitmapHandle);
</span><span class="cx"> if (!bitmap)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -170,11 +104,6 @@
</span><span class="cx"> handle.m_size = m_size;
</span><span class="cx"> handle.m_flags = m_flags;
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
- handle.m_graphicsSurfaceToken = m_graphicsSurface ? m_graphicsSurface->exportToken() : GraphicsSurfaceToken();
- if (handle.m_graphicsSurfaceToken.isValid())
- return true;
-#endif
</del><span class="cx"> if (!m_bitmap->createHandle(handle.m_bitmapHandle))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -192,22 +121,6 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<BitmapTexture> texture(passTexture);
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
- if (isBackedByGraphicsSurface()) {
- RefPtr<BitmapTextureGL> textureGL = toBitmapTextureGL(texture.get());
- if (textureGL) {
- uint32_t textureID = textureGL->id();
- uint32_t textureTarget = textureGL->textureTarget();
- m_graphicsSurface->copyToGLTexture(textureTarget, textureID, target, sourceOffset);
- return;
- }
-
- RefPtr<Image> image = m_graphicsSurface->createReadOnlyImage(IntRect(sourceOffset, target.size()));
- texture->updateContents(image.get(), target, IntPoint::zero(), BitmapTexture::UpdateCanModifyOriginalImageData);
- return;
- }
-#endif
-
</del><span class="cx"> ASSERT(m_bitmap);
</span><span class="cx"> RefPtr<Image> image = m_bitmap->createImage();
</span><span class="cx"> texture->updateContents(image.get(), target, sourceOffset, BitmapTexture::UpdateCanModifyOriginalImageData);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsWebCoordinatedSurfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.h (212637 => 212638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.h 2017-02-20 15:47:23 UTC (rev 212637)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.h 2017-02-20 16:52:46 UTC (rev 212638)
</span><span class="lines">@@ -25,10 +25,6 @@
</span><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include <WebCore/CoordinatedSurface.h>
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
-#include "GraphicsSurface.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> class BitmapTexture;
</span><span class="cx"> class GraphicsContext;
</span><span class="lines">@@ -46,16 +42,9 @@
</span><span class="cx"> void encode(IPC::Encoder&) const;
</span><span class="cx"> static bool decode(IPC::Decoder&, Handle&);
</span><span class="cx">
</span><del>-#if USE(GRAPHICS_SURFACE)
- WebCore::GraphicsSurfaceToken graphicsSurfaceToken() const { return m_graphicsSurfaceToken; }
-#endif
-
</del><span class="cx"> private:
</span><span class="cx"> friend class WebCoordinatedSurface;
</span><span class="cx"> mutable ShareableBitmap::Handle m_bitmapHandle;
</span><del>-#if USE(GRAPHICS_SURFACE)
- WebCore::GraphicsSurfaceToken m_graphicsSurfaceToken;
-#endif
</del><span class="cx"> WebCore::IntSize m_size;
</span><span class="cx"> WebCore::CoordinatedSurface::Flags m_flags;
</span><span class="cx"> };
</span><span class="lines">@@ -84,21 +73,8 @@
</span><span class="cx"> static Ref<WebCoordinatedSurface> create(const WebCore::IntSize&, Flags, RefPtr<ShareableBitmap>);
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WebCore::GraphicsContext> createGraphicsContext(const WebCore::IntRect&);
</span><del>-#if USE(GRAPHICS_SURFACE)
- WebCoordinatedSurface(const WebCore::IntSize&, Flags, RefPtr<WebCore::GraphicsSurface>);
- // Create a shareable bitmap backed by a graphics surface.
- static RefPtr<WebCoordinatedSurface> createWithSurface(const WebCore::IntSize&, Flags);
- // Create a WebCoordinatedSurface referencing an existing GraphicsSurface.
- static Ref<WebCoordinatedSurface> create(const WebCore::IntSize&, Flags, RefPtr<WebCore::GraphicsSurface>);
</del><span class="cx">
</span><del>- bool isBackedByGraphicsSurface() const { return !!m_graphicsSurface; }
-#endif
-
</del><span class="cx"> RefPtr<ShareableBitmap> m_bitmap;
</span><del>-
-#if USE(GRAPHICS_SURFACE)
- RefPtr<WebCore::GraphicsSurface> m_graphicsSurface;
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>