<!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>[210161] releases/WebKitGTK/webkit-2.14/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/210161">210161</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-27 03:51:57 -0800 (Tue, 27 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/208040">r208040</a> - Fix Windows WebGL build after <a href="http://trac.webkit.org/projects/webkit/changeset/208036">r208036</a>
https://bugs.webkit.org/show_bug.cgi?id=164101
* CMakeLists.txt:
Source/WebCore:
Fix Windows WebGL build after <a href="http://trac.webkit.org/projects/webkit/changeset/208022">r208022</a>
https://bugs.webkit.org/show_bug.cgi?id=164091
* platform/graphics/opengl/Extensions3DOpenGLCommon.h:
* platform/graphics/opengl/Extensions3DOpenGLES.cpp:
(WebCore::Extensions3DOpenGLES::Extensions3DOpenGLES):
* platform/graphics/opengl/Extensions3DOpenGLES.h:
* platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
(WebCore::GraphicsContext3D::getExtensions):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceThirdPartyANGLECMakeListstxt">releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/CMakeLists.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceThirdPartyANGLEChangeLog">releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommonh">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsopenglExtensions3DOpenGLEScpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsopenglExtensions3DOpenGLESh">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLEScpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceThirdPartyANGLECMakeListstxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/CMakeLists.txt (210160 => 210161)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/CMakeLists.txt 2016-12-27 11:51:48 UTC (rev 210160)
+++ releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/CMakeLists.txt 2016-12-27 11:51:57 UTC (rev 210161)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> src/libGLESv2/entry_points_gles_2_0.cpp
</span><span class="cx"> src/libGLESv2/entry_points_gles_2_0_ext.cpp
</span><span class="cx"> src/libGLESv2/entry_points_gles_3_0.cpp
</span><del>- src/libGLESv2/entry_points_gles_3_0_ext.cpp
</del><span class="cx"> src/libGLESv2/entry_points_gles_3_1.cpp
</span><span class="cx"> src/libGLESv2/global_state.cpp
</span><span class="cx"> src/libGLESv2/libGLESv2.cpp
</span><span class="lines">@@ -90,10 +89,6 @@
</span><span class="cx"> src/compiler/translator/Compiler.cpp
</span><span class="cx"> src/compiler/translator/ConstantUnion.cpp
</span><span class="cx"> src/compiler/translator/DeferGlobalInitializers.cpp
</span><del>- src/compiler/translator/depgraph/DependencyGraph.cpp
- src/compiler/translator/depgraph/DependencyGraphBuilder.cpp
- src/compiler/translator/depgraph/DependencyGraphOutput.cpp
- src/compiler/translator/depgraph/DependencyGraphTraverse.cpp
</del><span class="cx"> src/compiler/translator/Diagnostics.cpp
</span><span class="cx"> src/compiler/translator/DirectiveHandler.cpp
</span><span class="cx"> src/compiler/translator/EmulateGLFragColorBroadcast.cpp
</span><span class="lines">@@ -147,8 +142,6 @@
</span><span class="cx"> src/compiler/translator/StructureHLSL.cpp
</span><span class="cx"> src/compiler/translator/SymbolTable.cpp
</span><span class="cx"> src/compiler/translator/TextureFunctionHLSL.cpp
</span><del>- src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp
- src/compiler/translator/timing/RestrictVertexShaderTiming.cpp
</del><span class="cx"> src/compiler/translator/TranslatorESSL.cpp
</span><span class="cx"> src/compiler/translator/TranslatorGLSL.cpp
</span><span class="cx"> src/compiler/translator/TranslatorHLSL.cpp
</span><span class="lines">@@ -180,17 +173,13 @@
</span><span class="cx"> src/libANGLE/Config.cpp
</span><span class="cx"> src/libANGLE/Context.cpp
</span><span class="cx"> src/libANGLE/ContextState.cpp
</span><del>- src/libANGLE/Data.cpp
</del><span class="cx"> src/libANGLE/Debug.cpp
</span><span class="cx"> src/libANGLE/Device.cpp
</span><span class="cx"> src/libANGLE/Display.cpp
</span><span class="cx"> src/libANGLE/Error.cpp
</span><span class="cx"> src/libANGLE/Fence.cpp
</span><del>- src/libANGLE/Float16ToFloat32.cpp
</del><span class="cx"> src/libANGLE/format_map_autogen.cpp
</span><del>- src/libANGLE/format_map_autogen.cpp
</del><span class="cx"> src/libANGLE/formatutils.cpp
</span><del>- src/libANGLE/formatutils.cpp
</del><span class="cx"> src/libANGLE/Framebuffer.cpp
</span><span class="cx"> src/libANGLE/FramebufferAttachment.cpp
</span><span class="cx"> src/libANGLE/HandleAllocator.cpp
</span><span class="lines">@@ -208,7 +197,6 @@
</span><span class="cx"> src/libANGLE/renderer/ContextImpl.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/BufferD3D.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/CompilerD3D.cpp
</span><del>- src/libANGLE/renderer/d3d/copyimage.cpp
</del><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">@@ -222,7 +210,6 @@
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/Image11.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
</span><del>- src/libANGLE/renderer/d3d/d3d11/load_functions_table_autogen.cpp
</del><span class="cx"> src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/Query11.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
</span><span class="lines">@@ -231,18 +218,15 @@
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
</span><del>- src/libANGLE/renderer/d3d/d3d11/Stream11.cpp
</del><span class="cx"> src/libANGLE/renderer/d3d/d3d11/StreamProducerNV12.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
</span><del>- src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
</del><span class="cx"> src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
</span><del>- src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp
</del><span class="cx"> src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d9/Blit9.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp
</span><span class="lines">@@ -249,7 +233,6 @@
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d9/Context9.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d9/Fence9.cpp
</span><del>- src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
</del><span class="cx"> src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d9/Image9.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp
</span><span class="lines">@@ -274,9 +257,6 @@
</span><span class="cx"> src/libANGLE/renderer/d3d/ImageD3D.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/IndexBuffer.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/IndexDataManager.cpp
</span><del>- src/libANGLE/renderer/d3d/loadimage_etc.cpp
- src/libANGLE/renderer/d3d/loadimage.cpp
- src/libANGLE/renderer/d3d/loadimageSSE2.cpp
</del><span class="cx"> src/libANGLE/renderer/d3d/NativeWindowD3D.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/ProgramD3D.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/RenderbufferD3D.cpp
</span><span class="lines">@@ -286,7 +266,6 @@
</span><span class="cx"> src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/SurfaceD3D.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/TextureD3D.cpp
</span><del>- src/libANGLE/renderer/d3d/TransformFeedbackD3D.cpp
</del><span class="cx"> src/libANGLE/renderer/d3d/VaryingPacking.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/VertexBuffer.cpp
</span><span class="cx"> src/libANGLE/renderer/d3d/VertexDataManager.cpp
</span><span class="lines">@@ -296,7 +275,6 @@
</span><span class="cx"> src/libANGLE/renderer/Format.cpp
</span><span class="cx"> src/libANGLE/renderer/load_functions_table_autogen.cpp
</span><span class="cx"> src/libANGLE/renderer/renderer_utils.cpp
</span><del>- src/libANGLE/renderer/Renderer.cpp
</del><span class="cx"> src/libANGLE/renderer/SurfaceImpl.cpp
</span><span class="cx"> src/libANGLE/renderer/TextureImpl.cpp
</span><span class="cx"> src/libANGLE/ResourceManager.cpp
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/ChangeLog (210160 => 210161)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/ChangeLog 2016-12-27 11:51:48 UTC (rev 210160)
+++ releases/WebKitGTK/webkit-2.14/Source/ThirdParty/ANGLE/ChangeLog 2016-12-27 11:51:57 UTC (rev 210161)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2016-10-28 Alex Christensen <achristensen@webkit.org>
+
+ Fix Windows WebGL build after r208036
+ https://bugs.webkit.org/show_bug.cgi?id=164101
+
+ * CMakeLists.txt:
+
</ins><span class="cx"> 2016-10-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix Windows WebGL build after r208036
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (210160 => 210161)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-12-27 11:51:48 UTC (rev 210160)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-12-27 11:51:57 UTC (rev 210161)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-28 Alex Christensen <achristensen@webkit.org>
+
+ Fix Windows WebGL build after r208022
+ https://bugs.webkit.org/show_bug.cgi?id=164091
+
+ * platform/graphics/opengl/Extensions3DOpenGLCommon.h:
+ * platform/graphics/opengl/Extensions3DOpenGLES.cpp:
+ (WebCore::Extensions3DOpenGLES::Extensions3DOpenGLES):
+ * platform/graphics/opengl/Extensions3DOpenGLES.h:
+ * platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
+ (WebCore::GraphicsContext3D::getExtensions):
+
</ins><span class="cx"> 2016-10-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Update ANGLE
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommonh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h (210160 => 210161)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h 2016-12-27 11:51:48 UTC (rev 210160)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h 2016-12-27 11:51:57 UTC (rev 210161)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef Extensions3DOpenGLCommon_h
-#define Extensions3DOpenGLCommon_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "Extensions3D.h"
</span><span class="cx">
</span><span class="lines">@@ -96,5 +95,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // Extensions3DOpenGLCommon_h
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsopenglExtensions3DOpenGLEScpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp (210160 => 210161)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp 2016-12-27 11:51:48 UTC (rev 210160)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp 2016-12-27 11:51:57 UTC (rev 210161)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Extensions3DOpenGLES::Extensions3DOpenGLES(GraphicsContext3D* context)
- : Extensions3DOpenGLCommon(context)
</del><ins>+Extensions3DOpenGLES::Extensions3DOpenGLES(GraphicsContext3D* context, bool useIndexedGetString)
+ : Extensions3DOpenGLCommon(context, useIndexedGetString)
</ins><span class="cx"> , m_contextResetStatus(GL_NO_ERROR)
</span><span class="cx"> , m_supportsOESvertexArrayObject(false)
</span><span class="cx"> , m_supportsIMGMultisampledRenderToTexture(false)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsopenglExtensions3DOpenGLESh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h (210160 => 210161)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2016-12-27 11:51:48 UTC (rev 210160)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2016-12-27 11:51:57 UTC (rev 210161)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef Extensions3DOpenGLES_h
-#define Extensions3DOpenGLES_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "Extensions3DOpenGLCommon.h"
</span><span class="cx">
</span><span class="lines">@@ -64,7 +63,7 @@
</span><span class="cx"> class Extensions3DOpenGLES : public Extensions3DOpenGLCommon {
</span><span class="cx"> public:
</span><span class="cx"> // This class only needs to be instantiated by GraphicsContext3D implementations.
</span><del>- explicit Extensions3DOpenGLES(GraphicsContext3D*);
</del><ins>+ explicit Extensions3DOpenGLES(GraphicsContext3D*, bool useIndexedGetString);
</ins><span class="cx"> virtual ~Extensions3DOpenGLES();
</span><span class="cx">
</span><span class="cx"> virtual void framebufferTexture2DMultisampleIMG(unsigned long target, unsigned long attachment, unsigned long textarget, unsigned int texture, int level, unsigned long samples);
</span><span class="lines">@@ -126,5 +125,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // USE(OPENGL_ES_2)
</span><del>-
-#endif // Extensions3DOpenGLES_h
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLEScpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp (210160 => 210161)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2016-12-27 11:51:48 UTC (rev 210160)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2016-12-27 11:51:57 UTC (rev 210161)
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> Extensions3D* GraphicsContext3D::getExtensions()
</span><span class="cx"> {
</span><span class="cx"> if (!m_extensions)
</span><del>- m_extensions = std::make_unique<Extensions3DOpenGLES>(this);
</del><ins>+ m_extensions = std::make_unique<Extensions3DOpenGLES>(this, isGLES2Compliant());
</ins><span class="cx"> return m_extensions.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>