<!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>[204839] 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/204839">204839</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-08-23 08:34:09 -0700 (Tue, 23 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>CanvasRenderingContext2D should not have a CanvasRenderingContext parent interface
https://bugs.webkit.org/show_bug.cgi?id=161054
Reviewed by Ryosuke Niwa.
LayoutTests/imported/w3c:
Rebaseline W3C test now that more checks are passing.
* web-platform-tests/html/dom/interfaces-expected.txt:
Source/WebCore:
CanvasRenderingContext2D should not have a CanvasRenderingContext parent interface
as per:
- https://html.spec.whatwg.org/multipage/scripting.html#canvasrenderingcontext2d
Firefox and Chrome agree with the specification.
No new tests, rebaselined existing test.
* CMakeLists.txt:
* DerivedSources.cpp:
* DerivedSources.make:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSBindingsAllInOne.cpp:
* bindings/js/JSCanvasRenderingContext.h: Renamed from Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp.
(WebCore::toJS):
* bindings/js/JSCanvasRenderingContext2DCustom.cpp:
(WebCore::JSCanvasRenderingContext2DOwner::isReachableFromOpaqueRoots):
(WebCore::JSCanvasRenderingContext2D::visitAdditionalChildren):
* bindings/js/JSDocumentCustom.cpp:
(WebCore::JSDocument::getCSSCanvasContext):
(WebCore::JSDocument::createTouchList): Deleted.
* bindings/js/JSHTMLCanvasElementCustom.cpp:
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateImplementation):
* dom/Document.idl:
* html/canvas/CanvasRenderingContext.idl: Removed.
* html/canvas/CanvasRenderingContext2D.idl:
* html/canvas/WebGL2RenderingContext.idl:
* html/canvas/WebGLRenderingContext.idl:
* html/canvas/WebGLRenderingContextBase.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmldominterfacesexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt</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="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp">trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCanvasRenderingContext2DCustomcpp">trunk/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDocumentCustomcpp">trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLCanvasElementCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCoredomDocumentidl">trunk/Source/WebCore/dom/Document.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Didl">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGL2RenderingContextidl">trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextidl">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseidl">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsjsJSCanvasRenderingContexth">trunk/Source/WebCore/bindings/js/JSCanvasRenderingContext.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsjsJSCanvasRenderingContextCustomcpp">trunk/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContextidl">trunk/Source/WebCore/html/canvas/CanvasRenderingContext.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-08-23 Chris Dumez <cdumez@apple.com>
+
+ CanvasRenderingContext2D should not have a CanvasRenderingContext parent interface
+ https://bugs.webkit.org/show_bug.cgi?id=161054
+
+ Reviewed by Ryosuke Niwa.
+
+ Rebaseline W3C test now that more checks are passing.
+
+ * web-platform-tests/html/dom/interfaces-expected.txt:
+
</ins><span class="cx"> 2016-08-23 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement redirect support post CORS-preflight
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmldominterfacesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -4790,9 +4790,9 @@
</span><span class="cx"> PASS CanvasRenderingContext2D interface: existence and properties of interface object
</span><span class="cx"> PASS CanvasRenderingContext2D interface object length
</span><span class="cx"> PASS CanvasRenderingContext2D interface object name
</span><del>-FAIL CanvasRenderingContext2D interface: existence and properties of interface prototype object assert_equals: prototype of CanvasRenderingContext2D.prototype is not Object.prototype expected object "[object Object]" but got object "[object CanvasRenderingContextPrototype]"
</del><ins>+PASS CanvasRenderingContext2D interface: existence and properties of interface prototype object
</ins><span class="cx"> PASS CanvasRenderingContext2D interface: existence and properties of interface prototype object's "constructor" property
</span><del>-FAIL CanvasRenderingContext2D interface: attribute canvas assert_own_property: expected property "canvas" missing
</del><ins>+PASS CanvasRenderingContext2D interface: attribute canvas
</ins><span class="cx"> PASS CanvasRenderingContext2D interface: operation save()
</span><span class="cx"> PASS CanvasRenderingContext2D interface: operation restore()
</span><span class="cx"> PASS CanvasRenderingContext2D interface: operation scale(unrestricted double,unrestricted double)
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -544,7 +544,6 @@
</span><span class="cx"> html/canvas/CanvasPath.idl
</span><span class="cx"> html/canvas/CanvasPattern.idl
</span><span class="cx"> html/canvas/CanvasProxy.idl
</span><del>- html/canvas/CanvasRenderingContext.idl
</del><span class="cx"> html/canvas/CanvasRenderingContext2D.idl
</span><span class="cx"> html/canvas/DOMPath.idl
</span><span class="cx"> html/canvas/EXTBlendMinMax.idl
</span><span class="lines">@@ -1124,7 +1123,6 @@
</span><span class="cx"> bindings/js/JSCSSValueCustom.cpp
</span><span class="cx"> bindings/js/JSCallbackData.cpp
</span><span class="cx"> bindings/js/JSCanvasRenderingContext2DCustom.cpp
</span><del>- bindings/js/JSCanvasRenderingContextCustom.cpp
</del><span class="cx"> bindings/js/JSCharacterDataCustom.cpp
</span><span class="cx"> bindings/js/JSClientRectCustom.cpp
</span><span class="cx"> bindings/js/JSCommandLineAPIHostCustom.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/ChangeLog 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2016-08-23 Chris Dumez <cdumez@apple.com>
+
+ CanvasRenderingContext2D should not have a CanvasRenderingContext parent interface
+ https://bugs.webkit.org/show_bug.cgi?id=161054
+
+ Reviewed by Ryosuke Niwa.
+
+ CanvasRenderingContext2D should not have a CanvasRenderingContext parent interface
+ as per:
+ - https://html.spec.whatwg.org/multipage/scripting.html#canvasrenderingcontext2d
+
+ Firefox and Chrome agree with the specification.
+
+ No new tests, rebaselined existing test.
+
+ * CMakeLists.txt:
+ * DerivedSources.cpp:
+ * DerivedSources.make:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSBindingsAllInOne.cpp:
+ * bindings/js/JSCanvasRenderingContext.h: Renamed from Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp.
+ (WebCore::toJS):
+ * bindings/js/JSCanvasRenderingContext2DCustom.cpp:
+ (WebCore::JSCanvasRenderingContext2DOwner::isReachableFromOpaqueRoots):
+ (WebCore::JSCanvasRenderingContext2D::visitAdditionalChildren):
+ * bindings/js/JSDocumentCustom.cpp:
+ (WebCore::JSDocument::getCSSCanvasContext):
+ (WebCore::JSDocument::createTouchList): Deleted.
+ * bindings/js/JSHTMLCanvasElementCustom.cpp:
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+ * dom/Document.idl:
+ * html/canvas/CanvasRenderingContext.idl: Removed.
+ * html/canvas/CanvasRenderingContext2D.idl:
+ * html/canvas/WebGL2RenderingContext.idl:
+ * html/canvas/WebGLRenderingContext.idl:
+ * html/canvas/WebGLRenderingContextBase.idl:
+
</ins><span class="cx"> 2016-08-03 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> Share and improve extraction of character for operator and token elements
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/DerivedSources.cpp 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> #include "JSCanvasGradient.cpp"
</span><span class="cx"> #include "JSCanvasPattern.cpp"
</span><span class="cx"> #include "JSCanvasProxy.cpp"
</span><del>-#include "JSCanvasRenderingContext.cpp"
</del><span class="cx"> #include "JSCanvasRenderingContext2D.cpp"
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="cx"> #include "JSByteLengthQueuingStrategy.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/DerivedSources.make 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -453,7 +453,6 @@
</span><span class="cx"> $(WebCore)/html/canvas/CanvasPath.idl \
</span><span class="cx"> $(WebCore)/html/canvas/CanvasPattern.idl \
</span><span class="cx"> $(WebCore)/html/canvas/CanvasProxy.idl \
</span><del>- $(WebCore)/html/canvas/CanvasRenderingContext.idl \
</del><span class="cx"> $(WebCore)/html/canvas/CanvasRenderingContext2D.idl \
</span><span class="cx"> $(WebCore)/html/canvas/DOMPath.idl \
</span><span class="cx"> $(WebCore)/html/canvas/EXTBlendMinMax.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -1713,6 +1713,7 @@
</span><span class="cx"> 4634592C1AC2271000ECB71C /* PowerObserverMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4634592B1AC2271000ECB71C /* PowerObserverMac.cpp */; };
</span><span class="cx"> 463EB6221B8789E00096ED51 /* TagCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 463EB6201B8789CB0096ED51 /* TagCollection.cpp */; };
</span><span class="cx"> 463EB6231B8789E00096ED51 /* TagCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 463EB6211B8789CB0096ED51 /* TagCollection.h */; };
</span><ins>+ 4659D2711D6B90A50096FD86 /* JSCanvasRenderingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 4659D2701D6B909F0096FD86 /* JSCanvasRenderingContext.h */; };
</ins><span class="cx"> 465A8E791C8A24CE00E7D3E4 /* RuntimeApplicationChecks.mm in Sources */ = {isa = PBXBuildFile; fileRef = 465A8E781C8A24CE00E7D3E4 /* RuntimeApplicationChecks.mm */; };
</span><span class="cx"> 4669B2871B852A0B000F905F /* JSDOMNamedFlowCollectionCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F2768E1B85297F005C2556 /* JSDOMNamedFlowCollectionCustom.cpp */; };
</span><span class="cx"> 4671E0651D67A59600C6B497 /* CanvasPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4671E0631D67A57B00C6B497 /* CanvasPath.cpp */; };
</span><span class="lines">@@ -1838,7 +1839,6 @@
</span><span class="cx"> 49ECEB6E1499790D00CDD3A4 /* FilterOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 49ECEB641499790D00CDD3A4 /* FilterOperation.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 49ECEB6F1499790D00CDD3A4 /* FilterOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49ECEB651499790D00CDD3A4 /* FilterOperations.cpp */; };
</span><span class="cx"> 49ECEB701499790D00CDD3A4 /* FilterOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 49ECEB661499790D00CDD3A4 /* FilterOperations.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 49EED1421051969400099FAB /* JSCanvasRenderingContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49EED13C1051969400099FAB /* JSCanvasRenderingContext.cpp */; };
</del><span class="cx"> 49EED1431051969400099FAB /* JSCanvasRenderingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 49EED13D1051969400099FAB /* JSCanvasRenderingContext.h */; };
</span><span class="cx"> 49EED1441051969400099FAB /* JSCanvasRenderingContext2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49EED13E1051969400099FAB /* JSCanvasRenderingContext2D.cpp */; };
</span><span class="cx"> 49EED1451051969400099FAB /* JSCanvasRenderingContext2D.h in Headers */ = {isa = PBXBuildFile; fileRef = 49EED13F1051969400099FAB /* JSCanvasRenderingContext2D.h */; };
</span><span class="lines">@@ -1846,7 +1846,6 @@
</span><span class="cx"> 49EED1471051969400099FAB /* JSWebGLRenderingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 49EED1411051969400099FAB /* JSWebGLRenderingContext.h */; };
</span><span class="cx"> 49EED14E1051971A00099FAB /* JSCanvasRenderingContext2DCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49EED14B1051971900099FAB /* JSCanvasRenderingContext2DCustom.cpp */; };
</span><span class="cx"> 49EED14F1051971A00099FAB /* JSWebGLRenderingContextCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49EED14C1051971A00099FAB /* JSWebGLRenderingContextCustom.cpp */; };
</span><del>- 49EED1501051971A00099FAB /* JSCanvasRenderingContextCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49EED14D1051971A00099FAB /* JSCanvasRenderingContextCustom.cpp */; };
</del><span class="cx"> 49FC7A501444AF5F00A5D864 /* DisplayRefreshMonitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49FC7A4F1444AF5F00A5D864 /* DisplayRefreshMonitor.cpp */; };
</span><span class="cx"> 49FFBF1D11C8550E006A7118 /* GraphicsContext3DMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49FFBF1C11C8550E006A7118 /* GraphicsContext3DMac.mm */; };
</span><span class="cx"> 49FFBF3F11C93EE3006A7118 /* WebGLLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 49FFBF3D11C93EE3006A7118 /* WebGLLayer.h */; };
</span><span class="lines">@@ -8633,6 +8632,7 @@
</span><span class="cx"> 4634592B1AC2271000ECB71C /* PowerObserverMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PowerObserverMac.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 463EB6201B8789CB0096ED51 /* TagCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TagCollection.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 463EB6211B8789CB0096ED51 /* TagCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TagCollection.h; sourceTree = "<group>"; };
</span><ins>+ 4659D2701D6B909F0096FD86 /* JSCanvasRenderingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCanvasRenderingContext.h; sourceTree = "<group>"; };
</ins><span class="cx"> 465A8E781C8A24CE00E7D3E4 /* RuntimeApplicationChecks.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RuntimeApplicationChecks.mm; sourceTree = "<group>"; };
</span><span class="cx"> 4671E0631D67A57B00C6B497 /* CanvasPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasPath.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4671E0641D67A57B00C6B497 /* CanvasPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasPath.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -8731,7 +8731,6 @@
</span><span class="cx"> 49C7B9BB1042D32F0009D447 /* WebGLRenderbuffer.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebGLRenderbuffer.idl; sourceTree = "<group>"; };
</span><span class="cx"> 49C7B9BC1042D32F0009D447 /* CanvasRenderingContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasRenderingContext.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 49C7B9BD1042D32F0009D447 /* CanvasRenderingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasRenderingContext.h; sourceTree = "<group>"; };
</span><del>- 49C7B9BE1042D32F0009D447 /* CanvasRenderingContext.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CanvasRenderingContext.idl; sourceTree = "<group>"; };
</del><span class="cx"> 49C7B9BF1042D32F0009D447 /* WebGLRenderingContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebGLRenderingContext.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 49C7B9C01042D32F0009D447 /* WebGLRenderingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGLRenderingContext.h; sourceTree = "<group>"; };
</span><span class="cx"> 49C7B9C11042D32F0009D447 /* WebGLRenderingContext.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebGLRenderingContext.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -8772,7 +8771,6 @@
</span><span class="cx"> 49ECEB641499790D00CDD3A4 /* FilterOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilterOperation.h; sourceTree = "<group>"; };
</span><span class="cx"> 49ECEB651499790D00CDD3A4 /* FilterOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FilterOperations.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 49ECEB661499790D00CDD3A4 /* FilterOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilterOperations.h; sourceTree = "<group>"; };
</span><del>- 49EED13C1051969400099FAB /* JSCanvasRenderingContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCanvasRenderingContext.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 49EED13D1051969400099FAB /* JSCanvasRenderingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCanvasRenderingContext.h; sourceTree = "<group>"; };
</span><span class="cx"> 49EED13E1051969400099FAB /* JSCanvasRenderingContext2D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCanvasRenderingContext2D.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 49EED13F1051969400099FAB /* JSCanvasRenderingContext2D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCanvasRenderingContext2D.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -8780,7 +8778,6 @@
</span><span class="cx"> 49EED1411051969400099FAB /* JSWebGLRenderingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLRenderingContext.h; sourceTree = "<group>"; };
</span><span class="cx"> 49EED14B1051971900099FAB /* JSCanvasRenderingContext2DCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCanvasRenderingContext2DCustom.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 49EED14C1051971A00099FAB /* JSWebGLRenderingContextCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLRenderingContextCustom.cpp; sourceTree = "<group>"; };
</span><del>- 49EED14D1051971A00099FAB /* JSCanvasRenderingContextCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCanvasRenderingContextCustom.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 49FC7A4F1444AF5F00A5D864 /* DisplayRefreshMonitor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DisplayRefreshMonitor.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 49FFBF1C11C8550E006A7118 /* GraphicsContext3DMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GraphicsContext3DMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 49FFBF3D11C93EE3006A7118 /* WebGLLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGLLayer.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -16057,7 +16054,6 @@
</span><span class="cx"> 49484FB8102CF23C00188DD3 /* CanvasProxy.idl */,
</span><span class="cx"> 49C7B9BC1042D32F0009D447 /* CanvasRenderingContext.cpp */,
</span><span class="cx"> 49C7B9BD1042D32F0009D447 /* CanvasRenderingContext.h */,
</span><del>- 49C7B9BE1042D32F0009D447 /* CanvasRenderingContext.idl */,
</del><span class="cx"> 49484FBC102CF23C00187DD3 /* CanvasRenderingContext2D.cpp */,
</span><span class="cx"> 49484FBD102CF23C00187DD3 /* CanvasRenderingContext2D.h */,
</span><span class="cx"> 49484FBE102CF23C00187DD3 /* CanvasRenderingContext2D.idl */,
</span><span class="lines">@@ -18684,7 +18680,6 @@
</span><span class="cx"> 65DF323509D1DE65000BE325 /* JSCanvasPattern.cpp */,
</span><span class="cx"> 65DF323609D1DE65000BE325 /* JSCanvasPattern.h */,
</span><span class="cx"> 65DF323609D1DE65001BE325 /* JSCanvasProxy.h */,
</span><del>- 49EED13C1051969400099FAB /* JSCanvasRenderingContext.cpp */,
</del><span class="cx"> 49EED13D1051969400099FAB /* JSCanvasRenderingContext.h */,
</span><span class="cx"> 49EED13E1051969400099FAB /* JSCanvasRenderingContext2D.cpp */,
</span><span class="cx"> 49EED13F1051969400099FAB /* JSCanvasRenderingContext2D.h */,
</span><span class="lines">@@ -20915,7 +20910,7 @@
</span><span class="cx"> FD8AA63B1695148E00D2EA68 /* JSBiquadFilterNodeCustom.cpp */,
</span><span class="cx"> 8931DE5A14C44C44000DC9D2 /* JSBlobCustom.cpp */,
</span><span class="cx"> 49EED14B1051971900099FAB /* JSCanvasRenderingContext2DCustom.cpp */,
</span><del>- 49EED14D1051971A00099FAB /* JSCanvasRenderingContextCustom.cpp */,
</del><ins>+ 4659D2701D6B909F0096FD86 /* JSCanvasRenderingContext.h */,
</ins><span class="cx"> 7C33F3581B4A044800502CAF /* JSCharacterDataCustom.cpp */,
</span><span class="cx"> 46A58AC41D46B3FA00432036 /* JSClientRectCustom.cpp */,
</span><span class="cx"> A584FE371864DAC100843B10 /* JSCommandLineAPIHostCustom.cpp */,
</span><span class="lines">@@ -24950,6 +24945,7 @@
</span><span class="cx"> FD23A12613F5FA5900F67001 /* JSMediaElementAudioSourceNode.h in Headers */,
</span><span class="cx"> E44614190CD6826900FADA75 /* JSMediaError.h in Headers */,
</span><span class="cx"> BC3C39B70C0D3D8D005F4D7A /* JSMediaList.h in Headers */,
</span><ins>+ 4659D2711D6B90A50096FD86 /* JSCanvasRenderingContext.h in Headers */,
</ins><span class="cx"> 93D437A31D57B7E200AB85EA /* JSMediaListCustom.h in Headers */,
</span><span class="cx"> D3A94A47122DC40F00A37BBC /* JSMediaQueryList.h in Headers */,
</span><span class="cx"> 7C5343FD17B74B63004232F0 /* JSMediaQueryListListener.h in Headers */,
</span><span class="lines">@@ -28297,10 +28293,8 @@
</span><span class="cx"> 1449E287107D4DB400B5793F /* JSCallbackData.cpp in Sources */,
</span><span class="cx"> 65DF323909D1DE65000BE325 /* JSCanvasGradient.cpp in Sources */,
</span><span class="cx"> 65DF323B09D1DE65000BE325 /* JSCanvasPattern.cpp in Sources */,
</span><del>- 49EED1421051969400099FAB /* JSCanvasRenderingContext.cpp in Sources */,
</del><span class="cx"> 49EED1441051969400099FAB /* JSCanvasRenderingContext2D.cpp in Sources */,
</span><span class="cx"> 49EED14E1051971A00099FAB /* JSCanvasRenderingContext2DCustom.cpp in Sources */,
</span><del>- 49EED1501051971A00099FAB /* JSCanvasRenderingContextCustom.cpp in Sources */,
</del><span class="cx"> 93F9B7A00BA6032600854064 /* JSCDATASection.cpp in Sources */,
</span><span class="cx"> FDA15EA112B03EE1003A583A /* JSChannelMergerNode.cpp in Sources */,
</span><span class="cx"> FDA15EA312B03EE1003A583A /* JSChannelSplitterNode.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> #include "JSCSSValueCustom.cpp"
</span><span class="cx"> #include "JSCallbackData.cpp"
</span><span class="cx"> #include "JSCanvasRenderingContext2DCustom.cpp"
</span><del>-#include "JSCanvasRenderingContextCustom.cpp"
</del><span class="cx"> #include "JSCharacterDataCustom.cpp"
</span><span class="cx"> #include "JSClientRectCustom.cpp"
</span><span class="cx"> #include "JSCommandLineAPIHostCustom.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCanvasRenderingContexthfromrev204831trunkSourceWebCorebindingsjsJSCanvasRenderingContextCustomcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/bindings/js/JSCanvasRenderingContext.h (from rev 204831, trunk/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp) (0 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCanvasRenderingContext.h (rev 0)
+++ trunk/Source/WebCore/bindings/js/JSCanvasRenderingContext.h 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+/*
+ * Copyright (C) 2015-2016 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 INC. ``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 INC. OR
+ * 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.
+ */
+
+#pragma once
+
+#include "CanvasRenderingContext2D.h"
+#include "JSCanvasRenderingContext2D.h"
+
+#if ENABLE(WEBGL)
+#include "JSWebGL2RenderingContext.h"
+#include "JSWebGLRenderingContext.h"
+#include "WebGL2RenderingContext.h"
+#include "WebGLRenderingContext.h"
+#endif
+
+namespace WebCore {
+
+inline JSC::JSValue toJS(JSC::ExecState* state, JSDOMGlobalObject* globalObject, CanvasRenderingContext& object)
+{
+#if ENABLE(WEBGL)
+ if (is<WebGLRenderingContext>(object))
+ return wrap(state, globalObject, downcast<WebGLRenderingContext>(object));
+#if ENABLE(WEBGL2)
+ if (is<WebGL2RenderingContext>(object))
+ return wrap(state, globalObject, downcast<WebGL2RenderingContext>(object));
+#endif
+#endif
+ return wrap(state, globalObject, downcast<CanvasRenderingContext2D>(object));
+}
+
+inline JSC::JSValue toJS(JSC::ExecState* state, JSDOMGlobalObject* globalObject, CanvasRenderingContext* object)
+{
+ return object ? toJS(state, globalObject, *object) : JSC::jsNull();
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCanvasRenderingContext2DCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -38,6 +38,18 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+bool JSCanvasRenderingContext2DOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
+{
+ JSCanvasRenderingContext2D* jsCanvasRenderingContext = jsCast<JSCanvasRenderingContext2D*>(handle.slot()->asCell());
+ void* root = WebCore::root(jsCanvasRenderingContext->wrapped().canvas());
+ return visitor.containsOpaqueRoot(root);
+}
+
+void JSCanvasRenderingContext2D::visitAdditionalChildren(SlotVisitor& visitor)
+{
+ visitor.addOpaqueRoot(root(wrapped().canvas()));
+}
+
</ins><span class="cx"> static JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, const CanvasStyle& style)
</span><span class="cx"> {
</span><span class="cx"> if (style.canvasGradient())
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCanvasRenderingContextCustomcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -1,68 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 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 INC. ``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 INC. OR
- * 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"
-#include "JSCanvasRenderingContext.h"
-
-#include "CanvasRenderingContext2D.h"
-#include "HTMLCanvasElement.h"
-#include "JSCanvasRenderingContext2D.h"
-#include "JSNode.h"
-
-#if ENABLE(WEBGL)
-#include "JSWebGL2RenderingContext.h"
-#include "JSWebGLRenderingContext.h"
-#include "WebGL2RenderingContext.h"
-#include "WebGLRenderingContext.h"
-#endif
-
-using namespace JSC;
-
-namespace WebCore {
-
-void JSCanvasRenderingContext::visitAdditionalChildren(SlotVisitor& visitor)
-{
- visitor.addOpaqueRoot(root(wrapped().canvas()));
-}
-
-JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject* globalObject, Ref<CanvasRenderingContext>&& object)
-{
-#if ENABLE(WEBGL)
- if (is<WebGLRenderingContext>(object))
- return CREATE_DOM_WRAPPER(globalObject, WebGLRenderingContext, WTFMove(object));
-#if ENABLE(WEBGL2)
- if (is<WebGL2RenderingContext>(object))
- return CREATE_DOM_WRAPPER(globalObject, WebGL2RenderingContext, WTFMove(object));
-#endif
-#endif
- return CREATE_DOM_WRAPPER(globalObject, CanvasRenderingContext2D, WTFMove(object));
-}
-
-JSValue toJS(ExecState* state, JSDOMGlobalObject* globalObject, CanvasRenderingContext& object)
-{
- return wrap(state, globalObject, object);
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDocumentCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -24,7 +24,9 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "HTMLDocument.h"
</span><ins>+#include "JSCanvasRenderingContext.h"
</ins><span class="cx"> #include "JSCanvasRenderingContext2D.h"
</span><ins>+#include "JSDOMConvert.h"
</ins><span class="cx"> #include "JSDOMWindowCustom.h"
</span><span class="cx"> #include "JSHTMLDocument.h"
</span><span class="cx"> #include "JSLocation.h"
</span><span class="lines">@@ -141,6 +143,25 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+JSValue JSDocument::getCSSCanvasContext(JSC::ExecState& state)
+{
+ if (UNLIKELY(state.argumentCount() < 4))
+ return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
+ auto contextId = state.uncheckedArgument(0).toWTFString(&state);
+ if (UNLIKELY(state.hadException()))
+ return jsUndefined();
+ auto name = state.uncheckedArgument(1).toWTFString(&state);
+ if (UNLIKELY(state.hadException()))
+ return jsUndefined();
+ auto width = convert<int32_t>(state, state.uncheckedArgument(2), NormalConversion);
+ if (UNLIKELY(state.hadException()))
+ return jsUndefined();
+ auto height = convert<int32_t>(state, state.uncheckedArgument(3), NormalConversion);
+ if (UNLIKELY(state.hadException()))
+ return jsUndefined();
+ return toJS(&state, globalObject(), wrapped().getCSSCanvasContext(WTFMove(contextId), WTFMove(name), WTFMove(width), WTFMove(height)));
+}
+
</ins><span class="cx"> void JSDocument::visitAdditionalChildren(SlotVisitor& visitor)
</span><span class="cx"> {
</span><span class="cx"> visitor.addOpaqueRoot(wrapped().scriptExecutionContext());
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLCanvasElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CanvasContextAttributes.h"
</span><span class="cx"> #include "HTMLCanvasElement.h"
</span><ins>+#include "JSCanvasRenderingContext.h"
</ins><span class="cx"> #include "JSCanvasRenderingContext2D.h"
</span><span class="cx"> #include <bindings/ScriptObject.h>
</span><span class="cx"> #include <wtf/GetPtr.h>
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -3538,10 +3538,6 @@
</span><span class="cx"> $rootString .= " if (!element)\n";
</span><span class="cx"> $rootString .= " return false;\n";
</span><span class="cx"> $rootString .= " void* root = WebCore::root(element);\n";
</span><del>- } elsif ($interfaceName eq "CanvasRenderingContext") {
- $implIncludes{"Element.h"} = 1;
- $implIncludes{"JSNodeCustom.h"} = 1;
- $rootString = " void* root = WebCore::root(js${interfaceName}->wrapped().canvas());\n";
</del><span class="cx"> } elsif (GetGenerateIsReachable($interface) eq "ImplOwnerNodeRoot") {
</span><span class="cx"> $implIncludes{"Element.h"} = 1;
</span><span class="cx"> $implIncludes{"JSNodeCustom.h"} = 1;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.idl (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.idl 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/dom/Document.idl 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -171,7 +171,8 @@
</span><span class="cx"> CSSStyleDeclaration createCSSStyleDeclaration();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- CanvasRenderingContext getCSSCanvasContext(DOMString contextId, DOMString name, long width, long height);
</del><ins>+ // FIXME: This is not standard and has been dropped from Blink already.
+ [Custom] (CanvasRenderingContext2D or WebGLRenderingContextBase) getCSSCanvasContext(DOMString contextId, DOMString name, long width, long height);
</ins><span class="cx">
</span><span class="cx"> HTMLCollection getElementsByClassName(DOMString classNames);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContextidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/html/canvas/CanvasRenderingContext.idl (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext.idl 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext.idl 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -1,34 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 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 INC. ``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 INC. OR
- * 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,
- JSCustomMarkFunction,
- GenerateIsReachable,
- CustomToJSObject
-] interface CanvasRenderingContext {
- readonly attribute HTMLCanvasElement canvas;
-};
-
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Didl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -26,8 +26,15 @@
</span><span class="cx"> enum ImageSmoothingQuality { "low", "medium", "high" };
</span><span class="cx"> enum CanvasWindingRule { "nonzero", "evenodd" };
</span><span class="cx">
</span><del>-interface CanvasRenderingContext2D : CanvasRenderingContext {
</del><ins>+[
+ CustomIsReachable,
+ JSGenerateToJSObject,
+ JSCustomMarkFunction,
+] interface CanvasRenderingContext2D {
</ins><span class="cx">
</span><ins>+ // back-reference to the canvas
+ readonly attribute HTMLCanvasElement canvas;
+
</ins><span class="cx"> void save();
</span><span class="cx"> void restore();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGL2RenderingContextidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> Conditional=WEBGL2,
</span><span class="cx"> EnabledAtRuntime=WebGL2,
</span><span class="cx"> JSCustomMarkFunction,
</span><ins>+ JSGenerateToJSObject,
</ins><span class="cx"> DoNotCheckConstants,
</span><span class="cx"> ] interface WebGL2RenderingContext : WebGLRenderingContextBase {
</span><span class="cx"> const GLenum READ_BUFFER = 0x0C02;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.idl (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.idl 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.idl 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> [
</span><span class="cx"> Conditional=WEBGL,
</span><span class="cx"> JSCustomMarkFunction,
</span><ins>+ JSGenerateToJSObject,
</ins><span class="cx"> DoNotCheckConstants,
</span><span class="cx"> ] interface WebGLRenderingContext : WebGLRenderingContextBase {
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl (204838 => 204839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl 2016-08-23 15:26:10 UTC (rev 204838)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl 2016-08-23 15:34:09 UTC (rev 204839)
</span><span class="lines">@@ -43,8 +43,11 @@
</span><span class="cx"> DoNotCheckConstants,
</span><span class="cx"> JSCustomMarkFunction,
</span><span class="cx"> NoInterfaceObject,
</span><del>-] interface WebGLRenderingContextBase : CanvasRenderingContext {
</del><ins>+] interface WebGLRenderingContextBase {
</ins><span class="cx">
</span><ins>+ // back-reference to the canvas
+ readonly attribute HTMLCanvasElement canvas;
+
</ins><span class="cx"> /* ClearBufferMask */
</span><span class="cx"> const GLenum DEPTH_BUFFER_BIT = 0x00000100;
</span><span class="cx"> const GLenum STENCIL_BUFFER_BIT = 0x00000400;
</span></span></pre>
</div>
</div>
</body>
</html>