<!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>[181379] releases/WebKitGTK/webkit-2.8</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/181379">181379</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-11 03:20:31 -0700 (Wed, 11 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/181321">r181321</a> - [GTK] Add a configure option to build with OpenGL ES 2
https://bugs.webkit.org/show_bug.cgi?id=142498
Patch by Carlos Garcia Campos <cgarcia@igalia.com> and José Dapena Paz <jdapena@igalia.com> on 2015-03-10
Reviewed by Martin Robinson.
.:
Add ENABLE_GLES2 option. It's disabled by default, but if passed
GLES2 is required and OpenGL is not even searched. Otherwise we
search for OpenGL as usual, using it only if present.
* Source/cmake/OptionsGTK.cmake:
Source/WebCore:
Build GLES or GL specific files depending on the build options.
* PlatformGTK.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28ChangeLog">releases/WebKitGTK/webkit-2.8/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorePlatformGTKcmake">releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourcecmakeOptionsGTKcmake">releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/ChangeLog (181378 => 181379)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/ChangeLog 2015-03-11 10:19:01 UTC (rev 181378)
+++ releases/WebKitGTK/webkit-2.8/ChangeLog 2015-03-11 10:20:31 UTC (rev 181379)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-03-10 Carlos Garcia Campos <cgarcia@igalia.com> and José Dapena Paz <jdapena@igalia.com>
+
+ [GTK] Add a configure option to build with OpenGL ES 2
+ https://bugs.webkit.org/show_bug.cgi?id=142498
+
+ Reviewed by Martin Robinson.
+
+ Add ENABLE_GLES2 option. It's disabled by default, but if passed
+ GLES2 is required and OpenGL is not even searched. Otherwise we
+ search for OpenGL as usual, using it only if present.
+
+ * Source/cmake/OptionsGTK.cmake:
+
</ins><span class="cx"> 2015-03-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Update OptionsGTK.cmake and NEWS for 2.7.91 release.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (181378 => 181379)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-11 10:19:01 UTC (rev 181378)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-11 10:20:31 UTC (rev 181379)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-03-10 Carlos Garcia Campos <cgarcia@igalia.com> and José Dapena Paz <jdapena@igalia.com>
+
+ [GTK] Add a configure option to build with OpenGL ES 2
+ https://bugs.webkit.org/show_bug.cgi?id=142498
+
+ Reviewed by Martin Robinson.
+
+ Build GLES or GL specific files depending on the build options.
+
+ * PlatformGTK.cmake:
+
</ins><span class="cx"> 2015-03-10 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Shrink the CSSPropertyID enum type
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformGTK.cmake (181378 => 181379)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformGTK.cmake 2015-03-11 10:19:01 UTC (rev 181378)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformGTK.cmake 2015-03-11 10:20:31 UTC (rev 181379)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx">
</span><span class="cx"> platform/graphics/GraphicsContext3DPrivate.cpp
</span><span class="cx"> platform/graphics/ImageSource.cpp
</span><del>- platform/graphics/OpenGLShims.cpp
</del><span class="cx"> platform/graphics/WOFFFileFormat.cpp
</span><span class="cx">
</span><span class="cx"> platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp
</span><span class="lines">@@ -116,10 +115,7 @@
</span><span class="cx"> platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp
</span><span class="cx"> platform/graphics/harfbuzz/HarfBuzzShaper.cpp
</span><span class="cx">
</span><del>- platform/graphics/opengl/Extensions3DOpenGL.cpp
</del><span class="cx"> platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
</span><del>- platform/graphics/opengl/Extensions3DOpenGLES.cpp
- platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
</del><span class="cx"> platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
</span><span class="cx"> platform/graphics/opengl/TemporaryOpenGLSetting.cpp
</span><span class="cx">
</span><span class="lines">@@ -405,6 +401,22 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (WTF_USE_OPENGL_ES_2)
+ list(APPEND WebCore_SOURCES
+ platform/graphics/opengl/Extensions3DOpenGLES.cpp
+ platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
+ )
+endif ()
+
+if (WTF_USE_OPENGL)
+ list(APPEND WebCore_SOURCES
+ platform/graphics/OpenGLShims.cpp
+
+ platform/graphics/opengl/Extensions3DOpenGL.cpp
+ platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
+ )
+endif ()
+
</ins><span class="cx"> if (ENABLE_PLUGIN_PROCESS_GTK2)
</span><span class="cx"> # WebKitPluginProcess2 needs a version of WebCore compiled against GTK+2, so we've isolated all the GTK+
</span><span class="cx"> # dependent files into a separate library which can be used to construct a GTK+2 WebCore
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake (181378 => 181379)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake 2015-03-11 10:19:01 UTC (rev 181378)
+++ releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake 2015-03-11 10:20:31 UTC (rev 181379)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> set(ENABLE_X11_TARGET ON CACHE BOOL "Whether to enable support for the X11 windowing target.")
</span><span class="cx"> set(ENABLE_WAYLAND_TARGET OFF CACHE BOOL "Whether to enable support for the Wayland windowing target.")
</span><span class="cx"> set(ENABLE_INTROSPECTION ON CACHE BOOL "Whether to enable GObject introspection.")
</span><ins>+set(ENABLE_GLES2 OFF CACHE BOOL "Whether to enable OpenGL ES 2.0.")
</ins><span class="cx">
</span><span class="cx"> # These are shared variables, but we special case their definition so that we can use the
</span><span class="cx"> # CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
</span><span class="lines">@@ -46,7 +47,6 @@
</span><span class="cx"> find_package(WebP REQUIRED)
</span><span class="cx"> find_package(ATSPI 2.5.3)
</span><span class="cx"> find_package(GObjectIntrospection)
</span><del>-find_package(OpenGL)
</del><span class="cx"> find_package(EGL)
</span><span class="cx"> find_package(GeoClue2 2.1.5)
</span><span class="cx"> find_package(GnuTLS 3.0.0)
</span><span class="lines">@@ -56,31 +56,47 @@
</span><span class="cx"> find_package(GeoClue)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (ENABLE_GLES2)
+ find_package(OpenGLES2 REQUIRED)
+ if (OPENGLES2_FOUND AND NOT(EGL_FOUND))
+ message(FATAL_ERROR "EGL is needed for OpenGL ES 2.0.")
+ endif ()
+else ()
+ find_package(OpenGL)
+endif ()
+
</ins><span class="cx"> if (ENABLE_X11_TARGET)
</span><span class="cx"> # With cmake 3.2.x we have to explicitly ask for X11 otherwise the X11_X11_LIB
</span><span class="cx"> # variable won't be set thus the X11 linker flags won't be added and the build
</span><span class="cx"> # will fail.
</span><span class="cx"> find_package(X11 REQUIRED)
</span><del>- # We don't use find_package for GLX because it is part of -lGL, unlike EGL.
- check_include_files("GL/glx.h" GLX_FOUND)
</del><ins>+ if (OPENGL_FOUND)
+ # We don't use find_package for GLX because it is part of -lGL, unlike EGL.
+ check_include_files("GL/glx.h" GLX_FOUND)
+ endif ()
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_BEGIN()
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." ON)
</span><span class="cx">
</span><del>-if (OPENGL_FOUND AND (GLX_FOUND OR EGL_FOUND))
</del><ins>+if ((OPENGL_FOUND OR OPENGLES2_FOUND) AND (GLX_FOUND OR EGL_FOUND))
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL ON)
</span><span class="cx">
</span><del>- if (GLX_FOUND)
- list(APPEND CAIRO_GL_COMPONENTS cairo-glx)
- endif ()
- if (EGL_FOUND)
- list(APPEND CAIRO_GL_COMPONENTS cairo-egl)
- endif ()
- find_package(CairoGL 1.10.2 COMPONENTS ${CAIRO_GL_COMPONENTS})
- if (CAIRO_GL_FOUND)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS ON)
</del><ins>+ if (OPENGL_FOUND)
+ if (GLX_FOUND)
+ list(APPEND CAIRO_GL_COMPONENTS cairo-glx)
+ endif ()
+ if (EGL_FOUND)
+ list(APPEND CAIRO_GL_COMPONENTS cairo-egl)
+ endif ()
+ find_package(CairoGL 1.10.2 COMPONENTS ${CAIRO_GL_COMPONENTS})
+ if (CAIRO_GL_FOUND)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS ON)
+ else ()
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS OFF)
+ endif ()
</ins><span class="cx"> else ()
</span><ins>+ # FIXME: Should we search for cairo-glesv2 instead of cairo-gl in this case?
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS OFF)
</span><span class="cx"> endif ()
</span><span class="cx"> else ()
</span><span class="lines">@@ -315,16 +331,23 @@
</span><span class="cx"> find_package(Enchant REQUIRED)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (OPENGL_FOUND AND (GLX_FOUND OR EGL_FOUND))
</del><ins>+if ((OPENGL_FOUND OR OPENGLES2_FOUND) AND (GLX_FOUND OR EGL_FOUND))
</ins><span class="cx"> set(ENABLE_TEXTURE_MAPPER 1)
</span><span class="cx"> set(WTF_USE_3D_GRAPHICS 1)
</span><span class="cx">
</span><del>- add_definitions(-DWTF_USE_OPENGL=1)
</del><span class="cx"> add_definitions(-DWTF_USE_3D_GRAPHICS=1)
</span><span class="cx"> add_definitions(-DWTF_USE_TEXTURE_MAPPER=1)
</span><span class="cx"> add_definitions(-DWTF_USE_TEXTURE_MAPPER_GL=1)
</span><span class="cx"> add_definitions(-DENABLE_3D_RENDERING=1)
</span><span class="cx">
</span><ins>+ if (OPENGLES2_FOUND)
+ set(WTF_USE_OPENGL_ES_2 1)
+ add_definitions(-DWTF_USE_OPENGL_ES_2=1)
+ else ()
+ set(WTF_USE_OPENGL 1)
+ add_definitions(-DWTF_USE_OPENGL=1)
+ endif ()
+
</ins><span class="cx"> if (EGL_FOUND)
</span><span class="cx"> add_definitions(-DWTF_USE_EGL=1)
</span><span class="cx"> endif ()
</span></span></pre>
</div>
</div>
</body>
</html>