<!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>[193473] branches/safari-601-branch</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/193473">193473</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-04 14:38:01 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190595">r190595</a>. rdar://problem/23732402</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlcanvasWebGL2RenderingContextcpp">branches/safari-601-branch/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlcanvasWebGLRenderingContextcpp">branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsfastcanvaswebglunprefixedanisotropicextensionexpectedtxt">branches/safari-601-branch/LayoutTests/fast/canvas/webgl/unprefixed-anisotropic-extension-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcanvaswebglunprefixedanisotropicextensionhtml">branches/safari-601-branch/LayoutTests/fast/canvas/webgl/unprefixed-anisotropic-extension.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193472 => 193473)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-04 22:37:57 UTC (rev 193472)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-04 22:38:01 UTC (rev 193473)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-12-04 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190595. rdar://problem/23732402
+
+ 2015-10-05 Dean Jackson <dino@apple.com>
+
+ EXT_texture_filter_anisotropic extension exposed with WEBKIT_ prefix
+ https://bugs.webkit.org/show_bug.cgi?id=149765
+ <rdar://problem/22983722>
+
+ Reviewed by Beth Dakin.
+
+ Simple test that the unprefixed form exists. The actual functionality
+ is exercised in the WebGL conformance tests.
+
+ * fast/canvas/webgl/unprefixed-anisotropic-extension-expected.txt: Added.
+ * fast/canvas/webgl/unprefixed-anisotropic-extension.html: Added.
+
+2015-12-04 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r190446. rdar://problem/23732367
</span><span class="cx">
</span><span class="cx"> 2015-10-01 Dean Jackson <dino@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcanvaswebglunprefixedanisotropicextensionexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/canvas/webgl/unprefixed-anisotropic-extension-expected.txt (0 => 193473)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/canvas/webgl/unprefixed-anisotropic-extension-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/canvas/webgl/unprefixed-anisotropic-extension-expected.txt 2015-12-04 22:38:01 UTC (rev 193473)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+This test verifies that EXT_texture_filter_anisotropic is available.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS WebGL context exists
+PASS Successfully enabled EXT_texture_filter_anisotropic extension
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcanvaswebglunprefixedanisotropicextensionhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/canvas/webgl/unprefixed-anisotropic-extension.html (0 => 193473)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/canvas/webgl/unprefixed-anisotropic-extension.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/canvas/webgl/unprefixed-anisotropic-extension.html 2015-12-04 22:38:01 UTC (rev 193473)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Checking unprefixed EXT_texture_filter_anisotropic extension</title>
+<script src="resources/desktop-gl-constants.js" type="text/javascript"></script>
+<script src="../../../resources/js-test-pre.js"></script>
+<script src="resources/webgl-test.js"></script>
+<script src="resources/webgl-test-utils.js"></script>
+</head>
+<body>
+<div id="description"></div>
+<canvas id="canvas" style="width: 1px; height: 1px;"> </canvas>
+<div id="console"></div>
+
+<script>
+"use strict";
+description("This test verifies that EXT_texture_filter_anisotropic is available.");
+
+debug("");
+
+var wtu = WebGLTestUtils;
+var gl = wtu.create3DContext("canvas");
+
+if (!gl)
+ testFailed("WebGL context does not exist");
+else {
+ testPassed("WebGL context exists");
+
+ var ext = gl.getExtension("EXT_texture_filter_anisotropic");
+ if (!ext)
+ testFailed("No EXT_texture_filter_anisotropic support");
+ else
+ testPassed("Successfully enabled EXT_texture_filter_anisotropic extension");
+}
+
+debug("");
+var successfullyParsed = true;
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193472 => 193473)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-04 22:37:57 UTC (rev 193472)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-04 22:38:01 UTC (rev 193473)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-12-04 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190595. rdar://problem/23732402
+
+ 2015-10-05 Dean Jackson <dino@apple.com>
+
+ EXT_texture_filter_anisotropic extension exposed with WEBKIT_ prefix
+ https://bugs.webkit.org/show_bug.cgi?id=149765
+ <rdar://problem/22983722>
+
+ Reviewed by Beth Dakin.
+
+ We can now remove the WEBKIT_ prefix from this extension.
+
+ Test: fast/canvas/webgl/unprefixed-anisotropic-extension.html
+
+ * html/canvas/WebGL2RenderingContext.cpp: Support the prefixed and unprefixed form.
+ (WebCore::WebGL2RenderingContext::getExtension):
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::getExtension):
+ (WebCore::WebGLRenderingContext::getSupportedExtensions):
+
+2015-12-04 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r190446. rdar://problem/23732367
</span><span class="cx">
</span><span class="cx"> 2015-10-01 Dean Jackson <dino@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlcanvasWebGL2RenderingContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (193472 => 193473)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2015-12-04 22:37:57 UTC (rev 193472)
+++ branches/safari-601-branch/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2015-12-04 22:38:01 UTC (rev 193473)
</span><span class="lines">@@ -950,7 +950,7 @@
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- if (equalIgnoringCase(name, "WEBKIT_EXT_texture_filter_anisotropic")
</del><ins>+ if ((equalIgnoringCase(name, "EXT_texture_filter_anisotropic") || equalIgnoringCase(name, "WEBKIT_EXT_texture_filter_anisotropic"))
</ins><span class="cx"> && m_context->getExtensions()->supports("GL_EXT_texture_filter_anisotropic")) {
</span><span class="cx"> if (!m_extTextureFilterAnisotropic) {
</span><span class="cx"> m_context->getExtensions()->ensureEnabled("GL_EXT_texture_filter_anisotropic");
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (193472 => 193473)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2015-12-04 22:37:57 UTC (rev 193472)
+++ branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2015-12-04 22:38:01 UTC (rev 193473)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> }
</span><span class="cx"> return m_extShaderTextureLOD.get();
</span><span class="cx"> }
</span><del>- if (equalIgnoringCase(name, "WEBKIT_EXT_texture_filter_anisotropic")
</del><ins>+ if ((equalIgnoringCase(name, "EXT_texture_filter_anisotropic") || equalIgnoringCase(name, "WEBKIT_EXT_texture_filter_anisotropic"))
</ins><span class="cx"> && m_context->getExtensions()->supports("GL_EXT_texture_filter_anisotropic")) {
</span><span class="cx"> if (!m_extTextureFilterAnisotropic) {
</span><span class="cx"> m_context->getExtensions()->ensureEnabled("GL_EXT_texture_filter_anisotropic");
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> if (m_context->getExtensions()->supports("GL_EXT_shader_texture_lod") || m_context->getExtensions()->supports("GL_ARB_shader_texture_lod"))
</span><span class="cx"> result.append("EXT_shader_texture_lod");
</span><span class="cx"> if (m_context->getExtensions()->supports("GL_EXT_texture_filter_anisotropic"))
</span><del>- result.append("WEBKIT_EXT_texture_filter_anisotropic");
</del><ins>+ result.append("EXT_texture_filter_anisotropic");
</ins><span class="cx"> if (m_context->getExtensions()->supports("GL_OES_vertex_array_object"))
</span><span class="cx"> result.append("OES_vertex_array_object");
</span><span class="cx"> if (m_context->getExtensions()->supports("GL_OES_element_index_uint"))
</span></span></pre>
</div>
</div>
</body>
</html>