<!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>[178398] trunk/Source/WebCore</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/178398">178398</a></dd>
<dt>Author</dt> <dd>roger_fong@apple.com</dd>
<dt>Date</dt> <dd>2015-01-13 17:55:33 -0800 (Tue, 13 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Unreviewed] Windows build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/178390">r178390</a>.
* DerivedSources.cpp:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* bindings/js/JSBindingsAllInOne.cpp:
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::create):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</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="#trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp">trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178397 => 178398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-14 01:34:31 UTC (rev 178397)
+++ trunk/Source/WebCore/ChangeLog 2015-01-14 01:55:33 UTC (rev 178398)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-13 Roger Fong <roger_fong@apple.com>
+
+ [Unreviewed] Windows build fix after r178390.
+
+ * DerivedSources.cpp:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * bindings/js/JSBindingsAllInOne.cpp:
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::create):
+
</ins><span class="cx"> 2015-01-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> NSButtonCell leak allocated under WebCore::paintToggleButton
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (178397 => 178398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2015-01-14 01:34:31 UTC (rev 178397)
+++ trunk/Source/WebCore/DerivedSources.cpp 2015-01-14 01:55:33 UTC (rev 178398)
</span><span class="lines">@@ -54,6 +54,8 @@
</span><span class="cx"> #include "JSOESTextureHalfFloat.cpp"
</span><span class="cx"> #include "JSOESTextureHalfFloatLinear.cpp"
</span><span class="cx"> #include "JSOESVertexArrayObject.cpp"
</span><ins>+#include "JSWebGL1RenderingContext.cpp"
+#include "JSWebGL2RenderingContext.cpp"
</ins><span class="cx"> #include "JSWebGLActiveInfo.cpp"
</span><span class="cx"> #include "JSWebGLBuffer.cpp"
</span><span class="cx"> #include "JSWebGLCompressedTextureATC.cpp"
</span><span class="lines">@@ -69,7 +71,7 @@
</span><span class="cx"> #include "JSWebGLLoseContext.cpp"
</span><span class="cx"> #include "JSWebGLProgram.cpp"
</span><span class="cx"> #include "JSWebGLRenderbuffer.cpp"
</span><del>-#include "JSWebGLRenderingContext.cpp"
</del><ins>+#include "JSWebGLRenderingContextBase.cpp"
</ins><span class="cx"> #include "JSWebGLShader.cpp"
</span><span class="cx"> #include "JSWebGLShaderPrecisionFormat.cpp"
</span><span class="cx"> #include "JSWebGLTexture.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (178397 => 178398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-14 01:34:31 UTC (rev 178397)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-14 01:55:33 UTC (rev 178398)
</span><span class="lines">@@ -636,20 +636,6 @@
</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><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLRenderingContext.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>
</del><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLShader.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -762,6 +748,30 @@
</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\JSWebGL1RenderingContext.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGL2RenderingContext.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLRenderingContextBase.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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">@@ -776,7 +786,30 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\JSWebGLRenderingContextCustom.cpp" />
</del><ins>+ <ClCompile Include="..\bindings\js\JSWebGL1RenderingContextCustom.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\bindings\js\JSWebGL2RenderingContextCustom.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\bindings\js\JSWebGLRenderingContextBaseCustom.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\css\CSSImageSetValue.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">@@ -6638,6 +6671,8 @@
</span><span class="cx"> <ClCompile Include="..\html\canvas\OESTextureHalfFloat.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\OESTextureHalfFloatLinear.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\OESVertexArrayObject.cpp" />
</span><ins>+ <ClCompile Include="..\html\canvas\WebGL1RenderingContext.cpp" />
+ <ClCompile Include="..\html\canvas\WebGL2RenderingContext.cpp" />
</ins><span class="cx"> <ClCompile Include="..\html\canvas\WebGLBuffer.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\WebGLCompressedTextureATC.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\WebGLCompressedTexturePVRTC.cpp" />
</span><span class="lines">@@ -6657,7 +6692,7 @@
</span><span class="cx"> <ClCompile Include="..\html\canvas\WebGLObject.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\WebGLProgram.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\WebGLRenderbuffer.cpp" />
</span><del>- <ClCompile Include="..\html\canvas\WebGLRenderingContext.cpp" />
</del><ins>+ <ClCompile Include="..\html\canvas\WebGLRenderingContextBase.cpp" />
</ins><span class="cx"> <ClCompile Include="..\html\canvas\WebGLShader.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\WebGLShaderPrecisionFormat.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\WebGLSharedObject.cpp" />
</span><span class="lines">@@ -18692,7 +18727,6 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLLoseContext.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLProgram.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLRenderbuffer.h" />
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLRenderingContext.h" />
</del><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLShader.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLShaderPrecisionFormat.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLTexture.h" />
</span><span class="lines">@@ -18761,6 +18795,9 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSEXTsRGB.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSEXTFragDepth.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSEXTBlendMinMax.h" />
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\JSWebGL1RenderingContext.h" />
+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\JSWebGL2RenderingContext.h" />
+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\JSWebGLRenderingContextBase.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">@@ -18860,6 +18897,8 @@
</span><span class="cx"> <ClInclude Include="..\html\canvas\OESTextureHalfFloat.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\OESTextureHalfFloatLinear.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\OESVertexArrayObject.h" />
</span><ins>+ <ClInclude Include="..\html\canvas\WebGL1RenderingContext.h" />
+ <ClInclude Include="..\html\canvas\WebGL2RenderingContext.h" />
</ins><span class="cx"> <ClInclude Include="..\html\canvas\WebGLActiveInfo.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\WebGLBuffer.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\WebGLCompressedTextureATC.h" />
</span><span class="lines">@@ -18880,7 +18919,7 @@
</span><span class="cx"> <ClInclude Include="..\html\canvas\WebGLObject.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\WebGLProgram.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\WebGLRenderbuffer.h" />
</span><del>- <ClInclude Include="..\html\canvas\WebGLRenderingContext.h" />
</del><ins>+ <ClInclude Include="..\html\canvas\WebGLRenderingContextBase.h" />
</ins><span class="cx"> <ClInclude Include="..\html\canvas\WebGLShader.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\WebGLShaderPrecisionFormat.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\WebGLSharedObject.h" />
</span><span class="lines">@@ -21274,4 +21313,4 @@
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (178397 => 178398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-14 01:34:31 UTC (rev 178397)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-14 01:55:33 UTC (rev 178398)
</span><span class="lines">@@ -1383,9 +1383,6 @@
</span><span class="cx"> <ClCompile Include="..\platform\graphics\RoundedRect.cpp">
</span><span class="cx"> <Filter>platform\graphics</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\platform\graphics\SegmentedFontData.cpp">
- <Filter>platform\graphics</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\platform\graphics\ShadowBlur.cpp">
</span><span class="cx"> <Filter>platform\graphics</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -4851,9 +4848,6 @@
</span><span class="cx"> <ClCompile Include="..\platform\graphics\FontCache.cpp">
</span><span class="cx"> <Filter>platform\graphics</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\platform\graphics\FontData.cpp">
- <Filter>platform\graphics</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\platform\graphics\FontDescription.cpp">
</span><span class="cx"> <Filter>platform\graphics</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -6379,9 +6373,6 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLRenderbuffer.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLRenderingContext.cpp">
- <Filter>DerivedSources</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLShader.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -6487,9 +6478,6 @@
</span><span class="cx"> <ClCompile Include="..\html\canvas\WebGLRenderbuffer.cpp">
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\html\canvas\WebGLRenderingContext.cpp">
- <Filter>html\canvas</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\html\canvas\WebGLShader.cpp">
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -6583,9 +6571,6 @@
</span><span class="cx"> <ClCompile Include="..\platform\graphics\cg\GraphicsContext3DCG.cpp">
</span><span class="cx"> <Filter>platform\graphics\cg</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\JSWebGLRenderingContextCustom.cpp">
- <Filter>bindings\js</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\platform\graphics\cairo\GraphicsContext3DCairo.cpp">
</span><span class="cx"> <Filter>platform\graphics\cairo</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -7150,6 +7135,34 @@
</span><span class="cx"> <ClCompile Include="..\html\canvas\EXTBlendMinMax.cpp">
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\platform\graphics\FontRanges.cpp" />
+ <ClCompile Include="..\html\canvas\WebGL1RenderingContext.cpp">
+ <Filter>html\canvas</Filter>
+ </ClCompile>
+ <ClCompile Include="..\html\canvas\WebGL2RenderingContext.cpp">
+ <Filter>html\canvas</Filter>
+ </ClCompile>
+ <ClCompile Include="..\html\canvas\WebGLRenderingContextBase.cpp">
+ <Filter>html\canvas</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\WebKitBuild\Release\obj64\WebCore\DerivedSources\JSWebGL1RenderingContext.cpp">
+ <Filter>DerivedSources</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\WebKitBuild\Release\obj64\WebCore\DerivedSources\JSWebGL2RenderingContext.cpp">
+ <Filter>DerivedSources</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\WebKitBuild\Release\obj64\WebCore\DerivedSources\JSWebGLRenderingContextBase.cpp">
+ <Filter>DerivedSources</Filter>
+ </ClCompile>
+ <ClCompile Include="..\bindings\js\JSWebGL1RenderingContextCustom.cpp">
+ <Filter>bindings\js</Filter>
+ </ClCompile>
+ <ClCompile Include="..\bindings\js\JSWebGL2RenderingContextCustom.cpp">
+ <Filter>bindings\js</Filter>
+ </ClCompile>
+ <ClCompile Include="..\bindings\js\JSWebGLRenderingContextBaseCustom.cpp">
+ <Filter>bindings\js</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">@@ -8415,9 +8428,6 @@
</span><span class="cx"> <ClInclude Include="..\platform\graphics\RoundedRect.h">
</span><span class="cx"> <Filter>platform\graphics</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\platform\graphics\SegmentedFontData.h">
- <Filter>platform\graphics</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\platform\graphics\ShadowBlur.h">
</span><span class="cx"> <Filter>platform\graphics</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -12709,9 +12719,6 @@
</span><span class="cx"> <ClInclude Include="..\platform\graphics\FontCache.h">
</span><span class="cx"> <Filter>platform\graphics</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\platform\graphics\FontData.h">
- <Filter>platform\graphics</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\platform\graphics\FontDescription.h">
</span><span class="cx"> <Filter>platform\graphics</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -14216,9 +14223,6 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLRenderbuffer.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLRenderingContext.h">
- <Filter>DerivedSources</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLShader.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -14327,9 +14331,6 @@
</span><span class="cx"> <ClInclude Include="..\html\canvas\WebGLRenderbuffer.h">
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\html\canvas\WebGLRenderingContext.h">
- <Filter>html\canvas</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\html\canvas\WebGLShader.h">
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -15053,6 +15054,25 @@
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseBackendSync.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\SQLStatementSync.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\SQLTransactionBackendSync.h" />
</span><ins>+ <ClInclude Include="..\platform\graphics\FontRanges.h" />
+ <ClInclude Include="..\html\canvas\WebGL1RenderingContext.h">
+ <Filter>html\canvas</Filter>
+ </ClInclude>
+ <ClInclude Include="..\html\canvas\WebGL2RenderingContext.h">
+ <Filter>html\canvas</Filter>
+ </ClInclude>
+ <ClInclude Include="..\html\canvas\WebGLRenderingContextBase.h">
+ <Filter>html\canvas</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\WebKitBuild\Release\obj64\WebCore\DerivedSources\JSWebGL1RenderingContext.h">
+ <Filter>DerivedSources</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\WebKitBuild\Release\obj64\WebCore\DerivedSources\JSWebGL2RenderingContext.h">
+ <Filter>DerivedSources</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\WebKitBuild\Release\obj64\WebCore\DerivedSources\JSWebGLRenderingContextBase.h">
+ <Filter>DerivedSources</Filter>
+ </ClInclude>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="..\css\CSSGrammar.y.in">
</span><span class="lines">@@ -15263,4 +15283,4 @@
</span><span class="cx"> <Filter>platform\win</Filter>
</span><span class="cx"> </MASM>
</span><span class="cx"> </ItemGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (178397 => 178398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2015-01-14 01:34:31 UTC (rev 178397)
+++ trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2015-01-14 01:55:33 UTC (rev 178398)
</span><span class="lines">@@ -131,6 +131,9 @@
</span><span class="cx"> #include "JSTreeWalkerCustom.cpp"
</span><span class="cx"> #include "JSVideoTrackCustom.cpp"
</span><span class="cx"> #include "JSVideoTrackListCustom.cpp"
</span><ins>+#include "JSWebGL1RenderingContextCustom.cpp"
+#include "JSWebGL2RenderingContextCustom.cpp"
+#include "JSWebGLRenderingContextBaseCustom.cpp"
</ins><span class="cx"> #include "JSWebKitPointCustom.cpp"
</span><span class="cx"> #include "JSWorkerCustom.cpp"
</span><span class="cx"> #include "JSWorkerGlobalScopeBase.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (178397 => 178398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-01-14 01:34:31 UTC (rev 178397)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-01-14 01:55:33 UTC (rev 178398)
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx">
</span><span class="cx"> if (isPendingPolicyResolution) {
</span><span class="cx"> LOG(WebGL, "Create a WebGL context that looks real, but will require a policy resolution if used.");
</span><del>- std::unique_ptr<WebGLRenderingContextBase> renderingContext = nil;
</del><ins>+ std::unique_ptr<WebGLRenderingContextBase> renderingContext = nullptr;
</ins><span class="cx"> if (type == "experimental-webgl2")
</span><span class="cx"> renderingContext = std::unique_ptr<WebGL2RenderingContext>(new WebGL2RenderingContext(canvas, attributes));
</span><span class="cx"> else
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx"> if (extensions->supports("GL_EXT_debug_marker"))
</span><span class="cx"> extensions->pushGroupMarkerEXT("WebGLRenderingContext");
</span><span class="cx">
</span><del>- std::unique_ptr<WebGLRenderingContextBase> renderingContext = nil;
</del><ins>+ std::unique_ptr<WebGLRenderingContextBase> renderingContext = nullptr;
</ins><span class="cx"> if (type == "experimental-webgl2")
</span><span class="cx"> renderingContext = std::unique_ptr<WebGL2RenderingContext>(new WebGL2RenderingContext(canvas, context, attributes));
</span><span class="cx"> else
</span></span></pre>
</div>
</div>
</body>
</html>