<!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>[181629] 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/181629">181629</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-03-17 02:45:55 -0700 (Tue, 17 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
https://bugs.webkit.org/show_bug.cgi?id=142530
Reviewed by Darin Adler.
Source/ThirdParty/ANGLE:
* ANGLE/ShaderLang.h: Added. Includes include/GLSLANG/ShaderLang.h. Used in WebCore
so we can avoid using ANGLE's EGL headers and use the system-default headers instead.
Source/WebCore:
Include the ANGLE's ShaderLang.h through the new forwarding header. This allows
us to not list Source/ThirdParty/ANGLE/include in the list of inclusion directories
and thus avoid ANGLE's EGL and GLES2/GLES3 headers, defaulting to the system-provided
headers instead.
Source/ThirdParty/ANGLE/include/KHR is still used because ANGLE's khrplatform.h is
required by the ShaderLang.h header. Source/ThirdParty/ANGLE/src is not used for the
whole WebCore library anymore, only the ANGLESupport library.
* CMakeLists.txt:
* platform/graphics/ANGLEWebKitBridge.h:
* platform/graphics/cairo/GraphicsContext3DCairo.cpp:
Source/WebKit2:
* CMakeLists.txt: Replace the Source/ThirdParty/ANGLE/include/GLSLANG entry
in the list of inclusion directories for WebKit2 with Source/ThirdParty/ANGLE,
possible due to the new forwarding header for ANGLE's ShaderLang.h.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsANGLEWebKitBridgeh">trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoGraphicsContext3DCairocpp">trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/ThirdParty/ANGLE/ANGLE/</li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEShaderLangh">trunk/Source/ThirdParty/ANGLE/ANGLE/ShaderLang.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceThirdPartyANGLEANGLEShaderLangh"></a>
<div class="addfile"><h4>Added: trunk/Source/ThirdParty/ANGLE/ANGLE/ShaderLang.h (0 => 181629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE/ShaderLang.h (rev 0)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE/ShaderLang.h 2015-03-17 09:45:55 UTC (rev 181629)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+#include "include/GLSLANG/ShaderLang.h"
</ins></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (181628 => 181629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-03-17 09:33:30 UTC (rev 181628)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-03-17 09:45:55 UTC (rev 181629)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-17 Zan Dobersek <zdobersek@igalia.com>
+
+ [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
+ https://bugs.webkit.org/show_bug.cgi?id=142530
+
+ Reviewed by Darin Adler.
+
+ * ANGLE/ShaderLang.h: Added. Includes include/GLSLANG/ShaderLang.h. Used in WebCore
+ so we can avoid using ANGLE's EGL headers and use the system-default headers instead.
+
</ins><span class="cx"> 2015-03-16 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix after r181571.
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (181628 => 181629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-03-17 09:33:30 UTC (rev 181628)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-03-17 09:45:55 UTC (rev 181629)
</span><span class="lines">@@ -2991,10 +2991,8 @@
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><del>- "${THIRDPARTY_DIR}/ANGLE/src"
- "${THIRDPARTY_DIR}/ANGLE/include/"
</del><ins>+ "${THIRDPARTY_DIR}/ANGLE/"
</ins><span class="cx"> "${THIRDPARTY_DIR}/ANGLE/include/KHR"
</span><del>- "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
</del><span class="cx"> "${WEBCORE_DIR}/platform/graphics/gpu"
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -3522,6 +3520,7 @@
</span><span class="cx"> APPEND
</span><span class="cx"> PROPERTY INCLUDE_DIRECTORIES
</span><span class="cx"> "${THIRDPARTY_DIR}/ANGLE/include"
</span><ins>+ "${THIRDPARTY_DIR}/ANGLE/src"
</ins><span class="cx"> )
</span><span class="cx"> list(APPEND WebCore_LIBRARIES ANGLESupport)
</span><span class="cx"> WEBKIT_SET_EXTRA_COMPILER_FLAGS(ANGLESupport IGNORECXX_WARNINGS)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181628 => 181629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-17 09:33:30 UTC (rev 181628)
+++ trunk/Source/WebCore/ChangeLog 2015-03-17 09:45:55 UTC (rev 181629)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-03-17 Zan Dobersek <zdobersek@igalia.com>
+
+ [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
+ https://bugs.webkit.org/show_bug.cgi?id=142530
+
+ Reviewed by Darin Adler.
+
+ Include the ANGLE's ShaderLang.h through the new forwarding header. This allows
+ us to not list Source/ThirdParty/ANGLE/include in the list of inclusion directories
+ and thus avoid ANGLE's EGL and GLES2/GLES3 headers, defaulting to the system-provided
+ headers instead.
+
+ Source/ThirdParty/ANGLE/include/KHR is still used because ANGLE's khrplatform.h is
+ required by the ShaderLang.h header. Source/ThirdParty/ANGLE/src is not used for the
+ whole WebCore library anymore, only the ANGLESupport library.
+
+ * CMakeLists.txt:
+ * platform/graphics/ANGLEWebKitBridge.h:
+ * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
+
</ins><span class="cx"> 2015-03-17 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Show rendering frames (and FPS) in Layout and Rendering timeline
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsANGLEWebKitBridgeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h (181628 => 181629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2015-03-17 09:33:30 UTC (rev 181628)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2015-03-17 09:45:55 UTC (rev 181629)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> #include "GLSLANG/ShaderLang.h"
</span><span class="cx"> #else
</span><del>-#include "ShaderLang.h"
</del><ins>+#include <ANGLE/ShaderLang.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoGraphicsContext3DCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp (181628 => 181629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2015-03-17 09:33:30 UTC (rev 181628)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2015-03-17 09:45:55 UTC (rev 181629)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "PlatformContextCairo.h"
</span><span class="cx"> #include "RefPtrCairo.h"
</span><del>-#include <GLSLANG/ShaderLang.h>
</del><ins>+#include <ANGLE/ShaderLang.h>
</ins><span class="cx"> #include <cairo.h>
</span><span class="cx">
</span><span class="cx"> #if USE(OPENGL_ES_2)
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (181628 => 181629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-03-17 09:33:30 UTC (rev 181628)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-03-17 09:45:55 UTC (rev 181629)
</span><span class="lines">@@ -149,8 +149,8 @@
</span><span class="cx">
</span><span class="cx"> if (WTF_USE_3D_GRAPHICS)
</span><span class="cx"> list(APPEND WebKit2_INCLUDE_DIRECTORIES
</span><ins>+ "${THIRDPARTY_DIR}/ANGLE"
</ins><span class="cx"> "${THIRDPARTY_DIR}/ANGLE/include/KHR"
</span><del>- "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
</del><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181628 => 181629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-17 09:33:30 UTC (rev 181628)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-17 09:45:55 UTC (rev 181629)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-03-17 Zan Dobersek <zdobersek@igalia.com>
+
+ [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
+ https://bugs.webkit.org/show_bug.cgi?id=142530
+
+ Reviewed by Darin Adler.
+
+ * CMakeLists.txt: Replace the Source/ThirdParty/ANGLE/include/GLSLANG entry
+ in the list of inclusion directories for WebKit2 with Source/ThirdParty/ANGLE,
+ possible due to the new forwarding header for ANGLE's ShaderLang.h.
+
</ins><span class="cx"> 2015-03-17 Gwang Yoon Hwang <yoon@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r180924): Unable to build WebKitGTK+ with threaded compositor
</span></span></pre>
</div>
</div>
</body>
</html>