<!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>[177235] 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/177235">177235</a></dd>
<dt>Author</dt> <dd>roger_fong@apple.com</dd>
<dt>Date</dt> <dd>2014-12-12 13:56:20 -0800 (Fri, 12 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement EXT_blend_minmax as a WebGL 1 extension.
https://bugs.webkit.org/show_bug.cgi?id=128974.
<rdar://problem/19195535>
Tested by:
webgl/1.0.3/conformance/extensions/ext-blend-minmax.html
fast/canvas/webgl/constants.html
Specifications for this extension:
https://www.khronos.org/registry/webgl/extensions/EXT_blend_minmax/
* 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/EXTBlendMinMax.cpp: Added.
(WebCore::EXTBlendMinMax::EXTBlendMinMax):
(WebCore::EXTBlendMinMax::~EXTBlendMinMax):
(WebCore::EXTBlendMinMax::getName):
* html/canvas/EXTBlendMinMax.h: Added.
* html/canvas/EXTBlendMinMax.idl: Added.
* html/canvas/WebGLExtension.h:
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::getExtension):
(WebCore::WebGLRenderingContext::getSupportedExtensions):
(WebCore::WebGLRenderingContext::validateBlendEquation):
* html/canvas/WebGLRenderingContext.h:
* html/canvas/WebGLRenderingContext.idl:
* platform/graphics/Extensions3D.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebglconstantshtml">trunk/LayoutTests/fast/canvas/webgl/constants.html</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="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextidl">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.idl</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsExtensions3Dh">trunk/Source/WebCore/platform/graphics/Extensions3D.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTBlendMinMaxcpp">trunk/Source/WebCore/html/canvas/EXTBlendMinMax.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTBlendMinMaxh">trunk/Source/WebCore/html/canvas/EXTBlendMinMax.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTBlendMinMaxidl">trunk/Source/WebCore/html/canvas/EXTBlendMinMax.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (177234 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-12-12 21:40:57 UTC (rev 177234)
+++ trunk/LayoutTests/ChangeLog 2014-12-12 21:56:20 UTC (rev 177235)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-12-12 Roger Fong <roger_fong@apple.com>
+
+ Implement EXT_blend_minmax as a WebGL 1 extension.
+ https://bugs.webkit.org/show_bug.cgi?id=128974.
+ <rdar://problem/19195535>
+
+ Reviewed by Dean Jackson.
+
+ * fast/canvas/webgl/constants.html:
+
</ins><span class="cx"> 2014-12-12 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> http/tests/css/link-css-disabled-value-with-slow-loading-sheet.html is flaky
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebglconstantshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/webgl/constants.html (177234 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/constants.html 2014-12-12 21:40:57 UTC (rev 177234)
+++ trunk/LayoutTests/fast/canvas/webgl/constants.html 2014-12-12 21:56:20 UTC (rev 177235)
</span><span class="lines">@@ -438,7 +438,11 @@
</span><span class="cx"> SRGB_EXT : 0x8C40,
</span><span class="cx"> SRGB_ALPHA_EXT : 0x8C42,
</span><span class="cx"> SRGB8_ALPHA8_EXT : 0x8C43,
</span><del>-FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT : 0x8210
</del><ins>+FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT : 0x8210,
+
+/* EXT_BLEND_MINMAX extension */
+MIN_EXT : 0x8007,
+MAX_EXT : 0x8008
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Constants removed from the WebGL spec compared to ES 2.0
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (177234 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-12-12 21:40:57 UTC (rev 177234)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-12-12 21:56:20 UTC (rev 177235)
</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/EXTBlendMinMax.idl
</ins><span class="cx"> html/canvas/EXTFragDepth.idl
</span><span class="cx"> html/canvas/EXTShaderTextureLOD.idl
</span><span class="cx"> html/canvas/EXTTextureFilterAnisotropic.idl
</span><span class="lines">@@ -1675,6 +1676,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/EXTBlendMinMax.cpp
</ins><span class="cx"> html/canvas/EXTFragDepth.cpp
</span><span class="cx"> html/canvas/EXTShaderTextureLOD.cpp
</span><span class="cx"> html/canvas/EXTTextureFilterAnisotropic.cpp
</span><span class="lines">@@ -2807,6 +2809,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/EXTBlendMinMax.cpp
</ins><span class="cx"> html/canvas/EXTFragDepth.cpp
</span><span class="cx"> html/canvas/EXTShaderTextureLOD.cpp
</span><span class="cx"> html/canvas/EXTTextureFilterAnisotropic.cpp
</span><span class="lines">@@ -2847,6 +2850,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/EXTBlendMinMax.idl
</ins><span class="cx"> html/canvas/EXTFragDepth.idl
</span><span class="cx"> html/canvas/EXTShaderTextureLOD.idl
</span><span class="cx"> html/canvas/EXTTextureFilterAnisotropic.idl
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177234 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-12 21:40:57 UTC (rev 177234)
+++ trunk/Source/WebCore/ChangeLog 2014-12-12 21:56:20 UTC (rev 177235)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2014-12-12 Roger Fong <roger_fong@apple.com>
+
+ Implement EXT_blend_minmax as a WebGL 1 extension.
+ https://bugs.webkit.org/show_bug.cgi?id=128974.
+ <rdar://problem/19195535>
+
+ Reviewed by Dean Jackson.
+
+ Tested by:
+ webgl/1.0.3/conformance/extensions/ext-blend-minmax.html
+ fast/canvas/webgl/constants.html
+
+ Specifications for this extension:
+ https://www.khronos.org/registry/webgl/extensions/EXT_blend_minmax/
+
+ * 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/EXTBlendMinMax.cpp: Added.
+ (WebCore::EXTBlendMinMax::EXTBlendMinMax):
+ (WebCore::EXTBlendMinMax::~EXTBlendMinMax):
+ (WebCore::EXTBlendMinMax::getName):
+ * html/canvas/EXTBlendMinMax.h: Added.
+ * html/canvas/EXTBlendMinMax.idl: Added.
+ * html/canvas/WebGLExtension.h:
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::getExtension):
+ (WebCore::WebGLRenderingContext::getSupportedExtensions):
+ (WebCore::WebGLRenderingContext::validateBlendEquation):
+ * html/canvas/WebGLRenderingContext.h:
+ * html/canvas/WebGLRenderingContext.idl:
+ * platform/graphics/Extensions3D.h:
+
</ins><span class="cx"> 2014-12-12 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the concept of simple selector from the parser
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (177234 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2014-12-12 21:40:57 UTC (rev 177234)
+++ trunk/Source/WebCore/DerivedSources.cpp 2014-12-12 21:56:20 UTC (rev 177235)
</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 "JSEXTBlendMinMax.cpp"
</ins><span class="cx"> #include "JSEXTFragDepth.cpp"
</span><span class="cx"> #include "JSEXTShaderTextureLOD.cpp"
</span><span class="cx"> #include "JSEXTTextureFilterAnisotropic.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (177234 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2014-12-12 21:40:57 UTC (rev 177234)
+++ trunk/Source/WebCore/DerivedSources.make 2014-12-12 21:56:20 UTC (rev 177235)
</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/EXTBlendMinMax.idl \
</ins><span class="cx"> $(WebCore)/html/canvas/EXTFragDepth.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESElementIndexUint.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESStandardDerivatives.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (177234 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-12-12 21:40:57 UTC (rev 177234)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-12-12 21:56:20 UTC (rev 177235)
</span><span class="lines">@@ -748,6 +748,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\JSEXTBlendMinMax.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">@@ -6684,6 +6698,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\EXTBlendMinMax.cpp" />
</ins><span class="cx"> <ClCompile Include="..\html\canvas\EXTFragDepth.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\EXTTextureFilterAnisotropic.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\OESElementIndexUint.cpp" />
</span><span class="lines">@@ -18881,7 +18896,8 @@
</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><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSEXTFragDepth.h” />
</del><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSEXTFragDepth.h" />
+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSEXTBlendMinMax.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">@@ -18972,6 +18988,7 @@
</span><span class="cx"> <ClInclude Include="..\html\canvas\EXTShaderTextureLOD.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\EXTsRGB.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\EXTFragDepth.h” />
</span><ins>+ <ClInclude Include="..\html\canvas\EXTBlendMinMax.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 (177234 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-12-12 21:40:57 UTC (rev 177234)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-12-12 21:56:20 UTC (rev 177235)
</span><span class="lines">@@ -7267,6 +7267,12 @@
</span><span class="cx"> <ClCompile Include="..\html\canvas\EXTFragDepth.cpp">
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSEXTBlendMinMax.cpp">
+ <Filter>DerivedSources</Filter>
+ </ClCompile>
+ <ClCompile Include="..\html\canvas\EXTBlendMinMax.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">@@ -15278,6 +15284,12 @@
</span><span class="cx"> <ClInclude Include="..\html\canvas\EXTFragDepth.h”>
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSEXTBlendMinMax.h”>
+ <Filter>DerivedSources</Filter>
+ </ClInclude>
+ <ClInclude Include="..\html\canvas\EXTBlendMinMax.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 (177234 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-12-12 21:40:57 UTC (rev 177234)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-12-12 21:56:20 UTC (rev 177235)
</span><span class="lines">@@ -2309,6 +2309,9 @@
</span><span class="cx"> 71E2183B17359FB8006E6E4D /* PlugInsResourcesData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71E2183917359FB8006E6E4D /* PlugInsResourcesData.cpp */; };
</span><span class="cx"> 71E623D1151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E623CF151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h */; };
</span><span class="cx"> 71FB967B1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h in Headers */ = {isa = PBXBuildFile; fileRef = 71FB967A1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 724ED32C1A3A7E5400F5F13C /* EXTBlendMinMax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 724ED3291A3A7E5400F5F13C /* EXTBlendMinMax.cpp */; };
+ 724ED3311A3A8B2300F5F13C /* JSEXTBlendMinMax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 724ED32F1A3A8B2300F5F13C /* JSEXTBlendMinMax.cpp */; };
+ 724ED3321A3A8B2300F5F13C /* JSEXTBlendMinMax.h in Headers */ = {isa = PBXBuildFile; fileRef = 724ED3301A3A8B2300F5F13C /* JSEXTBlendMinMax.h */; };
</ins><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><span class="lines">@@ -9489,6 +9492,11 @@
</span><span class="cx"> 71E623CE151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedIntegerOptionalInteger.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 71E623CF151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedIntegerOptionalInteger.h; sourceTree = "<group>"; };
</span><span class="cx"> 71FB967A1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedEnumerationPropertyTearOff.h; sourceTree = "<group>"; };
</span><ins>+ 724ED3291A3A7E5400F5F13C /* EXTBlendMinMax.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EXTBlendMinMax.cpp; path = canvas/EXTBlendMinMax.cpp; sourceTree = "<group>"; };
+ 724ED32A1A3A7E5400F5F13C /* EXTBlendMinMax.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EXTBlendMinMax.h; path = canvas/EXTBlendMinMax.h; sourceTree = "<group>"; };
+ 724ED32B1A3A7E5400F5F13C /* EXTBlendMinMax.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = EXTBlendMinMax.idl; path = canvas/EXTBlendMinMax.idl; sourceTree = "<group>"; };
+ 724ED32F1A3A8B2300F5F13C /* JSEXTBlendMinMax.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSEXTBlendMinMax.cpp; path = "JSEXTBlendMinMax.cpp"; sourceTree = "<group>"; };
+ 724ED3301A3A8B2300F5F13C /* JSEXTBlendMinMax.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSEXTBlendMinMax.h; path = "JSEXTBlendMinMax.h"; sourceTree = "<group>"; };
</ins><span class="cx"> 72626E010EF022FE00A07E20 /* FontFastPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFastPath.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 727AFED11A2EA6A0000442E8 /* EXTsRGB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EXTsRGB.cpp; path = canvas/EXTsRGB.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 727AFED21A2EA6A0000442E8 /* EXTsRGB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EXTsRGB.h; path = canvas/EXTsRGB.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -15817,6 +15825,9 @@
</span><span class="cx"> 49484FC0102CF23C00187DD3 /* CanvasStyle.h */,
</span><span class="cx"> FB91392016AE4B0B001FE682 /* DOMPath.h */,
</span><span class="cx"> FB91392116AE4B0B001FE682 /* DOMPath.idl */,
</span><ins>+ 724ED3291A3A7E5400F5F13C /* EXTBlendMinMax.cpp */,
+ 724ED32A1A3A7E5400F5F13C /* EXTBlendMinMax.h */,
+ 724ED32B1A3A7E5400F5F13C /* EXTBlendMinMax.idl */,
</ins><span class="cx"> 5C4304AD191AC908000E2BC0 /* EXTShaderTextureLOD.cpp */,
</span><span class="cx"> 5C4304AE191AC908000E2BC0 /* EXTShaderTextureLOD.h */,
</span><span class="cx"> 5C4304AF191AC908000E2BC0 /* EXTShaderTextureLOD.idl */,
</span><span class="lines">@@ -18731,6 +18742,8 @@
</span><span class="cx"> A83B79080CCAFF2B000B0825 /* HTML */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 724ED32F1A3A8B2300F5F13C /* JSEXTBlendMinMax.cpp */,
+ 724ED3301A3A8B2300F5F13C /* JSEXTBlendMinMax.h */,
</ins><span class="cx"> 72F1ADA31A390B9F00014E18 /* JSEXTFragDepth.cpp */,
</span><span class="cx"> 72F1ADA41A390B9F00014E18 /* JSEXTFragDepth.h */,
</span><span class="cx"> 72E417611A2E8D2F004C562A /* JSEXTsRGB.cpp */,
</span><span class="lines">@@ -25222,6 +25235,7 @@
</span><span class="cx"> A83B78FC0CCAFF15000B0825 /* JSSVGFontFaceUriElement.h in Headers */,
</span><span class="cx"> B2FA3D990AB75A6F000E5AC4 /* JSSVGForeignObjectElement.h in Headers */,
</span><span class="cx"> B2FA3D9B0AB75A6F000E5AC4 /* JSSVGGElement.h in Headers */,
</span><ins>+ 724ED3321A3A8B2300F5F13C /* JSEXTBlendMinMax.h in Headers */,
</ins><span class="cx"> B27B28280CEF0C0700D39D54 /* JSSVGGlyphElement.h in Headers */,
</span><span class="cx"> 24D9129A13CA971400D21915 /* JSSVGGlyphRefElement.h in Headers */,
</span><span class="cx"> B2FA3D9D0AB75A6F000E5AC4 /* JSSVGGradientElement.h in Headers */,
</span><span class="lines">@@ -29085,6 +29099,7 @@
</span><span class="cx"> BC772C5E0C4EB3440083285F /* MIMETypeRegistryMac.mm in Sources */,
</span><span class="cx"> 52F10865162B6DA4009AC81E /* MixedContentChecker.cpp in Sources */,
</span><span class="cx"> CDF2B0101820540600F2B424 /* MockBox.cpp in Sources */,
</span><ins>+ 724ED3311A3A8B2300F5F13C /* JSEXTBlendMinMax.cpp in Sources */,
</ins><span class="cx"> CDF2B0121820540600F2B424 /* MockMediaPlayerMediaSource.cpp in Sources */,
</span><span class="cx"> CDF2B0141820540600F2B424 /* MockMediaSourcePrivate.cpp in Sources */,
</span><span class="cx"> 07C59B6317F4D1BF000FBCBB /* MockMediaStreamCenter.cpp in Sources */,
</span><span class="lines">@@ -30043,6 +30058,7 @@
</span><span class="cx"> A0EE0DF7144F825500F80B0D /* WebGLDebugShaders.cpp in Sources */,
</span><span class="cx"> 6E3FAE8E14733FDB00E42307 /* WebGLDepthTexture.cpp in Sources */,
</span><span class="cx"> 5B30695D18B3D3450099D5E8 /* WebGLDrawBuffers.cpp in Sources */,
</span><ins>+ 724ED32C1A3A7E5400F5F13C /* EXTBlendMinMax.cpp in Sources */,
</ins><span class="cx"> 6EBF0E5412A8929800DB1709 /* WebGLExtension.cpp in Sources */,
</span><span class="cx"> 49C7B9CE1042D32F0009D447 /* WebGLFramebuffer.cpp in Sources */,
</span><span class="cx"> 6E47E66010B7944B00B186C8 /* WebGLGetInfo.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWebGLRenderingContextCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp (177234 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp 2014-12-12 21:40:57 UTC (rev 177234)
+++ trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp 2014-12-12 21:56:20 UTC (rev 177235)
</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 "EXTBlendMinMax.h"
</ins><span class="cx"> #include "EXTFragDepth.h"
</span><span class="cx"> #include "EXTShaderTextureLOD.h"
</span><span class="cx"> #include "EXTTextureFilterAnisotropic.h"
</span><span class="lines">@@ -38,6 +39,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 "JSEXTBlendMinMax.h"
</ins><span class="cx"> #include "JSEXTFragDepth.h"
</span><span class="cx"> #include "JSEXTShaderTextureLOD.h"
</span><span class="cx"> #include "JSEXTTextureFilterAnisotropic.h"
</span><span class="lines">@@ -219,6 +221,8 @@
</span><span class="cx"> return toJS(exec, globalObject, static_cast<EXTsRGB*>(extension));
</span><span class="cx"> case WebGLExtension::EXTFragDepthName:
</span><span class="cx"> return toJS(exec, globalObject, static_cast<EXTFragDepth*>(extension));
</span><ins>+ case WebGLExtension::EXTBlendMinMaxName:
+ return toJS(exec, globalObject, static_cast<EXTBlendMinMax*>(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="trunkSourceWebCorehtmlcanvasEXTBlendMinMaxcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/html/canvas/EXTBlendMinMax.cpp (0 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTBlendMinMax.cpp (rev 0)
+++ trunk/Source/WebCore/html/canvas/EXTBlendMinMax.cpp 2014-12-12 21:56:20 UTC (rev 177235)
</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 "EXTBlendMinMax.h"
+
+namespace WebCore {
+
+EXTBlendMinMax::EXTBlendMinMax(WebGLRenderingContext* context)
+ : WebGLExtension(context)
+{
+}
+
+EXTBlendMinMax::~EXTBlendMinMax()
+{
+}
+
+WebGLExtension::ExtensionName EXTBlendMinMax::getName() const
+{
+ return EXTBlendMinMaxName;
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEBGL)
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTBlendMinMaxh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/html/canvas/EXTBlendMinMax.h (0 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTBlendMinMax.h (rev 0)
+++ trunk/Source/WebCore/html/canvas/EXTBlendMinMax.h 2014-12-12 21:56:20 UTC (rev 177235)
</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 EXTBlendMinMax_h
+#define EXTBlendMinMax_h
+
+#include "WebGLExtension.h"
+
+namespace WebCore {
+
+class EXTBlendMinMax final : public WebGLExtension {
+public:
+ explicit EXTBlendMinMax(WebGLRenderingContext*);
+ virtual ~EXTBlendMinMax();
+
+ virtual ExtensionName getName() const override;
+};
+
+} // namespace WebCore
+
+#endif // EXTBlendMinMax_h
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTBlendMinMaxidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/html/canvas/EXTBlendMinMax.idl (0 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTBlendMinMax.idl (rev 0)
+++ trunk/Source/WebCore/html/canvas/EXTBlendMinMax.idl 2014-12-12 21:56:20 UTC (rev 177235)
</span><span class="lines">@@ -0,0 +1,33 @@
</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 EXTBlendMinMax {
+ const unsigned int MIN_EXT = 0x8007;
+ const unsigned int MAX_EXT = 0x8008;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLExtensionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLExtension.h (177234 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLExtension.h 2014-12-12 21:40:57 UTC (rev 177234)
+++ trunk/Source/WebCore/html/canvas/WebGLExtension.h 2014-12-12 21:56:20 UTC (rev 177235)
</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>+ EXTBlendMinMaxName,
</ins><span class="cx"> EXTFragDepthName,
</span><span class="cx"> EXTShaderTextureLODName,
</span><span class="cx"> EXTTextureFilterAnisotropicName,
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (177234 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-12-12 21:40:57 UTC (rev 177234)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-12-12 21:56:20 UTC (rev 177235)
</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 "EXTBlendMinMax.h"
</ins><span class="cx"> #include "EXTFragDepth.h"
</span><span class="cx"> #include "EXTShaderTextureLOD.h"
</span><span class="cx"> #include "EXTTextureFilterAnisotropic.h"
</span><span class="lines">@@ -2455,6 +2456,14 @@
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><ins>+ if (equalIgnoringCase(name, "EXT_blend_minmax")
+ && m_context->getExtensions()->supports("GL_EXT_blend_minmax")) {
+ if (!m_extBlendMinMax) {
+ m_context->getExtensions()->ensureEnabled("GL_EXT_blend_minmax");
+ m_extBlendMinMax = std::make_unique<EXTBlendMinMax>(this);
+ }
+ return m_extBlendMinMax.get();
+ }
</ins><span class="cx"> if (equalIgnoringCase(name, "EXT_sRGB")
</span><span class="cx"> && m_context->getExtensions()->supports("GL_EXT_sRGB")) {
</span><span class="cx"> if (!m_extsRGB) {
</span><span class="lines">@@ -3087,6 +3096,8 @@
</span><span class="cx"> if (m_isPendingPolicyResolution)
</span><span class="cx"> return result;
</span><span class="cx">
</span><ins>+ if (m_context->getExtensions()->supports("GL_EXT_blend_minmax"))
+ result.append("EXT_blend_minmax");
</ins><span class="cx"> if (m_context->getExtensions()->supports("GL_EXT_sRGB"))
</span><span class="cx"> result.append("EXT_sRGB");
</span><span class="cx"> if (m_context->getExtensions()->supports("GL_EXT_frag_depth"))
</span><span class="lines">@@ -5664,7 +5675,14 @@
</span><span class="cx"> case GraphicsContext3D::FUNC_ADD:
</span><span class="cx"> case GraphicsContext3D::FUNC_SUBTRACT:
</span><span class="cx"> case GraphicsContext3D::FUNC_REVERSE_SUBTRACT:
</span><ins>+ case Extensions3D::MIN_EXT:
+ case Extensions3D::MAX_EXT:
+ if ((mode == Extensions3D::MIN_EXT || mode == Extensions3D::MAX_EXT) && !m_extBlendMinMax) {
+ synthesizeGLError(GraphicsContext3D::INVALID_ENUM, functionName, "invalid mode");
+ return false;
+ }
</ins><span class="cx"> return true;
</span><ins>+ break;
</ins><span class="cx"> default:
</span><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_ENUM, functionName, "invalid mode");
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h (177234 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h 2014-12-12 21:40:57 UTC (rev 177234)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h 2014-12-12 21:56:20 UTC (rev 177235)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class ANGLEInstancedArrays;
</span><ins>+class EXTBlendMinMax;
</ins><span class="cx"> class EXTTextureFilterAnisotropic;
</span><span class="cx"> class EXTShaderTextureLOD;
</span><span class="cx"> class EXTsRGB;
</span><span class="lines">@@ -541,6 +542,7 @@
</span><span class="cx">
</span><span class="cx"> // Enabled extension objects.
</span><span class="cx"> std::unique_ptr<EXTFragDepth> m_extFragDepth;
</span><ins>+ std::unique_ptr<EXTBlendMinMax> m_extBlendMinMax;
</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="trunkSourceWebCorehtmlcanvasWebGLRenderingContextidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.idl (177234 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.idl 2014-12-12 21:40:57 UTC (rev 177234)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.idl 2014-12-12 21:56:20 UTC (rev 177235)
</span><span class="lines">@@ -423,6 +423,9 @@
</span><span class="cx"> const GLenum SRGB8_ALPHA8_EXT = 0x8C43;
</span><span class="cx"> const GLenum FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT = 0x8210;
</span><span class="cx">
</span><ins>+ const GLenum MIN_EXT = 0x8007;
+ const GLenum MAX_EXT = 0x8008;
+
</ins><span class="cx"> const GLenum RENDERBUFFER_WIDTH = 0x8D42;
</span><span class="cx"> const GLenum RENDERBUFFER_HEIGHT = 0x8D43;
</span><span class="cx"> const GLenum RENDERBUFFER_INTERNAL_FORMAT = 0x8D44;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsExtensions3Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Extensions3D.h (177234 => 177235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Extensions3D.h 2014-12-12 21:40:57 UTC (rev 177234)
+++ trunk/Source/WebCore/platform/graphics/Extensions3D.h 2014-12-12 21:56:20 UTC (rev 177235)
</span><span class="lines">@@ -96,6 +96,10 @@
</span><span class="cx"> SRGB8_ALPHA8_EXT = 0x8C43,
</span><span class="cx"> FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT = 0x8210,
</span><span class="cx">
</span><ins>+ // EXT_blend_minmax enums
+ MIN_EXT = 0x8007,
+ MAX_EXT = 0x8008,
+
</ins><span class="cx"> // GL_EXT_texture_format_BGRA8888 enums
</span><span class="cx"> BGRA_EXT = 0x80E1,
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>