<!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>[188905] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/188905">188905</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-08-25 03:11:14 -0700 (Tue, 25 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of custom bindings for RequestAnimationFrameCallback.handleEvent()
https://bugs.webkit.org/show_bug.cgi?id=148417
Reviewed by Sam Weinig.
Get rid of custom bindings for RequestAnimationFrameCallback.handleEvent()
by improving the bindings generator. In this case, the problem was that the
bindings generator did not know how to convert a double parameter into a
JSValue. The new code leverages the pre-existing NativeToJSValue subroutine
to do the conversion instead of duplicating complex support here.
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSRequestAnimationFrameCallbackCustom.cpp: Removed.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateCallbackImplementation):
* bindings/scripts/test/JS/JSTestCallback.cpp:
(WebCore::JSTestCallback::callbackWithArrayParam):
(WebCore::JSTestCallback::callbackWithSerializedScriptValueParam):
(WebCore::JSTestCallback::callbackWithStringList):
(WebCore::JSTestCallback::callbackWithBoolean):
(WebCore::JSTestCallback::callbackRequiresThisToPass):
* dom/RequestAnimationFrameCallback.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp">trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp</a></li>
<li><a href="#trunkSourceWebCoredomRequestAnimationFrameCallbackidl">trunk/Source/WebCore/dom/RequestAnimationFrameCallback.idl</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsjsJSRequestAnimationFrameCallbackCustomcpp">trunk/Source/WebCore/bindings/js/JSRequestAnimationFrameCallbackCustom.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (188904 => 188905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-08-25 05:31:49 UTC (rev 188904)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-25 10:11:14 UTC (rev 188905)
</span><span class="lines">@@ -1170,7 +1170,6 @@
</span><span class="cx"> bindings/js/JSReadableStreamControllerCustom.cpp
</span><span class="cx"> bindings/js/JSReadableStreamCustom.cpp
</span><span class="cx"> bindings/js/JSReadableStreamReaderCustom.cpp
</span><del>- bindings/js/JSRequestAnimationFrameCallbackCustom.cpp
</del><span class="cx"> bindings/js/JSSQLResultSetRowListCustom.cpp
</span><span class="cx"> bindings/js/JSSQLTransactionCustom.cpp
</span><span class="cx"> bindings/js/JSSVGLengthCustom.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188904 => 188905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-25 05:31:49 UTC (rev 188904)
+++ trunk/Source/WebCore/ChangeLog 2015-08-25 10:11:14 UTC (rev 188905)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-08-25 Chris Dumez <cdumez@apple.com>
+
+ Get rid of custom bindings for RequestAnimationFrameCallback.handleEvent()
+ https://bugs.webkit.org/show_bug.cgi?id=148417
+
+ Reviewed by Sam Weinig.
+
+ Get rid of custom bindings for RequestAnimationFrameCallback.handleEvent()
+ by improving the bindings generator. In this case, the problem was that the
+ bindings generator did not know how to convert a double parameter into a
+ JSValue. The new code leverages the pre-existing NativeToJSValue subroutine
+ to do the conversion instead of duplicating complex support here.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSRequestAnimationFrameCallbackCustom.cpp: Removed.
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateCallbackImplementation):
+ * bindings/scripts/test/JS/JSTestCallback.cpp:
+ (WebCore::JSTestCallback::callbackWithArrayParam):
+ (WebCore::JSTestCallback::callbackWithSerializedScriptValueParam):
+ (WebCore::JSTestCallback::callbackWithStringList):
+ (WebCore::JSTestCallback::callbackWithBoolean):
+ (WebCore::JSTestCallback::callbackRequiresThisToPass):
+ * dom/RequestAnimationFrameCallback.idl:
+
</ins><span class="cx"> 2015-08-24 Jinyoung Hur <hur.ims@navercorp.com>
</span><span class="cx">
</span><span class="cx"> Clear cairo-gl surface for initialization
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (188904 => 188905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-08-25 05:31:49 UTC (rev 188904)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-08-25 10:11:14 UTC (rev 188905)
</span><span class="lines">@@ -18605,20 +18605,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\JSRequestAnimationFrameCallbackCustom.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\bindings\js\JSSQLResultSetRowListCustom.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (188904 => 188905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-08-25 05:31:49 UTC (rev 188904)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-08-25 10:11:14 UTC (rev 188905)
</span><span class="lines">@@ -4431,9 +4431,6 @@
</span><span class="cx"> <ClCompile Include="..\bindings\js\ReadableJSStream.cpp">
</span><span class="cx"> <Filter>bindings\js</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\JSRequestAnimationFrameCallbackCustom.cpp">
- <Filter>bindings\js</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\bindings\js\JSSQLResultSetRowListCustom.cpp">
</span><span class="cx"> <Filter>bindings\js</Filter>
</span><span class="cx"> </ClCompile>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (188904 => 188905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-25 05:31:49 UTC (rev 188904)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-25 10:11:14 UTC (rev 188905)
</span><span class="lines">@@ -1738,7 +1738,6 @@
</span><span class="cx"> 4998AECE13F9D6C90090B1AA /* JSRequestAnimationFrameCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 4998AECC13F9D6C90090B1AA /* JSRequestAnimationFrameCallback.h */; };
</span><span class="cx"> 4998AED113FB224D0090B1AA /* ScriptedAnimationController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4998AECF13FB224D0090B1AA /* ScriptedAnimationController.cpp */; };
</span><span class="cx"> 4998AED213FB224D0090B1AA /* ScriptedAnimationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4998AED013FB224D0090B1AA /* ScriptedAnimationController.h */; };
</span><del>- 4998AED413FC417F0090B1AA /* JSRequestAnimationFrameCallbackCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4998AED313FC417F0090B1AA /* JSRequestAnimationFrameCallbackCustom.cpp */; };
</del><span class="cx"> 499B3EC5128CCC4700E726C2 /* PlatformCALayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 499B3EC3128CCC4700E726C2 /* PlatformCALayer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 499B3ED6128CD31400E726C2 /* GraphicsLayerCA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 499B3ED4128CD31400E726C2 /* GraphicsLayerCA.cpp */; };
</span><span class="cx"> 499B3ED7128CD31400E726C2 /* GraphicsLayerCA.h in Headers */ = {isa = PBXBuildFile; fileRef = 499B3ED5128CD31400E726C2 /* GraphicsLayerCA.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -8994,7 +8993,6 @@
</span><span class="cx"> 4998AECC13F9D6C90090B1AA /* JSRequestAnimationFrameCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRequestAnimationFrameCallback.h; sourceTree = "<group>"; };
</span><span class="cx"> 4998AECF13FB224D0090B1AA /* ScriptedAnimationController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptedAnimationController.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4998AED013FB224D0090B1AA /* ScriptedAnimationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptedAnimationController.h; sourceTree = "<group>"; };
</span><del>- 4998AED313FC417F0090B1AA /* JSRequestAnimationFrameCallbackCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRequestAnimationFrameCallbackCustom.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 499B3EC3128CCC4700E726C2 /* PlatformCALayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformCALayer.h; sourceTree = "<group>"; };
</span><span class="cx"> 499B3ED4128CD31400E726C2 /* GraphicsLayerCA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsLayerCA.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 499B3ED5128CD31400E726C2 /* GraphicsLayerCA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsLayerCA.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -21579,7 +21577,6 @@
</span><span class="cx"> A85F22081430377D007CC884 /* JSPopStateEventCustom.cpp */,
</span><span class="cx"> 41A023F31A39DBCB00F722CF /* JSReadableStreamCustom.cpp */,
</span><span class="cx"> 419FAFB01ABABD7B005B828B /* JSReadableStreamReaderCustom.cpp */,
</span><del>- 4998AED313FC417F0090B1AA /* JSRequestAnimationFrameCallbackCustom.cpp */,
</del><span class="cx"> 4AE0BF881836083100F3852D /* JSRTCIceCandidateCustom.cpp */,
</span><span class="cx"> 07CA120D182D67D800D12197 /* JSRTCPeerConnectionCustom.cpp */,
</span><span class="cx"> 07D07B131834158800ABDD3C /* JSRTCSessionDescriptionCustom.cpp */,
</span><span class="lines">@@ -29290,7 +29287,6 @@
</span><span class="cx"> 419FAFB11ABABDED005B828B /* JSReadableStreamReaderCustom.cpp in Sources */,
</span><span class="cx"> BCFE2F110C1B58370020235F /* JSRect.cpp in Sources */,
</span><span class="cx"> 4998AECD13F9D6C90090B1AA /* JSRequestAnimationFrameCallback.cpp in Sources */,
</span><del>- 4998AED413FC417F0090B1AA /* JSRequestAnimationFrameCallbackCustom.cpp in Sources */,
</del><span class="cx"> BC74DA481013F468007987AD /* JSRGBColor.cpp in Sources */,
</span><span class="cx"> 073794E519EE2FF200E5A045 /* JSRTCConfiguration.cpp in Sources */,
</span><span class="cx"> 07969DAB17D14151007FF842 /* JSRTCDataChannel.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (188904 => 188905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2015-08-25 05:31:49 UTC (rev 188904)
+++ trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2015-08-25 10:11:14 UTC (rev 188905)
</span><span class="lines">@@ -127,7 +127,6 @@
</span><span class="cx"> #include "JSReadableStreamReaderCustom.cpp"
</span><span class="cx"> #include "ReadableJSStream.cpp"
</span><span class="cx"> #endif
</span><del>-#include "JSRequestAnimationFrameCallbackCustom.cpp"
</del><span class="cx"> #include "JSSQLResultSetRowListCustom.cpp"
</span><span class="cx"> #include "JSSQLTransactionCustom.cpp"
</span><span class="cx"> #include "JSSVGLengthCustom.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSRequestAnimationFrameCallbackCustomcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/JSRequestAnimationFrameCallbackCustom.cpp (188904 => 188905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSRequestAnimationFrameCallbackCustom.cpp 2015-08-25 05:31:49 UTC (rev 188904)
+++ trunk/Source/WebCore/bindings/js/JSRequestAnimationFrameCallbackCustom.cpp 2015-08-25 10:11:14 UTC (rev 188905)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 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. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-
-#include "JSRequestAnimationFrameCallback.h"
-
-using namespace JSC;
-
-namespace WebCore {
-
-bool JSRequestAnimationFrameCallback::handleEvent(double highResNowMs)
-{
- if (!canInvokeCallback())
- return true;
-
- Ref<JSRequestAnimationFrameCallback> protect(*this);
-
- JSLockHolder lock(m_data->globalObject()->vm());
-
- MarkedArgumentBuffer args;
- args.append(jsNumber(highResNowMs));
-
- bool raisedException = false;
- m_data->invokeCallback(args, &raisedException);
- return !raisedException;
-}
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (188904 => 188905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-08-25 05:31:49 UTC (rev 188904)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-08-25 10:11:14 UTC (rev 188905)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> # Copyright (C) 2006 Anders Carlsson <andersca@mac.com>
</span><span class="cx"> # Copyright (C) 2006, 2007 Samuel Weinig <sam@webkit.org>
</span><span class="cx"> # Copyright (C) 2006 Alexey Proskuryakov <ap@webkit.org>
</span><del>-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2006, 2007-2010, 2013-2105 Apple Inc. All rights reserved.
</ins><span class="cx"> # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
</span><span class="cx"> # Copyright (C) Research In Motion Limited 2010. All rights reserved.
</span><span class="cx"> # Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
</span><span class="lines">@@ -3590,20 +3590,13 @@
</span><span class="cx"> push(@implContent, " JSLockHolder lock(m_data->globalObject()->vm());\n\n");
</span><span class="cx"> if (@params) {
</span><span class="cx"> push(@implContent, " ExecState* exec = m_data->globalObject()->globalExec();\n");
</span><ins>+ push(@implContent, " UNUSED_PARAM(exec);\n");
</ins><span class="cx"> }
</span><span class="cx"> push(@implContent, " MarkedArgumentBuffer args;\n");
</span><span class="cx">
</span><span class="cx"> foreach my $param (@params) {
</span><span class="cx"> my $paramName = $param->name;
</span><del>- if ($param->type eq "DOMString") {
- push(@implContent, " args.append(jsStringWithCache(exec, ${paramName}));\n");
- } elsif ($param->type eq "boolean") {
- push(@implContent, " args.append(jsBoolean(${paramName}));\n");
- } elsif ($param->type eq "SerializedScriptValue") {
- push(@implContent, " args.append($paramName ? $paramName->deserialize(exec, m_data->globalObject(), 0) : jsNull());\n");
- } else {
- push(@implContent, " args.append(toJS(exec, m_data->globalObject(), ${paramName}));\n");
- }
</del><ins>+ push(@implContent, " args.append(" . NativeToJSValue($param, 1, $interfaceName, $paramName, "m_data") . ");\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> push(@implContent, "\n bool raisedException = false;\n");
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp (188904 => 188905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp 2015-08-25 05:31:49 UTC (rev 188904)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp 2015-08-25 10:11:14 UTC (rev 188905)
</span><span class="lines">@@ -24,11 +24,15 @@
</span><span class="cx">
</span><span class="cx"> #include "JSTestCallback.h"
</span><span class="cx">
</span><ins>+#include "DOMStringList.h"
</ins><span class="cx"> #include "JSDOMStringList.h"
</span><span class="cx"> #include "JSTestNode.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "SerializedScriptValue.h"
</span><ins>+#include "TestNode.h"
+#include "URL.h"
</ins><span class="cx"> #include <runtime/JSLock.h>
</span><ins>+#include <runtime/JSString.h>
</ins><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="lines">@@ -84,8 +88,9 @@
</span><span class="cx"> JSLockHolder lock(m_data->globalObject()->vm());
</span><span class="cx">
</span><span class="cx"> ExecState* exec = m_data->globalObject()->globalExec();
</span><ins>+ UNUSED_PARAM(exec);
</ins><span class="cx"> MarkedArgumentBuffer args;
</span><del>- args.append(toJS(exec, m_data->globalObject(), arrayParam));
</del><ins>+ args.append(toJS(exec, m_data->globalObject(), WTF::getPtr(arrayParam)));
</ins><span class="cx">
</span><span class="cx"> bool raisedException = false;
</span><span class="cx"> m_data->invokeCallback(args, &raisedException);
</span><span class="lines">@@ -102,8 +107,9 @@
</span><span class="cx"> JSLockHolder lock(m_data->globalObject()->vm());
</span><span class="cx">
</span><span class="cx"> ExecState* exec = m_data->globalObject()->globalExec();
</span><ins>+ UNUSED_PARAM(exec);
</ins><span class="cx"> MarkedArgumentBuffer args;
</span><del>- args.append(srzParam ? srzParam->deserialize(exec, m_data->globalObject(), 0) : jsNull());
</del><ins>+ args.append(srzParam ? srzParam->deserialize(exec, castedThis->globalObject(), 0) : jsNull());
</ins><span class="cx"> args.append(jsStringWithCache(exec, strArg));
</span><span class="cx">
</span><span class="cx"> bool raisedException = false;
</span><span class="lines">@@ -121,8 +127,9 @@
</span><span class="cx"> JSLockHolder lock(m_data->globalObject()->vm());
</span><span class="cx">
</span><span class="cx"> ExecState* exec = m_data->globalObject()->globalExec();
</span><ins>+ UNUSED_PARAM(exec);
</ins><span class="cx"> MarkedArgumentBuffer args;
</span><del>- args.append(toJS(exec, m_data->globalObject(), listParam));
</del><ins>+ args.append(toJS(exec, m_data->globalObject(), WTF::getPtr(listParam)));
</ins><span class="cx">
</span><span class="cx"> bool raisedException = false;
</span><span class="cx"> m_data->invokeCallback(args, &raisedException);
</span><span class="lines">@@ -139,6 +146,7 @@
</span><span class="cx"> JSLockHolder lock(m_data->globalObject()->vm());
</span><span class="cx">
</span><span class="cx"> ExecState* exec = m_data->globalObject()->globalExec();
</span><ins>+ UNUSED_PARAM(exec);
</ins><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(jsBoolean(boolParam));
</span><span class="cx">
</span><span class="lines">@@ -157,9 +165,10 @@
</span><span class="cx"> JSLockHolder lock(m_data->globalObject()->vm());
</span><span class="cx">
</span><span class="cx"> ExecState* exec = m_data->globalObject()->globalExec();
</span><ins>+ UNUSED_PARAM(exec);
</ins><span class="cx"> MarkedArgumentBuffer args;
</span><del>- args.append(toJS(exec, m_data->globalObject(), longParam));
- args.append(toJS(exec, m_data->globalObject(), testNodeParam));
</del><ins>+ args.append(jsNumber(longParam));
+ args.append(toJS(exec, m_data->globalObject(), WTF::getPtr(testNodeParam)));
</ins><span class="cx">
</span><span class="cx"> bool raisedException = false;
</span><span class="cx"> m_data->invokeCallback(args, &raisedException);
</span></span></pre></div>
<a id="trunkSourceWebCoredomRequestAnimationFrameCallbackidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/RequestAnimationFrameCallback.idl (188904 => 188905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/RequestAnimationFrameCallback.idl 2015-08-25 05:31:49 UTC (rev 188904)
+++ trunk/Source/WebCore/dom/RequestAnimationFrameCallback.idl 2015-08-25 10:11:14 UTC (rev 188905)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> Conditional=REQUEST_ANIMATION_FRAME,
</span><del>-] callback interface RequestAnimationFrameCallback{
</del><ins>+] callback interface RequestAnimationFrameCallback {
</ins><span class="cx"> // highResTime is passed as high resolution timestamp, see
</span><span class="cx"> // http://www.w3.org/TR/hr-time/ for details.
</span><del>- [Custom] boolean handleEvent(unrestricted double highResTime);
</del><ins>+ boolean handleEvent(unrestricted double highResTime);
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>