<!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>[190964] releases/WebKitGTK/webkit-2.10</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/190964">190964</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-13 04:00:43 -0700 (Tue, 13 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190615">r190615</a> - Fix ENABLE_OPENGL=OFF builds
https://bugs.webkit.org/show_bug.cgi?id=146511
Patch by Emanuele Aina <emanuele.aina@collabora.com> on 2015-10-06
Reviewed by Darin Adler.
.:
* Source/cmake/OptionsGTK.cmake: Make ENABLE_WAYLAND_TARGET depend on
ENABLE_OPENGL due to EGL usage.
Source/WebCore:
* platform/graphics/texmap/BitmapTextureGL.h:
* platform/graphics/texmap/BitmapTextureGL.cpp:
* platform/graphics/texmap/TextureMapperGL.h:
* platform/graphics/texmap/TextureMapperGL.cpp:
* platform/graphics/texmap/TextureMapperShaderProgram.h:
* platform/graphics/texmap/TextureMapperShaderProgram.cpp:
Fix TEXTURE_MAPPER_GL vs. TEXTURE_MAPPER guards to make sure that
ENABLE_OPENGL=OFF only disables the GL-related parts.
Source/WebKit2:
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseRealize):
(webkitWebViewBaseDraw):
(webkitWebViewBaseDidRelaunchWebProcess):
Replace USE(TEXTURE_MAPPER_GL) with USE(TEXTURE_MAPPER) around
webkitWebViewRenderAcceleratedCompositingResults()
* UIProcess/DrawingAreaProxyImpl.cpp:
* UIProcess/DrawingAreaProxyImpl.h:
* WebProcess/WebPage/DrawingArea.cpp:
(WebKit::DrawingArea::DrawingArea):
* WebProcess/WebPage/DrawingArea.h:
* WebProcess/WebPage/LayerTreeHost.h:
Replace USE(TEXTURE_MAPPER_GL) with USE(TEXTURE_MAPPER) around
setNativeSurfaceHandleForCompositing().
* UIProcess/gtk/WebPreferencesGtk.cpp:
(WebKit::WebPreferences::platformInitializeStore):
Default to no AC if no GL support has been built.
* WebProcess/WebPage/DrawingArea.messages.in:
Replace USE(TEXTURE_MAPPER_GL) with USE(TEXTURE_MAPPER) around
SetNativeSurfaceHandleForCompositing.
* WebProcess/WebPage/DrawingAreaImpl.h:
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit::DrawingAreaImpl::enterAcceleratedCompositingMode):
Replace USE(TEXTURE_MAPPER_GL) with USE(TEXTURE_MAPPER) around
setNativeSurfaceHandleForCompositing().
(WebKit::DrawingAreaImpl::setNativeSurfaceHandleForCompositing):
Force setAcceleratedCompositingEnabled() only if a LayerTreeHost
implementation is available, to avoid crashing when building without
any GL support.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210ChangeLog">releases/WebKitGTK/webkit-2.10/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicstexmapBitmapTextureGLcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicstexmapBitmapTextureGLh">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicstexmapTextureMapperGLcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicstexmapTextureMapperGLh">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicstexmapTextureMapperShaderProgramcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicstexmapTextureMapperShaderProgramh">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessDrawingAreaProxyImplcpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessDrawingAreaProxyImplh">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessgtkWebPreferencesGtkcpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageDrawingAreacpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageDrawingAreah">releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageDrawingAreamessagesin">releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageDrawingAreaImplcpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageDrawingAreaImplh">releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageLayerTreeHosth">releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourcecmakeOptionsGTKcmake">releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/ChangeLog (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/ChangeLog 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/ChangeLog 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-10-06 Emanuele Aina <emanuele.aina@collabora.com>
+
+ Fix ENABLE_OPENGL=OFF builds
+ https://bugs.webkit.org/show_bug.cgi?id=146511
+
+ Reviewed by Darin Adler.
+
+ * Source/cmake/OptionsGTK.cmake: Make ENABLE_WAYLAND_TARGET depend on
+ ENABLE_OPENGL due to EGL usage.
+
</ins><span class="cx"> 2015-09-21 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Update OptionsGTK.cmake and NEWS for 2.10.0 release.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-10-06 Emanuele Aina <emanuele.aina@collabora.com>
+
+ Fix ENABLE_OPENGL=OFF builds
+ https://bugs.webkit.org/show_bug.cgi?id=146511
+
+ Reviewed by Darin Adler.
+
+ * platform/graphics/texmap/BitmapTextureGL.h:
+ * platform/graphics/texmap/BitmapTextureGL.cpp:
+ * platform/graphics/texmap/TextureMapperGL.h:
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ * platform/graphics/texmap/TextureMapperShaderProgram.h:
+ * platform/graphics/texmap/TextureMapperShaderProgram.cpp:
+ Fix TEXTURE_MAPPER_GL vs. TEXTURE_MAPPER guards to make sure that
+ ENABLE_OPENGL=OFF only disables the GL-related parts.
+
</ins><span class="cx"> 2015-10-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> data: URLs should not be preloaded
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicstexmapBitmapTextureGLcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -22,6 +22,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "BitmapTextureGL.h"
</span><span class="cx">
</span><ins>+#if USE(TEXTURE_MAPPER_GL)
+
</ins><span class="cx"> #include "Extensions3D.h"
</span><span class="cx"> #include "FilterOperations.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="lines">@@ -377,3 +379,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }; // namespace WebCore
</span><ins>+
+#endif // USE(TEXTURE_MAPPER_GL)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicstexmapBitmapTextureGLh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.h (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.h 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.h 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -21,6 +21,8 @@
</span><span class="cx"> #ifndef BitmapTextureGL_h
</span><span class="cx"> #define BitmapTextureGL_h
</span><span class="cx">
</span><ins>+#if USE(TEXTURE_MAPPER_GL)
+
</ins><span class="cx"> #include "BitmapTexture.h"
</span><span class="cx"> #include "FilterOperation.h"
</span><span class="cx"> #include "GraphicsContext3D.h"
</span><span class="lines">@@ -92,4 +94,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif // USE(TEXTURE_MAPPER_GL)
+
</ins><span class="cx"> #endif // BitmapTextureGL_h
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicstexmapTextureMapperGLcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -22,6 +22,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TextureMapperGL.h"
</span><span class="cx">
</span><ins>+#if USE(TEXTURE_MAPPER_GL)
+
</ins><span class="cx"> #include "BitmapTextureGL.h"
</span><span class="cx"> #include "BitmapTexturePool.h"
</span><span class="cx"> #include "Extensions3D.h"
</span><span class="lines">@@ -52,8 +54,6 @@
</span><span class="cx"> #define GL_UNPACK_SKIP_ROWS 0x0CF3
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER)
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> struct TextureMapperGLData {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -798,12 +798,11 @@
</span><span class="cx"> return adoptRef(texture);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL)
</del><span class="cx"> std::unique_ptr<TextureMapper> TextureMapper::platformCreateAccelerated()
</span><span class="cx"> {
</span><span class="cx"> return std::make_unique<TextureMapperGL>();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> };
</span><del>-#endif
</del><ins>+
+#endif // USE(TEXTURE_MAPPER_GL)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicstexmapTextureMapperGLh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #ifndef TextureMapperGL_h
</span><span class="cx"> #define TextureMapperGL_h
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER)
</del><ins>+#if USE(TEXTURE_MAPPER_GL)
</ins><span class="cx">
</span><span class="cx"> #include "FilterOperation.h"
</span><span class="cx"> #include "FloatQuad.h"
</span><span class="lines">@@ -138,6 +138,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // USE(TEXTURE_MAPPER)
</del><ins>+#endif // USE(TEXTURE_MAPPER_GL)
</ins><span class="cx">
</span><span class="cx"> #endif // TextureMapperGL_h
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicstexmapTextureMapperShaderProgramcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -22,7 +22,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TextureMapperShaderProgram.h"
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER)
</del><ins>+#if USE(TEXTURE_MAPPER_GL)
+
</ins><span class="cx"> #include "LengthFunctions.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "TextureMapperGL.h"
</span><span class="lines">@@ -412,4 +413,4 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+#endif // USE(TEXTURE_MAPPER_GL)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicstexmapTextureMapperShaderProgramh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #ifndef TextureMapperShaderProgram_h
</span><span class="cx"> #define TextureMapperShaderProgram_h
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER)
</del><ins>+#if USE(TEXTURE_MAPPER_GL)
</ins><span class="cx"> #include "GraphicsContext3D.h"
</span><span class="cx"> #include "TransformationMatrix.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -96,6 +96,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+#endif // USE(TEXTURE_MAPPER_GL)
</ins><span class="cx">
</span><span class="cx"> #endif // TextureMapperShaderProgram_h
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-10-06 Emanuele Aina <emanuele.aina@collabora.com>
+
+ Fix ENABLE_OPENGL=OFF builds
+ https://bugs.webkit.org/show_bug.cgi?id=146511
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseRealize):
+ (webkitWebViewBaseDraw):
+ (webkitWebViewBaseDidRelaunchWebProcess):
+ Replace USE(TEXTURE_MAPPER_GL) with USE(TEXTURE_MAPPER) around
+ webkitWebViewRenderAcceleratedCompositingResults()
+ * UIProcess/DrawingAreaProxyImpl.cpp:
+ * UIProcess/DrawingAreaProxyImpl.h:
+ * WebProcess/WebPage/DrawingArea.cpp:
+ (WebKit::DrawingArea::DrawingArea):
+ * WebProcess/WebPage/DrawingArea.h:
+ * WebProcess/WebPage/LayerTreeHost.h:
+ Replace USE(TEXTURE_MAPPER_GL) with USE(TEXTURE_MAPPER) around
+ setNativeSurfaceHandleForCompositing().
+ * UIProcess/gtk/WebPreferencesGtk.cpp:
+ (WebKit::WebPreferences::platformInitializeStore):
+ Default to no AC if no GL support has been built.
+ * WebProcess/WebPage/DrawingArea.messages.in:
+ Replace USE(TEXTURE_MAPPER_GL) with USE(TEXTURE_MAPPER) around
+ SetNativeSurfaceHandleForCompositing.
+ * WebProcess/WebPage/DrawingAreaImpl.h:
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::enterAcceleratedCompositingMode):
+ Replace USE(TEXTURE_MAPPER_GL) with USE(TEXTURE_MAPPER) around
+ setNativeSurfaceHandleForCompositing().
+ (WebKit::DrawingAreaImpl::setNativeSurfaceHandleForCompositing):
+ Force setAcceleratedCompositingEnabled() only if a LayerTreeHost
+ implementation is available, to avoid crashing when building without
+ any GL support.
+
</ins><span class="cx"> 2015-10-02 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> popstate is fired at the wrong time on load
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -326,7 +326,7 @@
</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_GL) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</del><ins>+#if USE(TEXTURE_MAPPER) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(priv->pageProxy->drawingArea());
</span><span class="cx"> drawingArea->setNativeSurfaceHandleForCompositing(GDK_WINDOW_XID(window));
</span><span class="cx"> #endif
</span><span class="lines">@@ -472,7 +472,7 @@
</span><span class="cx"> priv->authenticationDialog = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL)
</del><ins>+#if USE(TEXTURE_MAPPER)
</ins><span class="cx"> static bool webkitWebViewRenderAcceleratedCompositingResults(WebKitWebViewBase* webViewBase, DrawingAreaProxyImpl* drawingArea, cairo_t* cr, GdkRectangle* clipRect)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(drawingArea);
</span><span class="lines">@@ -518,7 +518,7 @@
</span><span class="cx"> if (!gdk_cairo_get_clip_rectangle(cr, &clipRect))
</span><span class="cx"> return FALSE;
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL)
</del><ins>+#if USE(TEXTURE_MAPPER)
</ins><span class="cx"> if (webkitWebViewRenderAcceleratedCompositingResults(webViewBase, drawingArea, cr, &clipRect))
</span><span class="cx"> return GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->draw(widget, cr);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1374,7 +1374,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)
</del><ins>+#if PLATFORM(X11) && USE(TEXTURE_MAPPER)
</ins><span class="cx"> if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::X11)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1384,12 +1384,13 @@
</span><span class="cx"> #if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</span><span class="cx"> if (!priv->redirectedWindow)
</span><span class="cx"> return;
</span><del>- drawingArea->setNativeSurfaceHandleForCompositing(priv->redirectedWindow->windowID());
</del><ins>+ uint64_t windowID = priv->redirectedWindow->windowID();
</ins><span class="cx"> #else
</span><span class="cx"> if (!gtk_widget_get_realized(GTK_WIDGET(webkitWebViewBase)))
</span><span class="cx"> return;
</span><del>- drawingArea->setNativeSurfaceHandleForCompositing(GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(webkitWebViewBase))));
</del><ins>+ uint64_t windowID = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(webkitWebViewBase)));
</ins><span class="cx"> #endif
</span><ins>+ drawingArea->setNativeSurfaceHandleForCompositing(windowID);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(webkitWebViewBase);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessDrawingAreaProxyImplcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> m_webPageProxy.enterAcceleratedCompositingMode(layerTreeContext);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
</del><ins>+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
</ins><span class="cx"> void DrawingAreaProxyImpl::setNativeSurfaceHandleForCompositing(uint64_t handle)
</span><span class="cx"> {
</span><span class="cx"> m_webPageProxy.process().send(Messages::DrawingArea::SetNativeSurfaceHandleForCompositing(handle), m_webPageProxy.pageID());
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessDrawingAreaProxyImplh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> bool hasReceivedFirstUpdate() const { return m_hasReceivedFirstUpdate; }
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
</del><ins>+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
</ins><span class="cx"> void setNativeSurfaceHandleForCompositing(uint64_t);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessgtkWebPreferencesGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -43,6 +43,9 @@
</span><span class="cx"> setPluginsEnabled(false);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><ins>+#if !ENABLE(OPEN_GL)
+ setAcceleratedCompositingEnabled(false);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPreferences::platformUpdateStringValueForKey(const String&, const String&)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> DrawingArea::DrawingArea(DrawingAreaType type, WebPage& webPage)
</span><span class="cx"> : m_type(type)
</span><span class="cx"> , m_webPage(webPage)
</span><del>-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
</del><ins>+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
</ins><span class="cx"> , m_nativeSurfaceHandleForCompositing(0)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -142,7 +142,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_GL) && PLATFORM(GTK)
</del><ins>+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
</ins><span class="cx"> uint64_t m_nativeSurfaceHandleForCompositing;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -167,7 +167,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_GL) && PLATFORM(GTK)
</del><ins>+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
</ins><span class="cx"> virtual void setNativeSurfaceHandleForCompositing(uint64_t) = 0;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageDrawingAreamessagesin"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2015-10-13 11:00:43 UTC (rev 190964)
</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_GL) && PLATFORM(GTK)
</del><ins>+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
</ins><span class="cx"> SetNativeSurfaceHandleForCompositing(uint64_t handle)
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageDrawingAreaImplcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> ASSERT(!m_layerTreeHost);
</span><span class="cx">
</span><span class="cx"> m_layerTreeHost = LayerTreeHost::create(&m_webPage);
</span><del>-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
</del><ins>+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
</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">@@ -687,14 +687,15 @@
</span><span class="cx"> m_layerTreeHost->setViewOverlayRootLayer(viewOverlayRootLayer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
</del><ins>+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
</ins><span class="cx"> void DrawingAreaImpl::setNativeSurfaceHandleForCompositing(uint64_t handle)
</span><span class="cx"> {
</span><span class="cx"> m_nativeSurfaceHandleForCompositing = handle;
</span><del>- m_webPage.corePage()->settings().setAcceleratedCompositingEnabled(true);
</del><span class="cx">
</span><del>- if (m_layerTreeHost)
</del><ins>+ if (m_layerTreeHost) {
+ m_webPage.corePage()->settings().setAcceleratedCompositingEnabled(true);
</ins><span class="cx"> m_layerTreeHost->setNativeSurfaceHandleForCompositing(handle);
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageDrawingAreaImplh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void attachViewOverlayGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) override;
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
</del><ins>+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
</ins><span class="cx"> virtual void setNativeSurfaceHandleForCompositing(uint64_t) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> virtual void scheduleAnimation() = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
</del><ins>+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
</ins><span class="cx"> virtual void setNativeSurfaceHandleForCompositing(uint64_t) = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake (190963 => 190964)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake 2015-10-13 11:00:43 UTC (rev 190964)
</span><span class="lines">@@ -95,6 +95,7 @@
</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><ins>+WEBKIT_OPTION_DEPEND(ENABLE_WAYLAND_TARGET ENABLE_OPENGL)
</ins><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>