<!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>[160208] trunk/Source</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/160208">160208</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2013-12-05 19:03:24 -0800 (Thu, 05 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor static getter function prototype to include thisValue in addition to the base object
https://bugs.webkit.org/show_bug.cgi?id=124461
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Add thisValue parameter to static getter prototype, and switch
from JSValue to EncodedJSValue for parameters and return value.
Currently none of the static getters use the thisValue, but
separating out the refactoring will prevent future changes
from getting lost in the noise of refactoring. This means
that this patch does not result in any change in behaviour.
* API/JSCallbackObject.h:
* API/JSCallbackObjectFunctions.h:
(JSC::::asCallbackObject):
(JSC::::staticFunctionGetter):
(JSC::::callbackGetter):
* jit/JITOperations.cpp:
* runtime/JSActivation.cpp:
(JSC::JSActivation::argumentsGetter):
* runtime/JSActivation.h:
* runtime/JSFunction.cpp:
(JSC::JSFunction::argumentsGetter):
(JSC::JSFunction::callerGetter):
(JSC::JSFunction::lengthGetter):
(JSC::JSFunction::nameGetter):
* runtime/JSFunction.h:
* runtime/JSObject.h:
(JSC::PropertySlot::getValue):
* runtime/NumberConstructor.cpp:
(JSC::numberConstructorNaNValue):
(JSC::numberConstructorNegInfinity):
(JSC::numberConstructorPosInfinity):
(JSC::numberConstructorMaxValue):
(JSC::numberConstructorMinValue):
* runtime/PropertySlot.h:
* runtime/RegExpConstructor.cpp:
(JSC::asRegExpConstructor):
(JSC::regExpConstructorDollar1):
(JSC::regExpConstructorDollar2):
(JSC::regExpConstructorDollar3):
(JSC::regExpConstructorDollar4):
(JSC::regExpConstructorDollar5):
(JSC::regExpConstructorDollar6):
(JSC::regExpConstructorDollar7):
(JSC::regExpConstructorDollar8):
(JSC::regExpConstructorDollar9):
(JSC::regExpConstructorInput):
(JSC::regExpConstructorMultiline):
(JSC::regExpConstructorLastMatch):
(JSC::regExpConstructorLastParen):
(JSC::regExpConstructorLeftContext):
(JSC::regExpConstructorRightContext):
* runtime/RegExpObject.cpp:
(JSC::asRegExpObject):
(JSC::regExpObjectGlobal):
(JSC::regExpObjectIgnoreCase):
(JSC::regExpObjectMultiline):
(JSC::regExpObjectSource):
Source/WebCore:
Change bindings codegen to produce static getter functions
with the correct types. Also update the many custom implementations
to the new type.
No change in behaviour.
* bindings/js/JSCSSStyleDeclarationCustom.cpp:
(WebCore::cssPropertyGetterPixelOrPosPrefixCallback):
(WebCore::cssPropertyGetterCallback):
* bindings/js/JSDOMBinding.cpp:
(WebCore::objectToStringFunctionGetter):
* bindings/js/JSDOMBinding.h:
* bindings/js/JSDOMMimeTypeArrayCustom.cpp:
(WebCore::JSDOMMimeTypeArray::nameGetter):
* bindings/js/JSDOMPluginArrayCustom.cpp:
(WebCore::JSDOMPluginArray::nameGetter):
* bindings/js/JSDOMPluginCustom.cpp:
(WebCore::JSDOMPlugin::nameGetter):
* bindings/js/JSDOMStringMapCustom.cpp:
(WebCore::JSDOMStringMap::nameGetter):
* bindings/js/JSDOMWindowCustom.cpp:
(WebCore::nonCachingStaticFunctionGetter):
(WebCore::childFrameGetter):
(WebCore::indexGetter):
(WebCore::namedItemGetter):
* bindings/js/JSHTMLAllCollectionCustom.cpp:
(WebCore::JSHTMLAllCollection::nameGetter):
* bindings/js/JSHTMLCollectionCustom.cpp:
(WebCore::JSHTMLCollection::nameGetter):
* bindings/js/JSHTMLDocumentCustom.cpp:
(WebCore::JSHTMLDocument::nameGetter):
* bindings/js/JSHTMLFormControlsCollectionCustom.cpp:
(WebCore::JSHTMLFormControlsCollection::nameGetter):
* bindings/js/JSHTMLFormElementCustom.cpp:
(WebCore::JSHTMLFormElement::nameGetter):
* bindings/js/JSHTMLFrameSetElementCustom.cpp:
(WebCore::JSHTMLFrameSetElement::nameGetter):
* bindings/js/JSHistoryCustom.cpp:
(WebCore::nonCachingStaticBackFunctionGetter):
(WebCore::nonCachingStaticForwardFunctionGetter):
(WebCore::nonCachingStaticGoFunctionGetter):
* bindings/js/JSJavaScriptCallFrameCustom.cpp:
(WebCore::JSJavaScriptCallFrame::scopeType):
* bindings/js/JSLocationCustom.cpp:
(WebCore::nonCachingStaticReplaceFunctionGetter):
(WebCore::nonCachingStaticReloadFunctionGetter):
(WebCore::nonCachingStaticAssignFunctionGetter):
* bindings/js/JSNamedNodeMapCustom.cpp:
(WebCore::JSNamedNodeMap::nameGetter):
* bindings/js/JSNodeListCustom.cpp:
(WebCore::JSNodeList::nameGetter):
* bindings/js/JSPluginElementFunctions.cpp:
(WebCore::pluginElementPropertyGetter):
* bindings/js/JSPluginElementFunctions.h:
* bindings/js/JSRTCStatsResponseCustom.cpp:
(WebCore::JSRTCStatsResponse::nameGetter):
* bindings/js/JSStorageCustom.cpp:
(WebCore::JSStorage::nameGetter):
* bindings/js/JSStyleSheetListCustom.cpp:
(WebCore::JSStyleSheetList::nameGetter):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateHeader):
(GenerateImplementation):
(GenerateParametersCheck):
* bridge/runtime_array.cpp:
(JSC::RuntimeArray::lengthGetter):
(JSC::RuntimeArray::indexGetter):
* bridge/runtime_array.h:
* bridge/runtime_method.cpp:
(JSC::RuntimeMethod::lengthGetter):
* bridge/runtime_method.h:
* bridge/runtime_object.cpp:
(JSC::Bindings::RuntimeObject::fallbackObjectGetter):
(JSC::Bindings::RuntimeObject::fieldGetter):
(JSC::Bindings::RuntimeObject::methodGetter):
* bridge/runtime_object.h:
Source/WebKit2:
Update the WK2 JSC usage to the new static getter API
* WebProcess/Plugins/Netscape/JSNPMethod.cpp:
(WebKit::callMethod):
* WebProcess/Plugins/Netscape/JSNPObject.cpp:
(WebKit::callNPJSObject):
(WebKit::constructWithConstructor):
(WebKit::JSNPObject::propertyGetter):
(WebKit::JSNPObject::methodGetter):
* WebProcess/Plugins/Netscape/JSNPObject.h:
* WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:
(WebKit::NPRuntimeObjectMap::getOrCreateNPObject):
(WebKit::NPRuntimeObjectMap::finalize):
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::frameForContext):
(WebKit::WebFrame::counterValue):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSCallbackObjecth">trunk/Source/JavaScriptCore/API/JSCallbackObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSCallbackObjectFunctionsh">trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOperationscpp">trunk/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSActivationcpp">trunk/Source/JavaScriptCore/runtime/JSActivation.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSActivationh">trunk/Source/JavaScriptCore/runtime/JSActivation.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSFunctionh">trunk/Source/JavaScriptCore/runtime/JSFunction.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeNumberConstructorcpp">trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePropertySloth">trunk/Source/JavaScriptCore/runtime/PropertySlot.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpConstructorcpp">trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpObjectcpp">trunk/Source/JavaScriptCore/runtime/RegExpObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingcpp">trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingh">trunk/Source/WebCore/bindings/js/JSDOMBinding.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMMimeTypeArrayCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMMimeTypeArrayCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMPluginArrayCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMPluginArrayCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMPluginCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMPluginCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMStringMapCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLAllCollectionCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLCollectionCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLDocumentCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLFormControlsCollectionCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLFormElementCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLFrameSetElementCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHistoryCustomcpp">trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSJavaScriptCallFrameCustomcpp">trunk/Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSLocationCustomcpp">trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSNamedNodeMapCustomcpp">trunk/Source/WebCore/bindings/js/JSNamedNodeMapCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSNodeListCustomcpp">trunk/Source/WebCore/bindings/js/JSNodeListCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSPluginElementFunctionscpp">trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSPluginElementFunctionsh">trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSRTCStatsResponseCustomcpp">trunk/Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSStorageCustomcpp">trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSStyleSheetListCustomcpp">trunk/Source/WebCore/bindings/js/JSStyleSheetListCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjectcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjecth">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCustomNamedGettercpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCustomNamedGetterh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestEventConstructorcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestEventConstructorh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestEventTargetcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestEventTargeth">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestExceptioncpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestExceptionh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestGenerateIsReachablecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestGenerateIsReachableh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestInterfaceh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestMediaQueryListListenercpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestMediaQueryListListenerh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNamedConstructorcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNamedConstructorh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNodecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNodeh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorsh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfaceh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefsh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSattributecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSattributeh">trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSreadonlycpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSreadonlyh">trunk/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h</a></li>
<li><a href="#trunkSourceWebCorebridgeruntime_arraycpp">trunk/Source/WebCore/bridge/runtime_array.cpp</a></li>
<li><a href="#trunkSourceWebCorebridgeruntime_arrayh">trunk/Source/WebCore/bridge/runtime_array.h</a></li>
<li><a href="#trunkSourceWebCorebridgeruntime_methodcpp">trunk/Source/WebCore/bridge/runtime_method.cpp</a></li>
<li><a href="#trunkSourceWebCorebridgeruntime_methodh">trunk/Source/WebCore/bridge/runtime_method.h</a></li>
<li><a href="#trunkSourceWebCorebridgeruntime_objectcpp">trunk/Source/WebCore/bridge/runtime_object.cpp</a></li>
<li><a href="#trunkSourceWebCorebridgeruntime_objecth">trunk/Source/WebCore/bridge/runtime_object.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeJSNPMethodcpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeJSNPObjectcpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeJSNPObjecth">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNPRuntimeObjectMapcpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebFramecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSCallbackObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSCallbackObject.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSCallbackObject.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/JavaScriptCore/API/JSCallbackObject.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -205,13 +205,14 @@
</span><span class="cx"> void init(ExecState*);
</span><span class="cx">
</span><span class="cx"> static JSCallbackObject* asCallbackObject(JSValue);
</span><ins>+ static JSCallbackObject* asCallbackObject(EncodedJSValue);
</ins><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL call(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL construct(ExecState*);
</span><span class="cx">
</span><span class="cx"> JSValue getStaticValue(ExecState*, PropertyName);
</span><del>- static JSValue staticFunctionGetter(ExecState*, JSValue, PropertyName);
- static JSValue callbackGetter(ExecState*, JSValue, PropertyName);
</del><ins>+ static EncodedJSValue staticFunctionGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+ static EncodedJSValue callbackGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
</ins><span class="cx">
</span><span class="cx"> OwnPtr<JSCallbackObjectData> m_callbackObjectData;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSCallbackObjectFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -50,6 +50,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Parent>
</span><ins>+inline JSCallbackObject<Parent>* JSCallbackObject<Parent>::asCallbackObject(EncodedJSValue value)
+{
+ ASSERT(asObject(JSValue::decode(value))->inherits(info()));
+ return jsCast<JSCallbackObject*>(asObject(JSValue::decode(value)));
+}
+
+template <class Parent>
</ins><span class="cx"> JSCallbackObject<Parent>::JSCallbackObject(ExecState* exec, Structure* structure, JSClassRef jsClass, void* data)
</span><span class="cx"> : Parent(exec->vm(), structure)
</span><span class="cx"> , m_callbackObjectData(adoptPtr(new JSCallbackObjectData(data, jsClass)))
</span><span class="lines">@@ -584,14 +591,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Parent>
</span><del>-JSValue JSCallbackObject<Parent>::staticFunctionGetter(ExecState* exec, JSValue slotParent, PropertyName propertyName)
</del><ins>+EncodedJSValue JSCallbackObject<Parent>::staticFunctionGetter(ExecState* exec, EncodedJSValue slotParent, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><span class="cx"> JSCallbackObject* thisObj = asCallbackObject(slotParent);
</span><span class="cx">
</span><span class="cx"> // Check for cached or override property.
</span><span class="cx"> PropertySlot slot2(thisObj);
</span><span class="cx"> if (Parent::getOwnPropertySlot(thisObj, exec, propertyName, slot2))
</span><del>- return slot2.getValue(exec, propertyName);
</del><ins>+ return JSValue::encode(slot2.getValue(exec, propertyName));
</ins><span class="cx">
</span><span class="cx"> if (StringImpl* name = propertyName.publicName()) {
</span><span class="cx"> for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass) {
</span><span class="lines">@@ -601,18 +608,18 @@
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> JSObject* o = JSCallbackFunction::create(vm, thisObj->globalObject(), callAsFunction, name);
</span><span class="cx"> thisObj->putDirect(vm, propertyName, o, entry->attributes);
</span><del>- return o;
</del><ins>+ return JSValue::encode(o);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return exec->vm().throwException(exec, createReferenceError(exec, ASCIILiteral("Static function property defined with NULL callAsFunction callback.")));
</del><ins>+ return JSValue::encode(exec->vm().throwException(exec, createReferenceError(exec, ASCIILiteral("Static function property defined with NULL callAsFunction callback."))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Parent>
</span><del>-JSValue JSCallbackObject<Parent>::callbackGetter(ExecState* exec, JSValue slotParent, PropertyName propertyName)
</del><ins>+EncodedJSValue JSCallbackObject<Parent>::callbackGetter(ExecState* exec, EncodedJSValue slotParent, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><span class="cx"> JSCallbackObject* thisObj = asCallbackObject(slotParent);
</span><span class="cx">
</span><span class="lines">@@ -632,15 +639,15 @@
</span><span class="cx"> }
</span><span class="cx"> if (exception) {
</span><span class="cx"> exec->vm().throwException(exec, toJS(exec, exception));
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx"> }
</span><span class="cx"> if (value)
</span><del>- return toJS(exec, value);
</del><ins>+ return JSValue::encode(toJS(exec, value));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return exec->vm().throwException(exec, createReferenceError(exec, ASCIILiteral("hasProperty callback returned true for a property that doesn't exist.")));
</del><ins>+ return JSValue::encode(exec->vm().throwException(exec, createReferenceError(exec, ASCIILiteral("hasProperty callback returned true for a property that doesn't exist."))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -1,3 +1,66 @@
</span><ins>+2013-12-04 Oliver Hunt <oliver@apple.com>
+
+ Refactor static getter function prototype to include thisValue in addition to the base object
+ https://bugs.webkit.org/show_bug.cgi?id=124461
+
+ Reviewed by Geoffrey Garen.
+
+ Add thisValue parameter to static getter prototype, and switch
+ from JSValue to EncodedJSValue for parameters and return value.
+
+ Currently none of the static getters use the thisValue, but
+ separating out the refactoring will prevent future changes
+ from getting lost in the noise of refactoring. This means
+ that this patch does not result in any change in behaviour.
+
+ * API/JSCallbackObject.h:
+ * API/JSCallbackObjectFunctions.h:
+ (JSC::::asCallbackObject):
+ (JSC::::staticFunctionGetter):
+ (JSC::::callbackGetter):
+ * jit/JITOperations.cpp:
+ * runtime/JSActivation.cpp:
+ (JSC::JSActivation::argumentsGetter):
+ * runtime/JSActivation.h:
+ * runtime/JSFunction.cpp:
+ (JSC::JSFunction::argumentsGetter):
+ (JSC::JSFunction::callerGetter):
+ (JSC::JSFunction::lengthGetter):
+ (JSC::JSFunction::nameGetter):
+ * runtime/JSFunction.h:
+ * runtime/JSObject.h:
+ (JSC::PropertySlot::getValue):
+ * runtime/NumberConstructor.cpp:
+ (JSC::numberConstructorNaNValue):
+ (JSC::numberConstructorNegInfinity):
+ (JSC::numberConstructorPosInfinity):
+ (JSC::numberConstructorMaxValue):
+ (JSC::numberConstructorMinValue):
+ * runtime/PropertySlot.h:
+ * runtime/RegExpConstructor.cpp:
+ (JSC::asRegExpConstructor):
+ (JSC::regExpConstructorDollar1):
+ (JSC::regExpConstructorDollar2):
+ (JSC::regExpConstructorDollar3):
+ (JSC::regExpConstructorDollar4):
+ (JSC::regExpConstructorDollar5):
+ (JSC::regExpConstructorDollar6):
+ (JSC::regExpConstructorDollar7):
+ (JSC::regExpConstructorDollar8):
+ (JSC::regExpConstructorDollar9):
+ (JSC::regExpConstructorInput):
+ (JSC::regExpConstructorMultiline):
+ (JSC::regExpConstructorLastMatch):
+ (JSC::regExpConstructorLastParen):
+ (JSC::regExpConstructorLeftContext):
+ (JSC::regExpConstructorRightContext):
+ * runtime/RegExpObject.cpp:
+ (JSC::asRegExpObject):
+ (JSC::regExpObjectGlobal):
+ (JSC::regExpObjectIgnoreCase):
+ (JSC::regExpObjectMultiline):
+ (JSC::regExpObjectSource):
+
</ins><span class="cx"> 2013-12-04 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> FTL should use cvttsd2si directly for double-to-int32 conversions
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx">
</span><span class="cx"> Identifier ident(vm, uid);
</span><span class="cx">
</span><del>- return JSValue::encode(function(exec, asObject(base), ident));
</del><ins>+ return function(exec, JSValue::encode(base), JSValue::encode(base), ident);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationCallGetter(ExecState* exec, JSCell* base, JSCell* getterSetter)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSActivationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSActivation.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSActivation.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/JavaScriptCore/runtime/JSActivation.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -210,17 +210,17 @@
</span><span class="cx"> return exec->globalThisValue();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSActivation::argumentsGetter(ExecState*, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue JSActivation::argumentsGetter(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSActivation* activation = jsCast<JSActivation*>(slotBase);
</del><ins>+ JSActivation* activation = jsCast<JSActivation*>(JSValue::decode(slotBase));
</ins><span class="cx"> CallFrame* callFrame = CallFrame::create(reinterpret_cast<Register*>(activation->m_registers));
</span><span class="cx"> ASSERT(!activation->isTornOff() && (callFrame->codeBlock()->usesArguments() || callFrame->codeBlock()->usesEval()));
</span><span class="cx"> if (activation->isTornOff() || !(callFrame->codeBlock()->usesArguments() || callFrame->codeBlock()->usesEval()))
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx">
</span><span class="cx"> VirtualRegister argumentsRegister = callFrame->codeBlock()->argumentsRegister();
</span><span class="cx"> if (JSValue arguments = callFrame->uncheckedR(argumentsRegister.offset()).jsValue())
</span><del>- return arguments;
</del><ins>+ return JSValue::encode(arguments);
</ins><span class="cx"> int realArgumentsRegister = unmodifiedArgumentsRegister(argumentsRegister).offset();
</span><span class="cx">
</span><span class="cx"> JSValue arguments = JSValue(Arguments::create(callFrame->vm(), callFrame));
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> callFrame->uncheckedR(realArgumentsRegister) = arguments;
</span><span class="cx">
</span><span class="cx"> ASSERT(callFrame->uncheckedR(realArgumentsRegister).jsValue().inherits(Arguments::info()));
</span><del>- return callFrame->uncheckedR(realArgumentsRegister).jsValue();
</del><ins>+ return JSValue::encode(callFrame->uncheckedR(realArgumentsRegister).jsValue());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSActivationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSActivation.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSActivation.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/JavaScriptCore/runtime/JSActivation.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> bool symbolTablePut(ExecState*, PropertyName, JSValue, bool shouldThrow);
</span><span class="cx"> bool symbolTablePutWithAttributes(VM&, PropertyName, JSValue, unsigned attributes);
</span><span class="cx">
</span><del>- static JSValue argumentsGetter(ExecState*, JSValue, PropertyName);
</del><ins>+ static EncodedJSValue argumentsGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
</ins><span class="cx">
</span><span class="cx"> static size_t allocationSize(SymbolTable*);
</span><span class="cx"> static size_t storageOffset();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -212,12 +212,12 @@
</span><span class="cx"> return functor.result();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSFunction::argumentsGetter(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue JSFunction::argumentsGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSFunction* thisObj = jsCast<JSFunction*>(slotBase);
</del><ins>+ JSFunction* thisObj = jsCast<JSFunction*>(JSValue::decode(slotBase));
</ins><span class="cx"> ASSERT(!thisObj->isHostFunction());
</span><span class="cx">
</span><del>- return retrieveArguments(exec, thisObj);
</del><ins>+ return JSValue::encode(retrieveArguments(exec, thisObj));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class RetrieveCallerFunctionFunctor {
</span><span class="lines">@@ -267,33 +267,33 @@
</span><span class="cx"> return functor.result();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSFunction::callerGetter(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue JSFunction::callerGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSFunction* thisObj = jsCast<JSFunction*>(slotBase);
</del><ins>+ JSFunction* thisObj = jsCast<JSFunction*>(JSValue::decode(slotBase));
</ins><span class="cx"> ASSERT(!thisObj->isHostFunction());
</span><span class="cx"> JSValue caller = retrieveCallerFunction(exec, thisObj);
</span><span class="cx">
</span><span class="cx"> // See ES5.1 15.3.5.4 - Function.caller may not be used to retrieve a strict caller.
</span><span class="cx"> if (!caller.isObject() || !asObject(caller)->inherits(JSFunction::info()))
</span><del>- return caller;
</del><ins>+ return JSValue::encode(caller);
</ins><span class="cx"> JSFunction* function = jsCast<JSFunction*>(caller);
</span><span class="cx"> if (function->isHostFunction() || !function->jsExecutable()->isStrictMode())
</span><del>- return caller;
- return throwTypeError(exec, ASCIILiteral("Function.caller used to retrieve strict caller"));
</del><ins>+ return JSValue::encode(caller);
+ return JSValue::encode(throwTypeError(exec, ASCIILiteral("Function.caller used to retrieve strict caller")));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSFunction::lengthGetter(ExecState*, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue JSFunction::lengthGetter(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSFunction* thisObj = jsCast<JSFunction*>(slotBase);
</del><ins>+ JSFunction* thisObj = jsCast<JSFunction*>(JSValue::decode(slotBase));
</ins><span class="cx"> ASSERT(!thisObj->isHostFunction());
</span><del>- return jsNumber(thisObj->jsExecutable()->parameterCount());
</del><ins>+ return JSValue::encode(jsNumber(thisObj->jsExecutable()->parameterCount()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSFunction::nameGetter(ExecState*, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue JSFunction::nameGetter(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSFunction* thisObj = jsCast<JSFunction*>(slotBase);
</del><ins>+ JSFunction* thisObj = jsCast<JSFunction*>(JSValue::decode(slotBase));
</ins><span class="cx"> ASSERT(!thisObj->isHostFunction());
</span><del>- return thisObj->jsExecutable()->nameValue();
</del><ins>+ return JSValue::encode(thisObj->jsExecutable()->nameValue());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSFunction::getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -171,10 +171,10 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE bool isHostFunctionNonInline() const;
</span><span class="cx">
</span><del>- static JSValue argumentsGetter(ExecState*, JSValue, PropertyName);
- static JSValue callerGetter(ExecState*, JSValue, PropertyName);
- static JSValue lengthGetter(ExecState*, JSValue, PropertyName);
- static JSValue nameGetter(ExecState*, JSValue, PropertyName);
</del><ins>+ static EncodedJSValue argumentsGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+ static EncodedJSValue callerGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+ static EncodedJSValue lengthGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+ static EncodedJSValue nameGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
</ins><span class="cx">
</span><span class="cx"> WriteBarrier<ExecutableBase> m_executable;
</span><span class="cx"> WriteBarrier<JSScope> m_scope;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -1535,10 +1535,10 @@
</span><span class="cx"> if (m_propertyType == TypeValue)
</span><span class="cx"> return JSValue::decode(m_data.value);
</span><span class="cx"> if (m_propertyType == TypeCustomIndex)
</span><del>- return m_data.customIndex.getIndexValue(exec, slotBase(), m_data.customIndex.index);
</del><ins>+ return JSValue::decode(m_data.customIndex.getIndexValue(exec, JSValue::encode(slotBase()), JSValue::encode(m_thisValue), m_data.customIndex.index));
</ins><span class="cx"> if (m_propertyType == TypeGetter)
</span><span class="cx"> return functionGetter(exec);
</span><del>- return m_data.custom.getValue(exec, slotBase(), propertyName);
</del><ins>+ return JSValue::decode(m_data.custom.getValue(exec, JSValue::encode(slotBase()), JSValue::encode(m_thisValue), propertyName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE JSValue PropertySlot::getValue(ExecState* exec, unsigned propertyName) const
</span><span class="lines">@@ -1546,10 +1546,10 @@
</span><span class="cx"> if (m_propertyType == TypeValue)
</span><span class="cx"> return JSValue::decode(m_data.value);
</span><span class="cx"> if (m_propertyType == TypeCustomIndex)
</span><del>- return m_data.customIndex.getIndexValue(exec, slotBase(), m_data.customIndex.index);
</del><ins>+ return JSValue::decode(m_data.customIndex.getIndexValue(exec, JSValue::encode(slotBase()), JSValue::encode(m_thisValue), m_data.customIndex.index));
</ins><span class="cx"> if (m_propertyType == TypeGetter)
</span><span class="cx"> return functionGetter(exec);
</span><del>- return m_data.custom.getValue(exec, slotBase(), Identifier::from(exec, propertyName));
</del><ins>+ return JSValue::decode(m_data.custom.getValue(exec, JSValue::encode(slotBase()), JSValue::encode(m_thisValue), Identifier::from(exec, propertyName)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeNumberConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -29,11 +29,11 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-static JSValue numberConstructorNaNValue(ExecState*, JSValue, PropertyName);
-static JSValue numberConstructorNegInfinity(ExecState*, JSValue, PropertyName);
-static JSValue numberConstructorPosInfinity(ExecState*, JSValue, PropertyName);
-static JSValue numberConstructorMaxValue(ExecState*, JSValue, PropertyName);
-static JSValue numberConstructorMinValue(ExecState*, JSValue, PropertyName);
</del><ins>+static EncodedJSValue numberConstructorNaNValue(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue numberConstructorNegInfinity(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue numberConstructorPosInfinity(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue numberConstructorMaxValue(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue numberConstructorMinValue(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="lines">@@ -82,29 +82,29 @@
</span><span class="cx"> lookupPut<NumberConstructor, InternalFunction>(exec, propertyName, value, ExecState::numberConstructorTable(exec), jsCast<NumberConstructor*>(cell), slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue numberConstructorNaNValue(ExecState*, JSValue, PropertyName)
</del><ins>+static EncodedJSValue numberConstructorNaNValue(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return jsNaN();
</del><ins>+ return JSValue::encode(jsNaN());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue numberConstructorNegInfinity(ExecState*, JSValue, PropertyName)
</del><ins>+static EncodedJSValue numberConstructorNegInfinity(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return jsNumber(-std::numeric_limits<double>::infinity());
</del><ins>+ return JSValue::encode(jsNumber(-std::numeric_limits<double>::infinity()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue numberConstructorPosInfinity(ExecState*, JSValue, PropertyName)
</del><ins>+static EncodedJSValue numberConstructorPosInfinity(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return jsNumber(std::numeric_limits<double>::infinity());
</del><ins>+ return JSValue::encode(jsNumber(std::numeric_limits<double>::infinity()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue numberConstructorMaxValue(ExecState*, JSValue, PropertyName)
</del><ins>+static EncodedJSValue numberConstructorMaxValue(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return jsNumber(1.7976931348623157E+308);
</del><ins>+ return JSValue::encode(jsNumber(1.7976931348623157E+308));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue numberConstructorMinValue(ExecState*, JSValue, PropertyName)
</del><ins>+static EncodedJSValue numberConstructorMinValue(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return jsNumber(5E-324);
</del><ins>+ return JSValue::encode(jsNumber(5E-324));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ECMA 15.7.1
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePropertySloth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PropertySlot.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PropertySlot.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/JavaScriptCore/runtime/PropertySlot.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- typedef JSValue (*GetValueFunc)(ExecState*, JSValue slotBase, PropertyName);
- typedef JSValue (*GetIndexValueFunc)(ExecState*, JSValue slotBase, unsigned);
</del><ins>+ typedef EncodedJSValue (*GetValueFunc)(ExecState*, EncodedJSValue slotBase, EncodedJSValue thisValue, PropertyName);
+ typedef EncodedJSValue (*GetIndexValueFunc)(ExecState*, EncodedJSValue slotBase, EncodedJSValue thisValue, unsigned);
</ins><span class="cx">
</span><span class="cx"> JSValue getValue(ExecState*, PropertyName) const;
</span><span class="cx"> JSValue getValue(ExecState*, unsigned propertyName) const;
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx">
</span><span class="cx"> PropertyType m_propertyType;
</span><span class="cx"> PropertyOffset m_offset;
</span><del>- JSValue m_thisValue;
</del><ins>+ const JSValue m_thisValue;
</ins><span class="cx"> JSObject* m_slotBase;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -29,21 +29,21 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-static JSValue regExpConstructorInput(ExecState*, JSValue, PropertyName);
-static JSValue regExpConstructorMultiline(ExecState*, JSValue, PropertyName);
-static JSValue regExpConstructorLastMatch(ExecState*, JSValue, PropertyName);
-static JSValue regExpConstructorLastParen(ExecState*, JSValue, PropertyName);
-static JSValue regExpConstructorLeftContext(ExecState*, JSValue, PropertyName);
-static JSValue regExpConstructorRightContext(ExecState*, JSValue, PropertyName);
-static JSValue regExpConstructorDollar1(ExecState*, JSValue, PropertyName);
-static JSValue regExpConstructorDollar2(ExecState*, JSValue, PropertyName);
-static JSValue regExpConstructorDollar3(ExecState*, JSValue, PropertyName);
-static JSValue regExpConstructorDollar4(ExecState*, JSValue, PropertyName);
-static JSValue regExpConstructorDollar5(ExecState*, JSValue, PropertyName);
-static JSValue regExpConstructorDollar6(ExecState*, JSValue, PropertyName);
-static JSValue regExpConstructorDollar7(ExecState*, JSValue, PropertyName);
-static JSValue regExpConstructorDollar8(ExecState*, JSValue, PropertyName);
-static JSValue regExpConstructorDollar9(ExecState*, JSValue, PropertyName);
</del><ins>+static EncodedJSValue regExpConstructorInput(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpConstructorMultiline(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpConstructorLastMatch(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpConstructorLastParen(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpConstructorLeftContext(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpConstructorRightContext(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpConstructorDollar1(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpConstructorDollar2(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpConstructorDollar3(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpConstructorDollar4(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpConstructorDollar5(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpConstructorDollar6(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpConstructorDollar7(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpConstructorDollar8(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpConstructorDollar9(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
</ins><span class="cx">
</span><span class="cx"> static void setRegExpConstructorInput(ExecState*, JSObject*, JSValue);
</span><span class="cx"> static void setRegExpConstructorMultiline(ExecState*, JSObject*, JSValue);
</span><span class="lines">@@ -158,79 +158,84 @@
</span><span class="cx"> return getStaticValueSlot<RegExpConstructor, InternalFunction>(exec, ExecState::regExpConstructorTable(exec), jsCast<RegExpConstructor*>(object), propertyName, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpConstructorDollar1(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+static inline RegExpConstructor* asRegExpConstructor(EncodedJSValue value)
</ins><span class="cx"> {
</span><del>- return asRegExpConstructor(slotBase)->getBackref(exec, 1);
</del><ins>+ return jsCast<RegExpConstructor*>(JSValue::decode(value));
</ins><span class="cx"> }
</span><ins>+
+EncodedJSValue regExpConstructorDollar1(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
+{
+ return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 1));
+}
</ins><span class="cx">
</span><del>-JSValue regExpConstructorDollar2(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpConstructorDollar2(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return asRegExpConstructor(slotBase)->getBackref(exec, 2);
</del><ins>+ return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 2));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpConstructorDollar3(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpConstructorDollar3(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return asRegExpConstructor(slotBase)->getBackref(exec, 3);
</del><ins>+ return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 3));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpConstructorDollar4(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpConstructorDollar4(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return asRegExpConstructor(slotBase)->getBackref(exec, 4);
</del><ins>+ return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 4));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpConstructorDollar5(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpConstructorDollar5(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return asRegExpConstructor(slotBase)->getBackref(exec, 5);
</del><ins>+ return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 5));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpConstructorDollar6(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpConstructorDollar6(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return asRegExpConstructor(slotBase)->getBackref(exec, 6);
</del><ins>+ return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 6));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpConstructorDollar7(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpConstructorDollar7(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return asRegExpConstructor(slotBase)->getBackref(exec, 7);
</del><ins>+ return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 7));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpConstructorDollar8(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpConstructorDollar8(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return asRegExpConstructor(slotBase)->getBackref(exec, 8);
</del><ins>+ return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 8));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpConstructorDollar9(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpConstructorDollar9(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return asRegExpConstructor(slotBase)->getBackref(exec, 9);
</del><ins>+ return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 9));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpConstructorInput(ExecState*, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpConstructorInput(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return asRegExpConstructor(slotBase)->input();
</del><ins>+ return JSValue::encode(asRegExpConstructor(slotBase)->input());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpConstructorMultiline(ExecState*, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpConstructorMultiline(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return jsBoolean(asRegExpConstructor(slotBase)->multiline());
</del><ins>+ return JSValue::encode(jsBoolean(asRegExpConstructor(slotBase)->multiline()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpConstructorLastMatch(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpConstructorLastMatch(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return asRegExpConstructor(slotBase)->getBackref(exec, 0);
</del><ins>+ return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 0));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpConstructorLastParen(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpConstructorLastParen(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return asRegExpConstructor(slotBase)->getLastParen(exec);
</del><ins>+ return JSValue::encode(asRegExpConstructor(slotBase)->getLastParen(exec));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpConstructorLeftContext(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpConstructorLeftContext(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return asRegExpConstructor(slotBase)->getLeftContext(exec);
</del><ins>+ return JSValue::encode(asRegExpConstructor(slotBase)->getLeftContext(exec));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpConstructorRightContext(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpConstructorRightContext(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return asRegExpConstructor(slotBase)->getRightContext(exec);
</del><ins>+ return JSValue::encode(asRegExpConstructor(slotBase)->getRightContext(exec));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RegExpConstructor::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpObject.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpObject.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/JavaScriptCore/runtime/RegExpObject.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -39,10 +39,10 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-static JSValue regExpObjectGlobal(ExecState*, JSValue, PropertyName);
-static JSValue regExpObjectIgnoreCase(ExecState*, JSValue, PropertyName);
-static JSValue regExpObjectMultiline(ExecState*, JSValue, PropertyName);
-static JSValue regExpObjectSource(ExecState*, JSValue, PropertyName);
</del><ins>+static EncodedJSValue regExpObjectGlobal(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpObjectIgnoreCase(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpObjectMultiline(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+static EncodedJSValue regExpObjectSource(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="lines">@@ -155,19 +155,24 @@
</span><span class="cx"> return Base::defineOwnProperty(object, exec, propertyName, descriptor, shouldThrow);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpObjectGlobal(ExecState*, JSValue slotBase, PropertyName)
</del><ins>+static inline RegExpObject* asRegExpObject(EncodedJSValue value)
</ins><span class="cx"> {
</span><del>- return jsBoolean(asRegExpObject(slotBase)->regExp()->global());
</del><ins>+ return jsCast<RegExpObject*>(JSValue::decode(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpObjectIgnoreCase(ExecState*, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpObjectGlobal(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return jsBoolean(asRegExpObject(slotBase)->regExp()->ignoreCase());
</del><ins>+ return JSValue::encode(jsBoolean(asRegExpObject(slotBase)->regExp()->global()));
</ins><span class="cx"> }
</span><ins>+
+EncodedJSValue regExpObjectIgnoreCase(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
+{
+ return JSValue::encode(jsBoolean(asRegExpObject(slotBase)->regExp()->ignoreCase()));
+}
</ins><span class="cx">
</span><del>-JSValue regExpObjectMultiline(ExecState*, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue regExpObjectMultiline(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return jsBoolean(asRegExpObject(slotBase)->regExp()->multiline());
</del><ins>+ return JSValue::encode(jsBoolean(asRegExpObject(slotBase)->regExp()->multiline()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><span class="lines">@@ -276,12 +281,14 @@
</span><span class="cx"> return jsString(exec, result.toString());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue regExpObjectSource(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+
+
+EncodedJSValue regExpObjectSource(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> String pattern = asRegExpObject(slotBase)->regExp()->pattern();
</span><span class="cx"> if (pattern.is8Bit())
</span><del>- return regExpObjectSourceInternal(exec, pattern, pattern.characters8(), pattern.length());
- return regExpObjectSourceInternal(exec, pattern, pattern.characters16(), pattern.length());
</del><ins>+ return JSValue::encode(regExpObjectSourceInternal(exec, pattern, pattern.characters8(), pattern.length()));
+ return JSValue::encode(regExpObjectSourceInternal(exec, pattern, pattern.characters16(), pattern.length()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RegExpObject::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/ChangeLog 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -1,3 +1,87 @@
</span><ins>+2013-12-04 Oliver Hunt <oliver@apple.com>
+
+ Refactor static getter function prototype to include thisValue in addition to the base object
+ https://bugs.webkit.org/show_bug.cgi?id=124461
+
+ Reviewed by Geoffrey Garen.
+
+ Change bindings codegen to produce static getter functions
+ with the correct types. Also update the many custom implementations
+ to the new type.
+
+ No change in behaviour.
+
+ * bindings/js/JSCSSStyleDeclarationCustom.cpp:
+ (WebCore::cssPropertyGetterPixelOrPosPrefixCallback):
+ (WebCore::cssPropertyGetterCallback):
+ * bindings/js/JSDOMBinding.cpp:
+ (WebCore::objectToStringFunctionGetter):
+ * bindings/js/JSDOMBinding.h:
+ * bindings/js/JSDOMMimeTypeArrayCustom.cpp:
+ (WebCore::JSDOMMimeTypeArray::nameGetter):
+ * bindings/js/JSDOMPluginArrayCustom.cpp:
+ (WebCore::JSDOMPluginArray::nameGetter):
+ * bindings/js/JSDOMPluginCustom.cpp:
+ (WebCore::JSDOMPlugin::nameGetter):
+ * bindings/js/JSDOMStringMapCustom.cpp:
+ (WebCore::JSDOMStringMap::nameGetter):
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::nonCachingStaticFunctionGetter):
+ (WebCore::childFrameGetter):
+ (WebCore::indexGetter):
+ (WebCore::namedItemGetter):
+ * bindings/js/JSHTMLAllCollectionCustom.cpp:
+ (WebCore::JSHTMLAllCollection::nameGetter):
+ * bindings/js/JSHTMLCollectionCustom.cpp:
+ (WebCore::JSHTMLCollection::nameGetter):
+ * bindings/js/JSHTMLDocumentCustom.cpp:
+ (WebCore::JSHTMLDocument::nameGetter):
+ * bindings/js/JSHTMLFormControlsCollectionCustom.cpp:
+ (WebCore::JSHTMLFormControlsCollection::nameGetter):
+ * bindings/js/JSHTMLFormElementCustom.cpp:
+ (WebCore::JSHTMLFormElement::nameGetter):
+ * bindings/js/JSHTMLFrameSetElementCustom.cpp:
+ (WebCore::JSHTMLFrameSetElement::nameGetter):
+ * bindings/js/JSHistoryCustom.cpp:
+ (WebCore::nonCachingStaticBackFunctionGetter):
+ (WebCore::nonCachingStaticForwardFunctionGetter):
+ (WebCore::nonCachingStaticGoFunctionGetter):
+ * bindings/js/JSJavaScriptCallFrameCustom.cpp:
+ (WebCore::JSJavaScriptCallFrame::scopeType):
+ * bindings/js/JSLocationCustom.cpp:
+ (WebCore::nonCachingStaticReplaceFunctionGetter):
+ (WebCore::nonCachingStaticReloadFunctionGetter):
+ (WebCore::nonCachingStaticAssignFunctionGetter):
+ * bindings/js/JSNamedNodeMapCustom.cpp:
+ (WebCore::JSNamedNodeMap::nameGetter):
+ * bindings/js/JSNodeListCustom.cpp:
+ (WebCore::JSNodeList::nameGetter):
+ * bindings/js/JSPluginElementFunctions.cpp:
+ (WebCore::pluginElementPropertyGetter):
+ * bindings/js/JSPluginElementFunctions.h:
+ * bindings/js/JSRTCStatsResponseCustom.cpp:
+ (WebCore::JSRTCStatsResponse::nameGetter):
+ * bindings/js/JSStorageCustom.cpp:
+ (WebCore::JSStorage::nameGetter):
+ * bindings/js/JSStyleSheetListCustom.cpp:
+ (WebCore::JSStyleSheetList::nameGetter):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateHeader):
+ (GenerateImplementation):
+ (GenerateParametersCheck):
+ * bridge/runtime_array.cpp:
+ (JSC::RuntimeArray::lengthGetter):
+ (JSC::RuntimeArray::indexGetter):
+ * bridge/runtime_array.h:
+ * bridge/runtime_method.cpp:
+ (JSC::RuntimeMethod::lengthGetter):
+ * bridge/runtime_method.h:
+ * bridge/runtime_object.cpp:
+ (JSC::Bindings::RuntimeObject::fallbackObjectGetter):
+ (JSC::Bindings::RuntimeObject::fieldGetter):
+ (JSC::Bindings::RuntimeObject::methodGetter):
+ * bridge/runtime_object.h:
+
</ins><span class="cx"> 2013-12-05 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove Image::decodedSize()
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -303,9 +303,9 @@
</span><span class="cx"> return getPropertyValueFallback(exec, thisObj, propertyID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue cssPropertyGetterPixelOrPosPrefixCallback(ExecState* exec, JSValue slotBase, unsigned propertyID)
</del><ins>+static EncodedJSValue cssPropertyGetterPixelOrPosPrefixCallback(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, unsigned propertyID)
</ins><span class="cx"> {
</span><del>- return cssPropertyGetterPixelOrPosPrefix(exec, jsCast<JSCSSStyleDeclaration*>(asObject(slotBase)), propertyID);
</del><ins>+ return JSValue::encode(cssPropertyGetterPixelOrPosPrefix(exec, jsCast<JSCSSStyleDeclaration*>(JSValue::decode(slotBase)), propertyID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline JSValue cssPropertyGetter(ExecState* exec, JSCSSStyleDeclaration* thisObj, unsigned propertyID)
</span><span class="lines">@@ -317,9 +317,9 @@
</span><span class="cx"> return getPropertyValueFallback(exec, thisObj, propertyID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue cssPropertyGetterCallback(ExecState* exec, JSValue slotBase, unsigned propertyID)
</del><ins>+static EncodedJSValue cssPropertyGetterCallback(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, unsigned propertyID)
</ins><span class="cx"> {
</span><del>- return cssPropertyGetter(exec, jsCast<JSCSSStyleDeclaration*>(asObject(slotBase)), propertyID);
</del><ins>+ return JSValue::encode(cssPropertyGetter(exec, jsCast<JSCSSStyleDeclaration*>(JSValue::decode(slotBase)), propertyID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSCSSStyleDeclaration::getOwnPropertySlotDelegate(ExecState*, PropertyName propertyIdentifier, PropertySlot& slot)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -271,9 +271,9 @@
</span><span class="cx"> frame->document()->domWindow()->printErrorMessage(message);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue objectToStringFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</del><ins>+EncodedJSValue objectToStringFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 0, propertyName.publicName(), objectProtoFuncToString);
</del><ins>+ return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 0, propertyName.publicName(), objectProtoFuncToString));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Structure* getCachedDOMStructure(JSDOMGlobalObject* globalObject, const ClassInfo* classInfo)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -572,7 +572,7 @@
</span><span class="cx"> bool shouldAllowAccessToDOMWindow(JSC::ExecState*, DOMWindow&, String& message);
</span><span class="cx">
</span><span class="cx"> void printErrorMessageForFrame(Frame*, const String& message);
</span><del>-JSC::JSValue objectToStringFunctionGetter(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue objectToStringFunctionGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> inline JSC::JSValue jsStringWithCache(JSC::ExecState* exec, const String& s)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMMimeTypeArrayCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMMimeTypeArrayCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMMimeTypeArrayCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSDOMMimeTypeArrayCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -33,10 +33,12 @@
</span><span class="cx"> return mimeTypeArray->canGetItemsForName(propertyNameToAtomicString(propertyName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSDOMMimeTypeArray::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSDOMMimeTypeArray::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSDOMMimeTypeArray* thisObj = jsCast<JSDOMMimeTypeArray*>(asObject(slotBase));
- return toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName)));
</del><ins>+ JSDOMMimeTypeArray* thisObj = jsDynamicCast<JSDOMMimeTypeArray*>(JSValue::decode(slotBase));
+ if (!thisObj)
+ return throwVMTypeError(exec);
+ return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPluginArrayCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPluginArrayCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPluginArrayCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSDOMPluginArrayCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx"> return pluginArray->canGetItemsForName(propertyNameToAtomicString(propertyName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSDOMPluginArray::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSDOMPluginArray::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSDOMPluginArray* thisObj = jsCast<JSDOMPluginArray*>(asObject(slotBase));
- return toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName)));
</del><ins>+ JSDOMPluginArray* thisObj = jsCast<JSDOMPluginArray*>(JSValue::decode(slotBase));
+ return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPluginCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPluginCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPluginCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSDOMPluginCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -32,10 +32,10 @@
</span><span class="cx"> return plugin->canGetItemsForName(propertyNameToAtomicString(propertyName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSDOMPlugin::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSDOMPlugin::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSDOMPlugin* thisObj = jsCast<JSDOMPlugin*>(asObject(slotBase));
- return toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName)));
</del><ins>+ JSDOMPlugin* thisObj = jsCast<JSDOMPlugin*>(JSValue::decode(slotBase));
+ return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMStringMapCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -40,10 +40,10 @@
</span><span class="cx"> return impl->contains(propertyNameToAtomicString(propertyName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSDOMStringMap::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSDOMStringMap::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSDOMStringMap* thisObj = jsCast<JSDOMStringMap*>(asObject(slotBase));
- return jsStringWithCache(exec, thisObj->impl().item(propertyNameToAtomicString(propertyName)));
</del><ins>+ JSDOMStringMap* thisObj = jsCast<JSDOMStringMap*>(JSValue::decode(slotBase));
+ return JSValue::encode(jsStringWithCache(exec, thisObj->impl().item(propertyNameToAtomicString(propertyName))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSDOMStringMap::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -67,24 +67,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<NativeFunction nativeFunction, int length>
</span><del>-JSValue nonCachingStaticFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</del><ins>+EncodedJSValue nonCachingStaticFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), length, propertyName.publicName(), nativeFunction);
</del><ins>+ return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), length, propertyName.publicName(), nativeFunction));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue childFrameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+static EncodedJSValue childFrameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return toJS(exec, jsCast<JSDOMWindow*>(asObject(slotBase))->impl().frame()->tree().scopedChild(propertyNameToAtomicString(propertyName))->document()->domWindow());
</del><ins>+ return JSValue::encode(toJS(exec, jsCast<JSDOMWindow*>(JSValue::decode(slotBase))->impl().frame()->tree().scopedChild(propertyNameToAtomicString(propertyName))->document()->domWindow()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue indexGetter(ExecState* exec, JSValue slotBase, unsigned index)
</del><ins>+static EncodedJSValue indexGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, unsigned index)
</ins><span class="cx"> {
</span><del>- return toJS(exec, jsCast<JSDOMWindow*>(asObject(slotBase))->impl().frame()->tree().scopedChild(index)->document()->domWindow());
</del><ins>+ return JSValue::encode(toJS(exec, jsCast<JSDOMWindow*>(JSValue::decode(slotBase))->impl().frame()->tree().scopedChild(index)->document()->domWindow()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue namedItemGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+static EncodedJSValue namedItemGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSDOMWindowBase* thisObj = jsCast<JSDOMWindow*>(asObject(slotBase));
</del><ins>+ JSDOMWindowBase* thisObj = jsCast<JSDOMWindow*>(JSValue::decode(slotBase));
</ins><span class="cx"> Document* document = thisObj->impl().frame()->document();
</span><span class="cx">
</span><span class="cx"> ASSERT(BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObj->impl()));
</span><span class="lines">@@ -93,15 +93,15 @@
</span><span class="cx">
</span><span class="cx"> AtomicStringImpl* atomicPropertyName = findAtomicString(propertyName);
</span><span class="cx"> if (!atomicPropertyName || !toHTMLDocument(document)->hasWindowNamedItem(*atomicPropertyName))
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx">
</span><span class="cx"> if (UNLIKELY(toHTMLDocument(document)->windowNamedItemContainsMultipleElements(*atomicPropertyName))) {
</span><span class="cx"> RefPtr<HTMLCollection> collection = document->windowNamedItems(atomicPropertyName);
</span><span class="cx"> ASSERT(collection->length() > 1);
</span><del>- return toJS(exec, thisObj->globalObject(), WTF::getPtr(collection));
</del><ins>+ return JSValue::encode(toJS(exec, thisObj->globalObject(), WTF::getPtr(collection)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return toJS(exec, thisObj->globalObject(), toHTMLDocument(document)->windowNamedItem(*atomicPropertyName));
</del><ins>+ return JSValue::encode(toJS(exec, thisObj->globalObject(), toHTMLDocument(document)->windowNamedItem(*atomicPropertyName)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSDOMWindow::getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLAllCollectionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -100,10 +100,10 @@
</span><span class="cx"> return collection->hasNamedItem(propertyNameToAtomicString(propertyName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSHTMLAllCollection::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSHTMLAllCollection::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSHTMLAllCollection* thisObj = jsCast<JSHTMLAllCollection*>(asObject(slotBase));
- return getNamedItems(exec, thisObj, propertyName);
</del><ins>+ JSHTMLAllCollection* thisObj = jsCast<JSHTMLAllCollection*>(JSValue::decode(slotBase));
+ return JSValue::encode(getNamedItems(exec, thisObj, propertyName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSHTMLAllCollection::item(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLCollectionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -45,11 +45,11 @@
</span><span class="cx"> return collection->hasNamedItem(propertyNameToAtomicString(propertyName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSHTMLCollection::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSHTMLCollection::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSHTMLCollection* collection = jsCast<JSHTMLCollection*>(asObject(slotBase));
</del><ins>+ JSHTMLCollection* collection = jsCast<JSHTMLCollection*>(JSValue::decode(slotBase));
</ins><span class="cx"> const AtomicString& name = propertyNameToAtomicString(propertyName);
</span><del>- return toJS(exec, collection->globalObject(), collection->impl().namedItem(name));
</del><ins>+ return JSValue::encode(toJS(exec, collection->globalObject(), collection->impl().namedItem(name)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, HTMLCollection* collection)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLDocumentCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -57,28 +57,28 @@
</span><span class="cx"> return atomicPropertyName && document->hasDocumentNamedItem(*atomicPropertyName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSHTMLDocument::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSHTMLDocument::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSHTMLDocument* thisObj = jsCast<JSHTMLDocument*>(asObject(slotBase));
</del><ins>+ JSHTMLDocument* thisObj = jsCast<JSHTMLDocument*>(JSValue::decode(slotBase));
</ins><span class="cx"> HTMLDocument& document = thisObj->impl();
</span><span class="cx">
</span><span class="cx"> AtomicStringImpl* atomicPropertyName = findAtomicString(propertyName);
</span><span class="cx"> if (!atomicPropertyName || !document.hasDocumentNamedItem(*atomicPropertyName))
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx">
</span><span class="cx"> if (UNLIKELY(document.documentNamedItemContainsMultipleElements(*atomicPropertyName))) {
</span><span class="cx"> RefPtr<HTMLCollection> collection = document.documentNamedItems(atomicPropertyName);
</span><span class="cx"> ASSERT(collection->length() > 1);
</span><del>- return toJS(exec, thisObj->globalObject(), WTF::getPtr(collection));
</del><ins>+ return JSValue::encode(toJS(exec, thisObj->globalObject(), WTF::getPtr(collection)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Element* element = document.documentNamedItem(*atomicPropertyName);
</span><span class="cx"> if (UNLIKELY(element->hasTagName(iframeTag))) {
</span><span class="cx"> if (Frame* frame = toHTMLIFrameElement(element)->contentFrame())
</span><del>- return toJS(exec, frame);
</del><ins>+ return JSValue::encode(toJS(exec, frame));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return toJS(exec, thisObj->globalObject(), element);
</del><ins>+ return JSValue::encode(toJS(exec, thisObj->globalObject(), element));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Custom attributes
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLFormControlsCollectionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -57,10 +57,10 @@
</span><span class="cx"> return collection->hasNamedItem(propertyNameToAtomicString(propertyName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSHTMLFormControlsCollection::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSHTMLFormControlsCollection::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSHTMLFormControlsCollection* thisObj = jsCast<JSHTMLFormControlsCollection*>(asObject(slotBase));
- return getNamedItems(exec, thisObj, propertyName);
</del><ins>+ JSHTMLFormControlsCollection* thisObj = jsCast<JSHTMLFormControlsCollection*>(JSValue::decode(slotBase));
+ return JSValue::encode(getNamedItems(exec, thisObj, propertyName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSHTMLFormControlsCollection::namedItem(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLFormElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -42,21 +42,21 @@
</span><span class="cx"> return form->hasNamedElement(propertyNameToAtomicString(propertyName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSHTMLFormElement::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSHTMLFormElement::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSHTMLFormElement* jsForm = jsCast<JSHTMLFormElement*>(asObject(slotBase));
</del><ins>+ JSHTMLFormElement* jsForm = jsCast<JSHTMLFormElement*>(JSValue::decode(slotBase));
</ins><span class="cx"> HTMLFormElement& form = jsForm->impl();
</span><span class="cx">
</span><span class="cx"> Vector<Ref<Element>> namedItems;
</span><span class="cx"> form.getNamedElements(propertyNameToAtomicString(propertyName), namedItems);
</span><span class="cx">
</span><span class="cx"> if (namedItems.isEmpty())
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx"> if (namedItems.size() == 1)
</span><del>- return toJS(exec, jsForm->globalObject(), &namedItems[0].get());
</del><ins>+ return JSValue::encode(toJS(exec, jsForm->globalObject(), &namedItems[0].get()));
</ins><span class="cx">
</span><span class="cx"> // FIXME: HTML5 specifies that this should be a RadioNodeList.
</span><del>- return toJS(exec, jsForm->globalObject(), StaticElementList::adopt(namedItems).get());
</del><ins>+ return JSValue::encode(toJS(exec, jsForm->globalObject(), StaticElementList::adopt(namedItems).get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLFrameSetElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -47,15 +47,15 @@
</span><span class="cx"> return frame && frame->hasTagName(frameTag);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSHTMLFrameSetElement::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSHTMLFrameSetElement::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- HTMLElement& element = jsCast<JSHTMLElement*>(asObject(slotBase))->impl();
</del><ins>+ HTMLElement& element = jsCast<JSHTMLElement*>(JSValue::decode(slotBase))->impl();
</ins><span class="cx"> Node* frameElement = element.children()->namedItem(propertyNameToAtomicString(propertyName));
</span><span class="cx"> if (Document* document = toHTMLFrameElement(frameElement)->contentDocument()) {
</span><span class="cx"> if (JSDOMWindowShell* window = toJSDOMWindowShell(document->frame(), currentWorld(exec)))
</span><del>- return window;
</del><ins>+ return JSValue::encode(window);
</ins><span class="cx"> }
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHistoryCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -38,19 +38,19 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static JSValue nonCachingStaticBackFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</del><ins>+static EncodedJSValue nonCachingStaticBackFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 0, propertyName.publicName(), jsHistoryPrototypeFunctionBack);
</del><ins>+ return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 0, propertyName.publicName(), jsHistoryPrototypeFunctionBack));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue nonCachingStaticForwardFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</del><ins>+static EncodedJSValue nonCachingStaticForwardFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 0, propertyName.publicName(), jsHistoryPrototypeFunctionForward);
</del><ins>+ return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 0, propertyName.publicName(), jsHistoryPrototypeFunctionForward));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue nonCachingStaticGoFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</del><ins>+static EncodedJSValue nonCachingStaticGoFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 1, propertyName.publicName(), jsHistoryPrototypeFunctionGo);
</del><ins>+ return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 1, propertyName.publicName(), jsHistoryPrototypeFunctionGo));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSHistory::getOwnPropertySlotDelegate(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSJavaScriptCallFrameCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -106,17 +106,17 @@
</span><span class="cx"> if (!foundLocalScope) {
</span><span class="cx"> // First activation object is local scope, each successive activation object is closure.
</span><span class="cx"> if (!index)
</span><del>- return jsJavaScriptCallFrameLOCAL_SCOPE(exec, JSValue(), Identifier());
</del><ins>+ return JSValue::decode(jsJavaScriptCallFrameLOCAL_SCOPE(exec, EncodedJSValue(), EncodedJSValue(), Identifier()));
</ins><span class="cx"> foundLocalScope = true;
</span><span class="cx"> } else if (!index)
</span><del>- return jsJavaScriptCallFrameCLOSURE_SCOPE(exec, JSValue(), Identifier());
</del><ins>+ return JSValue::decode(jsJavaScriptCallFrameCLOSURE_SCOPE(exec, EncodedJSValue(), EncodedJSValue(), Identifier()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!index) {
</span><span class="cx"> // Last in the chain is global scope.
</span><span class="cx"> if (++iter == end)
</span><del>- return jsJavaScriptCallFrameGLOBAL_SCOPE(exec, JSValue(), Identifier());
- return jsJavaScriptCallFrameWITH_SCOPE(exec, JSValue(), Identifier());
</del><ins>+ return JSValue::decode(jsJavaScriptCallFrameGLOBAL_SCOPE(exec, EncodedJSValue(), EncodedJSValue(), Identifier()));
+ return JSValue::decode(jsJavaScriptCallFrameWITH_SCOPE(exec, EncodedJSValue(), EncodedJSValue(), Identifier()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> --index;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSLocationCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -30,19 +30,19 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static JSValue nonCachingStaticReplaceFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</del><ins>+static EncodedJSValue nonCachingStaticReplaceFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 1, propertyName.publicName(), jsLocationPrototypeFunctionReplace);
</del><ins>+ return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 1, propertyName.publicName(), jsLocationPrototypeFunctionReplace));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue nonCachingStaticReloadFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</del><ins>+static EncodedJSValue nonCachingStaticReloadFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 0, propertyName.publicName(), jsLocationPrototypeFunctionReload);
</del><ins>+ return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 0, propertyName.publicName(), jsLocationPrototypeFunctionReload));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue nonCachingStaticAssignFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</del><ins>+static EncodedJSValue nonCachingStaticAssignFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 1, propertyName.publicName(), jsLocationPrototypeFunctionAssign);
</del><ins>+ return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 1, propertyName.publicName(), jsLocationPrototypeFunctionAssign));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSLocation::getOwnPropertySlotDelegate(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSNamedNodeMapCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSNamedNodeMapCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNamedNodeMapCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSNamedNodeMapCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -40,10 +40,10 @@
</span><span class="cx"> return impl->getNamedItem(propertyNameToAtomicString(propertyName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSNamedNodeMap::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSNamedNodeMap::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSNamedNodeMap* thisObj = jsCast<JSNamedNodeMap*>(asObject(slotBase));
- return toJS(exec, thisObj->globalObject(), thisObj->impl().getNamedItem(propertyNameToAtomicString(propertyName)));
</del><ins>+ JSNamedNodeMap* thisObj = jsCast<JSNamedNodeMap*>(JSValue::decode(slotBase));
+ return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().getNamedItem(propertyNameToAtomicString(propertyName))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSNodeListCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSNodeListCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNodeListCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSNodeListCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -56,10 +56,10 @@
</span><span class="cx"> return impl->namedItem(propertyNameToAtomicString(propertyName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSNodeList::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSNodeList::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSNodeList* thisObj = jsCast<JSNodeList*>(asObject(slotBase));
- return toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName)));
</del><ins>+ JSNodeList* thisObj = jsCast<JSNodeList*>(JSValue::decode(slotBase));
+ return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSPluginElementFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -100,14 +100,14 @@
</span><span class="cx"> return instance->createRuntimeObject(exec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue pluginElementPropertyGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue pluginElementPropertyGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSHTMLElement* element = jsCast<JSHTMLElement*>(asObject(slotBase));
</del><ins>+ JSHTMLElement* element = jsCast<JSHTMLElement*>(JSValue::decode(slotBase));
</ins><span class="cx"> JSObject* scriptObject = pluginScriptObject(exec, element);
</span><span class="cx"> if (!scriptObject)
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx">
</span><del>- return scriptObject->get(exec, propertyName);
</del><ins>+ return JSValue::encode(scriptObject->get(exec, propertyName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool pluginElementCustomGetOwnPropertySlot(ExecState* exec, PropertyName propertyName, PropertySlot& slot, JSHTMLElement* element)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSPluginElementFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> JSC::Bindings::Instance* pluginInstance(HTMLElement&);
</span><span class="cx"> JSC::JSObject* pluginScriptObject(JSC::ExecState*, JSHTMLElement*);
</span><span class="cx">
</span><del>- JSC::JSValue pluginElementPropertyGetter(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+ JSC::EncodedJSValue pluginElementPropertyGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> bool pluginElementCustomGetOwnPropertySlot(JSC::ExecState*, JSC::PropertyName, JSC::PropertySlot&, JSHTMLElement*);
</span><span class="cx"> bool pluginElementCustomPut(JSC::ExecState*, JSC::PropertyName, JSC::JSValue, JSHTMLElement*, JSC::PutPropertySlot&);
</span><span class="cx"> JSC::CallType pluginElementGetCallData(JSHTMLElement*, JSC::CallData&);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSRTCStatsResponseCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -40,10 +40,10 @@
</span><span class="cx"> return response->canGetItemsForName(propertyNameToAtomicString(propertyName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSRTCStatsResponse::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSRTCStatsResponse::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSRTCStatsResponse* thisObj = jsCast<JSRTCStatsResponse*>(asObject(slotBase));
- return toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName)));
</del><ins>+ JSRTCStatsResponse* thisObj = jsCast<JSRTCStatsResponse*>(JSValue::decode(slotBase));
+ return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSStorageCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -42,18 +42,18 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSStorage::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSStorage::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSStorage* thisObj = jsCast<JSStorage*>(asObject(slotBase));
</del><ins>+ JSStorage* thisObj = jsCast<JSStorage*>(JSValue::decode(slotBase));
</ins><span class="cx">
</span><del>- JSValue prototype = asObject(slotBase)->prototype();
</del><ins>+ JSValue prototype = asObject(JSValue::decode(slotBase))->prototype();
</ins><span class="cx"> if (prototype.isObject() && asObject(prototype)->hasProperty(exec, propertyName))
</span><del>- return asObject(prototype)->get(exec, propertyName);
</del><ins>+ return JSValue::encode(asObject(prototype)->get(exec, propertyName));
</ins><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> JSValue result = jsStringOrNull(exec, thisObj->impl().getItem(propertyNameToString(propertyName), ec));
</span><span class="cx"> setDOMException(exec, ec);
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSStorage::deleteProperty(JSCell* cell, ExecState* exec, PropertyName propertyName)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSStyleSheetListCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSStyleSheetListCustom.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSStyleSheetListCustom.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/js/JSStyleSheetListCustom.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -40,12 +40,12 @@
</span><span class="cx"> return styleSheetList->getNamedItem(propertyNameToString(propertyName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSStyleSheetList::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSStyleSheetList::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSStyleSheetList* thisObj = jsCast<JSStyleSheetList*>(asObject(slotBase));
</del><ins>+ JSStyleSheetList* thisObj = jsCast<JSStyleSheetList*>(JSValue::decode(slotBase));
</ins><span class="cx"> HTMLStyleElement* element = thisObj->impl().getNamedItem(propertyNameToString(propertyName));
</span><span class="cx"> ASSERT(element);
</span><del>- return toJS(exec, thisObj->globalObject(), element->sheet());
</del><ins>+ return JSValue::encode(toJS(exec, thisObj->globalObject(), element->sheet()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -893,7 +893,7 @@
</span><span class="cx"> if ($hasNumericIndexedGetter) {
</span><span class="cx"> push(@headerContent, " JSC::JSValue getByIndex(JSC::ExecState*, unsigned index);\n");
</span><span class="cx"> } else {
</span><del>- push(@headerContent, " static JSC::JSValue indexGetter(JSC::ExecState*, JSC::JSValue, unsigned);\n");
</del><ins>+ push(@headerContent, " static JSC::EncodedJSValue indexGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, unsigned);\n");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -905,7 +905,7 @@
</span><span class="cx"> if ($namedGetterFunction || $interface->extendedAttributes->{"CustomNamedGetter"}) {
</span><span class="cx"> push(@headerContent, "private:\n");
</span><span class="cx"> push(@headerContent, " static bool canGetItemsForName(JSC::ExecState*, $interfaceName*, JSC::PropertyName);\n");
</span><del>- push(@headerContent, " static JSC::JSValue nameGetter(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);\n");
</del><ins>+ push(@headerContent, " static JSC::EncodedJSValue nameGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> push(@headerContent, "};\n\n");
</span><span class="lines">@@ -1041,7 +1041,7 @@
</span><span class="cx"> my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
</span><span class="cx"> push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
</span><span class="cx"> my $getter = GetAttributeGetterName($interfaceName, $className, $attribute);
</span><del>- push(@headerContent, "JSC::JSValue ${getter}(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);\n");
</del><ins>+ push(@headerContent, "JSC::EncodedJSValue ${getter}(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);\n");
</ins><span class="cx"> if (!IsReadonly($attribute)) {
</span><span class="cx"> my $setter = GetAttributeSetterName($interfaceName, $className, $attribute);
</span><span class="cx"> push(@headerContent, "void ${setter}(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);\n");
</span><span class="lines">@@ -1051,7 +1051,7 @@
</span><span class="cx">
</span><span class="cx"> if (!$interface->extendedAttributes->{"NoInterfaceObject"}) {
</span><span class="cx"> my $getter = "js" . $interfaceName . "Constructor";
</span><del>- push(@headerContent, "JSC::JSValue ${getter}(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);\n");
</del><ins>+ push(@headerContent, "JSC::EncodedJSValue ${getter}(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($interface->extendedAttributes->{"ReplaceableConstructor"}) {
</span><span class="lines">@@ -1066,7 +1066,7 @@
</span><span class="cx"> my $conditionalString = $codeGenerator->GenerateConditionalString($constant);
</span><span class="cx"> push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
</span><span class="cx"> my $getter = "js" . $interfaceName . $codeGenerator->WK_ucfirst($constant->name);
</span><del>- push(@headerContent, "JSC::JSValue ${getter}(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);\n");
</del><ins>+ push(@headerContent, "JSC::EncodedJSValue ${getter}(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);\n");
</ins><span class="cx"> push(@headerContent, "#endif\n") if $conditionalString;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1875,11 +1875,11 @@
</span><span class="cx"> my $attributeConditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
</span><span class="cx"> push(@implContent, "#if ${attributeConditionalString}\n") if $attributeConditionalString;
</span><span class="cx">
</span><del>- push(@implContent, "JSValue ${getFunctionName}(ExecState* exec, JSValue slotBase, PropertyName)\n");
</del><ins>+ push(@implContent, "EncodedJSValue ${getFunctionName}(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)\n");
</ins><span class="cx"> push(@implContent, "{\n");
</span><span class="cx">
</span><span class="cx"> if (!$attribute->isStatic || $attribute->signature->type =~ /Constructor$/) {
</span><del>- push(@implContent, " ${className}* castedThis = jsCast<$className*>(asObject(slotBase));\n");
</del><ins>+ push(@implContent, " ${className}* castedThis = jsDynamicCast<$className*>(JSValue::decode(slotBase));\n");
</ins><span class="cx"> } else {
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(slotBase);\n");
</span><span class="cx"> }
</span><span class="lines">@@ -1890,16 +1890,16 @@
</span><span class="cx"> AddToImplIncludes("RuntimeEnabledFeatures.h");
</span><span class="cx"> my $enable_function = GetRuntimeEnableFunctionName($attribute->signature);
</span><span class="cx"> push(@implContent, " if (!${enable_function}())\n");
</span><del>- push(@implContent, " return jsUndefined();\n");
</del><ins>+ push(@implContent, " return JSValue::encode(jsUndefined());\n");
</ins><span class="cx"> } elsif ($attribute->signature->extendedAttributes->{"EnabledBySetting"}) {
</span><span class="cx"> AddToImplIncludes("Frame.h");
</span><span class="cx"> AddToImplIncludes("Settings.h");
</span><span class="cx"> my $enable_function = ToMethodName($attribute->signature->extendedAttributes->{"EnabledBySetting"}) . "Enabled";
</span><span class="cx"> push(@implContent, " if (!castedThis->impl().frame())\n");
</span><del>- push(@implContent, " return jsUndefined();\n");
</del><ins>+ push(@implContent, " return JSValue::encode(jsUndefined());\n");
</ins><span class="cx"> push(@implContent, " Settings& settings = castedThis->impl().frame()->settings();\n");
</span><span class="cx"> push(@implContent, " if (!settings.$enable_function())\n");
</span><del>- push(@implContent, " return jsUndefined();\n");
</del><ins>+ push(@implContent, " return JSValue::encode(jsUndefined());\n");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1911,15 +1911,15 @@
</span><span class="cx"> !$attribute->signature->extendedAttributes->{"DoNotCheckSecurity"} &&
</span><span class="cx"> !$attribute->signature->extendedAttributes->{"DoNotCheckSecurityOnGetter"}) {
</span><span class="cx"> push(@implContent, " if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, castedThis->impl()))\n");
</span><del>- push(@implContent, " return jsUndefined();\n");
</del><ins>+ push(@implContent, " return JSValue::encode(jsUndefined());\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (HasCustomGetter($attribute->signature->extendedAttributes)) {
</span><del>- push(@implContent, " return castedThis->$implGetterFunctionName(exec);\n");
</del><ins>+ push(@implContent, " return JSValue::encode(castedThis->$implGetterFunctionName(exec));\n");
</ins><span class="cx"> } elsif ($attribute->signature->extendedAttributes->{"CheckSecurityForNode"}) {
</span><span class="cx"> $implIncludes{"JSDOMBinding.h"} = 1;
</span><span class="cx"> push(@implContent, " $interfaceName& impl = castedThis->impl();\n");
</span><del>- push(@implContent, " return shouldAllowAccessToNode(exec, impl." . $attribute->signature->name . "()) ? " . NativeToJSValue($attribute->signature, 0, $interfaceName, "impl.$implGetterFunctionName()", "castedThis") . " : jsNull();\n");
</del><ins>+ push(@implContent, " return JSValue::encode(shouldAllowAccessToNode(exec, impl." . $attribute->signature->name . "()) ? " . NativeToJSValue($attribute->signature, 0, $interfaceName, "impl.$implGetterFunctionName()", "castedThis") . " : jsNull());\n");
</ins><span class="cx"> } elsif ($type eq "EventListener") {
</span><span class="cx"> $implIncludes{"EventListener.h"} = 1;
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(exec);\n");
</span><span class="lines">@@ -1931,10 +1931,10 @@
</span><span class="cx"> } else {
</span><span class="cx"> push(@implContent, " if (JSObject* jsFunction = jsListener->jsFunction(impl.scriptExecutionContext()))\n");
</span><span class="cx"> }
</span><del>- push(@implContent, " return jsFunction;\n");
</del><ins>+ push(@implContent, " return JSValue::encode(jsFunction);\n");
</ins><span class="cx"> push(@implContent, " }\n");
</span><span class="cx"> push(@implContent, " }\n");
</span><del>- push(@implContent, " return jsNull();\n");
</del><ins>+ push(@implContent, " return JSValue::encode(jsNull());\n");
</ins><span class="cx"> } elsif ($attribute->signature->type =~ /Constructor$/) {
</span><span class="cx"> my $constructorType = $attribute->signature->type;
</span><span class="cx"> $constructorType =~ s/Constructor$//;
</span><span class="lines">@@ -1943,10 +1943,10 @@
</span><span class="cx"> if ($interfaceName eq "DOMWindow") {
</span><span class="cx"> my $named = ($constructorType =~ /Named$/) ? "Named" : "";
</span><span class="cx"> $constructorType =~ s/Named$//;
</span><del>- push(@implContent, " return JS" . $constructorType . "::get${named}Constructor(exec->vm(), castedThis);\n");
</del><ins>+ push(@implContent, " return JSValue::encode(JS" . $constructorType . "::get${named}Constructor(exec->vm(), castedThis));\n");
</ins><span class="cx"> } else {
</span><span class="cx"> AddToImplIncludes("JS" . $constructorType . ".h", $attribute->signature->extendedAttributes->{"Conditional"});
</span><del>- push(@implContent, " return JS" . $constructorType . "::getConstructor(exec->vm(), castedThis->globalObject());\n");
</del><ins>+ push(@implContent, " return JSValue::encode(JS" . $constructorType . "::getConstructor(exec->vm(), castedThis->globalObject()));\n");
</ins><span class="cx"> }
</span><span class="cx"> } elsif (!$attribute->signature->extendedAttributes->{"GetterRaisesException"}) {
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(exec);\n") if !$attribute->signature->extendedAttributes->{"CallWith"};
</span><span class="lines">@@ -1957,10 +1957,10 @@
</span><span class="cx"> $cacheIndex = $currentCachedAttribute;
</span><span class="cx"> $currentCachedAttribute++;
</span><span class="cx"> push(@implContent, " if (JSValue cachedValue = castedThis->m_" . $attribute->signature->name . ".get())\n");
</span><del>- push(@implContent, " return cachedValue;\n");
</del><ins>+ push(@implContent, " return JSValue::encode(cachedValue);\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- my @callWithArgs = GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContent, "jsUndefined()");
</del><ins>+ my @callWithArgs = GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContent, "JSValue::encode(jsUndefined())");
</ins><span class="cx">
</span><span class="cx"> if ($svgListPropertyType) {
</span><span class="cx"> push(@implContent, " JSValue result = " . NativeToJSValue($attribute->signature, 0, $interfaceName, "castedThis->impl().$implGetterFunctionName(" . (join ", ", @callWithArgs) . ")", "castedThis") . ";\n");
</span><span class="lines">@@ -1998,12 +1998,12 @@
</span><span class="cx">
</span><span class="cx"> if ($isNullable) {
</span><span class="cx"> push(@implContent, " if (isNull)\n");
</span><del>- push(@implContent, " return jsNull();\n");
</del><ins>+ push(@implContent, " return JSValue::encode(jsNull());\n");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> push(@implContent, " castedThis->m_" . $attribute->signature->name . ".set(exec->vm(), castedThis, result);\n") if ($attribute->signature->extendedAttributes->{"CachedAttribute"});
</span><del>- push(@implContent, " return result;\n");
</del><ins>+ push(@implContent, " return JSValue::encode(result);\n");
</ins><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> my @arguments = ("ec");
</span><span class="lines">@@ -2014,7 +2014,7 @@
</span><span class="cx"> unshift(@arguments, "isNull");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unshift(@arguments, GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContent, "jsUndefined()"));
</del><ins>+ unshift(@arguments, GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContent, "JSValue::encode(jsUndefined())"));
</ins><span class="cx">
</span><span class="cx"> if ($svgPropertyOrListPropertyType) {
</span><span class="cx"> push(@implContent, " $svgPropertyOrListPropertyType impl(*castedThis->impl());\n");
</span><span class="lines">@@ -2026,11 +2026,11 @@
</span><span class="cx">
</span><span class="cx"> if ($isNullable) {
</span><span class="cx"> push(@implContent, " if (isNull)\n");
</span><del>- push(@implContent, " return jsNull();\n");
</del><ins>+ push(@implContent, " return JSValue::encode(jsNull());\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> push(@implContent, " setDOMException(exec, ec);\n");
</span><del>- push(@implContent, " return result;\n");
</del><ins>+ push(@implContent, " return JSValue::encode(result);\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> push(@implContent, "}\n\n");
</span><span class="lines">@@ -2043,16 +2043,16 @@
</span><span class="cx"> if (!$interface->extendedAttributes->{"NoInterfaceObject"}) {
</span><span class="cx"> my $constructorFunctionName = "js" . $interfaceName . "Constructor";
</span><span class="cx">
</span><del>- push(@implContent, "JSValue ${constructorFunctionName}(ExecState* exec, JSValue slotBase, PropertyName)\n");
</del><ins>+ push(@implContent, "EncodedJSValue ${constructorFunctionName}(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)\n");
</ins><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " ${className}* domObject = jsCast<$className*>(asObject(slotBase));\n");
</del><ins>+ push(@implContent, " ${className}* domObject = jsDynamicCast<$className*>(JSValue::decode(slotBase));\n");
</ins><span class="cx">
</span><span class="cx"> if ($interface->extendedAttributes->{"CheckSecurity"}) {
</span><span class="cx"> push(@implContent, " if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, domObject->impl()))\n");
</span><del>- push(@implContent, " return jsUndefined();\n");
</del><ins>+ push(@implContent, " return JSValue::encode(jsUndefined());\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- push(@implContent, " return ${className}::getConstructor(exec->vm(), domObject->globalObject());\n");
</del><ins>+ push(@implContent, " return JSValue::encode(${className}::getConstructor(exec->vm(), domObject->globalObject()));\n");
</ins><span class="cx"> push(@implContent, "}\n\n");
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2384,9 +2384,9 @@
</span><span class="cx"> push(@implContent, " return throwVMTypeError(exec);\n");
</span><span class="cx"> } else {
</span><span class="cx"> push(@implContent, " JSValue thisValue = exec->hostThisValue();\n");
</span><del>- push(@implContent, " if (!thisValue.inherits(${className}::info()))\n");
</del><ins>+ push(@implContent, " $className* castedThis = jsDynamicCast<$className*>(thisValue);\n");
+ push(@implContent, " if (!castedThis)\n");
</ins><span class="cx"> push(@implContent, " return throwVMTypeError(exec);\n");
</span><del>- push(@implContent, " $className* castedThis = jsCast<$className*>(asObject(thisValue));\n");
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> push(@implContent, " ASSERT_GC_OBJECT_INHERITS(castedThis, ${className}::info());\n");
</span><span class="lines">@@ -2484,13 +2484,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # FIXME: this casts into int to match our previous behavior which turned 0xFFFFFFFF in -1 for NodeFilter.SHOW_ALL
</span><del>- push(@implContent, "JSValue ${getter}(ExecState* exec, JSValue, PropertyName)\n");
</del><ins>+ push(@implContent, "EncodedJSValue ${getter}(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)\n");
</ins><span class="cx"> push(@implContent, "{\n");
</span><span class="cx"> if ($constant->type eq "DOMString") {
</span><del>- push(@implContent, " return jsStringOrNull(exec, String(" . $constant->value . "));\n");
</del><ins>+ push(@implContent, " return JSValue::encode(jsStringOrNull(exec, String(" . $constant->value . ")));\n");
</ins><span class="cx"> } else {
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(exec);\n");
</span><del>- push(@implContent, " return jsNumber(static_cast<int>(" . $constant->value . "));\n");
</del><ins>+ push(@implContent, " return JSValue::encode(jsNumber(static_cast<int>(" . $constant->value . ")));\n");
</ins><span class="cx"> }
</span><span class="cx"> push(@implContent, "}\n\n");
</span><span class="cx"> push(@implContent, "#endif\n") if $conditional;
</span><span class="lines">@@ -2498,15 +2498,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($indexedGetterFunction && !$hasNumericIndexedGetter) {
</span><del>- push(@implContent, "\nJSValue ${className}::indexGetter(ExecState* exec, JSValue slotBase, unsigned index)\n");
</del><ins>+ push(@implContent, "\nEncodedJSValue ${className}::indexGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, unsigned index)\n");
</ins><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " ${className}* thisObj = jsCast<$className*>(asObject(slotBase));\n");
</del><ins>+ push(@implContent, " ${className}* thisObj = jsCast<$className*>(JSValue::decode(slotBase));\n");
</ins><span class="cx"> push(@implContent, " ASSERT_GC_OBJECT_INHERITS(thisObj, info());\n");
</span><span class="cx"> if ($indexedGetterFunction->signature->type eq "DOMString") {
</span><span class="cx"> $implIncludes{"URL.h"} = 1;
</span><del>- push(@implContent, " return jsStringOrUndefined(exec, thisObj->impl().item(index));\n");
</del><ins>+ push(@implContent, " return JSValue::encode(jsStringOrUndefined(exec, thisObj->impl().item(index)));\n");
</ins><span class="cx"> } else {
</span><del>- push(@implContent, " return toJS(exec, thisObj->globalObject(), thisObj->impl().item(index));\n");
</del><ins>+ push(@implContent, " return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().item(index)));\n");
</ins><span class="cx"> }
</span><span class="cx"> push(@implContent, "}\n\n");
</span><span class="cx"> if ($interfaceName =~ /^HTML\w*Collection$/ or $interfaceName eq "RadioNodeList") {
</span><span class="lines">@@ -2537,10 +2537,10 @@
</span><span class="cx"> push(@implContent, "{\n");
</span><span class="cx"> push(@implContent, " return collection->hasNamedItem(propertyNameToAtomicString(propertyName));\n");
</span><span class="cx"> push(@implContent, "}\n\n");
</span><del>- push(@implContent, "JSValue ${className}::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)\n");
</del><ins>+ push(@implContent, "EncodedJSValue ${className}::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)\n");
</ins><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " ${className}* thisObj = jsCast<$className*>(asObject(slotBase));\n");
- push(@implContent, " return toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName)));\n");
</del><ins>+ push(@implContent, " ${className}* thisObj = jsCast<$className*>(JSValue::decode(slotBase));\n");
+ push(@implContent, " return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName))));\n");
</ins><span class="cx"> push(@implContent, "}\n\n");
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2731,7 +2731,7 @@
</span><span class="cx"> if ((!$hasParent or $interface->extendedAttributes->{"JSGenerateToNativeObject"}) and !$interface->extendedAttributes->{"JSCustomToNativeObject"}) {
</span><span class="cx"> push(@implContent, "$implType* to${interfaceName}(JSC::JSValue value)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " return value.inherits(${className}::info()) ? &jsCast<$className*>(asObject(value))->impl() : 0");
</del><ins>+ push(@implContent, " return value.inherits(${className}::info()) ? &jsCast<$className*>(value)->impl() : 0");
</ins><span class="cx"> push(@implContent, ";\n}\n");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2871,7 +2871,7 @@
</span><span class="cx"> push(@$outputArray, " return throwVMTypeError(exec);\n");
</span><span class="cx"> if ($function->isStatic) {
</span><span class="cx"> AddToImplIncludes("CallbackFunction.h");
</span><del>- push(@$outputArray, " $name = createFunctionOnlyCallback<${callbackClassName}>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->uncheckedArgument($argsIndex));\n");
</del><ins>+ push(@$outputArray, " $name = createFunctionOnlyCallback<${callbackClassName}>(exec, jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->uncheckedArgument($argsIndex));\n");
</ins><span class="cx"> } else {
</span><span class="cx"> push(@$outputArray, " $name = ${callbackClassName}::create(asObject(exec->uncheckedArgument($argsIndex)), castedThis->globalObject());\n");
</span><span class="cx"> }
</span><span class="lines">@@ -2881,7 +2881,7 @@
</span><span class="cx"> push(@$outputArray, " return throwVMTypeError(exec);\n");
</span><span class="cx"> if ($function->isStatic) {
</span><span class="cx"> AddToImplIncludes("CallbackFunction.h");
</span><del>- push(@$outputArray, " RefPtr<$argType> $name = createFunctionOnlyCallback<${callbackClassName}>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->uncheckedArgument($argsIndex));\n");
</del><ins>+ push(@$outputArray, " RefPtr<$argType> $name = createFunctionOnlyCallback<${callbackClassName}>(exec, jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->uncheckedArgument($argsIndex));\n");
</ins><span class="cx"> } else {
</span><span class="cx"> push(@$outputArray, " RefPtr<$argType> $name = ${callbackClassName}::create(asObject(exec->uncheckedArgument($argsIndex)), castedThis->globalObject());\n");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -130,24 +130,24 @@
</span><span class="cx"> return getStaticValueSlot<JSTestActiveDOMObject, Base>(exec, JSTestActiveDOMObjectTable, thisObject, propertyName, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestActiveDOMObjectExcitingAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestActiveDOMObjectExcitingAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestActiveDOMObject* castedThis = jsCast<JSTestActiveDOMObject*>(asObject(slotBase));
</del><ins>+ JSTestActiveDOMObject* castedThis = jsDynamicCast<JSTestActiveDOMObject*>(JSValue::decode(slotBase));
</ins><span class="cx"> if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, castedThis->impl()))
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestActiveDOMObject& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.excitingAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestActiveDOMObjectConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestActiveDOMObjectConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestActiveDOMObject* domObject = jsCast<JSTestActiveDOMObject*>(asObject(slotBase));
</del><ins>+ JSTestActiveDOMObject* domObject = jsDynamicCast<JSTestActiveDOMObject*>(JSValue::decode(slotBase));
</ins><span class="cx"> if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, domObject->impl()))
</span><del>- return jsUndefined();
- return JSTestActiveDOMObject::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ return JSValue::encode(jsUndefined());
+ return JSValue::encode(JSTestActiveDOMObject::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSTestActiveDOMObject::getConstructor(VM& vm, JSGlobalObject* globalObject)
</span><span class="lines">@@ -158,9 +158,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestActiveDOMObjectPrototypeFunctionExcitingFunction(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestActiveDOMObject::info()))
</del><ins>+ JSTestActiveDOMObject* castedThis = jsDynamicCast<JSTestActiveDOMObject*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestActiveDOMObject* castedThis = jsCast<JSTestActiveDOMObject*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestActiveDOMObject::info());
</span><span class="cx"> if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, castedThis->impl()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -177,9 +177,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestActiveDOMObjectPrototypeFunctionPostMessage(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestActiveDOMObject::info()))
</del><ins>+ JSTestActiveDOMObject* castedThis = jsDynamicCast<JSTestActiveDOMObject*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestActiveDOMObject* castedThis = jsCast<JSTestActiveDOMObject*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestActiveDOMObject::info());
</span><span class="cx"> TestActiveDOMObject& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx">
</span><span class="cx"> TestActiveDOMObject* toTestActiveDOMObject(JSC::JSValue value)
</span><span class="cx"> {
</span><del>- return value.inherits(JSTestActiveDOMObject::info()) ? &jsCast<JSTestActiveDOMObject*>(asObject(value))->impl() : 0;
</del><ins>+ return value.inherits(JSTestActiveDOMObject::info()) ? &jsCast<JSTestActiveDOMObject*>(value)->impl() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -144,8 +144,8 @@
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestActiveDOMObjectPrototypeFunctionPostMessage(JSC::ExecState*);
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><del>-JSC::JSValue jsTestActiveDOMObjectExcitingAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestActiveDOMObjectConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestActiveDOMObjectExcitingAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestActiveDOMObjectConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCustomNamedGettercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -144,10 +144,10 @@
</span><span class="cx"> return Base::getOwnPropertySlotByIndex(thisObject, exec, index, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestCustomNamedGetterConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestCustomNamedGetterConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestCustomNamedGetter* domObject = jsCast<JSTestCustomNamedGetter*>(asObject(slotBase));
- return JSTestCustomNamedGetter::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ JSTestCustomNamedGetter* domObject = jsDynamicCast<JSTestCustomNamedGetter*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestCustomNamedGetter::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSTestCustomNamedGetter::getConstructor(VM& vm, JSGlobalObject* globalObject)
</span><span class="lines">@@ -158,9 +158,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestCustomNamedGetterPrototypeFunctionAnotherFunction(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestCustomNamedGetter::info()))
</del><ins>+ JSTestCustomNamedGetter* castedThis = jsDynamicCast<JSTestCustomNamedGetter*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestCustomNamedGetter* castedThis = jsCast<JSTestCustomNamedGetter*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestCustomNamedGetter::info());
</span><span class="cx"> TestCustomNamedGetter& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx">
</span><span class="cx"> TestCustomNamedGetter* toTestCustomNamedGetter(JSC::JSValue value)
</span><span class="cx"> {
</span><del>- return value.inherits(JSTestCustomNamedGetter::info()) ? &jsCast<JSTestCustomNamedGetter*>(asObject(value))->impl() : 0;
</del><ins>+ return value.inherits(JSTestCustomNamedGetter::info()) ? &jsCast<JSTestCustomNamedGetter*>(value)->impl() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCustomNamedGetterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | JSC::InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | JSC::HasImpureGetOwnPropertySlot | Base::StructureFlags;
</span><span class="cx"> private:
</span><span class="cx"> static bool canGetItemsForName(JSC::ExecState*, TestCustomNamedGetter*, JSC::PropertyName);
</span><del>- static JSC::JSValue nameGetter(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+ static JSC::EncodedJSValue nameGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class JSTestCustomNamedGetterOwner : public JSC::WeakHandleOwner {
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestCustomNamedGetterPrototypeFunctionAnotherFunction(JSC::ExecState*);
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><del>-JSC::JSValue jsTestCustomNamedGetterConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestCustomNamedGetterConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</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 (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -167,30 +167,30 @@
</span><span class="cx"> return getStaticValueSlot<JSTestEventConstructor, Base>(exec, JSTestEventConstructorTable, thisObject, propertyName, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestEventConstructorAttr1(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestEventConstructorAttr1(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestEventConstructor* castedThis = jsCast<JSTestEventConstructor*>(asObject(slotBase));
</del><ins>+ JSTestEventConstructor* castedThis = jsDynamicCast<JSTestEventConstructor*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestEventConstructor& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.attr1());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestEventConstructorAttr2(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestEventConstructorAttr2(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestEventConstructor* castedThis = jsCast<JSTestEventConstructor*>(asObject(slotBase));
</del><ins>+ JSTestEventConstructor* castedThis = jsDynamicCast<JSTestEventConstructor*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestEventConstructor& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.attr2());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestEventConstructorConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestEventConstructorConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestEventConstructor* domObject = jsCast<JSTestEventConstructor*>(asObject(slotBase));
- return JSTestEventConstructor::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ JSTestEventConstructor* domObject = jsDynamicCast<JSTestEventConstructor*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestEventConstructor::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSTestEventConstructor::getConstructor(VM& vm, JSGlobalObject* globalObject)
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx">
</span><span class="cx"> TestEventConstructor* toTestEventConstructor(JSC::JSValue value)
</span><span class="cx"> {
</span><del>- return value.inherits(JSTestEventConstructor::info()) ? &jsCast<JSTestEventConstructor*>(asObject(value))->impl() : 0;
</del><ins>+ return value.inherits(JSTestEventConstructor::info()) ? &jsCast<JSTestEventConstructor*>(value)->impl() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestEventConstructorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -145,9 +145,9 @@
</span><span class="cx">
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><del>-JSC::JSValue jsTestEventConstructorAttr1(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestEventConstructorAttr2(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestEventConstructorConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestEventConstructorAttr1(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestEventConstructorAttr2(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestEventConstructorConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestEventTargetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -169,10 +169,10 @@
</span><span class="cx"> return Base::getOwnPropertySlotByIndex(thisObject, exec, index, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestEventTargetConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestEventTargetConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestEventTarget* domObject = jsCast<JSTestEventTarget*>(asObject(slotBase));
- return JSTestEventTarget::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ JSTestEventTarget* domObject = jsDynamicCast<JSTestEventTarget*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestEventTarget::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSTestEventTarget::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
</span><span class="lines">@@ -192,9 +192,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestEventTargetPrototypeFunctionItem(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestEventTarget::info()))
</del><ins>+ JSTestEventTarget* castedThis = jsDynamicCast<JSTestEventTarget*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestEventTarget* castedThis = jsCast<JSTestEventTarget*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestEventTarget::info());
</span><span class="cx"> TestEventTarget& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -214,9 +214,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestEventTargetPrototypeFunctionAddEventListener(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestEventTarget::info()))
</del><ins>+ JSTestEventTarget* castedThis = jsDynamicCast<JSTestEventTarget*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestEventTarget* castedThis = jsCast<JSTestEventTarget*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestEventTarget::info());
</span><span class="cx"> TestEventTarget& impl = castedThis->impl();
</span><span class="cx"> JSValue listener = exec->argument(1);
</span><span class="lines">@@ -229,9 +229,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestEventTargetPrototypeFunctionRemoveEventListener(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestEventTarget::info()))
</del><ins>+ JSTestEventTarget* castedThis = jsDynamicCast<JSTestEventTarget*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestEventTarget* castedThis = jsCast<JSTestEventTarget*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestEventTarget::info());
</span><span class="cx"> TestEventTarget& impl = castedThis->impl();
</span><span class="cx"> JSValue listener = exec->argument(1);
</span><span class="lines">@@ -244,9 +244,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestEventTargetPrototypeFunctionDispatchEvent(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestEventTarget::info()))
</del><ins>+ JSTestEventTarget* castedThis = jsDynamicCast<JSTestEventTarget*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestEventTarget* castedThis = jsCast<JSTestEventTarget*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestEventTarget::info());
</span><span class="cx"> TestEventTarget& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -272,11 +272,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue JSTestEventTarget::indexGetter(ExecState* exec, JSValue slotBase, unsigned index)
</del><ins>+EncodedJSValue JSTestEventTarget::indexGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, unsigned index)
</ins><span class="cx"> {
</span><del>- JSTestEventTarget* thisObj = jsCast<JSTestEventTarget*>(asObject(slotBase));
</del><ins>+ JSTestEventTarget* thisObj = jsCast<JSTestEventTarget*>(JSValue::decode(slotBase));
</ins><span class="cx"> ASSERT_GC_OBJECT_INHERITS(thisObj, info());
</span><del>- return toJS(exec, thisObj->globalObject(), thisObj->impl().item(index));
</del><ins>+ return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().item(index)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSTestEventTargetOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx">
</span><span class="cx"> TestEventTarget* toTestEventTarget(JSC::JSValue value)
</span><span class="cx"> {
</span><del>- return value.inherits(JSTestEventTarget::info()) ? &jsCast<JSTestEventTarget*>(asObject(value))->impl() : 0;
</del><ins>+ return value.inherits(JSTestEventTarget::info()) ? &jsCast<JSTestEventTarget*>(value)->impl() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestEventTargeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -73,10 +73,10 @@
</span><span class="cx"> JSTestEventTarget(JSC::Structure*, JSDOMGlobalObject*, PassRefPtr<TestEventTarget>);
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> static const unsigned StructureFlags = JSC::OverridesGetPropertyNames | JSC::OverridesGetOwnPropertySlot | JSC::InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | JSC::OverridesVisitChildren | JSC::MasqueradesAsUndefined | JSC::HasImpureGetOwnPropertySlot | Base::StructureFlags;
</span><del>- static JSC::JSValue indexGetter(JSC::ExecState*, JSC::JSValue, unsigned);
</del><ins>+ static JSC::EncodedJSValue indexGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, unsigned);
</ins><span class="cx"> private:
</span><span class="cx"> static bool canGetItemsForName(JSC::ExecState*, TestEventTarget*, JSC::PropertyName);
</span><del>- static JSC::JSValue nameGetter(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+ static JSC::EncodedJSValue nameGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class JSTestEventTargetOwner : public JSC::WeakHandleOwner {
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestEventTargetPrototypeFunctionDispatchEvent(JSC::ExecState*);
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><del>-JSC::JSValue jsTestEventTargetConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestEventTargetConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestExceptioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -120,20 +120,20 @@
</span><span class="cx"> return getStaticValueSlot<JSTestException, Base>(exec, JSTestExceptionTable, thisObject, propertyName, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestExceptionName(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestExceptionName(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestException* castedThis = jsCast<JSTestException*>(asObject(slotBase));
</del><ins>+ JSTestException* castedThis = jsDynamicCast<JSTestException*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestException& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.name());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestExceptionConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestExceptionConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestException* domObject = jsCast<JSTestException*>(asObject(slotBase));
- return JSTestException::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ JSTestException* domObject = jsDynamicCast<JSTestException*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestException::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSTestException::getConstructor(VM& vm, JSGlobalObject* globalObject)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx">
</span><span class="cx"> TestException* toTestException(JSC::JSValue value)
</span><span class="cx"> {
</span><del>- return value.inherits(JSTestException::info()) ? &jsCast<JSTestException*>(asObject(value))->impl() : 0;
</del><ins>+ return value.inherits(JSTestException::info()) ? &jsCast<JSTestException*>(value)->impl() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestExceptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -139,8 +139,8 @@
</span><span class="cx">
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><del>-JSC::JSValue jsTestExceptionName(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestExceptionConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestExceptionName(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestExceptionConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestGenerateIsReachablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -117,10 +117,10 @@
</span><span class="cx"> return getStaticValueSlot<JSTestGenerateIsReachable, Base>(exec, JSTestGenerateIsReachableTable, thisObject, propertyName, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestGenerateIsReachableConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestGenerateIsReachableConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestGenerateIsReachable* domObject = jsCast<JSTestGenerateIsReachable*>(asObject(slotBase));
- return JSTestGenerateIsReachable::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ JSTestGenerateIsReachable* domObject = jsDynamicCast<JSTestGenerateIsReachable*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestGenerateIsReachable::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSTestGenerateIsReachable::getConstructor(VM& vm, JSGlobalObject* globalObject)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx">
</span><span class="cx"> TestGenerateIsReachable* toTestGenerateIsReachable(JSC::JSValue value)
</span><span class="cx"> {
</span><del>- return value.inherits(JSTestGenerateIsReachable::info()) ? &jsCast<JSTestGenerateIsReachable*>(asObject(value))->impl() : 0;
</del><ins>+ return value.inherits(JSTestGenerateIsReachable::info()) ? &jsCast<JSTestGenerateIsReachable*>(value)->impl() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestGenerateIsReachableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx">
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><del>-JSC::JSValue jsTestGenerateIsReachableConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestGenerateIsReachableConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -272,143 +272,143 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSValue jsTestInterfaceConstructorImplementsStaticReadOnlyAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceConstructorImplementsStaticReadOnlyAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> JSValue result = jsNumber(TestInterface::implementsStaticReadOnlyAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSValue jsTestInterfaceConstructorImplementsStaticAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceConstructorImplementsStaticAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> JSValue result = jsStringWithCache(exec, TestInterface::implementsStaticAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSValue jsTestInterfaceImplementsStr1(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceImplementsStr1(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestInterface* castedThis = jsCast<JSTestInterface*>(asObject(slotBase));
</del><ins>+ JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestInterface& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.implementsStr1());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSValue jsTestInterfaceImplementsStr2(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceImplementsStr2(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestInterface* castedThis = jsCast<JSTestInterface*>(asObject(slotBase));
</del><ins>+ JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestInterface& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.implementsStr2());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSValue jsTestInterfaceImplementsStr3(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceImplementsStr3(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestInterface* castedThis = jsCast<JSTestInterface*>(asObject(slotBase));
- return castedThis->implementsStr3(exec);
</del><ins>+ JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(JSValue::decode(slotBase));
+ return JSValue::encode(castedThis->implementsStr3(exec));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSValue jsTestInterfaceImplementsNode(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceImplementsNode(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestInterface* castedThis = jsCast<JSTestInterface*>(asObject(slotBase));
</del><ins>+ JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestInterface& impl = castedThis->impl();
</span><span class="cx"> JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl.implementsNode()));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSValue jsTestInterfaceConstructorSupplementalStaticReadOnlyAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceConstructorSupplementalStaticReadOnlyAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> JSValue result = jsNumber(TestSupplemental::supplementalStaticReadOnlyAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSValue jsTestInterfaceConstructorSupplementalStaticAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceConstructorSupplementalStaticAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> JSValue result = jsStringWithCache(exec, TestSupplemental::supplementalStaticAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSValue jsTestInterfaceSupplementalStr1(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceSupplementalStr1(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestInterface* castedThis = jsCast<JSTestInterface*>(asObject(slotBase));
</del><ins>+ JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestInterface& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, TestSupplemental::supplementalStr1(&impl));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSValue jsTestInterfaceSupplementalStr2(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceSupplementalStr2(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestInterface* castedThis = jsCast<JSTestInterface*>(asObject(slotBase));
</del><ins>+ JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestInterface& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, TestSupplemental::supplementalStr2(&impl));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSValue jsTestInterfaceSupplementalStr3(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceSupplementalStr3(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestInterface* castedThis = jsCast<JSTestInterface*>(asObject(slotBase));
- return castedThis->supplementalStr3(exec);
</del><ins>+ JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(JSValue::decode(slotBase));
+ return JSValue::encode(castedThis->supplementalStr3(exec));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSValue jsTestInterfaceSupplementalNode(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceSupplementalNode(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestInterface* castedThis = jsCast<JSTestInterface*>(asObject(slotBase));
</del><ins>+ JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestInterface& impl = castedThis->impl();
</span><span class="cx"> JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(TestSupplemental::supplementalNode(&impl)));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-JSValue jsTestInterfaceConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestInterface* domObject = jsCast<JSTestInterface*>(asObject(slotBase));
- return JSTestInterface::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ JSTestInterface* domObject = jsDynamicCast<JSTestInterface*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestInterface::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSTestInterface::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
</span><span class="lines">@@ -538,9 +538,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionImplementsMethod1(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestInterface::info()))
</del><ins>+ JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestInterface* castedThis = jsCast<JSTestInterface*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestInterface::info());
</span><span class="cx"> TestInterface& impl = castedThis->impl();
</span><span class="cx"> impl.implementsMethod1();
</span><span class="lines">@@ -553,9 +553,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionImplementsMethod2(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestInterface::info()))
</del><ins>+ JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestInterface* castedThis = jsCast<JSTestInterface*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestInterface::info());
</span><span class="cx"> TestInterface& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 2)
</span><span class="lines">@@ -582,9 +582,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionImplementsMethod3(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestInterface::info()))
</del><ins>+ JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestInterface* castedThis = jsCast<JSTestInterface*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestInterface::info());
</span><span class="cx"> return JSValue::encode(castedThis->implementsMethod3(exec));
</span><span class="cx"> }
</span><span class="lines">@@ -604,9 +604,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionSupplementalMethod1(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestInterface::info()))
</del><ins>+ JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestInterface* castedThis = jsCast<JSTestInterface*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestInterface::info());
</span><span class="cx"> TestInterface& impl = castedThis->impl();
</span><span class="cx"> TestSupplemental::supplementalMethod1(&impl);
</span><span class="lines">@@ -619,9 +619,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionSupplementalMethod2(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestInterface::info()))
</del><ins>+ JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestInterface* castedThis = jsCast<JSTestInterface*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestInterface::info());
</span><span class="cx"> TestInterface& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 2)
</span><span class="lines">@@ -648,9 +648,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionSupplementalMethod3(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestInterface::info()))
</del><ins>+ JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestInterface* castedThis = jsCast<JSTestInterface*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestInterface::info());
</span><span class="cx"> return JSValue::encode(castedThis->supplementalMethod3(exec));
</span><span class="cx"> }
</span><span class="lines">@@ -669,34 +669,34 @@
</span><span class="cx"> // Constant getters
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSValue jsTestInterfaceIMPLEMENTSCONSTANT1(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceIMPLEMENTSCONSTANT1(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(1));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(1)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSValue jsTestInterfaceIMPLEMENTSCONSTANT2(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceIMPLEMENTSCONSTANT2(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(2));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(2)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSValue jsTestInterfaceSUPPLEMENTALCONSTANT1(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceSUPPLEMENTALCONSTANT1(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(1));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(1)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSValue jsTestInterfaceSUPPLEMENTALCONSTANT2(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestInterfaceSUPPLEMENTALCONSTANT2(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(2));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(2)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="lines">@@ -736,7 +736,7 @@
</span><span class="cx">
</span><span class="cx"> TestInterface* toTestInterface(JSC::JSValue value)
</span><span class="cx"> {
</span><del>- return value.inherits(JSTestInterface::info()) ? &jsCast<JSTestInterface*>(asObject(value))->impl() : 0;
</del><ins>+ return value.inherits(JSTestInterface::info()) ? &jsCast<JSTestInterface*>(value)->impl() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -198,63 +198,63 @@
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSC::JSValue jsTestInterfaceConstructorImplementsStaticReadOnlyAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceConstructorImplementsStaticReadOnlyAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSC::JSValue jsTestInterfaceConstructorImplementsStaticAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceConstructorImplementsStaticAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestInterfaceConstructorImplementsStaticAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSC::JSValue jsTestInterfaceImplementsStr1(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceImplementsStr1(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSC::JSValue jsTestInterfaceImplementsStr2(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceImplementsStr2(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestInterfaceImplementsStr2(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSC::JSValue jsTestInterfaceImplementsStr3(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceImplementsStr3(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestInterfaceImplementsStr3(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSC::JSValue jsTestInterfaceImplementsNode(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceImplementsNode(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestInterfaceImplementsNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSC::JSValue jsTestInterfaceConstructorSupplementalStaticReadOnlyAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceConstructorSupplementalStaticReadOnlyAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSC::JSValue jsTestInterfaceConstructorSupplementalStaticAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceConstructorSupplementalStaticAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestInterfaceConstructorSupplementalStaticAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSC::JSValue jsTestInterfaceSupplementalStr1(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceSupplementalStr1(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSC::JSValue jsTestInterfaceSupplementalStr2(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceSupplementalStr2(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestInterfaceSupplementalStr2(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSC::JSValue jsTestInterfaceSupplementalStr3(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceSupplementalStr3(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestInterfaceSupplementalStr3(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSC::JSValue jsTestInterfaceSupplementalNode(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceSupplementalNode(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestInterfaceSupplementalNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><span class="cx"> #endif
</span><del>-JSC::JSValue jsTestInterfaceConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> // Constants
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSC::JSValue jsTestInterfaceIMPLEMENTSCONSTANT1(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceIMPLEMENTSCONSTANT1(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition22) || ENABLE(Condition23)
</span><del>-JSC::JSValue jsTestInterfaceIMPLEMENTSCONSTANT2(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceIMPLEMENTSCONSTANT2(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSC::JSValue jsTestInterfaceSUPPLEMENTALCONSTANT1(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceSUPPLEMENTALCONSTANT1(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><del>-JSC::JSValue jsTestInterfaceSUPPLEMENTALCONSTANT2(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestInterfaceSUPPLEMENTALCONSTANT2(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestMediaQueryListListenercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -128,10 +128,10 @@
</span><span class="cx"> return getStaticValueSlot<JSTestMediaQueryListListener, Base>(exec, JSTestMediaQueryListListenerTable, thisObject, propertyName, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestMediaQueryListListenerConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestMediaQueryListListenerConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestMediaQueryListListener* domObject = jsCast<JSTestMediaQueryListListener*>(asObject(slotBase));
- return JSTestMediaQueryListListener::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ JSTestMediaQueryListListener* domObject = jsDynamicCast<JSTestMediaQueryListListener*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestMediaQueryListListener::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSTestMediaQueryListListener::getConstructor(VM& vm, JSGlobalObject* globalObject)
</span><span class="lines">@@ -142,9 +142,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestMediaQueryListListenerPrototypeFunctionMethod(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestMediaQueryListListener::info()))
</del><ins>+ JSTestMediaQueryListListener* castedThis = jsDynamicCast<JSTestMediaQueryListListener*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestMediaQueryListListener* castedThis = jsCast<JSTestMediaQueryListListener*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestMediaQueryListListener::info());
</span><span class="cx"> TestMediaQueryListListener& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx">
</span><span class="cx"> TestMediaQueryListListener* toTestMediaQueryListListener(JSC::JSValue value)
</span><span class="cx"> {
</span><del>- return value.inherits(JSTestMediaQueryListListener::info()) ? &jsCast<JSTestMediaQueryListListener*>(asObject(value))->impl() : 0;
</del><ins>+ return value.inherits(JSTestMediaQueryListListener::info()) ? &jsCast<JSTestMediaQueryListListener*>(value)->impl() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestMediaQueryListListenerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestMediaQueryListListenerPrototypeFunctionMethod(JSC::ExecState*);
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><del>-JSC::JSValue jsTestMediaQueryListListenerConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestMediaQueryListListenerConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNamedConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -164,10 +164,10 @@
</span><span class="cx"> return getStaticValueSlot<JSTestNamedConstructor, Base>(exec, JSTestNamedConstructorTable, thisObject, propertyName, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestNamedConstructorConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestNamedConstructorConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestNamedConstructor* domObject = jsCast<JSTestNamedConstructor*>(asObject(slotBase));
- return JSTestNamedConstructor::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ JSTestNamedConstructor* domObject = jsDynamicCast<JSTestNamedConstructor*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestNamedConstructor::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSTestNamedConstructor::getConstructor(VM& vm, JSGlobalObject* globalObject)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx">
</span><span class="cx"> TestNamedConstructor* toTestNamedConstructor(JSC::JSValue value)
</span><span class="cx"> {
</span><del>- return value.inherits(JSTestNamedConstructor::info()) ? &jsCast<JSTestNamedConstructor*>(asObject(value))->impl() : 0;
</del><ins>+ return value.inherits(JSTestNamedConstructor::info()) ? &jsCast<JSTestNamedConstructor*>(value)->impl() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNamedConstructorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx">
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><del>-JSC::JSValue jsTestNamedConstructorConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestNamedConstructorConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -121,10 +121,10 @@
</span><span class="cx"> return getStaticValueSlot<JSTestNode, Base>(exec, JSTestNodeTable, thisObject, propertyName, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestNodeConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestNodeConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestNode* domObject = jsCast<JSTestNode*>(asObject(slotBase));
- return JSTestNode::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ JSTestNode* domObject = jsDynamicCast<JSTestNode*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestNode::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSTestNode::getConstructor(VM& vm, JSGlobalObject* globalObject)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx">
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><del>-JSC::JSValue jsTestNodeConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestNodeConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -392,725 +392,725 @@
</span><span class="cx"> return getStaticValueSlot<JSTestObj, Base>(exec, JSTestObjTable, thisObject, propertyName, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestObjReadOnlyLongAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjReadOnlyLongAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.readOnlyLongAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjReadOnlyStringAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjReadOnlyStringAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.readOnlyStringAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjReadOnlyTestObjAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjReadOnlyTestObjAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl.readOnlyTestObjAttr()));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjConstructorStaticReadOnlyLongAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjConstructorStaticReadOnlyLongAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> JSValue result = jsNumber(TestObj::staticReadOnlyLongAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjConstructorStaticStringAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjConstructorStaticStringAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> JSValue result = jsStringWithCache(exec, TestObj::staticStringAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjConstructorTestSubObj(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjConstructorTestSubObj(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
- return JSTestSubObj::getConstructor(exec->vm(), castedThis->globalObject());
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestSubObj::getConstructor(exec->vm(), castedThis->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjTestSubObjEnabledBySettingConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjTestSubObjEnabledBySettingConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> if (!castedThis->impl().frame())
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx"> Settings& settings = castedThis->impl().frame()->settings();
</span><span class="cx"> if (!settings.testSettingEnabled())
</span><del>- return jsUndefined();
- return JSTestSubObj::getConstructor(exec->vm(), castedThis->globalObject());
</del><ins>+ return JSValue::encode(jsUndefined());
+ return JSValue::encode(JSTestSubObj::getConstructor(exec->vm(), castedThis->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjEnumAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjEnumAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.enumAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjByteAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjByteAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.byteAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjOctetAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjOctetAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.octetAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjShortAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjShortAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.shortAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjUnsignedShortAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjUnsignedShortAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.unsignedShortAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjLongAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjLongAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.longAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjLongLongAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjLongLongAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.longLongAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjUnsignedLongLongAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjUnsignedLongLongAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.unsignedLongLongAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjStringAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjStringAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.stringAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjTestObjAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjTestObjAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl.testObjAttr()));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjXMLObjAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjXMLObjAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl.xmlObjAttr()));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjCreate(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCreate(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsBoolean(impl.isCreate());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjReflectedStringAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjReflectedStringAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.fastGetAttribute(WebCore::HTMLNames::reflectedstringattrAttr));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjReflectedIntegralAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjReflectedIntegralAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.getIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjReflectedUnsignedIntegralAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjReflectedUnsignedIntegralAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(std::max(0, impl.getIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr)));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjReflectedBooleanAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjReflectedBooleanAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsBoolean(impl.fastHasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjReflectedURLAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjReflectedURLAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjReflectedStringAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjReflectedStringAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.fastGetAttribute(WebCore::HTMLNames::customContentStringAttrAttr));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjReflectedCustomIntegralAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjReflectedCustomIntegralAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.getIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjReflectedCustomBooleanAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjReflectedCustomBooleanAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsBoolean(impl.fastHasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjReflectedCustomURLAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjReflectedCustomURLAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjTypedArrayAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjTypedArrayAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl.typedArrayAttr()));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjAttrWithGetterException(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjAttrWithGetterException(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSC::JSValue result = jsNumber(impl.attrWithGetterException(ec));
</span><span class="cx"> setDOMException(exec, ec);
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjAttrWithSetterException(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjAttrWithSetterException(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.attrWithSetterException());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjStringAttrWithGetterException(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjStringAttrWithGetterException(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSC::JSValue result = jsStringWithCache(exec, impl.stringAttrWithGetterException(ec));
</span><span class="cx"> setDOMException(exec, ec);
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjStringAttrWithSetterException(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjStringAttrWithSetterException(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.stringAttrWithSetterException());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjCustomAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCustomAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
- return castedThis->customAttr(exec);
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
+ return JSValue::encode(castedThis->customAttr(exec));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjWithScriptStateAttribute(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjWithScriptStateAttribute(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.withScriptStateAttribute(exec));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjWithScriptExecutionContextAttribute(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjWithScriptExecutionContextAttribute(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> ScriptExecutionContext* scriptContext = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();
</span><span class="cx"> if (!scriptContext)
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl.withScriptExecutionContextAttribute(scriptContext)));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjWithScriptStateAttributeRaises(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjWithScriptStateAttributeRaises(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSC::JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl.withScriptStateAttributeRaises(exec, ec)));
</span><span class="cx"> setDOMException(exec, ec);
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjWithScriptExecutionContextAttributeRaises(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjWithScriptExecutionContextAttributeRaises(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> ScriptExecutionContext* scriptContext = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();
</span><span class="cx"> if (!scriptContext)
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSC::JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl.withScriptExecutionContextAttributeRaises(scriptContext, ec)));
</span><span class="cx"> setDOMException(exec, ec);
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjWithScriptExecutionContextAndScriptStateAttribute(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateAttribute(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> ScriptExecutionContext* scriptContext = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();
</span><span class="cx"> if (!scriptContext)
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl.withScriptExecutionContextAndScriptStateAttribute(exec, scriptContext)));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjWithScriptExecutionContextAndScriptStateAttributeRaises(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateAttributeRaises(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> ScriptExecutionContext* scriptContext = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();
</span><span class="cx"> if (!scriptContext)
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSC::JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl.withScriptExecutionContextAndScriptStateAttributeRaises(exec, scriptContext, ec)));
</span><span class="cx"> setDOMException(exec, ec);
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> ScriptExecutionContext* scriptContext = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();
</span><span class="cx"> if (!scriptContext)
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl.withScriptExecutionContextAndScriptStateWithSpacesAttribute(exec, scriptContext)));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjWithScriptArgumentsAndCallStackAttribute(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjWithScriptArgumentsAndCallStackAttribute(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl.withScriptArgumentsAndCallStackAttribute()));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition1)
</span><del>-JSValue jsTestObjConditionalAttr1(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjConditionalAttr1(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.conditionalAttr1());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition1) && ENABLE(Condition2)
</span><del>-JSValue jsTestObjConditionalAttr2(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjConditionalAttr2(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.conditionalAttr2());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition1) || ENABLE(Condition2)
</span><del>-JSValue jsTestObjConditionalAttr3(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjConditionalAttr3(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.conditionalAttr3());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition1)
</span><del>-JSValue jsTestObjConditionalAttr4Constructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjConditionalAttr4Constructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
- return JSTestObjectA::getConstructor(exec->vm(), castedThis->globalObject());
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestObjectA::getConstructor(exec->vm(), castedThis->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition1) && ENABLE(Condition2)
</span><del>-JSValue jsTestObjConditionalAttr5Constructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjConditionalAttr5Constructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
- return JSTestObjectB::getConstructor(exec->vm(), castedThis->globalObject());
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestObjectB::getConstructor(exec->vm(), castedThis->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition1) || ENABLE(Condition2)
</span><del>-JSValue jsTestObjConditionalAttr6Constructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjConditionalAttr6Constructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
- return JSTestObjectC::getConstructor(exec->vm(), castedThis->globalObject());
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestObjectC::getConstructor(exec->vm(), castedThis->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-JSValue jsTestObjCachedAttribute1(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCachedAttribute1(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> if (JSValue cachedValue = castedThis->m_cachedAttribute1.get())
</span><del>- return cachedValue;
</del><ins>+ return JSValue::encode(cachedValue);
</ins><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = (impl.cachedAttribute1().hasNoValue() ? jsNull() : impl.cachedAttribute1().jsValue());
</span><span class="cx"> castedThis->m_cachedAttribute1.set(exec->vm(), castedThis, result);
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjCachedAttribute2(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCachedAttribute2(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> if (JSValue cachedValue = castedThis->m_cachedAttribute2.get())
</span><del>- return cachedValue;
</del><ins>+ return JSValue::encode(cachedValue);
</ins><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = (impl.cachedAttribute2().hasNoValue() ? jsNull() : impl.cachedAttribute2().jsValue());
</span><span class="cx"> castedThis->m_cachedAttribute2.set(exec->vm(), castedThis, result);
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjAnyAttribute(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjAnyAttribute(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = (impl.anyAttribute().hasNoValue() ? jsNull() : impl.anyAttribute().jsValue());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjContentDocument(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjContentDocument(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> TestObj& impl = castedThis->impl();
</span><del>- return shouldAllowAccessToNode(exec, impl.contentDocument()) ? toJS(exec, castedThis->globalObject(), WTF::getPtr(impl.contentDocument())) : jsNull();
</del><ins>+ return JSValue::encode(shouldAllowAccessToNode(exec, impl.contentDocument()) ? toJS(exec, castedThis->globalObject(), WTF::getPtr(impl.contentDocument())) : jsNull());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjMutablePoint(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjMutablePoint(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(SVGStaticPropertyTearOff<TestObj, SVGPoint>::create(impl, impl.mutablePoint(), &TestObj::updateMutablePoint)));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjImmutablePoint(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjImmutablePoint(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(SVGPropertyTearOff<SVGPoint>::create(impl.immutablePoint())));
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjStrawberry(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjStrawberry(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.blueberry());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjStrictFloat(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjStrictFloat(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.strictFloat());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjDescription(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjDescription(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.description());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjId(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjId(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.id());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjHash(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjHash(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.hash());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjReplaceableAttribute(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjReplaceableAttribute(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.replaceableAttribute());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjNullableDoubleAttribute(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjNullableDoubleAttribute(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> bool isNull = false;
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.nullableDoubleAttribute(isNull));
</span><span class="cx"> if (isNull)
</span><del>- return jsNull();
- return result;
</del><ins>+ return JSValue::encode(jsNull());
+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjNullableLongAttribute(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjNullableLongAttribute(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> bool isNull = false;
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.nullableLongAttribute(isNull));
</span><span class="cx"> if (isNull)
</span><del>- return jsNull();
- return result;
</del><ins>+ return JSValue::encode(jsNull());
+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjNullableBooleanAttribute(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjNullableBooleanAttribute(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> bool isNull = false;
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsBoolean(impl.nullableBooleanAttribute(isNull));
</span><span class="cx"> if (isNull)
</span><del>- return jsNull();
- return result;
</del><ins>+ return JSValue::encode(jsNull());
+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjNullableStringAttribute(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjNullableStringAttribute(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> bool isNull = false;
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.nullableStringAttribute(isNull));
</span><span class="cx"> if (isNull)
</span><del>- return jsNull();
- return result;
</del><ins>+ return JSValue::encode(jsNull());
+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjNullableLongSettableAttribute(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjNullableLongSettableAttribute(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> bool isNull = false;
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.nullableLongSettableAttribute(isNull));
</span><span class="cx"> if (isNull)
</span><del>- return jsNull();
- return result;
</del><ins>+ return JSValue::encode(jsNull());
+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjNullableStringValue(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjNullableStringValue(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> bool isNull = false;
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSC::JSValue result = jsNumber(impl.nullableStringValue(isNull, ec));
</span><span class="cx"> if (isNull)
</span><del>- return jsNull();
</del><ins>+ return JSValue::encode(jsNull());
</ins><span class="cx"> setDOMException(exec, ec);
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjAttribute(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjAttribute(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.attribute());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjAttributeWithReservedEnumType(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjAttributeWithReservedEnumType(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.attributeWithReservedEnumType());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestObjConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestObjConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestObj* domObject = jsCast<JSTestObj*>(asObject(slotBase));
- return JSTestObj::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ JSTestObj* domObject = jsDynamicCast<JSTestObj*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestObj::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSTestObj::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
</span><span class="lines">@@ -1772,9 +1772,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVoidMethod(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> impl.voidMethod();
</span><span class="lines">@@ -1784,9 +1784,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVoidMethodWithArgs(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 3)
</span><span class="lines">@@ -1807,9 +1807,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionByteMethod(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx">
</span><span class="lines">@@ -1820,9 +1820,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionByteMethodWithArgs(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 3)
</span><span class="lines">@@ -1844,9 +1844,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOctetMethod(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx">
</span><span class="lines">@@ -1857,9 +1857,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOctetMethodWithArgs(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 3)
</span><span class="lines">@@ -1881,9 +1881,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionLongMethod(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx">
</span><span class="lines">@@ -1894,9 +1894,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionLongMethodWithArgs(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 3)
</span><span class="lines">@@ -1918,9 +1918,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionObjMethod(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx">
</span><span class="lines">@@ -1931,9 +1931,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionObjMethodWithArgs(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 3)
</span><span class="lines">@@ -1955,9 +1955,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithSequenceArg(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -1972,9 +1972,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodReturningSequence(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -1990,9 +1990,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithEnumArg(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2009,9 +2009,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodThatRequiresAllArgsAndThrows(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 2)
</span><span class="lines">@@ -2032,9 +2032,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionSerializedValue(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2049,9 +2049,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOptionsObject(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2069,9 +2069,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithException(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -2083,9 +2083,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionCustomMethod(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> return JSValue::encode(castedThis->customMethod(exec));
</span><span class="cx"> }
</span><span class="lines">@@ -2093,9 +2093,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionCustomMethodWithArgs(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> return JSValue::encode(castedThis->customMethodWithArgs(exec));
</span><span class="cx"> }
</span><span class="lines">@@ -2103,9 +2103,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionAddEventListener(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue listener = exec->argument(1);
</span><span class="lines">@@ -2118,9 +2118,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionRemoveEventListener(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> JSValue listener = exec->argument(1);
</span><span class="lines">@@ -2133,9 +2133,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateVoid(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> impl.withScriptStateVoid(exec);
</span><span class="lines">@@ -2145,9 +2145,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateObj(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx">
</span><span class="lines">@@ -2160,9 +2160,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateVoidException(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -2174,9 +2174,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateObjException(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -2191,9 +2191,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContext(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> ScriptExecutionContext* scriptContext = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();
</span><span class="lines">@@ -2206,9 +2206,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptState(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> ScriptExecutionContext* scriptContext = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();
</span><span class="lines">@@ -2221,9 +2221,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateObjException(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -2241,9 +2241,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateWithSpaces(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> ScriptExecutionContext* scriptContext = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();
</span><span class="lines">@@ -2259,9 +2259,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptArgumentsAndCallStack(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> RefPtr<ScriptArguments> scriptArguments(createScriptArguments(exec, 0));
</span><span class="lines">@@ -2272,9 +2272,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalArg(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx">
</span><span class="lines">@@ -2294,9 +2294,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndOptionalArg(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2321,9 +2321,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2356,9 +2356,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalString(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx">
</span><span class="lines">@@ -2378,9 +2378,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalStringIsUndefined(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> const String& str(exec->argument(0).isEmpty() ? String() : exec->argument(0).toString(exec)->value(exec));
</span><span class="lines">@@ -2393,9 +2393,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalStringIsNullString(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> const String& str(argumentOrNull(exec, 0).isEmpty() ? String() : argumentOrNull(exec, 0).toString(exec)->value(exec));
</span><span class="lines">@@ -2408,9 +2408,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithCallbackArg(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2425,9 +2425,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackArg(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 2)
</span><span class="lines">@@ -2445,9 +2445,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithCallbackAndOptionalArg(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> RefPtr<TestCallback> callback;
</span><span class="lines">@@ -2466,7 +2466,7 @@
</span><span class="cx"> if (!exec->argument(0).isUndefinedOrNull()) {
</span><span class="cx"> if (!exec->uncheckedArgument(0).isFunction())
</span><span class="cx"> return throwVMTypeError(exec);
</span><del>- callback = createFunctionOnlyCallback<JSTestCallback>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->uncheckedArgument(0));
</del><ins>+ callback = createFunctionOnlyCallback<JSTestCallback>(exec, jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->uncheckedArgument(0));
</ins><span class="cx"> }
</span><span class="cx"> TestObj::staticMethodWithCallbackAndOptionalArg(callback);
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -2478,7 +2478,7 @@
</span><span class="cx"> return throwVMError(exec, createNotEnoughArgumentsError(exec));
</span><span class="cx"> if (!exec->argument(0).isFunction())
</span><span class="cx"> return throwVMTypeError(exec);
</span><del>- RefPtr<TestCallback> callback = createFunctionOnlyCallback<JSTestCallback>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->uncheckedArgument(0));
</del><ins>+ RefPtr<TestCallback> callback = createFunctionOnlyCallback<JSTestCallback>(exec, jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->uncheckedArgument(0));
</ins><span class="cx"> TestObj::staticMethodWithCallbackArg(callback);
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="lines">@@ -2487,9 +2487,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConditionalMethod1(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx">
</span><span class="lines">@@ -2503,9 +2503,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConditionalMethod2(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> impl.conditionalMethod2();
</span><span class="lines">@@ -2518,9 +2518,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConditionalMethod3(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> impl.conditionalMethod3();
</span><span class="lines">@@ -2532,9 +2532,9 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod1(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 2)
</span><span class="lines">@@ -2552,9 +2552,9 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod2(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2579,9 +2579,9 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod3(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2596,9 +2596,9 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod4(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2613,9 +2613,9 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod5(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2630,9 +2630,9 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod6(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2647,9 +2647,9 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod7(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2664,9 +2664,9 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod8(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2681,9 +2681,9 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod9(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2698,9 +2698,9 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod10(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2715,9 +2715,9 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod11(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2842,9 +2842,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionClassMethodWithClamp(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 2)
</span><span class="lines">@@ -2872,9 +2872,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithUnsignedLongSequence(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2889,9 +2889,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionStringArrayFunction(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2909,9 +2909,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionDomStringListFunction(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2929,9 +2929,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionGetSVGDocument(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -2946,9 +2946,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert1(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2963,9 +2963,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert2(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2980,9 +2980,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert4(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -2997,9 +2997,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert5(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -3014,9 +3014,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMutablePointFunction(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx">
</span><span class="lines">@@ -3027,9 +3027,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionImmutablePointFunction(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx">
</span><span class="lines">@@ -3040,9 +3040,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOrange(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> impl.banana();
</span><span class="lines">@@ -3052,9 +3052,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionStrictFunction(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 3)
</span><span class="lines">@@ -3078,9 +3078,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionStrictFunctionWithSequence(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 2)
</span><span class="lines">@@ -3103,9 +3103,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionStrictFunctionWithArray(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 2)
</span><span class="lines">@@ -3128,9 +3128,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVariadicStringMethod(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -3148,9 +3148,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVariadicDoubleMethod(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -3168,9 +3168,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVariadicNodeMethod(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -3191,9 +3191,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionAny(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestObj::info()))
</del><ins>+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> TestObj& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 2)
</span><span class="lines">@@ -3222,88 +3222,88 @@
</span><span class="cx"> // Constant getters
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition1)
</span><del>-JSValue jsTestObjCONDITIONAL_CONST(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCONDITIONAL_CONST(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(0));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(0)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-JSValue jsTestObjCONST_VALUE_0(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCONST_VALUE_0(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(0));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(0)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestObjCONST_VALUE_1(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCONST_VALUE_1(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(1));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(1)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestObjCONST_VALUE_2(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCONST_VALUE_2(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(2));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(2)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestObjCONST_VALUE_4(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCONST_VALUE_4(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(4));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(4)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestObjCONST_VALUE_8(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCONST_VALUE_8(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(8));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(8)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestObjCONST_VALUE_9(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCONST_VALUE_9(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(-1));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(-1)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestObjCONST_VALUE_10(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCONST_VALUE_10(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return jsStringOrNull(exec, String("my constant string"));
</del><ins>+ return JSValue::encode(jsStringOrNull(exec, String("my constant string")));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestObjCONST_VALUE_11(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCONST_VALUE_11(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(0xffffffff));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(0xffffffff)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestObjCONST_VALUE_12(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCONST_VALUE_12(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(0x01));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(0x01)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestObjCONST_VALUE_13(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCONST_VALUE_13(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(0X20));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(0X20)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestObjCONST_VALUE_14(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCONST_VALUE_14(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(0x1abc));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(0x1abc)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestObjCONST_JAVASCRIPT(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestObjCONST_JAVASCRIPT(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(15));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(15)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestObjReadonly(ExecState* exec, JSValue, PropertyName)
</del><ins>+EncodedJSValue jsTestObjReadonly(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><del>- return jsNumber(static_cast<int>(0));
</del><ins>+ return JSValue::encode(jsNumber(static_cast<int>(0)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSTestObjOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
</span><span class="lines">@@ -3360,7 +3360,7 @@
</span><span class="cx">
</span><span class="cx"> TestObj* toTestObj(JSC::JSValue value)
</span><span class="cx"> {
</span><del>- return value.inherits(JSTestObj::info()) ? &jsCast<JSTestObj*>(asObject(value))->impl() : 0;
</del><ins>+ return value.inherits(JSTestObj::info()) ? &jsCast<JSTestObj*>(value)->impl() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -234,158 +234,158 @@
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionAny(JSC::ExecState*);
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><del>-JSC::JSValue jsTestObjReadOnlyLongAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjReadOnlyStringAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjReadOnlyTestObjAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjConstructorStaticReadOnlyLongAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjConstructorStaticStringAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjReadOnlyLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjReadOnlyStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjReadOnlyTestObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjConstructorStaticReadOnlyLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjConstructorStaticStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjConstructorStaticStringAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjConstructorTestSubObj(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjTestSubObjEnabledBySettingConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjConstructorTestSubObj(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjTestSubObjEnabledBySettingConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjTestSubObjEnabledBySettingConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjEnumAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjEnumAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjEnumAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjByteAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjByteAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjByteAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjOctetAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjOctetAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjOctetAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjShortAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjShortAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjShortAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjUnsignedShortAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjUnsignedShortAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjUnsignedShortAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjLongAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjLongAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjLongLongAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjLongLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjLongLongAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjUnsignedLongLongAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjUnsignedLongLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjUnsignedLongLongAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjStringAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjStringAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjTestObjAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjTestObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjTestObjAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjXMLObjAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjXMLObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjXMLObjAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjCreate(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjCreate(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjCreate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjReflectedStringAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjReflectedStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjReflectedStringAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjReflectedIntegralAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjReflectedIntegralAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjReflectedIntegralAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjReflectedUnsignedIntegralAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjReflectedUnsignedIntegralAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjReflectedUnsignedIntegralAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjReflectedBooleanAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjReflectedBooleanAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjReflectedBooleanAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjReflectedURLAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjReflectedURLAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjReflectedURLAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjReflectedStringAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjReflectedStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjReflectedStringAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjReflectedCustomIntegralAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjReflectedCustomIntegralAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjReflectedCustomIntegralAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjReflectedCustomBooleanAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjReflectedCustomBooleanAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjReflectedCustomBooleanAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjReflectedCustomURLAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjReflectedCustomURLAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjReflectedCustomURLAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjTypedArrayAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjTypedArrayAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjTypedArrayAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjAttrWithGetterException(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjAttrWithGetterException(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjAttrWithSetterException(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjAttrWithSetterException(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjStringAttrWithGetterException(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjStringAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjStringAttrWithGetterException(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjStringAttrWithSetterException(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjStringAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjStringAttrWithSetterException(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjCustomAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjCustomAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjCustomAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjWithScriptStateAttribute(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjWithScriptStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjWithScriptStateAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjWithScriptExecutionContextAttribute(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjWithScriptExecutionContextAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjWithScriptStateAttributeRaises(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjWithScriptStateAttributeRaises(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjWithScriptStateAttributeRaises(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjWithScriptExecutionContextAttributeRaises(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAttributeRaises(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjWithScriptExecutionContextAttributeRaises(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjWithScriptExecutionContextAndScriptStateAttribute(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjWithScriptExecutionContextAndScriptStateAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjWithScriptExecutionContextAndScriptStateAttributeRaises(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateAttributeRaises(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjWithScriptExecutionContextAndScriptStateAttributeRaises(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjWithScriptArgumentsAndCallStackAttribute(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjWithScriptArgumentsAndCallStackAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjWithScriptArgumentsAndCallStackAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><span class="cx"> #if ENABLE(Condition1)
</span><del>-JSC::JSValue jsTestObjConditionalAttr1(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjConditionalAttr1(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjConditionalAttr1(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition1) && ENABLE(Condition2)
</span><del>-JSC::JSValue jsTestObjConditionalAttr2(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjConditionalAttr2(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjConditionalAttr2(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition1) || ENABLE(Condition2)
</span><del>-JSC::JSValue jsTestObjConditionalAttr3(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjConditionalAttr3(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjConditionalAttr3(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition1)
</span><del>-JSC::JSValue jsTestObjConditionalAttr4Constructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjConditionalAttr4Constructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjConditionalAttr4Constructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition1) && ENABLE(Condition2)
</span><del>-JSC::JSValue jsTestObjConditionalAttr5Constructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjConditionalAttr5Constructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjConditionalAttr5Constructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(Condition1) || ENABLE(Condition2)
</span><del>-JSC::JSValue jsTestObjConditionalAttr6Constructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjConditionalAttr6Constructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjConditionalAttr6Constructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><span class="cx"> #endif
</span><del>-JSC::JSValue jsTestObjCachedAttribute1(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjCachedAttribute2(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjAnyAttribute(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjCachedAttribute1(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjCachedAttribute2(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjAnyAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjAnyAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjContentDocument(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjMutablePoint(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjContentDocument(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjMutablePoint(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjMutablePoint(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjImmutablePoint(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjImmutablePoint(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjImmutablePoint(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjStrawberry(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjStrawberry(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjStrawberry(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjStrictFloat(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjStrictFloat(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjStrictFloat(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjDescription(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjId(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjDescription(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjId(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjId(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjHash(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjReplaceableAttribute(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjHash(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjReplaceableAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjReplaceableAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjNullableDoubleAttribute(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjNullableLongAttribute(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjNullableBooleanAttribute(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjNullableStringAttribute(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjNullableLongSettableAttribute(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjNullableDoubleAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjNullableLongAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjNullableBooleanAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjNullableStringAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjNullableLongSettableAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjNullableLongSettableAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjNullableStringValue(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjNullableStringValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjNullableStringValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjAttribute(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjAttributeWithReservedEnumType(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjAttributeWithReservedEnumType(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestObjAttributeWithReservedEnumType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestObjConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> // Constants
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition1)
</span><del>-JSC::JSValue jsTestObjCONDITIONAL_CONST(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjCONDITIONAL_CONST(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> #endif
</span><del>-JSC::JSValue jsTestObjCONST_VALUE_0(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjCONST_VALUE_1(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjCONST_VALUE_2(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjCONST_VALUE_4(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjCONST_VALUE_8(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjCONST_VALUE_9(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjCONST_VALUE_10(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjCONST_VALUE_11(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjCONST_VALUE_12(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjCONST_VALUE_13(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjCONST_VALUE_14(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjCONST_JAVASCRIPT(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestObjReadonly(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestObjCONST_VALUE_0(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjCONST_VALUE_1(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjCONST_VALUE_2(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjCONST_VALUE_4(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjCONST_VALUE_8(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjCONST_VALUE_9(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjCONST_VALUE_10(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjCONST_VALUE_11(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjCONST_VALUE_12(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjCONST_VALUE_13(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjCONST_VALUE_14(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjCONST_JAVASCRIPT(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestObjReadonly(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -192,10 +192,10 @@
</span><span class="cx"> return getStaticValueSlot<JSTestOverloadedConstructors, Base>(exec, JSTestOverloadedConstructorsTable, thisObject, propertyName, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestOverloadedConstructorsConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestOverloadedConstructorsConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestOverloadedConstructors* domObject = jsCast<JSTestOverloadedConstructors*>(asObject(slotBase));
- return JSTestOverloadedConstructors::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ JSTestOverloadedConstructors* domObject = jsDynamicCast<JSTestOverloadedConstructors*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestOverloadedConstructors::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSTestOverloadedConstructors::getConstructor(VM& vm, JSGlobalObject* globalObject)
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx">
</span><span class="cx"> TestOverloadedConstructors* toTestOverloadedConstructors(JSC::JSValue value)
</span><span class="cx"> {
</span><del>- return value.inherits(JSTestOverloadedConstructors::info()) ? &jsCast<JSTestOverloadedConstructors*>(asObject(value))->impl() : 0;
</del><ins>+ return value.inherits(JSTestOverloadedConstructors::info()) ? &jsCast<JSTestOverloadedConstructors*>(value)->impl() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><del>-JSC::JSValue jsTestOverloadedConstructorsConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestOverloadedConstructorsConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -129,66 +129,66 @@
</span><span class="cx"> return getStaticValueSlot<JSTestSerializedScriptValueInterface, Base>(exec, JSTestSerializedScriptValueInterfaceTable, thisObject, propertyName, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestSerializedScriptValueInterfaceValue(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestSerializedScriptValueInterfaceValue(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestSerializedScriptValueInterface* castedThis = jsCast<JSTestSerializedScriptValueInterface*>(asObject(slotBase));
</del><ins>+ JSTestSerializedScriptValueInterface* castedThis = jsDynamicCast<JSTestSerializedScriptValueInterface*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestSerializedScriptValueInterface& impl = castedThis->impl();
</span><span class="cx"> JSValue result = impl.value() ? impl.value()->deserialize(exec, castedThis->globalObject(), 0) : jsNull();
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestSerializedScriptValueInterfaceReadonlyValue(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestSerializedScriptValueInterfaceReadonlyValue(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestSerializedScriptValueInterface* castedThis = jsCast<JSTestSerializedScriptValueInterface*>(asObject(slotBase));
</del><ins>+ JSTestSerializedScriptValueInterface* castedThis = jsDynamicCast<JSTestSerializedScriptValueInterface*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestSerializedScriptValueInterface& impl = castedThis->impl();
</span><span class="cx"> JSValue result = impl.readonlyValue() ? impl.readonlyValue()->deserialize(exec, castedThis->globalObject(), 0) : jsNull();
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestSerializedScriptValueInterfaceCachedValue(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestSerializedScriptValueInterfaceCachedValue(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestSerializedScriptValueInterface* castedThis = jsCast<JSTestSerializedScriptValueInterface*>(asObject(slotBase));
</del><ins>+ JSTestSerializedScriptValueInterface* castedThis = jsDynamicCast<JSTestSerializedScriptValueInterface*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> if (JSValue cachedValue = castedThis->m_cachedValue.get())
</span><del>- return cachedValue;
</del><ins>+ return JSValue::encode(cachedValue);
</ins><span class="cx"> TestSerializedScriptValueInterface& impl = castedThis->impl();
</span><span class="cx"> JSValue result = impl.cachedValue() ? impl.cachedValue()->deserialize(exec, castedThis->globalObject(), 0) : jsNull();
</span><span class="cx"> castedThis->m_cachedValue.set(exec->vm(), castedThis, result);
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestSerializedScriptValueInterfacePorts(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestSerializedScriptValueInterfacePorts(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestSerializedScriptValueInterface* castedThis = jsCast<JSTestSerializedScriptValueInterface*>(asObject(slotBase));
</del><ins>+ JSTestSerializedScriptValueInterface* castedThis = jsDynamicCast<JSTestSerializedScriptValueInterface*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestSerializedScriptValueInterface& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsArray(exec, castedThis->globalObject(), impl.ports());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestSerializedScriptValueInterfaceCachedReadonlyValue(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestSerializedScriptValueInterfaceCachedReadonlyValue(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestSerializedScriptValueInterface* castedThis = jsCast<JSTestSerializedScriptValueInterface*>(asObject(slotBase));
</del><ins>+ JSTestSerializedScriptValueInterface* castedThis = jsDynamicCast<JSTestSerializedScriptValueInterface*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> if (JSValue cachedValue = castedThis->m_cachedReadonlyValue.get())
</span><del>- return cachedValue;
</del><ins>+ return JSValue::encode(cachedValue);
</ins><span class="cx"> TestSerializedScriptValueInterface& impl = castedThis->impl();
</span><span class="cx"> JSValue result = impl.cachedReadonlyValue() ? impl.cachedReadonlyValue()->deserialize(exec, castedThis->globalObject(), 0) : jsNull();
</span><span class="cx"> castedThis->m_cachedReadonlyValue.set(exec->vm(), castedThis, result);
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestSerializedScriptValueInterfaceConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestSerializedScriptValueInterfaceConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestSerializedScriptValueInterface* domObject = jsCast<JSTestSerializedScriptValueInterface*>(asObject(slotBase));
- return JSTestSerializedScriptValueInterface::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ JSTestSerializedScriptValueInterface* domObject = jsDynamicCast<JSTestSerializedScriptValueInterface*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestSerializedScriptValueInterface::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSTestSerializedScriptValueInterface::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx">
</span><span class="cx"> TestSerializedScriptValueInterface* toTestSerializedScriptValueInterface(JSC::JSValue value)
</span><span class="cx"> {
</span><del>- return value.inherits(JSTestSerializedScriptValueInterface::info()) ? &jsCast<JSTestSerializedScriptValueInterface*>(asObject(value))->impl() : 0;
</del><ins>+ return value.inherits(JSTestSerializedScriptValueInterface::info()) ? &jsCast<JSTestSerializedScriptValueInterface*>(value)->impl() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -146,14 +146,14 @@
</span><span class="cx">
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><del>-JSC::JSValue jsTestSerializedScriptValueInterfaceValue(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestSerializedScriptValueInterfaceValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestSerializedScriptValueInterfaceReadonlyValue(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestSerializedScriptValueInterfaceCachedValue(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceReadonlyValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceCachedValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestSerializedScriptValueInterfaceCachedValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestSerializedScriptValueInterfacePorts(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestSerializedScriptValueInterfaceCachedReadonlyValue(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestSerializedScriptValueInterfaceConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestSerializedScriptValueInterfacePorts(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceCachedReadonlyValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -176,79 +176,79 @@
</span><span class="cx"> return getStaticValueSlot<JSTestTypedefs, Base>(exec, JSTestTypedefsTable, thisObject, propertyName, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsTestTypedefsUnsignedLongLongAttr(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestTypedefsUnsignedLongLongAttr(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(slotBase));
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.unsignedLongLongAttr());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestTypedefsImmutableSerializedScriptValue(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestTypedefsImmutableSerializedScriptValue(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(slotBase));
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx"> JSValue result = impl.immutableSerializedScriptValue() ? impl.immutableSerializedScriptValue()->deserialize(exec, castedThis->globalObject(), 0) : jsNull();
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestTypedefsConstructorTestSubObj(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestTypedefsConstructorTestSubObj(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(slotBase));
- return JSTestSubObj::getConstructor(exec->vm(), castedThis->globalObject());
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestSubObj::getConstructor(exec->vm(), castedThis->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestTypedefsAttrWithGetterException(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestTypedefsAttrWithGetterException(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(slotBase));
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(JSValue::decode(slotBase));
</ins><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx"> JSC::JSValue result = jsNumber(impl.attrWithGetterException(ec));
</span><span class="cx"> setDOMException(exec, ec);
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestTypedefsAttrWithSetterException(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestTypedefsAttrWithSetterException(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(slotBase));
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsNumber(impl.attrWithSetterException());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestTypedefsStringAttrWithGetterException(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestTypedefsStringAttrWithGetterException(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(slotBase));
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(JSValue::decode(slotBase));
</ins><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx"> JSC::JSValue result = jsStringWithCache(exec, impl.stringAttrWithGetterException(ec));
</span><span class="cx"> setDOMException(exec, ec);
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestTypedefsStringAttrWithSetterException(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestTypedefsStringAttrWithSetterException(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(slotBase));
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.stringAttrWithSetterException());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsTestTypedefsConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsTestTypedefsConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSTestTypedefs* domObject = jsCast<JSTestTypedefs*>(asObject(slotBase));
- return JSTestTypedefs::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ JSTestTypedefs* domObject = jsDynamicCast<JSTestTypedefs*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSTestTypedefs::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSTestTypedefs::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
</span><span class="lines">@@ -342,9 +342,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionFunc(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestTypedefs::info()))
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestTypedefs::info());
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx">
</span><span class="lines">@@ -364,9 +364,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionSetShadow(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestTypedefs::info()))
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestTypedefs::info());
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 3)
</span><span class="lines">@@ -405,9 +405,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionMethodWithSequenceArg(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestTypedefs::info()))
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestTypedefs::info());
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -423,9 +423,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionNullableArrayArg(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestTypedefs::info()))
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestTypedefs::info());
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -440,9 +440,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionFuncWithClamp(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestTypedefs::info()))
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestTypedefs::info());
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -477,9 +477,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionImmutablePointFunction(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestTypedefs::info()))
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestTypedefs::info());
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx">
</span><span class="lines">@@ -490,9 +490,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionStringArrayFunction(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestTypedefs::info()))
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestTypedefs::info());
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -510,9 +510,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionStringArrayFunction2(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestTypedefs::info()))
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestTypedefs::info());
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -530,9 +530,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionCallWithSequenceThatRequiresInclude(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestTypedefs::info()))
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestTypedefs::info());
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="lines">@@ -548,9 +548,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionMethodWithException(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><del>- if (!thisValue.inherits(JSTestTypedefs::info()))
</del><ins>+ JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
+ if (!castedThis)
</ins><span class="cx"> return throwVMTypeError(exec);
</span><del>- JSTestTypedefs* castedThis = jsCast<JSTestTypedefs*>(asObject(thisValue));
</del><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestTypedefs::info());
</span><span class="cx"> TestTypedefs& impl = castedThis->impl();
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -613,7 +613,7 @@
</span><span class="cx">
</span><span class="cx"> TestTypedefs* toTestTypedefs(JSC::JSValue value)
</span><span class="cx"> {
</span><del>- return value.inherits(JSTestTypedefs::info()) ? &jsCast<JSTestTypedefs*>(asObject(value))->impl() : 0;
</del><ins>+ return value.inherits(JSTestTypedefs::info()) ? &jsCast<JSTestTypedefs*>(value)->impl() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -155,20 +155,20 @@
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionMethodWithException(JSC::ExecState*);
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><del>-JSC::JSValue jsTestTypedefsUnsignedLongLongAttr(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestTypedefsUnsignedLongLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestTypedefsUnsignedLongLongAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestTypedefsImmutableSerializedScriptValue(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestTypedefsImmutableSerializedScriptValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestTypedefsImmutableSerializedScriptValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestTypedefsConstructorTestSubObj(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsTestTypedefsAttrWithGetterException(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestTypedefsConstructorTestSubObj(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsTestTypedefsAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestTypedefsAttrWithGetterException(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestTypedefsAttrWithSetterException(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestTypedefsAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestTypedefsAttrWithSetterException(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestTypedefsStringAttrWithGetterException(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestTypedefsStringAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestTypedefsStringAttrWithGetterException(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestTypedefsStringAttrWithSetterException(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestTypedefsStringAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> void setJSTestTypedefsStringAttrWithSetterException(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
</span><del>-JSC::JSValue jsTestTypedefsConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsTestTypedefsConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSattributecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -120,20 +120,20 @@
</span><span class="cx"> return getStaticValueSlot<JSattribute, Base>(exec, JSattributeTable, thisObject, propertyName, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsattributeReadonly(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsattributeReadonly(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSattribute* castedThis = jsCast<JSattribute*>(asObject(slotBase));
</del><ins>+ JSattribute* castedThis = jsDynamicCast<JSattribute*>(JSValue::decode(slotBase));
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> attribute& impl = castedThis->impl();
</span><span class="cx"> JSValue result = jsStringWithCache(exec, impl.readonly());
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-JSValue jsattributeConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsattributeConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSattribute* domObject = jsCast<JSattribute*>(asObject(slotBase));
- return JSattribute::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ JSattribute* domObject = jsDynamicCast<JSattribute*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSattribute::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSattribute::getConstructor(VM& vm, JSGlobalObject* globalObject)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx">
</span><span class="cx"> attribute* toattribute(JSC::JSValue value)
</span><span class="cx"> {
</span><del>- return value.inherits(JSattribute::info()) ? &jsCast<JSattribute*>(asObject(value))->impl() : 0;
</del><ins>+ return value.inherits(JSattribute::info()) ? &jsCast<JSattribute*>(value)->impl() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSattributeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -139,8 +139,8 @@
</span><span class="cx">
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><del>-JSC::JSValue jsattributeReadonly(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
-JSC::JSValue jsattributeConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsattributeReadonly(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+JSC::EncodedJSValue jsattributeConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSreadonlycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -117,10 +117,10 @@
</span><span class="cx"> return getStaticValueSlot<JSreadonly, Base>(exec, JSreadonlyTable, thisObject, propertyName, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsreadonlyConstructor(ExecState* exec, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue jsreadonlyConstructor(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- JSreadonly* domObject = jsCast<JSreadonly*>(asObject(slotBase));
- return JSreadonly::getConstructor(exec->vm(), domObject->globalObject());
</del><ins>+ JSreadonly* domObject = jsDynamicCast<JSreadonly*>(JSValue::decode(slotBase));
+ return JSValue::encode(JSreadonly::getConstructor(exec->vm(), domObject->globalObject()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSreadonly::getConstructor(VM& vm, JSGlobalObject* globalObject)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx">
</span><span class="cx"> readonly* toreadonly(JSC::JSValue value)
</span><span class="cx"> {
</span><del>- return value.inherits(JSreadonly::info()) ? &jsCast<JSreadonly*>(asObject(value))->impl() : 0;
</del><ins>+ return value.inherits(JSreadonly::info()) ? &jsCast<JSreadonly*>(value)->impl() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSreadonlyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx">
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><del>-JSC::JSValue jsreadonlyConstructor(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+JSC::EncodedJSValue jsreadonlyConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebridgeruntime_arraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/runtime_array.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/runtime_array.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bridge/runtime_array.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -60,16 +60,16 @@
</span><span class="cx"> static_cast<RuntimeArray*>(cell)->RuntimeArray::~RuntimeArray();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue RuntimeArray::lengthGetter(ExecState*, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue RuntimeArray::lengthGetter(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- RuntimeArray* thisObj = static_cast<RuntimeArray*>(asObject(slotBase));
- return jsNumber(thisObj->getLength());
</del><ins>+ RuntimeArray* thisObj = jsCast<RuntimeArray*>(JSValue::decode(slotBase));
+ return JSValue::encode(jsNumber(thisObj->getLength()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue RuntimeArray::indexGetter(ExecState* exec, JSValue slotBase, unsigned index)
</del><ins>+EncodedJSValue RuntimeArray::indexGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, unsigned index)
</ins><span class="cx"> {
</span><del>- RuntimeArray* thisObj = static_cast<RuntimeArray*>(asObject(slotBase));
- return thisObj->getConcreteArray()->valueAt(exec, index);
</del><ins>+ RuntimeArray* thisObj = jsCast<RuntimeArray*>(JSValue::decode(slotBase));
+ return JSValue::encode(thisObj->getConcreteArray()->valueAt(exec, index));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RuntimeArray::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
</span></span></pre></div>
<a id="trunkSourceWebCorebridgeruntime_arrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/runtime_array.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/runtime_array.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bridge/runtime_array.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RuntimeArray(ExecState*, Structure*);
</span><del>- static JSValue lengthGetter(ExecState*, JSValue, PropertyName);
- static JSValue indexGetter(ExecState*, JSValue, unsigned);
</del><ins>+ static EncodedJSValue lengthGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+ static EncodedJSValue indexGetter(ExecState*, EncodedJSValue, EncodedJSValue, unsigned);
</ins><span class="cx">
</span><span class="cx"> BindingsArray* m_array;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebridgeruntime_methodcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/runtime_method.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/runtime_method.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bridge/runtime_method.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -54,11 +54,11 @@
</span><span class="cx"> ASSERT(inherits(info()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue RuntimeMethod::lengthGetter(ExecState*, JSValue slotBase, PropertyName)
</del><ins>+EncodedJSValue RuntimeMethod::lengthGetter(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- RuntimeMethod* thisObj = static_cast<RuntimeMethod*>(asObject(slotBase));
</del><ins>+ RuntimeMethod* thisObj = jsCast<RuntimeMethod*>(JSValue::decode(slotBase));
</ins><span class="cx">
</span><del>- return jsNumber(thisObj->m_method->numParameters());
</del><ins>+ return JSValue::encode(jsNumber(thisObj->m_method->numParameters()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RuntimeMethod::getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot &slot)
</span></span></pre></div>
<a id="trunkSourceWebCorebridgeruntime_methodh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/runtime_method.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/runtime_method.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bridge/runtime_method.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- static JSValue lengthGetter(ExecState*, JSValue, PropertyName);
</del><ins>+ static EncodedJSValue lengthGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
</ins><span class="cx">
</span><span class="cx"> Bindings::Method* m_method;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebridgeruntime_objectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/runtime_object.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/runtime_object.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bridge/runtime_object.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -62,13 +62,13 @@
</span><span class="cx"> m_instance = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue RuntimeObject::fallbackObjectGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue RuntimeObject::fallbackObjectGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- RuntimeObject* thisObj = static_cast<RuntimeObject*>(asObject(slotBase));
</del><ins>+ RuntimeObject* thisObj = jsCast<RuntimeObject*>(JSValue::decode(slotBase));
</ins><span class="cx"> RefPtr<Instance> instance = thisObj->m_instance;
</span><span class="cx">
</span><span class="cx"> if (!instance)
</span><del>- return throwInvalidAccessError(exec);
</del><ins>+ return JSValue::encode(throwInvalidAccessError(exec));
</ins><span class="cx">
</span><span class="cx"> instance->begin();
</span><span class="cx">
</span><span class="lines">@@ -77,16 +77,16 @@
</span><span class="cx">
</span><span class="cx"> instance->end();
</span><span class="cx">
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue RuntimeObject::fieldGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue RuntimeObject::fieldGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- RuntimeObject* thisObj = static_cast<RuntimeObject*>(asObject(slotBase));
</del><ins>+ RuntimeObject* thisObj = jsCast<RuntimeObject*>(JSValue::decode(slotBase));
</ins><span class="cx"> RefPtr<Instance> instance = thisObj->m_instance;
</span><span class="cx">
</span><span class="cx"> if (!instance)
</span><del>- return throwInvalidAccessError(exec);
</del><ins>+ return JSValue::encode(throwInvalidAccessError(exec));
</ins><span class="cx">
</span><span class="cx"> instance->begin();
</span><span class="cx">
</span><span class="lines">@@ -96,16 +96,16 @@
</span><span class="cx">
</span><span class="cx"> instance->end();
</span><span class="cx">
</span><del>- return result;
</del><ins>+ return JSValue::encode(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue RuntimeObject::methodGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue RuntimeObject::methodGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- RuntimeObject* thisObj = static_cast<RuntimeObject*>(asObject(slotBase));
</del><ins>+ RuntimeObject* thisObj = jsCast<RuntimeObject*>(JSValue::decode(slotBase));
</ins><span class="cx"> RefPtr<Instance> instance = thisObj->m_instance;
</span><span class="cx">
</span><span class="cx"> if (!instance)
</span><del>- return throwInvalidAccessError(exec);
</del><ins>+ return JSValue::encode(throwInvalidAccessError(exec));
</ins><span class="cx">
</span><span class="cx"> instance->begin();
</span><span class="cx">
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> instance->end();
</span><span class="cx">
</span><del>- return method;
</del><ins>+ return JSValue::encode(method);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RuntimeObject::getOwnPropertySlot(JSObject* object, ExecState *exec, PropertyName propertyName, PropertySlot& slot)
</span></span></pre></div>
<a id="trunkSourceWebCorebridgeruntime_objecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/runtime_object.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/runtime_object.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebCore/bridge/runtime_object.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -78,9 +78,9 @@
</span><span class="cx"> static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesGetPropertyNames | Base::StructureFlags;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- static JSValue fallbackObjectGetter(ExecState*, JSValue, PropertyName);
- static JSValue fieldGetter(ExecState*, JSValue, PropertyName);
- static JSValue methodGetter(ExecState*, JSValue, PropertyName);
</del><ins>+ static EncodedJSValue fallbackObjectGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+ static EncodedJSValue fieldGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
+ static EncodedJSValue methodGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
</ins><span class="cx">
</span><span class="cx"> RefPtr<Instance> m_instance;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2013-12-04 Oliver Hunt <oliver@apple.com>
+
+ Refactor static getter function prototype to include thisValue in addition to the base object
+ https://bugs.webkit.org/show_bug.cgi?id=124461
+
+ Reviewed by Geoffrey Garen.
+
+ Update the WK2 JSC usage to the new static getter API
+
+ * WebProcess/Plugins/Netscape/JSNPMethod.cpp:
+ (WebKit::callMethod):
+ * WebProcess/Plugins/Netscape/JSNPObject.cpp:
+ (WebKit::callNPJSObject):
+ (WebKit::constructWithConstructor):
+ (WebKit::JSNPObject::propertyGetter):
+ (WebKit::JSNPObject::methodGetter):
+ * WebProcess/Plugins/Netscape/JSNPObject.h:
+ * WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:
+ (WebKit::NPRuntimeObjectMap::getOrCreateNPObject):
+ (WebKit::NPRuntimeObjectMap::finalize):
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::frameForContext):
+ (WebKit::WebFrame::counterValue):
+
</ins><span class="cx"> 2013-12-05 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r160133.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeJSNPMethodcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -59,13 +59,13 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL callMethod(ExecState* exec)
</span><span class="cx"> {
</span><del>- JSNPMethod* jsNPMethod = static_cast<JSNPMethod*>(exec->callee());
</del><ins>+ JSNPMethod* jsNPMethod = jsCast<JSNPMethod*>(exec->callee());
</ins><span class="cx">
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><span class="cx">
</span><span class="cx"> // Check if we're calling a method on the plug-in script object.
</span><span class="cx"> if (thisValue.inherits(JSHTMLElement::info())) {
</span><del>- JSHTMLElement* element = static_cast<JSHTMLElement*>(asObject(thisValue));
</del><ins>+ JSHTMLElement* element = jsCast<JSHTMLElement*>(asObject(thisValue));
</ins><span class="cx">
</span><span class="cx"> // Try to get the script object from the element
</span><span class="cx"> if (JSObject* scriptObject = pluginScriptObject(exec, element))
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (thisValue.inherits(JSNPObject::info())) {
</span><del>- JSNPObject* jsNPObject = static_cast<JSNPObject*>(asObject(thisValue));
</del><ins>+ JSNPObject* jsNPObject = jsCast<JSNPObject*>(asObject(thisValue));
</ins><span class="cx">
</span><span class="cx"> return JSValue::encode(jsNPObject->callMethod(exec, jsNPMethod->npIdentifier()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeJSNPObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> JSObject* object = exec->callee();
</span><span class="cx"> ASSERT(object->inherits(JSNPObject::info()));
</span><span class="cx">
</span><del>- return JSValue::encode(static_cast<JSNPObject*>(object)->callObject(exec));
</del><ins>+ return JSValue::encode(jsCast<JSNPObject*>(object)->callObject(exec));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::CallType JSNPObject::getCallData(JSC::JSCell* cell, JSC::CallData& callData)
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> JSObject* constructor = exec->callee();
</span><span class="cx"> ASSERT(constructor->inherits(JSNPObject::info()));
</span><span class="cx">
</span><del>- return JSValue::encode(static_cast<JSNPObject*>(constructor)->callConstructor(exec));
</del><ins>+ return JSValue::encode(jsCast<JSNPObject*>(constructor)->callConstructor(exec));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ConstructType JSNPObject::getConstructData(JSCell* cell, ConstructData& constructData)
</span><span class="lines">@@ -417,16 +417,16 @@
</span><span class="cx"> npnMemFree(identifiers);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSNPObject::propertyGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSNPObject::propertyGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSNPObject* thisObj = static_cast<JSNPObject*>(asObject(slotBase));
</del><ins>+ JSNPObject* thisObj = jsCast<JSNPObject*>(JSValue::decode(slotBase));
</ins><span class="cx"> ASSERT_GC_OBJECT_INHERITS(thisObj, info());
</span><span class="cx">
</span><span class="cx"> if (!thisObj->m_npObject)
</span><del>- return throwInvalidAccessError(exec);
</del><ins>+ return JSValue::encode(throwInvalidAccessError(exec));
</ins><span class="cx">
</span><span class="cx"> if (!thisObj->m_npObject->_class->getProperty)
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx">
</span><span class="cx"> NPVariant result;
</span><span class="cx"> VOID_TO_NPVARIANT(result);
</span><span class="lines">@@ -446,23 +446,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!returnValue)
</span><del>- return jsUndefined();
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx">
</span><span class="cx"> JSValue propertyValue = thisObj->m_objectMap->convertNPVariantToJSValue(exec, thisObj->globalObject(), result);
</span><span class="cx"> releaseNPVariantValue(&result);
</span><del>- return propertyValue;
</del><ins>+ return JSValue::encode(propertyValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSNPObject::methodGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</del><ins>+EncodedJSValue JSNPObject::methodGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSNPObject* thisObj = static_cast<JSNPObject*>(asObject(slotBase));
</del><ins>+ JSNPObject* thisObj = jsCast<JSNPObject*>(JSValue::decode(slotBase));
</ins><span class="cx"> ASSERT_GC_OBJECT_INHERITS(thisObj, info());
</span><span class="cx">
</span><span class="cx"> if (!thisObj->m_npObject)
</span><del>- return throwInvalidAccessError(exec);
</del><ins>+ return JSValue::encode(throwInvalidAccessError(exec));
</ins><span class="cx">
</span><span class="cx"> NPIdentifier npIdentifier = npIdentifierFromIdentifier(propertyName);
</span><del>- return JSNPMethod::create(exec, thisObj->globalObject(), propertyName.publicName(), npIdentifier);
</del><ins>+ return JSValue::encode(JSNPMethod::create(exec, thisObj->globalObject(), propertyName.publicName(), npIdentifier));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSObject* JSNPObject::throwInvalidAccessError(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeJSNPObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -95,8 +95,8 @@
</span><span class="cx">
</span><span class="cx"> static void getOwnPropertyNames(JSC::JSObject*, JSC::ExecState*, JSC::PropertyNameArray&, JSC::EnumerationMode);
</span><span class="cx">
</span><del>- static JSC::JSValue propertyGetter(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
- static JSC::JSValue methodGetter(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
</del><ins>+ static JSC::EncodedJSValue propertyGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
+ static JSC::EncodedJSValue methodGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</ins><span class="cx"> static JSC::JSObject* throwInvalidAccessError(JSC::ExecState*);
</span><span class="cx">
</span><span class="cx"> NPRuntimeObjectMap* m_objectMap;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNPRuntimeObjectMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> {
</span><span class="cx"> // If this is a JSNPObject, we can just get its underlying NPObject.
</span><span class="cx"> if (jsObject->classInfo() == JSNPObject::info()) {
</span><del>- JSNPObject* jsNPObject = static_cast<JSNPObject*>(jsObject);
</del><ins>+ JSNPObject* jsNPObject = jsCast<JSNPObject*>(jsObject);
</ins><span class="cx"> NPObject* npObject = jsNPObject->npObject();
</span><span class="cx">
</span><span class="cx"> retainNPObject(npObject);
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx">
</span><span class="cx"> void NPRuntimeObjectMap::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
</span><span class="cx"> {
</span><del>- JSNPObject* object = static_cast<JSNPObject*>(handle.get().asCell());
</del><ins>+ JSNPObject* object = jsCast<JSNPObject*>(handle.get().asCell());
</ins><span class="cx"> weakRemove(m_jsNPObjects, static_cast<NPObject*>(context), object);
</span><span class="cx"> addToInvalidationQueue(object->leakNPObject());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (160207 => 160208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2013-12-06 02:52:12 UTC (rev 160207)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2013-12-06 03:03:24 UTC (rev 160208)
</span><span class="lines">@@ -664,7 +664,7 @@
</span><span class="cx"> if (!toJS(element)->inherits(JSElement::info()))
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- return counterValueForElement(&static_cast<JSElement*>(toJS(element))->impl());
</del><ins>+ return counterValueForElement(&jsCast<JSElement*>(toJS(element))->impl());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebFrame::provisionalURL() const
</span></span></pre>
</div>
</div>
</body>
</html>