<!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>[210025] 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/210025">210025</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2016-12-20 10:52:56 -0800 (Tue, 20 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[DataCue] Un-prefix DataCue and remove custom bindings
https://bugs.webkit.org/show_bug.cgi?id=166087
Reviewed by Eric Carlson.
Source/WebCore:
* CMakeLists.txt:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSBindingsAllInOne.cpp:
* bindings/js/JSDataCueCustom.cpp: Removed.
Remove JSDataCueCustom.cpp
* bindings/js/JSTextTrackCueCustom.cpp:
(WebCore::toJSNewlyCreated):
Remove out of date comment.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateConstructorDefinition):
Update constructor generation code to use JSDOMConvert.
* html/track/DataCue.cpp:
(WebCore::DataCue::DataCue):
(WebCore::DataCue::~DataCue):
(WebCore::DataCue::data):
(WebCore::DataCue::setData):
(WebCore::DataCue::cueContentsMatch):
(WebCore::DataCue::value):
(WebCore::DataCue::setValue):
(WebCore::DataCue::valueOrNull):
* html/track/DataCue.h:
* html/track/DataCue.idl:
* platform/SerializedPlatformRepresentation.h:
Remove DATACUE_VALUE define from web exposed classes, so the interface can
be the same on all platforms. Platforms that don't support DATACUE_VALUE will
just never have any value. Also remove custom annotations.
LayoutTests:
* media/track/track-datacue-value-expected.txt:
* media/track/track-datacue-value.html:
* platform/mac/js/dom/global-constructors-attributes-expected.txt:
Update tests for unprefixed DataCue.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackdatacuevalueexpectedtxt">trunk/LayoutTests/media/track/track-datacue-value-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackdatacuevaluehtml">trunk/LayoutTests/media/track/track-datacue-value.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-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="#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="#trunkSourceWebCorebindingsjsJSTextTrackCueCustomcpp">trunk/Source/WebCore/bindings/js/JSTextTrackCueCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestEventConstructorcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNamedConstructorcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNodecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorsWithSequencecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackDataCuecpp">trunk/Source/WebCore/html/track/DataCue.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackDataCueh">trunk/Source/WebCore/html/track/DataCue.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackDataCueidl">trunk/Source/WebCore/html/track/DataCue.idl</a></li>
<li><a href="#trunkSourceWebCoreplatformSerializedPlatformRepresentationh">trunk/Source/WebCore/platform/SerializedPlatformRepresentation.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsjsJSDataCueCustomcpp">trunk/Source/WebCore/bindings/js/JSDataCueCustom.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/LayoutTests/ChangeLog 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-12-20 Sam Weinig <sam@webkit.org>
+
+ [DataCue] Un-prefix DataCue and remove custom bindings
+ https://bugs.webkit.org/show_bug.cgi?id=166087
+
+ Reviewed by Eric Carlson.
+
+ * media/track/track-datacue-value-expected.txt:
+ * media/track/track-datacue-value.html:
+ * platform/mac/js/dom/global-constructors-attributes-expected.txt:
+ Update tests for unprefixed DataCue.
+
</ins><span class="cx"> 2016-12-20 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement the updated port/area-based Scroll Snap Module Level 1 Spec
</span></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackdatacuevalueexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-datacue-value-expected.txt (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-datacue-value-expected.txt 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/LayoutTests/media/track/track-datacue-value-expected.txt 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><del>-Tests WebKitDataCue.value
</del><ins>+Tests DataCue.value
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> *** Initialize with string.
</span><del>-RUN(cue = new WebKitDataCue(2, 6, 'test'))
</del><ins>+RUN(cue = new DataCue(2, 6, 'test'))
</ins><span class="cx"> EXPECTED (cue.id == '') OK
</span><span class="cx"> EXPECTED (cue.startTime == '2') OK
</span><span class="cx"> EXPECTED (cue.endTime == '6') OK
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> EXPECTED (cue.type == '') OK
</span><span class="cx">
</span><span class="cx"> *** Initialize with an object.
</span><del>-RUN(cue = new WebKitDataCue(9, 16, { data: [1, 2, 3] }, 'org.test'))
</del><ins>+RUN(cue = new DataCue(9, 16, { data: [1, 2, 3] }, 'org.test'))
</ins><span class="cx"> EXPECTED (cue.id == '') OK
</span><span class="cx"> EXPECTED (cue.startTime == '9') OK
</span><span class="cx"> EXPECTED (cue.endTime == '16') OK
</span></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackdatacuevaluehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-datacue-value.html (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-datacue-value.html 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/LayoutTests/media/track/track-datacue-value.html 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> function loaded()
</span><span class="cx"> {
</span><span class="cx"> consoleWrite("<br>*** Initialize with string.");
</span><del>- run("cue = new WebKitDataCue(2, 6, 'test')");
</del><ins>+ run("cue = new DataCue(2, 6, 'test')");
</ins><span class="cx"> testExpected("cue.id", "");
</span><span class="cx"> testExpected("cue.startTime", 2);
</span><span class="cx"> testExpected("cue.endTime", 6);
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> testExpected("cue.type", '');
</span><span class="cx">
</span><span class="cx"> consoleWrite("<br>*** Initialize with an object.");
</span><del>- run("cue = new WebKitDataCue(9, 16, { data: [1, 2, 3] }, 'org.test')");
</del><ins>+ run("cue = new DataCue(9, 16, { data: [1, 2, 3] }, 'org.test')");
</ins><span class="cx"> testExpected("cue.id", "");
</span><span class="cx"> testExpected("cue.startTime", 9);
</span><span class="cx"> testExpected("cue.endTime", 16);
</span><span class="lines">@@ -45,6 +45,6 @@
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body onload="loaded()">
</span><del>- <p>Tests WebKitDataCue.value</p>
</del><ins>+ <p>Tests DataCue.value</p>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -373,6 +373,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DOMTokenList').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DOMTokenList').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DOMTokenList').configurable is true
</span><ins>+PASS Object.getOwnPropertyDescriptor(global, 'DataCue').value is DataCue
+PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('set') is false
</span><span class="lines">@@ -2393,11 +2398,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSRegionRule').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSRegionRule').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSRegionRule').configurable is true
</span><del>-PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').value is WebKitDataCue
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').configurable is true
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyError').value is WebKitMediaKeyError
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyError').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyError').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -1119,7 +1119,6 @@
</span><span class="cx"> bindings/js/JSDOMWindowProperties.cpp
</span><span class="cx"> bindings/js/JSDOMWindowShell.cpp
</span><span class="cx"> bindings/js/JSDOMWrapper.cpp
</span><del>- bindings/js/JSDataCueCustom.cpp
</del><span class="cx"> bindings/js/JSDeviceMotionEventCustom.cpp
</span><span class="cx"> bindings/js/JSDeviceOrientationEventCustom.cpp
</span><span class="cx"> bindings/js/JSDocumentCustom.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/ChangeLog 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-12-20 Sam Weinig <sam@webkit.org>
+
+ [DataCue] Un-prefix DataCue and remove custom bindings
+ https://bugs.webkit.org/show_bug.cgi?id=166087
+
+ Reviewed by Eric Carlson.
+
+ * CMakeLists.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSBindingsAllInOne.cpp:
+ * bindings/js/JSDataCueCustom.cpp: Removed.
+ Remove JSDataCueCustom.cpp
+
+ * bindings/js/JSTextTrackCueCustom.cpp:
+ (WebCore::toJSNewlyCreated):
+ Remove out of date comment.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateConstructorDefinition):
+ Update constructor generation code to use JSDOMConvert.
+
+ * html/track/DataCue.cpp:
+ (WebCore::DataCue::DataCue):
+ (WebCore::DataCue::~DataCue):
+ (WebCore::DataCue::data):
+ (WebCore::DataCue::setData):
+ (WebCore::DataCue::cueContentsMatch):
+ (WebCore::DataCue::value):
+ (WebCore::DataCue::setValue):
+ (WebCore::DataCue::valueOrNull):
+ * html/track/DataCue.h:
+ * html/track/DataCue.idl:
+ * platform/SerializedPlatformRepresentation.h:
+ Remove DATACUE_VALUE define from web exposed classes, so the interface can
+ be the same on all platforms. Platforms that don't support DATACUE_VALUE will
+ just never have any value. Also remove custom annotations.
+
</ins><span class="cx"> 2016-12-20 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement the updated port/area-based Scroll Snap Module Level 1 Spec
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -302,7 +302,6 @@
</span><span class="cx"> 07F0B97C1AC5DB4600E535D9 /* AVFoundationSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 07F0B97B1AC5DB4600E535D9 /* AVFoundationSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 07F876841AD580F900905849 /* MediaPlaybackTargetContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 07F876831AD4A94500905849 /* MediaPlaybackTargetContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 07F944161864D046005D31CB /* PlatformMediaSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAE8C081746B95700532D78 /* PlatformMediaSessionManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 07FBDE2C18FED178001A7CFF /* JSDataCueCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07FBDE2B18FED178001A7CFF /* JSDataCueCustom.cpp */; };
</del><span class="cx"> 07FE99DC18807A7D00256648 /* MediaElementSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07FE99DA18807A7D00256648 /* MediaElementSession.cpp */; };
</span><span class="cx"> 07FE99DD18807A7D00256648 /* MediaElementSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 07FE99DB18807A7D00256648 /* MediaElementSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 07FFDE68181AED420072D409 /* MediaStreamTrackPrivate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07FFDE66181AED420072D409 /* MediaStreamTrackPrivate.cpp */; };
</span><span class="lines">@@ -7289,7 +7288,6 @@
</span><span class="cx"> 07F0B9791AC5DB3300E535D9 /* AVKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVKitSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> 07F0B97B1AC5DB4600E535D9 /* AVFoundationSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVFoundationSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> 07F876831AD4A94500905849 /* MediaPlaybackTargetContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlaybackTargetContext.h; sourceTree = "<group>"; };
</span><del>- 07FBDE2B18FED178001A7CFF /* JSDataCueCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDataCueCustom.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 07FE99DA18807A7D00256648 /* MediaElementSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaElementSession.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07FE99DB18807A7D00256648 /* MediaElementSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaElementSession.h; sourceTree = "<group>"; };
</span><span class="cx"> 07FFDE66181AED420072D409 /* MediaStreamTrackPrivate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamTrackPrivate.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -22129,7 +22127,6 @@
</span><span class="cx"> AD726FEA16D9F40B003A4E6D /* JSCSSStyleDeclarationCustom.h */,
</span><span class="cx"> 9BC5F9DF1D5AAF6A002B749D /* JSCustomElementRegistryCustom.cpp */,
</span><span class="cx"> DEC2975D1B4DEB2A005F5945 /* JSCustomEventCustom.cpp */,
</span><del>- 07FBDE2B18FED178001A7CFF /* JSDataCueCustom.cpp */,
</del><span class="cx"> 31FB1A6B120A5D6900DC02A0 /* JSDeviceMotionEventCustom.cpp */,
</span><span class="cx"> 590E1B4A11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp */,
</span><span class="cx"> 49C7BA8C1042F5B10009D447 /* JSDocumentCustom.cpp */,
</span><span class="lines">@@ -29902,7 +29899,6 @@
</span><span class="cx"> 1AE82F8F0CAAFA9D002237AE /* JSDatabase.cpp in Sources */,
</span><span class="cx"> B59DD69A119029E5007E9684 /* JSDatabaseCallback.cpp in Sources */,
</span><span class="cx"> BE61039D18A9D65200DD50D7 /* JSDataCue.cpp in Sources */,
</span><del>- 07FBDE2C18FED178001A7CFF /* JSDataCueCustom.cpp in Sources */,
</del><span class="cx"> BCA83E4F0D7CE1E9003421A8 /* JSDataTransfer.cpp in Sources */,
</span><span class="cx"> 4162A4571011464700DFF3ED /* JSDedicatedWorkerGlobalScope.cpp in Sources */,
</span><span class="cx"> FDA15ED112B03F94003A583A /* JSDelayNode.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx"> #include "JSDOMWindowProperties.cpp"
</span><span class="cx"> #include "JSDOMWindowShell.cpp"
</span><span class="cx"> #include "JSDOMWrapper.cpp"
</span><del>-#include "JSDataCueCustom.cpp"
</del><span class="cx"> #include "JSDeviceOrientationEventCustom.cpp"
</span><span class="cx"> #include "JSDocumentCustom.cpp"
</span><span class="cx"> #include "JSDocumentFragmentCustom.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDataCueCustomcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/JSDataCueCustom.cpp (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDataCueCustom.cpp 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/bindings/js/JSDataCueCustom.cpp 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -1,106 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014, 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.
- */
-
-#include "config.h"
-
-#if ENABLE(VIDEO_TRACK)
-
-#include "JSDataCue.h"
-
-#include "JSDOMBinding.h"
-
-using namespace JSC;
-
-namespace WebCore {
-
-#if ENABLE(DATACUE_VALUE)
-JSValue JSDataCue::value(ExecState& state) const
-{
- return wrapped().value(&state);
-}
-
-void JSDataCue::setValue(ExecState& state, JSValue value)
-{
- wrapped().setValue(&state, value);
-}
-#endif
-
-EncodedJSValue JSC_HOST_CALL constructJSDataCue(ExecState& exec)
-{
- VM& vm = exec.vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
-
- DOMConstructorObject* castedThis = jsCast<DOMConstructorObject*>(exec.jsCallee());
- ASSERT(castedThis);
- if (exec.argumentCount() < 3)
- return throwVMError(&exec, scope, createNotEnoughArgumentsError(&exec));
-
- double startTime(exec.uncheckedArgument(0).toNumber(&exec));
- RETURN_IF_EXCEPTION(scope, encodedJSValue());
-
- double endTime(exec.uncheckedArgument(1).toNumber(&exec));
- RETURN_IF_EXCEPTION(scope, encodedJSValue());
-
- ScriptExecutionContext* context = castedThis->scriptExecutionContext();
- if (!context)
- return throwConstructorScriptExecutionContextUnavailableError(exec, scope, "DataCue");
-
- String type;
-#if ENABLE(DATACUE_VALUE)
- if (exec.argumentCount() > 3) {
- if (!exec.uncheckedArgument(3).isString())
- return throwArgumentTypeError(exec, scope, 3, "type", "DataCue", nullptr, "DOMString");
- type = asString(exec.uncheckedArgument(3))->value(&exec);
- }
-#endif
-
- JSValue valueArgument = exec.uncheckedArgument(2);
- if (valueArgument.isUndefinedOrNull()) {
- setDOMException(&exec, TypeError);
- return JSValue::encode(JSValue());
- }
-
- if (valueArgument.isCell() && valueArgument.asCell()->inherits(std::remove_pointer<JSArrayBuffer*>::type::info())) {
-
- ArrayBuffer* data = toUnsharedArrayBuffer(valueArgument);
- RETURN_IF_EXCEPTION(scope, encodedJSValue());
-
- if (UNLIKELY(!data)) {
- setDOMException(&exec, TypeError);
- return JSValue::encode(jsUndefined());
- }
- return JSValue::encode(createWrapper<DataCue>(castedThis->globalObject(), DataCue::create(*context, MediaTime::createWithDouble(startTime), MediaTime::createWithDouble(endTime), *data, type)));
- }
-
-#if !ENABLE(DATACUE_VALUE)
- return JSValue::encode(jsUndefined());
-#else
- return JSValue::encode(createWrapper<DataCue>(castedThis->globalObject(), DataCue::create(*context, MediaTime::createWithDouble(startTime), MediaTime::createWithDouble(endTime), valueArgument, type)));
-#endif
-}
-
-} // namespace WebCore
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSTextTrackCueCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSTextTrackCueCustom.cpp (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSTextTrackCueCustom.cpp 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/bindings/js/JSTextTrackCueCustom.cpp 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx">
</span><span class="cx"> JSValue toJSNewlyCreated(ExecState*, JSDOMGlobalObject* globalObject, Ref<TextTrackCue>&& cue)
</span><span class="cx"> {
</span><del>- // This switch will make more sense once we support DataCue
</del><span class="cx"> switch (cue->cueType()) {
</span><span class="cx"> case TextTrackCue::Data:
</span><span class="cx"> return createWrapper<DataCue>(globalObject, WTFMove(cue));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -5884,11 +5884,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> push(@$outputArray, " RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n") if $codeGenerator->ExtendedAttributeContains($interface->extendedAttributes->{ConstructorCallWith}, "ScriptState");
</span><del>- if ($interface->extendedAttributes->{ConstructorMayThrowException}) {
- push(@$outputArray, " return JSValue::encode(toJSNewlyCreated(*state, *castedThis->globalObject(), throwScope, WTFMove(object)));\n");
- } else {
- push(@$outputArray, " return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));\n");
- }
</del><ins>+
+ my $IDLType = GetIDLType($interface, $interface->type);
+
+ my @constructionConversionArguments = ();
+ push(@constructionConversionArguments, "*state");
+ push(@constructionConversionArguments, "*castedThis->globalObject()");
+ push(@constructionConversionArguments, "throwScope") if $interface->extendedAttributes->{ConstructorMayThrowException};
+ push(@constructionConversionArguments, "WTFMove(object)");
+
+ push(@$outputArray, " return JSValue::encode(toJSNewlyCreated<${IDLType}>(" . join(", ", @constructionConversionArguments) . "));\n");
</ins><span class="cx"> push(@$outputArray, "}\n\n");
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestEventConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> auto eventInitDict = convert<IDLDictionary<TestEventConstructor::Init>>(*state, state->argument(1));
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> auto object = TestEventConstructor::create(WTFMove(type), WTFMove(eventInitDict));
</span><del>- return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</del><ins>+ return JSValue::encode(toJSNewlyCreated<IDLInterface<TestEventConstructor>>(*state, *castedThis->globalObject(), WTFMove(object)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> JSValue JSTestEventConstructorConstructor::prototypeForStructure(JSC::VM& vm, const JSDOMGlobalObject& globalObject)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> if (UNLIKELY(!context))
</span><span class="cx"> return throwConstructorScriptExecutionContextUnavailableError(*state, throwScope, "TestInterface");
</span><span class="cx"> auto object = TestInterface::create(*context, WTFMove(str1), WTFMove(str2));
</span><del>- return JSValue::encode(toJSNewlyCreated(*state, *castedThis->globalObject(), throwScope, WTFMove(object)));
</del><ins>+ return JSValue::encode(toJSNewlyCreated<IDLInterface<TestInterface>>(*state, *castedThis->globalObject(), throwScope, WTFMove(object)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> JSValue JSTestInterfaceConstructor::prototypeForStructure(JSC::VM& vm, const JSDOMGlobalObject& globalObject)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNamedConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> auto str3 = state->argument(2).isUndefined() ? String() : convert<IDLDOMString>(*state, state->uncheckedArgument(2), StringConversionConfiguration::Normal);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> auto object = TestNamedConstructor::createForJSConstructor(*castedThis->document(), WTFMove(str1), WTFMove(str2), WTFMove(str3));
</span><del>- return JSValue::encode(toJSNewlyCreated(*state, *castedThis->globalObject(), throwScope, WTFMove(object)));
</del><ins>+ return JSValue::encode(toJSNewlyCreated<IDLInterface<TestNamedConstructor>>(*state, *castedThis->globalObject(), throwScope, WTFMove(object)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> JSValue JSTestNamedConstructorNamedConstructor::prototypeForStructure(JSC::VM& vm, const JSDOMGlobalObject& globalObject)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> auto* castedThis = jsCast<JSTestNodeConstructor*>(state->jsCallee());
</span><span class="cx"> ASSERT(castedThis);
</span><span class="cx"> auto object = TestNode::create();
</span><del>- return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</del><ins>+ return JSValue::encode(toJSNewlyCreated<IDLInterface<TestNode>>(*state, *castedThis->globalObject(), WTFMove(object)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> JSValue JSTestNodeConstructor::prototypeForStructure(JSC::VM& vm, const JSDOMGlobalObject& globalObject)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -1552,7 +1552,7 @@
</span><span class="cx"> ASSERT(context->isDocument());
</span><span class="cx"> auto& document = downcast<Document>(*context);
</span><span class="cx"> auto object = TestObj::create(document, testCallback.releaseNonNull(), testCallbackFunction.releaseNonNull());
</span><del>- return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</del><ins>+ return JSValue::encode(toJSNewlyCreated<IDLInterface<TestObj>>(*state, *castedThis->globalObject(), WTFMove(object)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> JSValue JSTestObjConstructor::prototypeForStructure(JSC::VM& vm, const JSDOMGlobalObject& globalObject)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> auto arrayBuffer = convert<IDLInterface<ArrayBuffer>>(*state, state->uncheckedArgument(0), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentTypeError(state, scope, 0, "arrayBuffer", "TestOverloadedConstructors", nullptr, "ArrayBuffer"); });
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> auto object = TestOverloadedConstructors::create(*arrayBuffer);
</span><del>- return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</del><ins>+ return JSValue::encode(toJSNewlyCreated<IDLInterface<TestOverloadedConstructors>>(*state, *castedThis->globalObject(), WTFMove(object)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline EncodedJSValue constructJSTestOverloadedConstructors2(ExecState* state)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> auto arrayBufferView = convert<IDLInterface<ArrayBufferView>>(*state, state->uncheckedArgument(0), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentTypeError(state, scope, 0, "arrayBufferView", "TestOverloadedConstructors", nullptr, "ArrayBufferView"); });
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> auto object = TestOverloadedConstructors::create(arrayBufferView.releaseNonNull());
</span><del>- return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</del><ins>+ return JSValue::encode(toJSNewlyCreated<IDLInterface<TestOverloadedConstructors>>(*state, *castedThis->globalObject(), WTFMove(object)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline EncodedJSValue constructJSTestOverloadedConstructors3(ExecState* state)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> auto blob = convert<IDLInterface<Blob>>(*state, state->uncheckedArgument(0), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentTypeError(state, scope, 0, "blob", "TestOverloadedConstructors", nullptr, "Blob"); });
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> auto object = TestOverloadedConstructors::create(*blob);
</span><del>- return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</del><ins>+ return JSValue::encode(toJSNewlyCreated<IDLInterface<TestOverloadedConstructors>>(*state, *castedThis->globalObject(), WTFMove(object)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline EncodedJSValue constructJSTestOverloadedConstructors4(ExecState* state)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> auto string = convert<IDLDOMString>(*state, state->uncheckedArgument(0), StringConversionConfiguration::Normal);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> auto object = TestOverloadedConstructors::create(WTFMove(string));
</span><del>- return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</del><ins>+ return JSValue::encode(toJSNewlyCreated<IDLInterface<TestOverloadedConstructors>>(*state, *castedThis->globalObject(), WTFMove(object)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline EncodedJSValue constructJSTestOverloadedConstructors5(ExecState* state)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> auto longArgs = convertVariadicArguments<IDLLong>(*state, 0);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> auto object = TestOverloadedConstructors::create(WTFMove(longArgs));
</span><del>- return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</del><ins>+ return JSValue::encode(toJSNewlyCreated<IDLInterface<TestOverloadedConstructors>>(*state, *castedThis->globalObject(), WTFMove(object)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> EncodedJSValue JSC_HOST_CALL JSTestOverloadedConstructorsConstructor::construct(ExecState* state)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorsWithSequencecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> auto sequenceOfStrings = state->argument(0).isUndefined() ? Converter<IDLSequence<IDLDOMString>>::ReturnType{ } : convert<IDLSequence<IDLDOMString>>(*state, state->uncheckedArgument(0));
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> auto object = TestOverloadedConstructorsWithSequence::create(WTFMove(sequenceOfStrings));
</span><del>- return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</del><ins>+ return JSValue::encode(toJSNewlyCreated<IDLInterface<TestOverloadedConstructorsWithSequence>>(*state, *castedThis->globalObject(), WTFMove(object)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline EncodedJSValue constructJSTestOverloadedConstructorsWithSequence2(ExecState* state)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> auto string = convert<IDLDOMString>(*state, state->uncheckedArgument(0), StringConversionConfiguration::Normal);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> auto object = TestOverloadedConstructorsWithSequence::create(WTFMove(string));
</span><del>- return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</del><ins>+ return JSValue::encode(toJSNewlyCreated<IDLInterface<TestOverloadedConstructorsWithSequence>>(*state, *castedThis->globalObject(), WTFMove(object)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> EncodedJSValue JSC_HOST_CALL JSTestOverloadedConstructorsWithSequenceConstructor::construct(ExecState* state)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> auto testCallbackInterface = convert<IDLCallbackInterface<JSTestCallbackInterface>>(*state, state->uncheckedArgument(2), *castedThis->globalObject(), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentMustBeFunctionError(state, scope, 2, "testCallbackInterface", "TestTypedefs", nullptr); });
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> auto object = TestTypedefs::create(WTFMove(hello), testCallbackFunction.releaseNonNull(), testCallbackInterface.releaseNonNull());
</span><del>- return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</del><ins>+ return JSValue::encode(toJSNewlyCreated<IDLInterface<TestTypedefs>>(*state, *castedThis->globalObject(), WTFMove(object)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> JSValue JSTestTypedefsConstructor::prototypeForStructure(JSC::VM& vm, const JSDOMGlobalObject& globalObject)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackDataCuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/DataCue.cpp (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/DataCue.cpp 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/html/track/DataCue.cpp 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -32,8 +32,11 @@
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "TextTrack.h"
</span><span class="cx"> #include "TextTrackCueList.h"
</span><ins>+#include <runtime/JSCInlines.h>
</ins><span class="cx"> #include <runtime/Protect.h>
</span><span class="cx">
</span><ins>+using namespace JSC;
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> DataCue::DataCue(ScriptExecutionContext& context, const MediaTime& start, const MediaTime& end, ArrayBuffer& data, const String& type)
</span><span class="lines">@@ -45,11 +48,10 @@
</span><span class="cx">
</span><span class="cx"> DataCue::DataCue(ScriptExecutionContext& context, const MediaTime& start, const MediaTime& end, const void* data, unsigned length)
</span><span class="cx"> : TextTrackCue(context, start, end)
</span><ins>+ , m_data(ArrayBuffer::create(data, length))
</ins><span class="cx"> {
</span><del>- m_data = ArrayBuffer::create(data, length);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(DATACUE_VALUE)
</del><span class="cx"> DataCue::DataCue(ScriptExecutionContext& context, const MediaTime& start, const MediaTime& end, RefPtr<SerializedPlatformRepresentation>&& platformValue, const String& type)
</span><span class="cx"> : TextTrackCue(context, start, end)
</span><span class="cx"> , m_type(type)
</span><span class="lines">@@ -65,22 +67,17 @@
</span><span class="cx"> if (m_value)
</span><span class="cx"> JSC::gcProtect(m_value);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> DataCue::~DataCue()
</span><span class="cx"> {
</span><del>-#if ENABLE(DATACUE_VALUE)
</del><span class="cx"> if (m_value)
</span><span class="cx"> JSC::gcUnprotect(m_value);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<ArrayBuffer> DataCue::data() const
</span><span class="cx"> {
</span><del>-#if ENABLE(DATACUE_VALUE)
</del><span class="cx"> if (m_platformValue)
</span><span class="cx"> return m_platformValue->data();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (!m_data)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -90,12 +87,10 @@
</span><span class="cx">
</span><span class="cx"> void DataCue::setData(ArrayBuffer& data)
</span><span class="cx"> {
</span><del>-#if ENABLE(DATACUE_VALUE)
</del><span class="cx"> m_platformValue = nullptr;
</span><span class="cx"> if (m_value)
</span><span class="cx"> JSC::gcUnprotect(m_value);
</span><span class="cx"> m_value = JSC::JSValue();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> m_data = ArrayBuffer::create(data);
</span><span class="cx"> }
</span><span class="lines">@@ -126,7 +121,6 @@
</span><span class="cx"> if (m_data && m_data->data() && memcmp(m_data->data(), otherData->data(), m_data->byteLength()))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if ENABLE(DATACUE_VALUE)
</del><span class="cx"> const SerializedPlatformRepresentation* otherPlatformValue = dataCue->platformValue();
</span><span class="cx"> if ((otherPlatformValue && !m_platformValue) || (!otherPlatformValue && m_platformValue))
</span><span class="cx"> return false;
</span><span class="lines">@@ -133,13 +127,12 @@
</span><span class="cx"> if (m_platformValue && !m_platformValue->isEqual(*otherPlatformValue))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- JSC::JSValue thisValue = value(nullptr);
- JSC::JSValue otherValue = dataCue->value(nullptr);
</del><ins>+ JSC::JSValue thisValue = valueOrNull();
+ JSC::JSValue otherValue = dataCue->valueOrNull();
</ins><span class="cx"> if ((otherValue && !thisValue) || (!otherValue && thisValue))
</span><span class="cx"> return false;
</span><span class="cx"> if (!JSC::JSValue::strictEqual(nullptr, thisValue, otherValue))
</span><span class="cx"> return false;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -163,11 +156,10 @@
</span><span class="cx"> return TextTrackCue::doesExtendCue(cue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(DATACUE_VALUE)
-JSC::JSValue DataCue::value(JSC::ExecState* exec) const
</del><ins>+JSC::JSValue DataCue::value(JSC::ExecState& state) const
</ins><span class="cx"> {
</span><del>- if (exec && m_platformValue)
- return m_platformValue->deserialize(exec);
</del><ins>+ if (m_platformValue)
+ return m_platformValue->deserialize(&state);
</ins><span class="cx">
</span><span class="cx"> if (m_value)
</span><span class="cx"> return m_value;
</span><span class="lines">@@ -175,7 +167,7 @@
</span><span class="cx"> return JSC::jsNull();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DataCue::setValue(JSC::ExecState*, JSC::JSValue value)
</del><ins>+void DataCue::setValue(JSC::ExecState&, JSC::JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: this should use a SerializedScriptValue.
</span><span class="cx"> if (m_value)
</span><span class="lines">@@ -187,8 +179,15 @@
</span><span class="cx"> m_platformValue = nullptr;
</span><span class="cx"> m_data = nullptr;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><ins>+JSValue DataCue::valueOrNull() const
+{
+ if (m_value)
+ return m_value;
+
+ return jsNull();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackDataCueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/DataCue.h (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/DataCue.h 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/html/track/DataCue.h 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -28,15 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx">
</span><ins>+#include "SerializedPlatformRepresentation.h"
</ins><span class="cx"> #include "TextTrackCue.h"
</span><span class="cx"> #include <runtime/ArrayBuffer.h>
</span><del>-#include <runtime/JSCInlines.h>
</del><ins>+#include <runtime/JSCJSValue.h>
</ins><span class="cx"> #include <wtf/MediaTime.h>
</span><span class="cx">
</span><del>-#if ENABLE(DATACUE_VALUE)
-#include "SerializedPlatformRepresentation.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class ScriptExecutionContext;
</span><span class="lines">@@ -58,53 +55,50 @@
</span><span class="cx"> return adoptRef(*new DataCue(context, start, end, data, type));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(DATACUE_VALUE)
</del><span class="cx"> static Ref<DataCue> create(ScriptExecutionContext& context, const MediaTime& start, const MediaTime& end, RefPtr<SerializedPlatformRepresentation>&& platformValue, const String& type)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new DataCue(context, start, end, WTFMove(platformValue), type));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Ref<DataCue> create(ScriptExecutionContext& context, const MediaTime& start, const MediaTime& end, JSC::JSValue value, const String& type)
</del><ins>+ static Ref<DataCue> create(ScriptExecutionContext& context, double start, double end, ArrayBuffer& data)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new DataCue(context, start, end, value, type));
</del><ins>+ return adoptRef(*new DataCue(context, MediaTime::createWithDouble(start), MediaTime::createWithDouble(end), data, emptyString()));
</ins><span class="cx"> }
</span><del>-#endif
</del><ins>+ static Ref<DataCue> create(ScriptExecutionContext& context, double start, double end, JSC::JSValue value, const String& type)
+ {
+ return adoptRef(*new DataCue(context, MediaTime::createWithDouble(start), MediaTime::createWithDouble(end), value, type));
+ }
</ins><span class="cx">
</span><span class="cx"> virtual ~DataCue();
</span><span class="cx"> CueType cueType() const override { return Data; }
</span><span class="cx">
</span><del>- RefPtr<ArrayBuffer> data() const;
- void setData(ArrayBuffer&);
</del><ins>+ RefPtr<JSC::ArrayBuffer> data() const;
+ void setData(JSC::ArrayBuffer&);
</ins><span class="cx">
</span><del>-#if ENABLE(DATACUE_VALUE)
</del><span class="cx"> const SerializedPlatformRepresentation* platformValue() const { return m_platformValue.get(); }
</span><span class="cx">
</span><del>- JSC::JSValue value(JSC::ExecState*) const;
- void setValue(JSC::ExecState*, JSC::JSValue);
</del><ins>+ JSC::JSValue value(JSC::ExecState&) const;
+ void setValue(JSC::ExecState&, JSC::JSValue);
</ins><span class="cx">
</span><span class="cx"> String type() const { return m_type; }
</span><span class="cx"> void setType(const String& type) { m_type = type; }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool isEqual(const TextTrackCue&, CueMatchRules) const override;
</span><span class="cx"> bool cueContentsMatch(const TextTrackCue&) const override;
</span><span class="cx"> bool doesExtendCue(const TextTrackCue&) const override;
</span><span class="cx">
</span><del>-protected:
</del><ins>+private:
</ins><span class="cx"> DataCue(ScriptExecutionContext&, const MediaTime& start, const MediaTime& end, ArrayBuffer&, const String&);
</span><span class="cx"> DataCue(ScriptExecutionContext&, const MediaTime& start, const MediaTime& end, const void*, unsigned);
</span><del>-#if ENABLE(DATACUE_VALUE)
</del><span class="cx"> DataCue(ScriptExecutionContext&, const MediaTime& start, const MediaTime& end, RefPtr<SerializedPlatformRepresentation>&&, const String&);
</span><span class="cx"> DataCue(ScriptExecutionContext&, const MediaTime& start, const MediaTime& end, JSC::JSValue, const String&);
</span><del>-#endif
</del><span class="cx">
</span><del>-private:
</del><ins>+ JSC::JSValue valueOrNull() const;
+
</ins><span class="cx"> RefPtr<ArrayBuffer> m_data;
</span><span class="cx"> String m_type;
</span><del>-#if ENABLE(DATACUE_VALUE)
</del><span class="cx"> RefPtr<SerializedPlatformRepresentation> m_platformValue;
</span><span class="cx"> JSC::JSValue m_value;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> DataCue* toDataCue(TextTrackCue*);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackDataCueidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/DataCue.idl (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/DataCue.idl 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/html/track/DataCue.idl 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -23,21 +23,16 @@
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><ins>+
</ins><span class="cx"> [
</span><span class="cx"> Conditional=VIDEO_TRACK,
</span><del>- CustomConstructor,
-#if defined(ENABLE_DATACUE_VALUE) && ENABLE_DATACUE_VALUE
- CustomConstructor(unrestricted double startTime, unrestricted double endTime, any value, optional DOMString type),
- InterfaceName=WebKitDataCue,
-#else
- CustomConstructor(unrestricted double startTime, unrestricted double endTime, ArrayBuffer data),
-#endif
- ConstructorMayThrowException,
</del><ins>+ Constructor(unrestricted double startTime, unrestricted double endTime, ArrayBuffer data),
+ Constructor(unrestricted double startTime, unrestricted double endTime, any value, optional DOMString type),
+ ConstructorCallWith=ScriptExecutionContext
</ins><span class="cx"> ] interface DataCue : TextTrackCue {
</span><span class="cx"> attribute ArrayBuffer data;
</span><span class="cx">
</span><del>-#if defined(ENABLE_DATACUE_VALUE) && ENABLE_DATACUE_VALUE
- [CustomGetter, CustomSetter] attribute any value;
</del><ins>+ // Proposed extensions.
+ [CallWith=ScriptState] attribute any value;
</ins><span class="cx"> readonly attribute DOMString type;
</span><del>-#endif
</del><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSerializedPlatformRepresentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SerializedPlatformRepresentation.h (210024 => 210025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SerializedPlatformRepresentation.h 2016-12-20 18:44:38 UTC (rev 210024)
+++ trunk/Source/WebCore/platform/SerializedPlatformRepresentation.h 2016-12-20 18:52:56 UTC (rev 210025)
</span><span class="lines">@@ -23,10 +23,9 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef SerializedPlatformRepresentation_h
-#define SerializedPlatformRepresentation_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><del>-#if ENABLE(VIDEO) && ENABLE(DATACUE_VALUE)
</del><ins>+#if ENABLE(VIDEO)
</ins><span class="cx">
</span><span class="cx"> #include <runtime/JSCInlines.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -38,7 +37,7 @@
</span><span class="cx"> virtual ~SerializedPlatformRepresentation() { }
</span><span class="cx">
</span><span class="cx"> virtual JSC::JSValue deserialize(JSC::ExecState*) const = 0;
</span><del>- virtual RefPtr<ArrayBuffer> data() const = 0;
</del><ins>+ virtual RefPtr<JSC::ArrayBuffer> data() const = 0;
</ins><span class="cx"> virtual bool isEqual(const SerializedPlatformRepresentation&) const = 0;
</span><span class="cx">
</span><span class="cx"> enum PlatformType {
</span><span class="lines">@@ -53,5 +52,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-#endif // SerializedPlatformRepresentation_h
-
</del></span></pre>
</div>
</div>
</body>
</html>