Title: [193473] branches/safari-601-branch
- Revision
- 193473
- Author
- matthew_han...@apple.com
- Date
- 2015-12-04 14:38:01 -0800 (Fri, 04 Dec 2015)
Log Message
Merge r190595. rdar://problem/23732402
Modified Paths
Added Paths
Diff
Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193472 => 193473)
--- 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)
@@ -1,5 +1,23 @@
2015-12-04 Matthew Hanson <matthew_han...@apple.com>
+ Merge r190595. rdar://problem/23732402
+
+ 2015-10-05 Dean Jackson <d...@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_han...@apple.com>
+
Merge r190446. rdar://problem/23732367
2015-10-01 Dean Jackson <d...@apple.com>
Added: branches/safari-601-branch/LayoutTests/fast/canvas/webgl/unprefixed-anisotropic-extension-expected.txt (0 => 193473)
--- 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)
@@ -0,0 +1,12 @@
+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
+
Added: branches/safari-601-branch/LayoutTests/fast/canvas/webgl/unprefixed-anisotropic-extension.html (0 => 193473)
--- 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)
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Checking unprefixed EXT_texture_filter_anisotropic extension</title>
+<script src="" type="text/_javascript_"></script>
+<script src=""
+<script src=""
+<script src=""
+</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=""
+
+</body>
+</html>
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193472 => 193473)
--- 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)
@@ -1,5 +1,27 @@
2015-12-04 Matthew Hanson <matthew_han...@apple.com>
+ Merge r190595. rdar://problem/23732402
+
+ 2015-10-05 Dean Jackson <d...@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_han...@apple.com>
+
Merge r190446. rdar://problem/23732367
2015-10-01 Dean Jackson <d...@apple.com>
Modified: branches/safari-601-branch/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (193472 => 193473)
--- 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)
@@ -950,7 +950,7 @@
if (isContextLostOrPending())
return nullptr;
- if (equalIgnoringCase(name, "WEBKIT_EXT_texture_filter_anisotropic")
+ if ((equalIgnoringCase(name, "EXT_texture_filter_anisotropic") || equalIgnoringCase(name, "WEBKIT_EXT_texture_filter_anisotropic"))
&& m_context->getExtensions()->supports("GL_EXT_texture_filter_anisotropic")) {
if (!m_extTextureFilterAnisotropic) {
m_context->getExtensions()->ensureEnabled("GL_EXT_texture_filter_anisotropic");
Modified: branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (193472 => 193473)
--- 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)
@@ -117,7 +117,7 @@
}
return m_extShaderTextureLOD.get();
}
- if (equalIgnoringCase(name, "WEBKIT_EXT_texture_filter_anisotropic")
+ if ((equalIgnoringCase(name, "EXT_texture_filter_anisotropic") || equalIgnoringCase(name, "WEBKIT_EXT_texture_filter_anisotropic"))
&& m_context->getExtensions()->supports("GL_EXT_texture_filter_anisotropic")) {
if (!m_extTextureFilterAnisotropic) {
m_context->getExtensions()->ensureEnabled("GL_EXT_texture_filter_anisotropic");
@@ -267,7 +267,7 @@
if (m_context->getExtensions()->supports("GL_EXT_shader_texture_lod") || m_context->getExtensions()->supports("GL_ARB_shader_texture_lod"))
result.append("EXT_shader_texture_lod");
if (m_context->getExtensions()->supports("GL_EXT_texture_filter_anisotropic"))
- result.append("WEBKIT_EXT_texture_filter_anisotropic");
+ result.append("EXT_texture_filter_anisotropic");
if (m_context->getExtensions()->supports("GL_OES_vertex_array_object"))
result.append("OES_vertex_array_object");
if (m_context->getExtensions()->supports("GL_OES_element_index_uint"))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
