<!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>[151749] branches/dfgFourthTier/Source/JavaScriptCore</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/151749">151749</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2013-06-19 13:09:33 -0700 (Wed, 19 Jun 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Refactor ObjCCallbackFunction to inherit directly from InternalFunction
https://bugs.webkit.org/show_bug.cgi?id=117595

Reviewed by Geoffrey Garen.

* API/APICallbackFunction.h: Added. New struct that allows JSCallbackFunction and 
ObjCCallbackFunction to share their host call() implementation through the magic of 
templates.
(JSC::APICallbackFunction::call):
* API/JSCallbackFunction.cpp:
(JSC::JSCallbackFunction::getCallData): Changed to get the template-ized version of 
the host function.
* API/JSCallbackFunction.h:
* API/ObjCCallbackFunction.h: Now inherits directly from InternalFunction.
* API/ObjCCallbackFunction.mm:
(JSC::ObjCCallbackFunction::ObjCCallbackFunction):
(JSC::ObjCCallbackFunction::getCallData): Ditto.
* GNUmakefile.list.am: Build files!
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.xcodeproj/project.pbxproj:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreAPIJSCallbackFunctioncpp">branches/dfgFourthTier/Source/JavaScriptCore/API/JSCallbackFunction.cpp</a></li>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreAPIJSCallbackFunctionh">branches/dfgFourthTier/Source/JavaScriptCore/API/JSCallbackFunction.h</a></li>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreAPIObjCCallbackFunctionh">branches/dfgFourthTier/Source/JavaScriptCore/API/ObjCCallbackFunction.h</a></li>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreAPIObjCCallbackFunctionmm">branches/dfgFourthTier/Source/JavaScriptCore/API/ObjCCallbackFunction.mm</a></li>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreChangeLog">branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreGNUmakefilelistam">branches/dfgFourthTier/Source/JavaScriptCore/GNUmakefile.list.am</a></li>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">branches/dfgFourthTier/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">branches/dfgFourthTier/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">branches/dfgFourthTier/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreAPIAPICallbackFunctionh">branches/dfgFourthTier/Source/JavaScriptCore/API/APICallbackFunction.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesdfgFourthTierSourceJavaScriptCoreAPIAPICallbackFunctionh"></a>
<div class="addfile"><h4>Added: branches/dfgFourthTier/Source/JavaScriptCore/API/APICallbackFunction.h (0 => 151749)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/API/APICallbackFunction.h                                (rev 0)
+++ branches/dfgFourthTier/Source/JavaScriptCore/API/APICallbackFunction.h        2013-06-19 20:09:33 UTC (rev 151749)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+/*
+ * Copyright (C) 2013 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. 
+ */
+
+#ifndef APICallbackFunction_h
+#define APICallbackFunction_h
+
+#include &quot;APICast.h&quot;
+#include &quot;APIShims.h&quot;
+#include &quot;Error.h&quot;
+#include &lt;wtf/Vector.h&gt;
+
+namespace JSC {
+
+struct APICallbackFunction {
+
+template &lt;typename T&gt; static EncodedJSValue JSC_HOST_CALL call(ExecState*);
+
+};
+
+template &lt;typename T&gt;
+EncodedJSValue APICallbackFunction::call(ExecState* exec)
+{
+    JSContextRef execRef = toRef(exec);
+    JSObjectRef functionRef = toRef(exec-&gt;callee());
+    JSObjectRef thisObjRef = toRef(jsCast&lt;JSObject*&gt;(exec-&gt;hostThisValue().toThis(exec, NotStrictMode)));
+
+    int argumentCount = static_cast&lt;int&gt;(exec-&gt;argumentCount());
+    Vector&lt;JSValueRef, 16&gt; arguments(argumentCount);
+    for (int i = 0; i &lt; argumentCount; i++)
+        arguments[i] = toRef(exec, exec-&gt;argument(i));
+
+    JSValueRef exception = 0;
+    JSValueRef result;
+    {
+        APICallbackShim callbackShim(exec);
+        result = jsCast&lt;T*&gt;(toJS(functionRef))-&gt;m_callback(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), &amp;exception);
+    }
+    if (exception)
+        throwError(exec, toJS(exec, exception));
+
+    // result must be a valid JSValue.
+    if (!result)
+        return JSValue::encode(jsUndefined());
+
+    return JSValue::encode(toJS(exec, result));
+}
+} // namespace JSC
+
+#endif // APICallbackFunction_h
</ins></span></pre></div>
<a id="branchesdfgFourthTierSourceJavaScriptCoreAPIJSCallbackFunctioncpp"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/API/JSCallbackFunction.cpp (151748 => 151749)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/API/JSCallbackFunction.cpp        2013-06-19 20:05:33 UTC (rev 151748)
+++ branches/dfgFourthTier/Source/JavaScriptCore/API/JSCallbackFunction.cpp        2013-06-19 20:09:33 UTC (rev 151749)
</span><span class="lines">@@ -26,8 +26,9 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;JSCallbackFunction.h&quot;
</span><span class="cx"> 
</span><del>-#include &quot;APIShims.h&quot;
</del><ins>+#include &quot;APICallbackFunction.h&quot;
</ins><span class="cx"> #include &quot;APICast.h&quot;
</span><ins>+#include &quot;APIShims.h&quot;
</ins><span class="cx"> #include &quot;CodeBlock.h&quot;
</span><span class="cx"> #include &quot;Error.h&quot;
</span><span class="cx"> #include &quot;ExceptionHelpers.h&quot;
</span><span class="lines">@@ -63,36 +64,9 @@
</span><span class="cx">     return function;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-EncodedJSValue JSCallbackFunction::call(ExecState* exec)
-{
-    JSContextRef execRef = toRef(exec);
-    JSObjectRef functionRef = toRef(exec-&gt;callee());
-    JSObjectRef thisObjRef = toRef(jsCast&lt;JSObject*&gt;(exec-&gt;hostThisValue().toThis(exec, NotStrictMode)));
-
-    int argumentCount = static_cast&lt;int&gt;(exec-&gt;argumentCount());
-    Vector&lt;JSValueRef, 16&gt; arguments(argumentCount);
-    for (int i = 0; i &lt; argumentCount; i++)
-        arguments[i] = toRef(exec, exec-&gt;argument(i));
-
-    JSValueRef exception = 0;
-    JSValueRef result;
-    {
-        APICallbackShim callbackShim(exec);
-        result = jsCast&lt;JSCallbackFunction*&gt;(toJS(functionRef))-&gt;m_callback(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), &amp;exception);
-    }
-    if (exception)
-        throwError(exec, toJS(exec, exception));
-
-    // result must be a valid JSValue.
-    if (!result)
-        return JSValue::encode(jsUndefined());
-
-    return JSValue::encode(toJS(exec, result));
-}
-
</del><span class="cx"> CallType JSCallbackFunction::getCallData(JSCell*, CallData&amp; callData)
</span><span class="cx"> {
</span><del>-    callData.native.function = call;
</del><ins>+    callData.native.function = APICallbackFunction::call&lt;JSCallbackFunction&gt;;
</ins><span class="cx">     return CallTypeHost;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchesdfgFourthTierSourceJavaScriptCoreAPIJSCallbackFunctionh"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/API/JSCallbackFunction.h (151748 => 151749)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/API/JSCallbackFunction.h        2013-06-19 20:05:33 UTC (rev 151748)
+++ branches/dfgFourthTier/Source/JavaScriptCore/API/JSCallbackFunction.h        2013-06-19 20:09:33 UTC (rev 151749)
</span><span class="lines">@@ -32,10 +32,7 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span><span class="cx"> class JSCallbackFunction : public InternalFunction {
</span><del>-protected:
-    JSCallbackFunction(JSGlobalObject*, Structure*, JSObjectCallAsFunctionCallback);
-    void finishCreation(VM&amp;, const String&amp; name);
-
</del><ins>+    friend struct APICallbackFunction;
</ins><span class="cx"> public:
</span><span class="cx">     typedef InternalFunction Base;
</span><span class="cx"> 
</span><span class="lines">@@ -50,12 +47,12 @@
</span><span class="cx">         return Structure::create(vm, globalObject, proto, TypeInfo(ObjectType, StructureFlags), &amp;s_info); 
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-protected:
-    static CallType getCallData(JSCell*, CallData&amp;);
-
</del><span class="cx"> private:
</span><del>-    static EncodedJSValue JSC_HOST_CALL call(ExecState*);
</del><ins>+    JSCallbackFunction(JSGlobalObject*, Structure*, JSObjectCallAsFunctionCallback);
+    void finishCreation(VM&amp;, const String&amp; name);
</ins><span class="cx"> 
</span><ins>+    static CallType getCallData(JSCell*, CallData&amp;);
+
</ins><span class="cx">     JSObjectCallAsFunctionCallback m_callback;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchesdfgFourthTierSourceJavaScriptCoreAPIObjCCallbackFunctionh"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/API/ObjCCallbackFunction.h (151748 => 151749)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/API/ObjCCallbackFunction.h        2013-06-19 20:05:33 UTC (rev 151748)
+++ branches/dfgFourthTier/Source/JavaScriptCore/API/ObjCCallbackFunction.h        2013-06-19 20:09:33 UTC (rev 151749)
</span><span class="lines">@@ -42,9 +42,10 @@
</span><span class="cx"> 
</span><span class="cx"> class ObjCCallbackFunctionImpl;
</span><span class="cx"> 
</span><del>-class ObjCCallbackFunction : public JSCallbackFunction {
</del><ins>+class ObjCCallbackFunction : public InternalFunction {
+    friend struct APICallbackFunction;
</ins><span class="cx"> public:
</span><del>-    typedef JSCallbackFunction Base;
</del><ins>+    typedef InternalFunction Base;
</ins><span class="cx"> 
</span><span class="cx">     static ObjCCallbackFunction* create(ExecState*, JSGlobalObject*, const String&amp; name, PassOwnPtr&lt;ObjCCallbackFunctionImpl&gt;);
</span><span class="cx">     static void destroy(JSCell*);
</span><span class="lines">@@ -63,6 +64,9 @@
</span><span class="cx">     ObjCCallbackFunction(JSGlobalObject*, JSObjectCallAsFunctionCallback, PassOwnPtr&lt;ObjCCallbackFunctionImpl&gt;);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><ins>+    static CallType getCallData(JSCell*, CallData&amp;);
+
+    JSObjectCallAsFunctionCallback m_callback;
</ins><span class="cx">     OwnPtr&lt;ObjCCallbackFunctionImpl&gt; m_impl;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchesdfgFourthTierSourceJavaScriptCoreAPIObjCCallbackFunctionmm"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/API/ObjCCallbackFunction.mm (151748 => 151749)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/API/ObjCCallbackFunction.mm        2013-06-19 20:05:33 UTC (rev 151748)
+++ branches/dfgFourthTier/Source/JavaScriptCore/API/ObjCCallbackFunction.mm        2013-06-19 20:09:33 UTC (rev 151749)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if JSC_OBJC_API_ENABLED
</span><span class="cx"> 
</span><ins>+#import &quot;APICallbackFunction.h&quot;
</ins><span class="cx"> #import &quot;APICast.h&quot;
</span><span class="cx"> #import &quot;APIShims.h&quot;
</span><span class="cx"> #import &quot;Error.h&quot;
</span><span class="lines">@@ -469,7 +470,8 @@
</span><span class="cx"> const JSC::ClassInfo ObjCCallbackFunction::s_info = { &quot;CallbackFunction&quot;, &amp;Base::s_info, 0, 0, CREATE_METHOD_TABLE(ObjCCallbackFunction) };
</span><span class="cx"> 
</span><span class="cx"> ObjCCallbackFunction::ObjCCallbackFunction(JSC::JSGlobalObject* globalObject, JSObjectCallAsFunctionCallback callback, PassOwnPtr&lt;ObjCCallbackFunctionImpl&gt; impl)
</span><del>-    : Base(globalObject, globalObject-&gt;objcCallbackFunctionStructure(), callback)
</del><ins>+    : Base(globalObject, globalObject-&gt;objcCallbackFunctionStructure())
+    , m_callback(callback)
</ins><span class="cx">     , m_impl(impl)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -486,6 +488,12 @@
</span><span class="cx">     static_cast&lt;ObjCCallbackFunction*&gt;(cell)-&gt;ObjCCallbackFunction::~ObjCCallbackFunction();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+CallType ObjCCallbackFunction::getCallData(JSCell*, CallData&amp; callData)
+{
+    callData.native.function = APICallbackFunction::call&lt;ObjCCallbackFunction&gt;;
+    return CallTypeHost;
+}
+
</ins><span class="cx"> JSValueRef ObjCCallbackFunctionImpl::call(JSContext *context, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span><span class="cx"> {
</span><span class="cx">     JSGlobalContextRef contextRef = [context globalContextRef];
</span></span></pre></div>
<a id="branchesdfgFourthTierSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog (151748 => 151749)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog        2013-06-19 20:05:33 UTC (rev 151748)
+++ branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog        2013-06-19 20:09:33 UTC (rev 151749)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2013-06-19  Mark Hahnenberg  &lt;mhahnenberg@apple.com&gt;
+
+        Refactor ObjCCallbackFunction to inherit directly from InternalFunction
+        https://bugs.webkit.org/show_bug.cgi?id=117595
+
+        Reviewed by Geoffrey Garen.
+
+        * API/APICallbackFunction.h: Added. New struct that allows JSCallbackFunction and 
+        ObjCCallbackFunction to share their host call() implementation through the magic of 
+        templates.
+        (JSC::APICallbackFunction::call):
+        * API/JSCallbackFunction.cpp:
+        (JSC::JSCallbackFunction::getCallData): Changed to get the template-ized version of 
+        the host function.
+        * API/JSCallbackFunction.h:
+        * API/ObjCCallbackFunction.h: Now inherits directly from InternalFunction.
+        * API/ObjCCallbackFunction.mm:
+        (JSC::ObjCCallbackFunction::ObjCCallbackFunction):
+        (JSC::ObjCCallbackFunction::getCallData): Ditto.
+        * GNUmakefile.list.am: Build files!
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2013-06-19  Michael Saboff  &lt;msaboff@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         fourthTier: Arity fixup should be done while on same stack
</span></span></pre></div>
<a id="branchesdfgFourthTierSourceJavaScriptCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/GNUmakefile.list.am (151748 => 151749)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/GNUmakefile.list.am        2013-06-19 20:05:33 UTC (rev 151748)
+++ branches/dfgFourthTier/Source/JavaScriptCore/GNUmakefile.list.am        2013-06-19 20:09:33 UTC (rev 151749)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">         DerivedSources/JavaScriptCore/LLIntAssembly.h
</span><span class="cx"> 
</span><span class="cx"> javascriptcore_sources += \
</span><ins>+    Source/JavaScriptCore/API/APICallbackFunction.h \
</ins><span class="cx">         Source/JavaScriptCore/API/APICast.h \
</span><span class="cx">         Source/JavaScriptCore/API/APIShims.h \
</span><span class="cx">     Source/JavaScriptCore/API/JSAPIWrapperObject.cpp \
</span></span></pre></div>
<a id="branchesdfgFourthTierSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (151748 => 151749)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj        2013-06-19 20:05:33 UTC (rev 151748)
+++ branches/dfgFourthTier/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj        2013-06-19 20:09:33 UTC (rev 151749)
</span><span class="lines">@@ -401,6 +401,7 @@
</span><span class="cx">     &lt;ClInclude Include=&quot;$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\StringConstructor.lut.h&quot; /&gt;
</span><span class="cx">   &lt;/ItemGroup&gt;
</span><span class="cx">   &lt;ItemGroup&gt;
</span><ins>+    &lt;ClInclude Include=&quot;..\API\APICallbackFunction.h&quot; /&gt;
</ins><span class="cx">     &lt;ClInclude Include=&quot;..\API\APICast.h&quot; /&gt;
</span><span class="cx">     &lt;ClInclude Include=&quot;..\API\JavaScript.h&quot; /&gt;
</span><span class="cx">     &lt;ClInclude Include=&quot;..\API\JavaScriptCore.h&quot; /&gt;
</span><span class="lines">@@ -792,4 +793,4 @@
</span><span class="cx">   &lt;Import Project=&quot;$(VCTargetsPath)\Microsoft.Cpp.targets&quot; /&gt;
</span><span class="cx">   &lt;ImportGroup Label=&quot;ExtensionTargets&quot;&gt;
</span><span class="cx">   &lt;/ImportGroup&gt;
</span><del>-&lt;/Project&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+&lt;/Project&gt;
</ins></span></pre></div>
<a id="branchesdfgFourthTierSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (151748 => 151749)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters        2013-06-19 20:05:33 UTC (rev 151748)
+++ branches/dfgFourthTier/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters        2013-06-19 20:09:33 UTC (rev 151749)
</span><span class="lines">@@ -764,6 +764,9 @@
</span><span class="cx">     &lt;/ClCompile&gt;
</span><span class="cx">   &lt;/ItemGroup&gt;
</span><span class="cx">   &lt;ItemGroup&gt;
</span><ins>+    &lt;ClInclude Include=&quot;..\API\APICallbackFunction.h&quot;&gt;
+      &lt;Filter&gt;API&lt;/Filter&gt;
+    &lt;/ClInclude&gt;
</ins><span class="cx">     &lt;ClInclude Include=&quot;..\API\APICast.h&quot;&gt;
</span><span class="cx">       &lt;Filter&gt;API&lt;/Filter&gt;
</span><span class="cx">     &lt;/ClInclude&gt;
</span><span class="lines">@@ -1939,4 +1942,4 @@
</span><span class="cx">     &lt;None Include=&quot;JavaScriptCorePreBuild.cmd&quot; /&gt;
</span><span class="cx">     &lt;None Include=&quot;copy-files.cmd&quot; /&gt;
</span><span class="cx">   &lt;/ItemGroup&gt;
</span><del>-&lt;/Project&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+&lt;/Project&gt;
</ins></span></pre></div>
<a id="branchesdfgFourthTierSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (151748 => 151749)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj        2013-06-19 20:05:33 UTC (rev 151748)
+++ branches/dfgFourthTier/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj        2013-06-19 20:09:33 UTC (rev 151749)
</span><span class="lines">@@ -598,6 +598,7 @@
</span><span class="cx">                 14F97447138C853E00DA1C67 /* HeapRootVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F97446138C853E00DA1C67 /* HeapRootVisitor.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 2600B5A6152BAAA70091EE5F /* JSStringJoiner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2600B5A4152BAAA70091EE5F /* JSStringJoiner.cpp */; };
</span><span class="cx">                 2600B5A7152BAAA70091EE5F /* JSStringJoiner.h in Headers */ = {isa = PBXBuildFile; fileRef = 2600B5A5152BAAA70091EE5F /* JSStringJoiner.h */; };
</span><ins>+                2A48D1911772365B00C65A5F /* APICallbackFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = C211B574176A224D000E2A23 /* APICallbackFunction.h */; };
</ins><span class="cx">                 41359CF30FDD89AD00206180 /* DateConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = D21202290AD4310C00ED79B6 /* DateConversion.h */; };
</span><span class="cx">                 4443AE3316E188D90076F110 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51F0EB6105C86C6B00E6DF1B /* Foundation.framework */; };
</span><span class="cx">                 451539B912DC994500EF7AC4 /* Yarr.h in Headers */ = {isa = PBXBuildFile; fileRef = 451539B812DC994500EF7AC4 /* Yarr.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -1917,6 +1918,7 @@
</span><span class="cx">                 C21122DE15DD9AB300790E3A /* GCThreadSharedData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GCThreadSharedData.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 C21122DF15DD9AB300790E3A /* GCThreadSharedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCThreadSharedData.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 C21122E015DD9AB300790E3A /* MarkStackInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkStackInlines.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><ins>+                C211B574176A224D000E2A23 /* APICallbackFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APICallbackFunction.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</ins><span class="cx">                 C218D13F1655CFD50062BB81 /* CopyWorkList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CopyWorkList.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 C2239D1216262BDD005AC5FD /* CopyVisitor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CopyVisitor.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 C2239D1316262BDD005AC5FD /* CopyVisitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CopyVisitor.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -2446,6 +2448,7 @@
</span><span class="cx">                 1432EBD70A34CAD400717B9F /* API */ = {
</span><span class="cx">                         isa = PBXGroup;
</span><span class="cx">                         children = (
</span><ins>+                                C211B574176A224D000E2A23 /* APICallbackFunction.h */,
</ins><span class="cx">                                 1482B78A0A4305AB00517CFC /* APICast.h */,
</span><span class="cx">                                 865F408710E7D56300947361 /* APIShims.h */,
</span><span class="cx">                                 1CAA8B4A0D32C39A0041BCFF /* JavaScript.h */,
</span><span class="lines">@@ -3722,6 +3725,7 @@
</span><span class="cx">                                 7E4EE7090EBB7963005934AA /* StructureChain.h in Headers */,
</span><span class="cx">                                 C2FE18A416BAEC4000AF3061 /* StructureRareData.h in Headers */,
</span><span class="cx">                                 C20BA92D16BB1C1500B3AEA2 /* StructureRareDataInlines.h in Headers */,
</span><ins>+                                2A48D1911772365B00C65A5F /* APICallbackFunction.h in Headers */,
</ins><span class="cx">                                 0F9332A514CA7DDD0085F3C6 /* StructureSet.h in Headers */,
</span><span class="cx">                                 0F766D3915AE4A1F008F363E /* StructureStubClearingWatchpoint.h in Headers */,
</span><span class="cx">                                 BCCF0D080EF0AAB900413C8F /* StructureStubInfo.h in Headers */,
</span></span></pre>
</div>
</div>

</body>
</html>