<!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>[199743] 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/199743">199743</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-04-19 14:45:44 -0700 (Tue, 19 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/199738">r199738</a>
Source/ThirdParty/ANGLE:
* CMakeLists.txt:
Source/WebCore:
* platform/graphics/efl/GraphicsContext3DEfl.cpp:
(WebCore::GraphicsContext3D::GraphicsContext3D):
* platform/graphics/win/GraphicsContext3DWin.cpp:
(WebCore::GraphicsContext3D::GraphicsContext3D):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartyANGLECMakeListstxt">trunk/Source/ThirdParty/ANGLE/CMakeLists.txt</a></li>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicseflGraphicsContext3DEflcpp">trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinGraphicsContext3DWincpp">trunk/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceThirdPartyANGLECMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/CMakeLists.txt (199742 => 199743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2016-04-19 21:02:15 UTC (rev 199742)
+++ trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2016-04-19 21:45:44 UTC (rev 199743)
</span><span class="lines">@@ -82,7 +82,6 @@
</span><span class="cx"> src/compiler/translator/SearchSymbol.cpp
</span><span class="cx"> src/compiler/translator/StructureHLSL.cpp
</span><span class="cx"> src/compiler/translator/TranslatorHLSL.cpp
</span><del>- src/compiler/translator/UnfoldShortCircuit.cpp
</del><span class="cx"> src/compiler/translator/UniformHLSL.cpp
</span><span class="cx"> src/compiler/translator/UtilsHLSL.cpp
</span><span class="cx"> src/compiler/translator/ArrayReturnValueToOutParameter.cpp
</span><span class="lines">@@ -127,7 +126,6 @@
</span><span class="cx"> src/compiler/translator/ShaderVars.cpp
</span><span class="cx"> src/compiler/translator/SymbolTable.cpp
</span><span class="cx"> src/compiler/translator/Types.cpp
</span><del>- src/compiler/translator/UnfoldShortCircuit.cpp
</del><span class="cx"> src/compiler/translator/UnfoldShortCircuitAST.cpp
</span><span class="cx"> src/compiler/translator/UnfoldShortCircuitToIf.cpp
</span><span class="cx"> src/compiler/translator/util.cpp
</span><span class="lines">@@ -179,6 +177,7 @@
</span><span class="cx"> src/libANGLE/renderer/d3d/CompilerD3D.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/EGLImageD3D.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/copyimage.cpp
</span><ins>+ src/libANGLE/renderer/d3d/loadimage_etc.cpp
</ins><span class="cx"> src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
</span><span class="lines">@@ -204,7 +203,6 @@
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp
</span><del>- src/libANGLE/renderer/d3d/d3d11/loadimage_etc.cpp
</del><span class="cx"> src/libANGLE/renderer/d3d/d3d11/load_functions_table_autogen.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (199742 => 199743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2016-04-19 21:02:15 UTC (rev 199742)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2016-04-19 21:45:44 UTC (rev 199743)
</span><span class="lines">@@ -1,5 +1,11 @@
</span><span class="cx"> 2016-04-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Build fix after r199738
+
+ * CMakeLists.txt:
+
+2016-04-19 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Build fix.
</span><span class="cx">
</span><span class="cx"> * src/compiler/translator/Intermediate.h: Added.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199742 => 199743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-19 21:02:15 UTC (rev 199742)
+++ trunk/Source/WebCore/ChangeLog 2016-04-19 21:45:44 UTC (rev 199743)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-19 Alex Christensen <achristensen@webkit.org>
+
+ Build fix after r199738
+
+ * platform/graphics/efl/GraphicsContext3DEfl.cpp:
+ (WebCore::GraphicsContext3D::GraphicsContext3D):
+ * platform/graphics/win/GraphicsContext3DWin.cpp:
+ (WebCore::GraphicsContext3D::GraphicsContext3D):
+
</ins><span class="cx"> 2016-04-19 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> ObjcInstance::stringValue should not call NSObject's description method
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicseflGraphicsContext3DEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp (199742 => 199743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp 2016-04-19 21:02:15 UTC (rev 199742)
+++ trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp 2016-04-19 21:45:44 UTC (rev 199743)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow, GraphicsContext3D::RenderStyle renderStyle)
</span><span class="cx"> : m_currentWidth(0)
</span><span class="cx"> , m_currentHeight(0)
</span><del>- , m_compiler(isGLES2Compliant() ? SH_ESSL_OUTPUT : SH_GLSL_OUTPUT)
</del><ins>+ , m_compiler(isGLES2Compliant() ? SH_ESSL_OUTPUT : SH_GLSL_COMPATIBILITY_OUTPUT)
</ins><span class="cx"> , m_attrs(attrs)
</span><span class="cx"> , m_renderStyle(renderStyle)
</span><span class="cx"> , m_texture(0)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinGraphicsContext3DWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp (199742 => 199743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp 2016-04-19 21:02:15 UTC (rev 199742)
+++ trunk/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp 2016-04-19 21:45:44 UTC (rev 199743)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attributes, HostWindow*, GraphicsContext3D::RenderStyle renderStyle)
</span><span class="cx"> : m_currentWidth(0)
</span><span class="cx"> , m_currentHeight(0)
</span><del>- , m_compiler(isGLES2Compliant() ? SH_ESSL_OUTPUT : SH_GLSL_OUTPUT)
</del><ins>+ , m_compiler(isGLES2Compliant() ? SH_ESSL_OUTPUT : SH_GLSL_COMPATIBILITY_OUTPUT)
</ins><span class="cx"> , m_attrs(attributes)
</span><span class="cx"> , m_texture(0)
</span><span class="cx"> , m_fbo(0)
</span></span></pre>
</div>
</div>
</body>
</html>