<!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>[207982] releases/WebKitGTK/webkit-2.14</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/207982">207982</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-27 03:24:26 -0700 (Thu, 27 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/207658">r207658</a> - [GTK] Configures but fails to link with ENABLE_OPENGL=OFF
https://bugs.webkit.org/show_bug.cgi?id=163449
Reviewed by Michael Catanzaro.
.:
Remove wrong dependency of Wayland on OpenGL introduced in <a href="http://trac.webkit.org/projects/webkit/changeset/190615">r190615</a>, it should be possible to build for Wayland
without GL.
* Source/cmake/OptionsGTK.cmake:
Source/WebCore:
Only define sharingGLContext in PlatformDisplay if EGL or GLX are enabled.
* platform/graphics/PlatformDisplay.cpp:
* platform/graphics/PlatformDisplay.h:
* platform/graphics/wayland/PlatformDisplayWayland.cpp:
(WebCore::PlatformDisplayWayland::initialize):
* platform/graphics/x11/PlatformDisplayX11.cpp:
(WebCore::PlatformDisplayX11::~PlatformDisplayX11):
Source/WebKit2:
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseRealize): Check TEXTURE_MAPPER_GL instead of TEXTURE_MAPPER and also ensure the current
display is X11.
(webkitWebViewBaseUnrealize): Ditto.
(webkitWebViewBaseDidRelaunchWebProcess): Check TEXTURE_MAPPER_GL instead of TEXTURE_MAPPER.
(webkitWebViewBasePageClosed): Ditto.
* UIProcess/AcceleratedDrawingAreaProxy.cpp:
(WebKit::AcceleratedDrawingAreaProxy::didUpdateBackingStoreState): Ditto.
(WebKit::AcceleratedDrawingAreaProxy::waitForAndDispatchDidUpdateBackingStoreState): Check EGL is enabled before
trying to use the WaylandCompositor.
* UIProcess/AcceleratedDrawingAreaProxy.h:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::createNewWebProcess): Ditto.
* UIProcess/gtk/AcceleratedBackingStore.cpp:
(WebKit::AcceleratedBackingStore::create): Ditto.
* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
* UIProcess/gtk/WaylandCompositor.cpp:
* UIProcess/gtk/WaylandCompositor.h:
* WebProcess/WebPage/AcceleratedDrawingArea.cpp:
(WebKit::AcceleratedDrawingArea::enterAcceleratedCompositingMode): Check TEXTURE_MAPPER_GL instead of TEXTURE_MAPPER.
* WebProcess/WebPage/AcceleratedDrawingArea.h:
* WebProcess/WebPage/DrawingArea.h:
* WebProcess/WebPage/DrawingArea.messages.in:
* WebProcess/WebPage/LayerTreeHost.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214ChangeLog">releases/WebKitGTK/webkit-2.14/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsPlatformDisplaycpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/PlatformDisplay.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsPlatformDisplayh">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/PlatformDisplay.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicswaylandPlatformDisplayWaylandcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsx11PlatformDisplayX11cpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessAcceleratedDrawingAreaProxycpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessAcceleratedDrawingAreaProxyh">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessWebProcessPoolcpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkAcceleratedBackingStorecpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStore.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkAcceleratedBackingStoreWaylandcpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkWaylandCompositorcpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkWaylandCompositorh">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageAcceleratedDrawingAreacpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageAcceleratedDrawingAreah">releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageDrawingAreah">releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageDrawingAreamessagesin">releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageLayerTreeHosth">releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourcecmakeOptionsGTKcmake">releases/WebKitGTK/webkit-2.14/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/ChangeLog (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/ChangeLog 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/ChangeLog 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-20 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Configures but fails to link with ENABLE_OPENGL=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=163449
+
+ Reviewed by Michael Catanzaro.
+
+ Remove wrong dependency of Wayland on OpenGL introduced in r190615, it should be possible to build for Wayland
+ without GL.
+
+ * Source/cmake/OptionsGTK.cmake:
+
</ins><span class="cx"> 2016-10-14 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Private/unsupported build options should be marked as advanced
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-10-20 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Configures but fails to link with ENABLE_OPENGL=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=163449
+
+ Reviewed by Michael Catanzaro.
+
+ Only define sharingGLContext in PlatformDisplay if EGL or GLX are enabled.
+
+ * platform/graphics/PlatformDisplay.cpp:
+ * platform/graphics/PlatformDisplay.h:
+ * platform/graphics/wayland/PlatformDisplayWayland.cpp:
+ (WebCore::PlatformDisplayWayland::initialize):
+ * platform/graphics/x11/PlatformDisplayX11.cpp:
+ (WebCore::PlatformDisplayX11::~PlatformDisplayX11):
+
</ins><span class="cx"> 2016-10-20 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop searching for first-letter containers at multi-column boundary.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsPlatformDisplaycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/PlatformDisplay.cpp (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(EFL)
</del><ins>+#if !PLATFORM(EFL) && (USE(EGL) || USE(GLX))
</ins><span class="cx"> GLContext* PlatformDisplay::sharingGLContext()
</span><span class="cx"> {
</span><span class="cx"> if (!m_sharingGLContext)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsPlatformDisplayh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/PlatformDisplay.h (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/PlatformDisplay.h 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/PlatformDisplay.h 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> virtual Type type() const = 0;
</span><span class="cx">
</span><del>-#if !PLATFORM(EFL)
</del><ins>+#if !PLATFORM(EFL) && (USE(EGL) || USE(GLX))
</ins><span class="cx"> // FIXME: This should not have any platform ifdef, but EFL has its own EGLContext class
</span><span class="cx"> // instead of using the GLContext common API.
</span><span class="cx"> GLContext* sharingGLContext();
</span><span class="lines">@@ -80,7 +80,9 @@
</span><span class="cx"> EGLDisplay m_eglDisplay;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(EGL) || USE(GLX)
</ins><span class="cx"> std::unique_ptr<GLContext> m_sharingGLContext;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static std::unique_ptr<PlatformDisplay> createPlatformDisplay();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicswaylandPlatformDisplayWaylandcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> wl_registry_add_listener(m_registry.get(), &s_registryListener, this);
</span><span class="cx"> wl_display_roundtrip(m_display);
</span><span class="cx">
</span><ins>+#if USE(EGL)
</ins><span class="cx"> #if defined(EGL_KHR_platform_wayland)
</span><span class="cx"> const char* extensions = eglQueryString(nullptr, EGL_EXTENSIONS);
</span><span class="cx"> if (GLContext::isExtensionSupported(extensions, "EGL_KHR_platform_base")) {
</span><span class="lines">@@ -79,6 +80,7 @@
</span><span class="cx"> m_eglDisplay = eglGetDisplay(m_display);
</span><span class="cx">
</span><span class="cx"> PlatformDisplay::initializeEGLDisplay();
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformDisplayWayland::registryGlobal(const char* interface, uint32_t name)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsx11PlatformDisplayX11cpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -56,8 +56,10 @@
</span><span class="cx">
</span><span class="cx"> PlatformDisplayX11::~PlatformDisplayX11()
</span><span class="cx"> {
</span><ins>+#if USE(EGL) || USE(GLX)
</ins><span class="cx"> // Clear the sharing context before releasing the display.
</span><span class="cx"> m_sharingGLContext = nullptr;
</span><ins>+#endif
</ins><span class="cx"> if (m_ownedDisplay)
</span><span class="cx"> XCloseDisplay(m_display);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2016-10-20 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Configures but fails to link with ENABLE_OPENGL=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=163449
+
+ Reviewed by Michael Catanzaro.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseRealize): Check TEXTURE_MAPPER_GL instead of TEXTURE_MAPPER and also ensure the current
+ display is X11.
+ (webkitWebViewBaseUnrealize): Ditto.
+ (webkitWebViewBaseDidRelaunchWebProcess): Check TEXTURE_MAPPER_GL instead of TEXTURE_MAPPER.
+ (webkitWebViewBasePageClosed): Ditto.
+ * UIProcess/AcceleratedDrawingAreaProxy.cpp:
+ (WebKit::AcceleratedDrawingAreaProxy::didUpdateBackingStoreState): Ditto.
+ (WebKit::AcceleratedDrawingAreaProxy::waitForAndDispatchDidUpdateBackingStoreState): Check EGL is enabled before
+ trying to use the WaylandCompositor.
+ * UIProcess/AcceleratedDrawingAreaProxy.h:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::createNewWebProcess): Ditto.
+ * UIProcess/gtk/AcceleratedBackingStore.cpp:
+ (WebKit::AcceleratedBackingStore::create): Ditto.
+ * UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+ * UIProcess/gtk/WaylandCompositor.cpp:
+ * UIProcess/gtk/WaylandCompositor.h:
+ * WebProcess/WebPage/AcceleratedDrawingArea.cpp:
+ (WebKit::AcceleratedDrawingArea::enterAcceleratedCompositingMode): Check TEXTURE_MAPPER_GL instead of TEXTURE_MAPPER.
+ * WebProcess/WebPage/AcceleratedDrawingArea.h:
+ * WebProcess/WebPage/DrawingArea.h:
+ * WebProcess/WebPage/DrawingArea.messages.in:
+ * WebProcess/WebPage/LayerTreeHost.h:
+
+2016-10-20 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Avoid strstr() when checking (E)GL extensions
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161958
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -377,9 +377,11 @@
</span><span class="cx"> gtk_widget_set_window(widget, window);
</span><span class="cx"> gdk_window_set_user_data(window, widget);
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
- if (DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(priv->pageProxy->drawingArea()))
- drawingArea->setNativeSurfaceHandleForCompositing(GDK_WINDOW_XID(window));
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+ if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::X11) {
+ if (DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(priv->pageProxy->drawingArea()))
+ drawingArea->setNativeSurfaceHandleForCompositing(GDK_WINDOW_XID(window));
+ }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> gtk_style_context_set_background(gtk_widget_get_style_context(widget), window);
</span><span class="lines">@@ -390,9 +392,11 @@
</span><span class="cx"> static void webkitWebViewBaseUnrealize(GtkWidget* widget)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebViewBase* webView = WEBKIT_WEB_VIEW_BASE(widget);
</span><del>-#if USE(TEXTURE_MAPPER) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
- if (DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(webView->priv->pageProxy->drawingArea()))
- drawingArea->destroyNativeSurfaceHandleForCompositing();
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+ if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::X11) {
+ if (DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(webView->priv->pageProxy->drawingArea()))
+ drawingArea->destroyNativeSurfaceHandleForCompositing();
+ }
</ins><span class="cx"> #endif
</span><span class="cx"> gtk_im_context_set_client_window(webView->priv->inputMethodFilter.context(), nullptr);
</span><span class="cx">
</span><span class="lines">@@ -1476,7 +1480,7 @@
</span><span class="cx"> // Queue a resize to ensure the new DrawingAreaProxy is resized.
</span><span class="cx"> gtk_widget_queue_resize_no_redraw(GTK_WIDGET(webkitWebViewBase));
</span><span class="cx">
</span><del>-#if PLATFORM(X11) && USE(TEXTURE_MAPPER) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</del><ins>+#if PLATFORM(X11) && USE(TEXTURE_MAPPER_GL) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::X11)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1498,7 +1502,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (webkitWebViewBase->priv->acceleratedBackingStore)
</span><span class="cx"> webkitWebViewBase->priv->acceleratedBackingStore->update(LayerTreeContext());
</span><del>-#if PLATFORM(X11) && USE(TEXTURE_MAPPER) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</del><ins>+#if PLATFORM(X11) && USE(TEXTURE_MAPPER_GL) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::X11)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessAcceleratedDrawingAreaProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.cpp (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.cpp 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.cpp 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> else {
</span><span class="cx"> m_hasReceivedFirstUpdate = true;
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> if (m_pendingNativeSurfaceHandleForCompositing) {
</span><span class="cx"> setNativeSurfaceHandleForCompositing(m_pendingNativeSurfaceHandleForCompositing);
</span><span class="cx"> m_pendingNativeSurfaceHandleForCompositing = 0;
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> if (!m_webPageProxy.isViewVisible())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if PLATFORM(WAYLAND)
</del><ins>+#if PLATFORM(WAYLAND) && USE(EGL)
</ins><span class="cx"> // Never block the UI process in Wayland when waiting for DidUpdateBackingStoreState after a resize,
</span><span class="cx"> // because the nested compositor needs to handle the web process requests that happens while resizing.
</span><span class="cx"> if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland && WaylandCompositor::singleton().isRunning())
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> m_webPageProxy.updateAcceleratedCompositingMode(layerTreeContext);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> void AcceleratedDrawingAreaProxy::setNativeSurfaceHandleForCompositing(uint64_t handle)
</span><span class="cx"> {
</span><span class="cx"> if (!m_hasReceivedFirstUpdate) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessAcceleratedDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.h (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.h 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.h 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> CoordinatedLayerTreeHostProxy& coordinatedLayerTreeHostProxy() const { return *m_coordinatedLayerTreeHostProxy.get(); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> void setNativeSurfaceHandleForCompositing(uint64_t);
</span><span class="cx"> void destroyNativeSurfaceHandleForCompositing();
</span><span class="cx"> #endif
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> // For a new Drawing Area don't draw anything until the WebProcess has sent over the first content.
</span><span class="cx"> bool m_hasReceivedFirstUpdate { false };
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> uint64_t m_pendingNativeSurfaceHandleForCompositing { 0 };
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebProcessPool.cpp (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -645,7 +645,7 @@
</span><span class="cx"> parameters.memoryPressureMonitorHandle = MemoryPressureMonitor::singleton().createHandle();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(WAYLAND)
</del><ins>+#if PLATFORM(WAYLAND) && USE(EGL)
</ins><span class="cx"> if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland)
</span><span class="cx"> parameters.waylandCompositorDisplayName = WaylandCompositor::singleton().displayName();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkAcceleratedBackingStorecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStore.cpp (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStore.cpp 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStore.cpp 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<AcceleratedBackingStore> AcceleratedBackingStore::create(WebPageProxy& webPage)
</span><span class="cx"> {
</span><del>-#if PLATFORM(WAYLAND)
</del><ins>+#if PLATFORM(WAYLAND) && USE(EGL)
</ins><span class="cx"> if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland)
</span><span class="cx"> return AcceleratedBackingStoreWayland::create(webPage);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkAcceleratedBackingStoreWaylandcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "AcceleratedBackingStoreWayland.h"
</span><span class="cx">
</span><del>-#if PLATFORM(WAYLAND)
</del><ins>+#if PLATFORM(WAYLAND) && USE(EGL)
</ins><span class="cx">
</span><span class="cx"> #include "WaylandCompositor.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="lines">@@ -162,4 +162,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // PLATFORM(WAYLAND)
</del><ins>+#endif // PLATFORM(WAYLAND) && USE(EGL)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkWaylandCompositorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WaylandCompositor.h"
</span><span class="cx">
</span><del>-#if PLATFORM(WAYLAND)
</del><ins>+#if PLATFORM(WAYLAND) && USE(EGL)
</ins><span class="cx">
</span><span class="cx"> #include "WebKit2WaylandServerProtocol.h"
</span><span class="cx"> #include <EGL/egl.h>
</span><span class="lines">@@ -516,4 +516,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // PLATFORM(WAYLAND)
</del><ins>+#endif // PLATFORM(WAYLAND) && USE(EGL)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkWaylandCompositorh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#if PLATFORM(WAYLAND)
</del><ins>+#if PLATFORM(WAYLAND) && USE(EGL)
</ins><span class="cx">
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include <WebCore/RefPtrCairo.h>
</span><span class="lines">@@ -126,4 +126,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // PLATFORM(WAYLAND)
</del><ins>+#endif // PLATFORM(WAYLAND) && USE(EGL)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageAcceleratedDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_layerTreeHost);
</span><span class="cx"> m_layerTreeHost = LayerTreeHost::create(m_webPage);
</span><del>-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> if (m_nativeSurfaceHandleForCompositing)
</span><span class="cx"> m_layerTreeHost->setNativeSurfaceHandleForCompositing(m_nativeSurfaceHandleForCompositing);
</span><span class="cx"> #endif
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> void AcceleratedDrawingArea::setNativeSurfaceHandleForCompositing(uint64_t handle)
</span><span class="cx"> {
</span><span class="cx"> m_nativeSurfaceHandleForCompositing = handle;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageAcceleratedDrawingAreah"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> void didReceiveCoordinatedLayerTreeHostMessage(IPC::Connection&, IPC::Decoder&) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> void setNativeSurfaceHandleForCompositing(uint64_t) override;
</span><span class="cx"> void destroyNativeSurfaceHandleForCompositing(bool&) override;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> DrawingAreaType m_type;
</span><span class="cx"> WebPage& m_webPage;
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> uint64_t m_nativeSurfaceHandleForCompositing { 0 };
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> virtual void addTransactionCallbackID(uint64_t callbackID) { ASSERT_NOT_REACHED(); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> virtual void setNativeSurfaceHandleForCompositing(uint64_t) = 0;
</span><span class="cx"> virtual void destroyNativeSurfaceHandleForCompositing(bool&) = 0;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageDrawingAreamessagesin"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> AddTransactionCallbackID(uint64_t callbackID)
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> SetNativeSurfaceHandleForCompositing(uint64_t handle)
</span><span class="cx"> DestroyNativeSurfaceHandleForCompositing() -> (bool handled)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> virtual void scheduleAnimation() = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
</ins><span class="cx"> virtual void setNativeSurfaceHandleForCompositing(uint64_t) { };
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/cmake/OptionsGTK.cmake (207981 => 207982)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/cmake/OptionsGTK.cmake 2016-10-27 10:22:04 UTC (rev 207981)
+++ releases/WebKitGTK/webkit-2.14/Source/cmake/OptionsGTK.cmake 2016-10-27 10:24:26 UTC (rev 207982)
</span><span class="lines">@@ -110,7 +110,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_OPENGL)
</span><span class="cx"> WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_VIDEO)
</span><span class="cx"> WEBKIT_OPTION_DEPEND(USE_GSTREAMER_MPEGTS ENABLE_VIDEO)
</span><del>-WEBKIT_OPTION_DEPEND(ENABLE_WAYLAND_TARGET ENABLE_OPENGL)
</del><span class="cx">
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
</span><span class="cx"> if (DEVELOPER_MODE)
</span></span></pre>
</div>
</div>
</body>
</html>