<!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>[177194] trunk</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/177194">177194</a></dd>
<dt>Author</dt> <dd>roger_fong@apple.com</dd>
<dt>Date</dt> <dd>2014-12-11 16:56:33 -0800 (Thu, 11 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement frag depth as a WebGL 1 extension.
https://bugs.webkit.org/show_bug.cgi?id=133635.
<rdar://problem/19195381>
Reviewed by Dean Jackson.
Test:
webgl/1.0.3/conformance/extensions/ext-frag-depth.html
Spec for this extension outlined here:
http://www.khronos.org/registry/webgl/extensions/EXT_frag_depth/
* CMakeLists.txt:
* DerivedSources.cpp:
* DerivedSources.make:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSWebGLRenderingContextCustom.cpp:
(WebCore::toJS):
* html/canvas/EXTFragDepth.cpp: Added.
(WebCore::EXTFragDepth::EXTFragDepth):
(WebCore::EXTFragDepth::~EXTFragDepth):
(WebCore::EXTFragDepth::getName):
* html/canvas/EXTFragDepth.h: Added.
* html/canvas/EXTFragDepth.idl: Added.
* html/canvas/WebGLExtension.h:
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::getExtension):
(WebCore::WebGLRenderingContext::getSupportedExtensions):
* html/canvas/WebGLRenderingContext.h:
* platform/graphics/opengl/Extensions3DOpenGL.cpp:
(WebCore::Extensions3DOpenGL::supportsExtension):
* platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
(WebCore::Extensions3DOpenGLCommon::ensureEnabled):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</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="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWebGLRenderingContextCustomcpp">trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLExtensionh">trunk/Source/WebCore/html/canvas/WebGLExtension.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContexth">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommoncpp">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTFragDepthcpp">trunk/Source/WebCore/html/canvas/EXTFragDepth.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTFragDepthh">trunk/Source/WebCore/html/canvas/EXTFragDepth.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTFragDepthidl">trunk/Source/WebCore/html/canvas/EXTFragDepth.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (177193 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-12-12 00:46:19 UTC (rev 177193)
+++ trunk/LayoutTests/ChangeLog 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-12-11 Roger Fong <roger_fong@apple.com>
+
+ Implement frag depth as a WebGL 1 extension.
+ https://bugs.webkit.org/show_bug.cgi?id=133635.
+ <rdar://problem/19195381>
+
+ Reviewed by Dean Jackson.
+
+ * platform/mac/TestExpectations: Unskip passing WebGL1 extension tests.
+
</ins><span class="cx"> 2014-12-11 Brendan Long <b.long@cablelabs.com>
</span><span class="cx">
</span><span class="cx"> Remove DataCue "text" attribute
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (177193 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2014-12-12 00:46:19 UTC (rev 177193)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -491,7 +491,21 @@
</span><span class="cx"> [ MountainLion ] webgl/1.0.2/conformance/textures/texture-size.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> # Skip 1.0.3 tests for now, to be unskipped when we get closer to conformance
</span><del>-webgl/1.0.3
</del><ins>+webgl/1.0.3/conformance/attribs [ Skip ]
+webgl/1.0.3/conformance/buffers [ Skip ]
+webgl/1.0.3/conformance/canvas [ Skip ]
+webgl/1.0.3/conformance/context [ Skip ]
+webgl/1.0.3/conformance/glsl [ Skip ]
+webgl/1.0.3/conformance/renderbuffers [ Skip ]
+webgl/1.0.3/conformance/rendering [ Skip ]
+webgl/1.0.3/conformance/state [ Skip ]
+webgl/1.0.3/conformance/textures [ Skip ]
+webgl/1.0.3/conformance/typedarrays [ Skip ]
+webgl/1.0.3/conformance/uniforms [ Skip ]
+webgl/1.0.3/conformance/extensions/angle-instanced-arrays.html [ Skip ]
+webgl/1.0.3/conformance/extensions/oes-texture-half-float.html [ Skip ]
+webgl/1.0.3/conformance/extensions/webgl-compressed-texture-size-limit.html [ Skip ]
+webgl/1.0.3/conformance/extensions/webgl-draw-buffers.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # Sending the mouse down event to the scrollbar starts a nested run loop which causes a hang.
</span><span class="cx"> fast/events/mousedown-in-subframe-scrollbar.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (177193 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-12-12 00:46:19 UTC (rev 177193)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -532,6 +532,7 @@
</span><span class="cx"> html/canvas/CanvasRenderingContext.idl
</span><span class="cx"> html/canvas/CanvasRenderingContext2D.idl
</span><span class="cx"> html/canvas/DOMPath.idl
</span><ins>+ html/canvas/EXTFragDepth.idl
</ins><span class="cx"> html/canvas/EXTShaderTextureLOD.idl
</span><span class="cx"> html/canvas/EXTTextureFilterAnisotropic.idl
</span><span class="cx"> html/canvas/EXTsRGB.idl
</span><span class="lines">@@ -1674,6 +1675,7 @@
</span><span class="cx"> html/canvas/CanvasRenderingContext.cpp
</span><span class="cx"> html/canvas/CanvasRenderingContext2D.cpp
</span><span class="cx"> html/canvas/CanvasStyle.cpp
</span><ins>+ html/canvas/EXTFragDepth.cpp
</ins><span class="cx"> html/canvas/EXTShaderTextureLOD.cpp
</span><span class="cx"> html/canvas/EXTTextureFilterAnisotropic.cpp
</span><span class="cx"> html/canvas/EXTsRGB.cpp
</span><span class="lines">@@ -2805,6 +2807,7 @@
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> html/canvas/ANGLEInstancedArrays.cpp
</span><ins>+ html/canvas/EXTFragDepth.cpp
</ins><span class="cx"> html/canvas/EXTShaderTextureLOD.cpp
</span><span class="cx"> html/canvas/EXTTextureFilterAnisotropic.cpp
</span><span class="cx"> html/canvas/EXTsRGB.cpp
</span><span class="lines">@@ -2844,6 +2847,7 @@
</span><span class="cx"> )
</span><span class="cx"> list(APPEND WebCore_IDL_FILES
</span><span class="cx"> html/canvas/ANGLEInstancedArrays.idl
</span><ins>+ html/canvas/EXTFragDepth.idl
</ins><span class="cx"> html/canvas/EXTShaderTextureLOD.idl
</span><span class="cx"> html/canvas/EXTTextureFilterAnisotropic.idl
</span><span class="cx"> html/canvas/EXTsRGB.idl
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177193 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-12 00:46:19 UTC (rev 177193)
+++ trunk/Source/WebCore/ChangeLog 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2014-12-10 Roger Fong <roger_fong@apple.com>
+
+ Implement frag depth as a WebGL 1 extension.
+ https://bugs.webkit.org/show_bug.cgi?id=133635.
+ <rdar://problem/19195381>
+
+ Reviewed by Dean Jackson.
+
+ Test:
+ webgl/1.0.3/conformance/extensions/ext-frag-depth.html
+
+ Spec for this extension outlined here:
+ http://www.khronos.org/registry/webgl/extensions/EXT_frag_depth/
+
+ * CMakeLists.txt:
+ * DerivedSources.cpp:
+ * DerivedSources.make:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSWebGLRenderingContextCustom.cpp:
+ (WebCore::toJS):
+ * html/canvas/EXTFragDepth.cpp: Added.
+ (WebCore::EXTFragDepth::EXTFragDepth):
+ (WebCore::EXTFragDepth::~EXTFragDepth):
+ (WebCore::EXTFragDepth::getName):
+ * html/canvas/EXTFragDepth.h: Added.
+ * html/canvas/EXTFragDepth.idl: Added.
+ * html/canvas/WebGLExtension.h:
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::getExtension):
+ (WebCore::WebGLRenderingContext::getSupportedExtensions):
+ * html/canvas/WebGLRenderingContext.h:
+ * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+ (WebCore::Extensions3DOpenGL::supportsExtension):
+ * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+ (WebCore::Extensions3DOpenGLCommon::ensureEnabled):
+
</ins><span class="cx"> 2014-12-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Optimize RenderElement::rendererForRootBackground() a bit
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (177193 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2014-12-12 00:46:19 UTC (rev 177193)
+++ trunk/Source/WebCore/DerivedSources.cpp 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #include "JSCanvasRenderingContext.cpp"
</span><span class="cx"> #include "JSCanvasRenderingContext2D.cpp"
</span><span class="cx"> #if ENABLE(WEBGL)
</span><ins>+#include "JSEXTFragDepth.cpp"
</ins><span class="cx"> #include "JSEXTShaderTextureLOD.cpp"
</span><span class="cx"> #include "JSEXTTextureFilterAnisotropic.cpp"
</span><span class="cx"> #include "JSEXTsRGB.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (177193 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2014-12-12 00:46:19 UTC (rev 177193)
+++ trunk/Source/WebCore/DerivedSources.make 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -425,6 +425,7 @@
</span><span class="cx"> $(WebCore)/html/canvas/EXTShaderTextureLOD.idl \
</span><span class="cx"> $(WebCore)/html/canvas/EXTTextureFilterAnisotropic.idl \
</span><span class="cx"> $(WebCore)/html/canvas/EXTsRGB.idl \
</span><ins>+ $(WebCore)/html/canvas/EXTFragDepth.idl \
</ins><span class="cx"> $(WebCore)/html/canvas/OESElementIndexUint.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESStandardDerivatives.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESTextureFloat.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (177193 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-12-12 00:46:19 UTC (rev 177193)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -734,6 +734,20 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSEXTFragDepth.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\accessibility\AccessibilityNodeObject.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -6670,6 +6684,7 @@
</span><span class="cx"> <ClCompile Include="..\html\canvas\CanvasPathMethods.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\EXTShaderTextureLOD.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\EXTsRGB.cpp" />
</span><ins>+ <ClCompile Include="..\html\canvas\EXTFragDepth.cpp" />
</ins><span class="cx"> <ClCompile Include="..\html\canvas\EXTTextureFilterAnisotropic.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\OESElementIndexUint.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\OESStandardDerivatives.cpp" />
</span><span class="lines">@@ -18866,6 +18881,7 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSVTTRegionList.cpp" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSVTTRegionList.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSEXTsRGB.h" />
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSEXTFragDepth.h” />
</ins><span class="cx"> <ClInclude Include="..\accessibility\AccessibilityNodeObject.h" />
</span><span class="cx"> <ClInclude Include="..\css\CSSImageSetValue.h" />
</span><span class="cx"> <ClInclude Include="..\css\WebKitCSSResourceValue.h" />
</span><span class="lines">@@ -18955,6 +18971,7 @@
</span><span class="cx"> <ClInclude Include="..\html\canvas\CanvasPathMethods.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\EXTShaderTextureLOD.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\EXTsRGB.h" />
</span><ins>+ <ClInclude Include="..\html\canvas\EXTFragDepth.h” />
</ins><span class="cx"> <ClInclude Include="..\html\canvas\EXTTextureFilterAnisotropic.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\OESElementIndexUint.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\OESStandardDerivatives.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (177193 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-12-12 00:46:19 UTC (rev 177193)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<?xml version="1.0" encoding="utf-8"?>
</del><ins>+<?xml version="1.0" encoding="utf-8"?>
</ins><span class="cx"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <Filter Include="DerivedSources">
</span><span class="lines">@@ -7261,6 +7261,12 @@
</span><span class="cx"> <ClCompile Include="..\html\canvas\EXTsRGB.cpp">
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSEXTFragDepth.cpp">
+ <Filter>DerivedSources</Filter>
+ </ClCompile>
+ <ClCompile Include="..\html\canvas\EXTFragDepth.cpp">
+ <Filter>html\canvas</Filter>
+ </ClCompile>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\Modules\geolocation\Coordinates.h">
</span><span class="lines">@@ -15266,6 +15272,12 @@
</span><span class="cx"> <ClInclude Include="..\html\canvas\EXTsRGB.h">
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSEXTFragDepth.h”>
+ <Filter>DerivedSources</Filter>
+ </ClInclude>
+ <ClInclude Include="..\html\canvas\EXTFragDepth.h”>
+ <Filter>html\canvas</Filter>
+ </ClInclude>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="..\css\CSSGrammar.y.in">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (177193 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-12-12 00:46:19 UTC (rev 177193)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -2312,7 +2312,8 @@
</span><span class="cx"> 72626E020EF022FE00A07E20 /* FontFastPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72626E010EF022FE00A07E20 /* FontFastPath.cpp */; };
</span><span class="cx"> 727AFED41A2EA6AE000442E8 /* EXTsRGB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 727AFED11A2EA6A0000442E8 /* EXTsRGB.cpp */; };
</span><span class="cx"> 72E417631A2E8D2F004C562A /* JSEXTsRGB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72E417611A2E8D2F004C562A /* JSEXTsRGB.cpp */; };
</span><del>- 72E417651A2E8D50004C562A /* JSEXTsRGB.h in Headers */ = {isa = PBXBuildFile; fileRef = 72E417621A2E8D2F004C562A /* JSEXTsRGB.h */; };
</del><ins>+ 72F1ADA21A3904DC00014E18 /* EXTFragDepth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72F1AD9F1A3904C300014E18 /* EXTFragDepth.cpp */; };
+ 72F1ADA51A390B9F00014E18 /* JSEXTFragDepth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72F1ADA31A390B9F00014E18 /* JSEXTFragDepth.cpp */; };
</ins><span class="cx"> 754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 754133A7102E00E800075D00 /* InspectorTimelineAgent.h */; };
</span><span class="cx"> 754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 754133A9102E00F400075D00 /* InspectorTimelineAgent.cpp */; };
</span><span class="cx"> 7553CFE8108F473F00EA281E /* TimelineRecordFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 7553CFE6108F473F00EA281E /* TimelineRecordFactory.h */; };
</span><span class="lines">@@ -9494,6 +9495,11 @@
</span><span class="cx"> 727AFED31A2EA6A0000442E8 /* EXTsRGB.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = EXTsRGB.idl; path = canvas/EXTsRGB.idl; sourceTree = "<group>"; };
</span><span class="cx"> 72E417611A2E8D2F004C562A /* JSEXTsRGB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSEXTsRGB.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 72E417621A2E8D2F004C562A /* JSEXTsRGB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSEXTsRGB.h; sourceTree = "<group>"; };
</span><ins>+ 72F1AD9F1A3904C300014E18 /* EXTFragDepth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EXTFragDepth.cpp; path = canvas/EXTFragDepth.cpp; sourceTree = "<group>"; };
+ 72F1ADA01A3904C300014E18 /* EXTFragDepth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EXTFragDepth.h; path = canvas/EXTFragDepth.h; sourceTree = "<group>"; };
+ 72F1ADA11A3904C300014E18 /* EXTFragDepth.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = EXTFragDepth.idl; path = canvas/EXTFragDepth.idl; sourceTree = "<group>"; };
+ 72F1ADA31A390B9F00014E18 /* JSEXTFragDepth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSEXTFragDepth.cpp; path = "JSEXTFragDepth.cpp"; sourceTree = "<group>"; };
+ 72F1ADA41A390B9F00014E18 /* JSEXTFragDepth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSEXTFragDepth.h; path = "JSEXTFragDepth.h"; sourceTree = "<group>"; };
</ins><span class="cx"> 754133A7102E00E800075D00 /* InspectorTimelineAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorTimelineAgent.h; sourceTree = "<group>"; };
</span><span class="cx"> 754133A9102E00F400075D00 /* InspectorTimelineAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorTimelineAgent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7553CFE6108F473F00EA281E /* TimelineRecordFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimelineRecordFactory.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -15820,6 +15826,9 @@
</span><span class="cx"> 727AFED11A2EA6A0000442E8 /* EXTsRGB.cpp */,
</span><span class="cx"> 727AFED21A2EA6A0000442E8 /* EXTsRGB.h */,
</span><span class="cx"> 727AFED31A2EA6A0000442E8 /* EXTsRGB.idl */,
</span><ins>+ 72F1AD9F1A3904C300014E18 /* EXTFragDepth.cpp */,
+ 72F1ADA01A3904C300014E18 /* EXTFragDepth.h */,
+ 72F1ADA11A3904C300014E18 /* EXTFragDepth.idl */,
</ins><span class="cx"> 7E5D7A73161D3F8F00896C34 /* OESElementIndexUint.cpp */,
</span><span class="cx"> 7E5D7A74161D3F8F00896C34 /* OESElementIndexUint.h */,
</span><span class="cx"> E176580C180DF3A0005A96D1 /* OESElementIndexUint.idl */,
</span><span class="lines">@@ -18722,6 +18731,8 @@
</span><span class="cx"> A83B79080CCAFF2B000B0825 /* HTML */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 72F1ADA31A390B9F00014E18 /* JSEXTFragDepth.cpp */,
+ 72F1ADA41A390B9F00014E18 /* JSEXTFragDepth.h */,
</ins><span class="cx"> 72E417611A2E8D2F004C562A /* JSEXTsRGB.cpp */,
</span><span class="cx"> 72E417621A2E8D2F004C562A /* JSEXTsRGB.h */,
</span><span class="cx"> 31A795C41888BAD100382F90 /* JSANGLEInstancedArrays.cpp */,
</span><span class="lines">@@ -23488,7 +23499,6 @@
</span><span class="cx"> FD315FFC12B0267600C1A359 /* AudioBufferSourceNode.h in Headers */,
</span><span class="cx"> FD31607C12B026F700C1A359 /* AudioBus.h in Headers */,
</span><span class="cx"> FD31607E12B026F700C1A359 /* AudioChannel.h in Headers */,
</span><del>- 72E417651A2E8D50004C562A /* JSEXTsRGB.h in Headers */,
</del><span class="cx"> FD31600512B0267600C1A359 /* AudioContext.h in Headers */,
</span><span class="cx"> FD31607F12B026F700C1A359 /* AudioDestination.h in Headers */,
</span><span class="cx"> 070F549E17F2402700169E04 /* AudioDestinationConsumer.h in Headers */,
</span><span class="lines">@@ -27364,6 +27374,7 @@
</span><span class="cx"> 5F2DBBE9178E3C8100141486 /* CertificateInfoMac.mm in Sources */,
</span><span class="cx"> E1A8E56617552B2A007488E7 /* CFURLExtras.cpp in Sources */,
</span><span class="cx"> 97BC69DC1505F076001B74AC /* ChangeVersionWrapper.cpp in Sources */,
</span><ins>+ 72F1ADA21A3904DC00014E18 /* EXTFragDepth.cpp in Sources */,
</ins><span class="cx"> FD315FFE12B0267600C1A359 /* ChannelMergerNode.cpp in Sources */,
</span><span class="cx"> FD31600112B0267600C1A359 /* ChannelSplitterNode.cpp in Sources */,
</span><span class="cx"> 6550B69F099DF0270090D781 /* CharacterData.cpp in Sources */,
</span><span class="lines">@@ -29994,6 +30005,7 @@
</span><span class="cx"> 29A8124A0FBB9CA900510293 /* WebAccessibilityObjectWrapperBase.mm in Sources */,
</span><span class="cx"> AAA728F816D1D8BC00D3BBC6 /* WebAccessibilityObjectWrapperIOS.mm in Sources */,
</span><span class="cx"> AA478A8016CD70C3007D1BB4 /* WebAccessibilityObjectWrapperMac.mm in Sources */,
</span><ins>+ 72F1ADA51A390B9F00014E18 /* JSEXTFragDepth.cpp in Sources */,
</ins><span class="cx"> 2D3EF4491917915C00034184 /* WebActionDisablingCALayerDelegate.mm in Sources */,
</span><span class="cx"> A56C5B9A189F34570082D13C /* WebConsoleAgent.cpp in Sources */,
</span><span class="cx"> CD7E05221651C28200C1201F /* WebCoreAVFResourceLoader.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWebGLRenderingContextCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp (177193 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp 2014-12-12 00:46:19 UTC (rev 177193)
+++ trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "JSWebGLRenderingContext.h"
</span><span class="cx">
</span><span class="cx"> #include "ANGLEInstancedArrays.h"
</span><ins>+#include "EXTFragDepth.h"
</ins><span class="cx"> #include "EXTShaderTextureLOD.h"
</span><span class="cx"> #include "EXTTextureFilterAnisotropic.h"
</span><span class="cx"> #include "EXTsRGB.h"
</span><span class="lines">@@ -37,6 +38,7 @@
</span><span class="cx"> #include "HTMLCanvasElement.h"
</span><span class="cx"> #include "HTMLImageElement.h"
</span><span class="cx"> #include "JSANGLEInstancedArrays.h"
</span><ins>+#include "JSEXTFragDepth.h"
</ins><span class="cx"> #include "JSEXTShaderTextureLOD.h"
</span><span class="cx"> #include "JSEXTTextureFilterAnisotropic.h"
</span><span class="cx"> #include "JSEXTsRGB.h"
</span><span class="lines">@@ -215,6 +217,8 @@
</span><span class="cx"> return toJS(exec, globalObject, static_cast<EXTTextureFilterAnisotropic*>(extension));
</span><span class="cx"> case WebGLExtension::EXTsRGBName:
</span><span class="cx"> return toJS(exec, globalObject, static_cast<EXTsRGB*>(extension));
</span><ins>+ case WebGLExtension::EXTFragDepthName:
+ return toJS(exec, globalObject, static_cast<EXTFragDepth*>(extension));
</ins><span class="cx"> case WebGLExtension::OESStandardDerivativesName:
</span><span class="cx"> return toJS(exec, globalObject, static_cast<OESStandardDerivatives*>(extension));
</span><span class="cx"> case WebGLExtension::OESTextureFloatName:
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTFragDepthcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/html/canvas/EXTFragDepth.cpp (0 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTFragDepth.cpp (rev 0)
+++ trunk/Source/WebCore/html/canvas/EXTFragDepth.cpp 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#if ENABLE(WEBGL)
+#include "EXTFragDepth.h"
+
+namespace WebCore {
+
+EXTFragDepth::EXTFragDepth(WebGLRenderingContext* context)
+ : WebGLExtension(context)
+{
+}
+
+EXTFragDepth::~EXTFragDepth()
+{
+}
+
+WebGLExtension::ExtensionName EXTFragDepth::getName() const
+{
+ return EXTFragDepthName;
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEBGL)
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTFragDepthh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/html/canvas/EXTFragDepth.h (0 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTFragDepth.h (rev 0)
+++ trunk/Source/WebCore/html/canvas/EXTFragDepth.h 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef EXTFragDepth_h
+#define EXTFragDepth_h
+
+#include "WebGLExtension.h"
+
+namespace WebCore {
+
+class EXTFragDepth final : public WebGLExtension {
+public:
+ explicit EXTFragDepth(WebGLRenderingContext*);
+ virtual ~EXTFragDepth();
+
+ virtual ExtensionName getName() const override;
+};
+
+} // namespace WebCore
+
+#endif // EXTFragDepth_h
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTFragDepthidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/html/canvas/EXTFragDepth.idl (0 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTFragDepth.idl (rev 0)
+++ trunk/Source/WebCore/html/canvas/EXTFragDepth.idl 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+/*
+* Copyright (C) 2014 Apple Inc. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+*
+* 1. Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+[
+ NoInterfaceObject,
+ Conditional=WEBGL,
+ GenerateIsReachable=ImplWebGLRenderingContext
+] interface EXTFragDepth {
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLExtensionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLExtension.h (177193 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLExtension.h 2014-12-12 00:46:19 UTC (rev 177193)
+++ trunk/Source/WebCore/html/canvas/WebGLExtension.h 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> // Extension names are needed to properly wrap instances in JavaScript objects.
</span><span class="cx"> enum ExtensionName {
</span><span class="cx"> WebGLLoseContextName,
</span><ins>+ EXTFragDepthName,
</ins><span class="cx"> EXTShaderTextureLODName,
</span><span class="cx"> EXTTextureFilterAnisotropicName,
</span><span class="cx"> EXTsRGBName,
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (177193 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-12-12 00:46:19 UTC (rev 177193)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "CachedImage.h"
</span><span class="cx"> #include "DOMWindow.h"
</span><span class="cx"> #include "Document.h"
</span><ins>+#include "EXTFragDepth.h"
</ins><span class="cx"> #include "EXTShaderTextureLOD.h"
</span><span class="cx"> #include "EXTTextureFilterAnisotropic.h"
</span><span class="cx"> #include "EXTsRGB.h"
</span><span class="lines">@@ -2462,7 +2463,14 @@
</span><span class="cx"> }
</span><span class="cx"> return m_extsRGB.get();
</span><span class="cx"> }
</span><del>-
</del><ins>+ if (equalIgnoringCase(name, "EXT_frag_depth")
+ && m_context->getExtensions()->supports("GL_EXT_frag_depth")) {
+ if (!m_extFragDepth) {
+ m_context->getExtensions()->ensureEnabled("GL_EXT_frag_depth");
+ m_extFragDepth = std::make_unique<EXTFragDepth>(this);
+ }
+ return m_extFragDepth.get();
+ }
</ins><span class="cx"> if (equalIgnoringCase(name, "EXT_shader_texture_lod")
</span><span class="cx"> && (m_context->getExtensions()->supports("GL_EXT_shader_texture_lod") || m_context->getExtensions()->supports("GL_ARB_shader_texture_lod"))) {
</span><span class="cx"> if (!m_extShaderTextureLOD) {
</span><span class="lines">@@ -3081,6 +3089,8 @@
</span><span class="cx">
</span><span class="cx"> if (m_context->getExtensions()->supports("GL_EXT_sRGB"))
</span><span class="cx"> result.append("EXT_sRGB");
</span><ins>+ if (m_context->getExtensions()->supports("GL_EXT_frag_depth"))
+ result.append("EXT_frag_depth");
</ins><span class="cx"> if (m_context->getExtensions()->supports("GL_OES_texture_float"))
</span><span class="cx"> result.append("OES_texture_float");
</span><span class="cx"> if (m_context->getExtensions()->supports("GL_OES_texture_float_linear"))
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h (177193 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h 2014-12-12 00:46:19 UTC (rev 177193)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> class EXTTextureFilterAnisotropic;
</span><span class="cx"> class EXTShaderTextureLOD;
</span><span class="cx"> class EXTsRGB;
</span><ins>+class EXTFragDepth;
</ins><span class="cx"> class HTMLImageElement;
</span><span class="cx"> class HTMLVideoElement;
</span><span class="cx"> class ImageBuffer;
</span><span class="lines">@@ -539,6 +540,7 @@
</span><span class="cx"> bool isContextLostOrPending();
</span><span class="cx">
</span><span class="cx"> // Enabled extension objects.
</span><ins>+ std::unique_ptr<EXTFragDepth> m_extFragDepth;
</ins><span class="cx"> std::unique_ptr<EXTsRGB> m_extsRGB;
</span><span class="cx"> std::unique_ptr<EXTTextureFilterAnisotropic> m_extTextureFilterAnisotropic;
</span><span class="cx"> std::unique_ptr<EXTShaderTextureLOD> m_extShaderTextureLOD;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (177193 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-12-12 00:46:19 UTC (rev 177193)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -176,6 +176,13 @@
</span><span class="cx"> return m_availableExtensions.contains("GL_EXT_texture_sRGB") && (m_availableExtensions.contains("GL_EXT_framebuffer_sRGB") || m_availableExtensions.contains("GL_ARB_framebuffer_sRGB"));
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ if (name == "GL_EXT_frag_depth")
+#if PLATFORM(MAC)
+ return true;
+#else
+ return m_availableExtensions.contains("GL_EXT_frag_depth");
+#endif
+
</ins><span class="cx"> // Desktop GL always supports GL_OES_rgb8_rgba8.
</span><span class="cx"> if (name == "GL_OES_rgb8_rgba8")
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (177193 => 177194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2014-12-12 00:46:19 UTC (rev 177193)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2014-12-12 00:56:33 UTC (rev 177194)
</span><span class="lines">@@ -144,6 +144,14 @@
</span><span class="cx"> ANGLEResources.EXT_shader_texture_lod = 1;
</span><span class="cx"> compiler.setResources(ANGLEResources);
</span><span class="cx"> }
</span><ins>+ } else if (name == "GL_EXT_frag_depth") {
+ // Enable support in ANGLE (if not enabled already)
+ ANGLEWebKitBridge& compiler = m_context->m_compiler;
+ ShBuiltInResources ANGLEResources = compiler.getResources();
+ if (!ANGLEResources.EXT_frag_depth) {
+ ANGLEResources.EXT_frag_depth = 1;
+ compiler.setResources(ANGLEResources);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>