<!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>[160204] 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/160204">160204</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-05 17:19:42 -0800 (Thu, 05 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/160133">r160133</a>.
http://trac.webkit.org/changeset/160133
https://bugs.webkit.org/show_bug.cgi?id=125325
broke bindings tests on all the bots (Requested by thorton on
#webkit).
Source/JavaScriptCore:
* API/JSCallbackObject.h:
* API/JSCallbackObjectFunctions.h:
(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::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::regExpObjectGlobal):
(JSC::regExpObjectIgnoreCase):
(JSC::regExpObjectMultiline):
(JSC::regExpObjectSource):
Source/WebCore:
* 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:
* 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::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="#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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSCallbackObject.h 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/JavaScriptCore/API/JSCallbackObject.h 2013-12-06 01:19:42 UTC (rev 160204)
</span><span class="lines">@@ -205,14 +205,13 @@
</span><span class="cx"> void init(ExecState*);
</span><span class="cx">
</span><span class="cx"> static JSCallbackObject* asCallbackObject(JSValue);
</span><del>- static JSCallbackObject* asCallbackObject(EncodedJSValue);
</del><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 EncodedJSValue staticFunctionGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
- static EncodedJSValue callbackGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
</del><ins>+ static JSValue staticFunctionGetter(ExecState*, JSValue, PropertyName);
+ static JSValue callbackGetter(ExecState*, JSValue, 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h 2013-12-06 01:19:42 UTC (rev 160204)
</span><span class="lines">@@ -50,13 +50,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Parent>
</span><del>-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>
</del><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">@@ -591,14 +584,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Parent>
</span><del>-EncodedJSValue JSCallbackObject<Parent>::staticFunctionGetter(ExecState* exec, EncodedJSValue slotParent, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSCallbackObject<Parent>::staticFunctionGetter(ExecState* exec, JSValue slotParent, 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 JSValue::encode(slot2.getValue(exec, propertyName));
</del><ins>+ return 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">@@ -608,18 +601,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 JSValue::encode(o);
</del><ins>+ return 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 JSValue::encode(exec->vm().throwException(exec, createReferenceError(exec, ASCIILiteral("Static function property defined with NULL callAsFunction callback."))));
</del><ins>+ return 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>-EncodedJSValue JSCallbackObject<Parent>::callbackGetter(ExecState* exec, EncodedJSValue slotParent, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSCallbackObject<Parent>::callbackGetter(ExecState* exec, JSValue slotParent, PropertyName propertyName)
</ins><span class="cx"> {
</span><span class="cx"> JSCallbackObject* thisObj = asCallbackObject(slotParent);
</span><span class="cx">
</span><span class="lines">@@ -639,15 +632,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 JSValue::encode(jsUndefined());
</del><ins>+ return jsUndefined();
</ins><span class="cx"> }
</span><span class="cx"> if (value)
</span><del>- return JSValue::encode(toJS(exec, value));
</del><ins>+ return toJS(exec, value);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return JSValue::encode(exec->vm().throwException(exec, createReferenceError(exec, ASCIILiteral("hasProperty callback returned true for a property that doesn't exist."))));
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-06 01:19:42 UTC (rev 160204)
</span><span class="lines">@@ -1,3 +1,57 @@
</span><ins>+2013-12-05 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r160133.
+ http://trac.webkit.org/changeset/160133
+ https://bugs.webkit.org/show_bug.cgi?id=125325
+
+ broke bindings tests on all the bots (Requested by thorton on
+ #webkit).
+
+ * API/JSCallbackObject.h:
+ * API/JSCallbackObjectFunctions.h:
+ (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::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::regExpObjectGlobal):
+ (JSC::regExpObjectIgnoreCase):
+ (JSC::regExpObjectMultiline):
+ (JSC::regExpObjectSource):
+
</ins><span class="cx"> 2013-12-05 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Make the C Loop LLINT work with callToJavaScript.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.cpp (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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 function(exec, JSValue::encode(base), JSValue::encode(base), ident);
</del><ins>+ return JSValue::encode(function(exec, asObject(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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSActivation.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/JavaScriptCore/runtime/JSActivation.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue JSActivation::argumentsGetter(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue JSActivation::argumentsGetter(ExecState*, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- JSActivation* activation = jsCast<JSActivation*>(JSValue::decode(slotBase));
</del><ins>+ JSActivation* activation = jsCast<JSActivation*>(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 JSValue::encode(jsUndefined());
</del><ins>+ return 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 JSValue::encode(arguments);
</del><ins>+ return 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 JSValue::encode(callFrame->uncheckedR(realArgumentsRegister).jsValue());
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSActivation.h 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/JavaScriptCore/runtime/JSActivation.h 2013-12-06 01:19:42 UTC (rev 160204)
</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 EncodedJSValue argumentsGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
</del><ins>+ static JSValue argumentsGetter(ExecState*, JSValue, 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue JSFunction::argumentsGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue JSFunction::argumentsGetter(ExecState* exec, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- JSFunction* thisObj = jsCast<JSFunction*>(JSValue::decode(slotBase));
</del><ins>+ JSFunction* thisObj = jsCast<JSFunction*>(slotBase);
</ins><span class="cx"> ASSERT(!thisObj->isHostFunction());
</span><span class="cx">
</span><del>- return JSValue::encode(retrieveArguments(exec, thisObj));
</del><ins>+ return 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>-EncodedJSValue JSFunction::callerGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue JSFunction::callerGetter(ExecState* exec, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- JSFunction* thisObj = jsCast<JSFunction*>(JSValue::decode(slotBase));
</del><ins>+ JSFunction* thisObj = jsCast<JSFunction*>(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 JSValue::encode(caller);
</del><ins>+ return caller;
</ins><span class="cx"> JSFunction* function = jsCast<JSFunction*>(caller);
</span><span class="cx"> if (function->isHostFunction() || !function->jsExecutable()->isStrictMode())
</span><del>- return JSValue::encode(caller);
- return JSValue::encode(throwTypeError(exec, ASCIILiteral("Function.caller used to retrieve strict caller")));
</del><ins>+ return caller;
+ return throwTypeError(exec, ASCIILiteral("Function.caller used to retrieve strict caller"));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSFunction::lengthGetter(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue JSFunction::lengthGetter(ExecState*, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- JSFunction* thisObj = jsCast<JSFunction*>(JSValue::decode(slotBase));
</del><ins>+ JSFunction* thisObj = jsCast<JSFunction*>(slotBase);
</ins><span class="cx"> ASSERT(!thisObj->isHostFunction());
</span><del>- return JSValue::encode(jsNumber(thisObj->jsExecutable()->parameterCount()));
</del><ins>+ return jsNumber(thisObj->jsExecutable()->parameterCount());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSFunction::nameGetter(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue JSFunction::nameGetter(ExecState*, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- JSFunction* thisObj = jsCast<JSFunction*>(JSValue::decode(slotBase));
</del><ins>+ JSFunction* thisObj = jsCast<JSFunction*>(slotBase);
</ins><span class="cx"> ASSERT(!thisObj->isHostFunction());
</span><del>- return JSValue::encode(thisObj->jsExecutable()->nameValue());
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.h 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.h 2013-12-06 01:19:42 UTC (rev 160204)
</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 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);
</del><ins>+ static JSValue argumentsGetter(ExecState*, JSValue, PropertyName);
+ static JSValue callerGetter(ExecState*, JSValue, PropertyName);
+ static JSValue lengthGetter(ExecState*, JSValue, PropertyName);
+ static JSValue nameGetter(ExecState*, JSValue, 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2013-12-06 01:19:42 UTC (rev 160204)
</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 JSValue::decode(m_data.customIndex.getIndexValue(exec, JSValue::encode(slotBase()), JSValue::encode(m_thisValue), m_data.customIndex.index));
</del><ins>+ return m_data.customIndex.getIndexValue(exec, slotBase(), m_data.customIndex.index);
</ins><span class="cx"> if (m_propertyType == TypeGetter)
</span><span class="cx"> return functionGetter(exec);
</span><del>- return JSValue::decode(m_data.custom.getValue(exec, JSValue::encode(slotBase()), JSValue::encode(m_thisValue), propertyName));
</del><ins>+ return m_data.custom.getValue(exec, slotBase(), 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 JSValue::decode(m_data.customIndex.getIndexValue(exec, JSValue::encode(slotBase()), JSValue::encode(m_thisValue), m_data.customIndex.index));
</del><ins>+ return m_data.customIndex.getIndexValue(exec, slotBase(), m_data.customIndex.index);
</ins><span class="cx"> if (m_propertyType == TypeGetter)
</span><span class="cx"> return functionGetter(exec);
</span><del>- return JSValue::decode(m_data.custom.getValue(exec, JSValue::encode(slotBase()), JSValue::encode(m_thisValue), Identifier::from(exec, propertyName)));
</del><ins>+ return m_data.custom.getValue(exec, slotBase(), 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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 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);
</del><ins>+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);
</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 EncodedJSValue numberConstructorNaNValue(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName)
</del><ins>+static JSValue numberConstructorNaNValue(ExecState*, JSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(jsNaN());
</del><ins>+ return jsNaN();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue numberConstructorNegInfinity(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName)
</del><ins>+static JSValue numberConstructorNegInfinity(ExecState*, JSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(jsNumber(-std::numeric_limits<double>::infinity()));
</del><ins>+ return jsNumber(-std::numeric_limits<double>::infinity());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue numberConstructorPosInfinity(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName)
</del><ins>+static JSValue numberConstructorPosInfinity(ExecState*, JSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(jsNumber(std::numeric_limits<double>::infinity()));
</del><ins>+ return jsNumber(std::numeric_limits<double>::infinity());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue numberConstructorMaxValue(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName)
</del><ins>+static JSValue numberConstructorMaxValue(ExecState*, JSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(jsNumber(1.7976931348623157E+308));
</del><ins>+ return jsNumber(1.7976931348623157E+308);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue numberConstructorMinValue(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName)
</del><ins>+static JSValue numberConstructorMinValue(ExecState*, JSValue, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(jsNumber(5E-324));
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PropertySlot.h 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/JavaScriptCore/runtime/PropertySlot.h 2013-12-06 01:19:42 UTC (rev 160204)
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- typedef EncodedJSValue (*GetValueFunc)(ExecState*, EncodedJSValue slotBase, EncodedJSValue thisValue, PropertyName);
- typedef EncodedJSValue (*GetIndexValueFunc)(ExecState*, EncodedJSValue slotBase, EncodedJSValue thisValue, unsigned);
</del><ins>+ typedef JSValue (*GetValueFunc)(ExecState*, JSValue slotBase, PropertyName);
+ typedef JSValue (*GetIndexValueFunc)(ExecState*, JSValue slotBase, 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>- const JSValue m_thisValue;
</del><ins>+ 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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 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);
</del><ins>+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);
</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,84 +158,79 @@
</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>-static inline RegExpConstructor* asRegExpConstructor(EncodedJSValue value)
</del><ins>+JSValue regExpConstructorDollar1(ExecState* exec, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return jsCast<RegExpConstructor*>(JSValue::decode(value));
</del><ins>+ return asRegExpConstructor(slotBase)->getBackref(exec, 1);
</ins><span class="cx"> }
</span><del>-
-EncodedJSValue regExpConstructorDollar1(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
-{
- return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 1));
-}
</del><span class="cx">
</span><del>-EncodedJSValue regExpConstructorDollar2(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpConstructorDollar2(ExecState* exec, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 2));
</del><ins>+ return asRegExpConstructor(slotBase)->getBackref(exec, 2);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue regExpConstructorDollar3(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpConstructorDollar3(ExecState* exec, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 3));
</del><ins>+ return asRegExpConstructor(slotBase)->getBackref(exec, 3);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue regExpConstructorDollar4(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpConstructorDollar4(ExecState* exec, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 4));
</del><ins>+ return asRegExpConstructor(slotBase)->getBackref(exec, 4);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue regExpConstructorDollar5(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpConstructorDollar5(ExecState* exec, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 5));
</del><ins>+ return asRegExpConstructor(slotBase)->getBackref(exec, 5);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue regExpConstructorDollar6(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpConstructorDollar6(ExecState* exec, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 6));
</del><ins>+ return asRegExpConstructor(slotBase)->getBackref(exec, 6);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue regExpConstructorDollar7(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpConstructorDollar7(ExecState* exec, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 7));
</del><ins>+ return asRegExpConstructor(slotBase)->getBackref(exec, 7);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue regExpConstructorDollar8(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpConstructorDollar8(ExecState* exec, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 8));
</del><ins>+ return asRegExpConstructor(slotBase)->getBackref(exec, 8);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue regExpConstructorDollar9(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpConstructorDollar9(ExecState* exec, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 9));
</del><ins>+ return asRegExpConstructor(slotBase)->getBackref(exec, 9);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue regExpConstructorInput(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpConstructorInput(ExecState*, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(asRegExpConstructor(slotBase)->input());
</del><ins>+ return asRegExpConstructor(slotBase)->input();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue regExpConstructorMultiline(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpConstructorMultiline(ExecState*, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(jsBoolean(asRegExpConstructor(slotBase)->multiline()));
</del><ins>+ return jsBoolean(asRegExpConstructor(slotBase)->multiline());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue regExpConstructorLastMatch(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpConstructorLastMatch(ExecState* exec, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(asRegExpConstructor(slotBase)->getBackref(exec, 0));
</del><ins>+ return asRegExpConstructor(slotBase)->getBackref(exec, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue regExpConstructorLastParen(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpConstructorLastParen(ExecState* exec, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(asRegExpConstructor(slotBase)->getLastParen(exec));
</del><ins>+ return asRegExpConstructor(slotBase)->getLastParen(exec);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue regExpConstructorLeftContext(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpConstructorLeftContext(ExecState* exec, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(asRegExpConstructor(slotBase)->getLeftContext(exec));
</del><ins>+ return asRegExpConstructor(slotBase)->getLeftContext(exec);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue regExpConstructorRightContext(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpConstructorRightContext(ExecState* exec, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(asRegExpConstructor(slotBase)->getRightContext(exec));
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpObject.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/JavaScriptCore/runtime/RegExpObject.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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 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);
</del><ins>+static JSValue regExpObjectGlobal(ExecState*, JSValue, PropertyName);
+static JSValue regExpObjectIgnoreCase(ExecState*, JSValue, PropertyName);
+static JSValue regExpObjectMultiline(ExecState*, JSValue, PropertyName);
+static JSValue regExpObjectSource(ExecState*, JSValue, PropertyName);
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="lines">@@ -155,24 +155,19 @@
</span><span class="cx"> return Base::defineOwnProperty(object, exec, propertyName, descriptor, shouldThrow);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline RegExpObject* asRegExpObject(EncodedJSValue value)
</del><ins>+JSValue regExpObjectGlobal(ExecState*, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return jsCast<RegExpObject*>(JSValue::decode(value));
</del><ins>+ return jsBoolean(asRegExpObject(slotBase)->regExp()->global());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue regExpObjectGlobal(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpObjectIgnoreCase(ExecState*, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(jsBoolean(asRegExpObject(slotBase)->regExp()->global()));
</del><ins>+ return jsBoolean(asRegExpObject(slotBase)->regExp()->ignoreCase());
</ins><span class="cx"> }
</span><del>-
-EncodedJSValue regExpObjectIgnoreCase(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
-{
- return JSValue::encode(jsBoolean(asRegExpObject(slotBase)->regExp()->ignoreCase()));
-}
</del><span class="cx">
</span><del>-EncodedJSValue regExpObjectMultiline(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpObjectMultiline(ExecState*, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(jsBoolean(asRegExpObject(slotBase)->regExp()->multiline()));
</del><ins>+ return jsBoolean(asRegExpObject(slotBase)->regExp()->multiline());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><span class="lines">@@ -281,14 +276,12 @@
</span><span class="cx"> return jsString(exec, result.toString());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-
-EncodedJSValue regExpObjectSource(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue regExpObjectSource(ExecState* exec, JSValue slotBase, 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 JSValue::encode(regExpObjectSourceInternal(exec, pattern, pattern.characters8(), pattern.length()));
- return JSValue::encode(regExpObjectSourceInternal(exec, pattern, pattern.characters16(), pattern.length()));
</del><ins>+ return regExpObjectSourceInternal(exec, pattern, pattern.characters8(), pattern.length());
+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/ChangeLog 2013-12-06 01:19:42 UTC (rev 160204)
</span><span class="lines">@@ -1,3 +1,83 @@
</span><ins>+2013-12-05 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r160133.
+ http://trac.webkit.org/changeset/160133
+ https://bugs.webkit.org/show_bug.cgi?id=125325
+
+ broke bindings tests on all the bots (Requested by thorton on
+ #webkit).
+
+ * 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 Seokju Kwon <seokju@webkit.org>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove 'cookiesString' output from Page.getCookies
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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 EncodedJSValue cssPropertyGetterPixelOrPosPrefixCallback(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, unsigned propertyID)
</del><ins>+static JSValue cssPropertyGetterPixelOrPosPrefixCallback(ExecState* exec, JSValue slotBase, unsigned propertyID)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(cssPropertyGetterPixelOrPosPrefix(exec, jsCast<JSCSSStyleDeclaration*>(JSValue::decode(slotBase)), propertyID));
</del><ins>+ return cssPropertyGetterPixelOrPosPrefix(exec, jsCast<JSCSSStyleDeclaration*>(asObject(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 EncodedJSValue cssPropertyGetterCallback(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, unsigned propertyID)
</del><ins>+static JSValue cssPropertyGetterCallback(ExecState* exec, JSValue slotBase, unsigned propertyID)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(cssPropertyGetter(exec, jsCast<JSCSSStyleDeclaration*>(JSValue::decode(slotBase)), propertyID));
</del><ins>+ return cssPropertyGetter(exec, jsCast<JSCSSStyleDeclaration*>(asObject(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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue objectToStringFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue objectToStringFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 0, propertyName.publicName(), objectProtoFuncToString));
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2013-12-06 01:19:42 UTC (rev 160204)
</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::EncodedJSValue objectToStringFunctionGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</del><ins>+JSC::JSValue objectToStringFunctionGetter(JSC::ExecState*, JSC::JSValue, 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMMimeTypeArrayCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSDOMMimeTypeArrayCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</span><span class="lines">@@ -33,12 +33,10 @@
</span><span class="cx"> return mimeTypeArray->canGetItemsForName(propertyNameToAtomicString(propertyName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSDOMMimeTypeArray::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSDOMMimeTypeArray::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSDOMMimeTypeArray* thisObj = jsDynamicCast<JSDOMMimeTypeArray*>(JSValue::decode(slotBase));
- if (!thisObj)
- return throwVMTypeError(exec);
- return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName))));
</del><ins>+ JSDOMMimeTypeArray* thisObj = jsCast<JSDOMMimeTypeArray*>(asObject(slotBase));
+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPluginArrayCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSDOMPluginArrayCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue JSDOMPluginArray::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSDOMPluginArray::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSDOMPluginArray* thisObj = jsCast<JSDOMPluginArray*>(JSValue::decode(slotBase));
- return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName))));
</del><ins>+ JSDOMPluginArray* thisObj = jsCast<JSDOMPluginArray*>(asObject(slotBase));
+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPluginCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSDOMPluginCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue JSDOMPlugin::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSDOMPlugin::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSDOMPlugin* thisObj = jsCast<JSDOMPlugin*>(JSValue::decode(slotBase));
- return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName))));
</del><ins>+ JSDOMPlugin* thisObj = jsCast<JSDOMPlugin*>(asObject(slotBase));
+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue JSDOMStringMap::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSDOMStringMap::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSDOMStringMap* thisObj = jsCast<JSDOMStringMap*>(JSValue::decode(slotBase));
- return JSValue::encode(jsStringWithCache(exec, thisObj->impl().item(propertyNameToAtomicString(propertyName))));
</del><ins>+ JSDOMStringMap* thisObj = jsCast<JSDOMStringMap*>(asObject(slotBase));
+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue nonCachingStaticFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue nonCachingStaticFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), length, propertyName.publicName(), nativeFunction));
</del><ins>+ return JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), length, propertyName.publicName(), nativeFunction);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue childFrameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+static JSValue childFrameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(toJS(exec, jsCast<JSDOMWindow*>(JSValue::decode(slotBase))->impl().frame()->tree().scopedChild(propertyNameToAtomicString(propertyName))->document()->domWindow()));
</del><ins>+ return toJS(exec, jsCast<JSDOMWindow*>(asObject(slotBase))->impl().frame()->tree().scopedChild(propertyNameToAtomicString(propertyName))->document()->domWindow());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue indexGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, unsigned index)
</del><ins>+static JSValue indexGetter(ExecState* exec, JSValue slotBase, unsigned index)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(toJS(exec, jsCast<JSDOMWindow*>(JSValue::decode(slotBase))->impl().frame()->tree().scopedChild(index)->document()->domWindow()));
</del><ins>+ return toJS(exec, jsCast<JSDOMWindow*>(asObject(slotBase))->impl().frame()->tree().scopedChild(index)->document()->domWindow());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue namedItemGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+static JSValue namedItemGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSDOMWindowBase* thisObj = jsCast<JSDOMWindow*>(JSValue::decode(slotBase));
</del><ins>+ JSDOMWindowBase* thisObj = jsCast<JSDOMWindow*>(asObject(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 JSValue::encode(jsUndefined());
</del><ins>+ return 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 JSValue::encode(toJS(exec, thisObj->globalObject(), WTF::getPtr(collection)));
</del><ins>+ return toJS(exec, thisObj->globalObject(), WTF::getPtr(collection));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return JSValue::encode(toJS(exec, thisObj->globalObject(), toHTMLDocument(document)->windowNamedItem(*atomicPropertyName)));
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue JSHTMLAllCollection::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSHTMLAllCollection::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSHTMLAllCollection* thisObj = jsCast<JSHTMLAllCollection*>(JSValue::decode(slotBase));
- return JSValue::encode(getNamedItems(exec, thisObj, propertyName));
</del><ins>+ JSHTMLAllCollection* thisObj = jsCast<JSHTMLAllCollection*>(asObject(slotBase));
+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue JSHTMLCollection::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSHTMLCollection::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSHTMLCollection* collection = jsCast<JSHTMLCollection*>(JSValue::decode(slotBase));
</del><ins>+ JSHTMLCollection* collection = jsCast<JSHTMLCollection*>(asObject(slotBase));
</ins><span class="cx"> const AtomicString& name = propertyNameToAtomicString(propertyName);
</span><del>- return JSValue::encode(toJS(exec, collection->globalObject(), collection->impl().namedItem(name)));
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue JSHTMLDocument::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSHTMLDocument::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSHTMLDocument* thisObj = jsCast<JSHTMLDocument*>(JSValue::decode(slotBase));
</del><ins>+ JSHTMLDocument* thisObj = jsCast<JSHTMLDocument*>(asObject(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 JSValue::encode(jsUndefined());
</del><ins>+ return 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 JSValue::encode(toJS(exec, thisObj->globalObject(), WTF::getPtr(collection)));
</del><ins>+ return 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 JSValue::encode(toJS(exec, frame));
</del><ins>+ return toJS(exec, frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return JSValue::encode(toJS(exec, thisObj->globalObject(), element));
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue JSHTMLFormControlsCollection::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSHTMLFormControlsCollection::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSHTMLFormControlsCollection* thisObj = jsCast<JSHTMLFormControlsCollection*>(JSValue::decode(slotBase));
- return JSValue::encode(getNamedItems(exec, thisObj, propertyName));
</del><ins>+ JSHTMLFormControlsCollection* thisObj = jsCast<JSHTMLFormControlsCollection*>(asObject(slotBase));
+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue JSHTMLFormElement::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSHTMLFormElement::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSHTMLFormElement* jsForm = jsCast<JSHTMLFormElement*>(JSValue::decode(slotBase));
</del><ins>+ JSHTMLFormElement* jsForm = jsCast<JSHTMLFormElement*>(asObject(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 JSValue::encode(jsUndefined());
</del><ins>+ return jsUndefined();
</ins><span class="cx"> if (namedItems.size() == 1)
</span><del>- return JSValue::encode(toJS(exec, jsForm->globalObject(), &namedItems[0].get()));
</del><ins>+ return 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 JSValue::encode(toJS(exec, jsForm->globalObject(), StaticElementList::adopt(namedItems).get()));
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue JSHTMLFrameSetElement::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSHTMLFrameSetElement::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- HTMLElement& element = jsCast<JSHTMLElement*>(JSValue::decode(slotBase))->impl();
</del><ins>+ HTMLElement& element = jsCast<JSHTMLElement*>(asObject(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 JSValue::encode(window);
</del><ins>+ return window;
</ins><span class="cx"> }
</span><del>- return JSValue::encode(jsUndefined());
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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 EncodedJSValue nonCachingStaticBackFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</del><ins>+static JSValue nonCachingStaticBackFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 0, propertyName.publicName(), jsHistoryPrototypeFunctionBack));
</del><ins>+ return JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 0, propertyName.publicName(), jsHistoryPrototypeFunctionBack);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue nonCachingStaticForwardFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</del><ins>+static JSValue nonCachingStaticForwardFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 0, propertyName.publicName(), jsHistoryPrototypeFunctionForward));
</del><ins>+ return JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 0, propertyName.publicName(), jsHistoryPrototypeFunctionForward);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue nonCachingStaticGoFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</del><ins>+static JSValue nonCachingStaticGoFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 1, propertyName.publicName(), jsHistoryPrototypeFunctionGo));
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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 JSValue::decode(jsJavaScriptCallFrameLOCAL_SCOPE(exec, EncodedJSValue(), EncodedJSValue(), Identifier()));
</del><ins>+ return jsJavaScriptCallFrameLOCAL_SCOPE(exec, JSValue(), Identifier());
</ins><span class="cx"> foundLocalScope = true;
</span><span class="cx"> } else if (!index)
</span><del>- return JSValue::decode(jsJavaScriptCallFrameCLOSURE_SCOPE(exec, EncodedJSValue(), EncodedJSValue(), Identifier()));
</del><ins>+ return jsJavaScriptCallFrameCLOSURE_SCOPE(exec, JSValue(), 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 JSValue::decode(jsJavaScriptCallFrameGLOBAL_SCOPE(exec, EncodedJSValue(), EncodedJSValue(), Identifier()));
- return JSValue::decode(jsJavaScriptCallFrameWITH_SCOPE(exec, EncodedJSValue(), EncodedJSValue(), Identifier()));
</del><ins>+ return jsJavaScriptCallFrameGLOBAL_SCOPE(exec, JSValue(), Identifier());
+ return jsJavaScriptCallFrameWITH_SCOPE(exec, JSValue(), 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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 EncodedJSValue nonCachingStaticReplaceFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</del><ins>+static JSValue nonCachingStaticReplaceFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 1, propertyName.publicName(), jsLocationPrototypeFunctionReplace));
</del><ins>+ return JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 1, propertyName.publicName(), jsLocationPrototypeFunctionReplace);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue nonCachingStaticReloadFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</del><ins>+static JSValue nonCachingStaticReloadFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 0, propertyName.publicName(), jsLocationPrototypeFunctionReload));
</del><ins>+ return JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 0, propertyName.publicName(), jsLocationPrototypeFunctionReload);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue nonCachingStaticAssignFunctionGetter(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName propertyName)
</del><ins>+static JSValue nonCachingStaticAssignFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- return JSValue::encode(JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), 1, propertyName.publicName(), jsLocationPrototypeFunctionAssign));
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNamedNodeMapCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSNamedNodeMapCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue JSNamedNodeMap::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSNamedNodeMap::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSNamedNodeMap* thisObj = jsCast<JSNamedNodeMap*>(JSValue::decode(slotBase));
- return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().getNamedItem(propertyNameToAtomicString(propertyName))));
</del><ins>+ JSNamedNodeMap* thisObj = jsCast<JSNamedNodeMap*>(asObject(slotBase));
+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNodeListCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSNodeListCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue JSNodeList::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSNodeList::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSNodeList* thisObj = jsCast<JSNodeList*>(JSValue::decode(slotBase));
- return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName))));
</del><ins>+ JSNodeList* thisObj = jsCast<JSNodeList*>(asObject(slotBase));
+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue pluginElementPropertyGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue pluginElementPropertyGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSHTMLElement* element = jsCast<JSHTMLElement*>(JSValue::decode(slotBase));
</del><ins>+ JSHTMLElement* element = jsCast<JSHTMLElement*>(asObject(slotBase));
</ins><span class="cx"> JSObject* scriptObject = pluginScriptObject(exec, element);
</span><span class="cx"> if (!scriptObject)
</span><del>- return JSValue::encode(jsUndefined());
</del><ins>+ return jsUndefined();
</ins><span class="cx">
</span><del>- return JSValue::encode(scriptObject->get(exec, propertyName));
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.h 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.h 2013-12-06 01:19:42 UTC (rev 160204)
</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::EncodedJSValue pluginElementPropertyGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</del><ins>+ JSC::JSValue pluginElementPropertyGetter(JSC::ExecState*, JSC::JSValue, 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue JSRTCStatsResponse::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSRTCStatsResponse::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSRTCStatsResponse* thisObj = jsCast<JSRTCStatsResponse*>(JSValue::decode(slotBase));
- return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName))));
</del><ins>+ JSRTCStatsResponse* thisObj = jsCast<JSRTCStatsResponse*>(asObject(slotBase));
+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</span><span class="lines">@@ -42,18 +42,18 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSStorage::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSStorage::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSStorage* thisObj = jsCast<JSStorage*>(JSValue::decode(slotBase));
</del><ins>+ JSStorage* thisObj = jsCast<JSStorage*>(asObject(slotBase));
</ins><span class="cx">
</span><del>- JSValue prototype = asObject(JSValue::decode(slotBase))->prototype();
</del><ins>+ JSValue prototype = asObject(slotBase)->prototype();
</ins><span class="cx"> if (prototype.isObject() && asObject(prototype)->hasProperty(exec, propertyName))
</span><del>- return JSValue::encode(asObject(prototype)->get(exec, propertyName));
</del><ins>+ return 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 JSValue::encode(result);
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSStyleSheetListCustom.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/js/JSStyleSheetListCustom.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue JSStyleSheetList::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSStyleSheetList::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSStyleSheetList* thisObj = jsCast<JSStyleSheetList*>(JSValue::decode(slotBase));
</del><ins>+ JSStyleSheetList* thisObj = jsCast<JSStyleSheetList*>(asObject(slotBase));
</ins><span class="cx"> HTMLStyleElement* element = thisObj->impl().getNamedItem(propertyNameToString(propertyName));
</span><span class="cx"> ASSERT(element);
</span><del>- return JSValue::encode(toJS(exec, thisObj->globalObject(), element->sheet()));
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2013-12-06 01:19:42 UTC (rev 160204)
</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::EncodedJSValue indexGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, unsigned);\n");
</del><ins>+ push(@headerContent, " static JSC::JSValue indexGetter(JSC::ExecState*, JSC::JSValue, 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::EncodedJSValue nameGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);\n");
</del><ins>+ push(@headerContent, " static JSC::JSValue nameGetter(JSC::ExecState*, JSC::JSValue, 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::EncodedJSValue ${getter}(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);\n");
</del><ins>+ push(@headerContent, "JSC::JSValue ${getter}(JSC::ExecState*, JSC::JSValue, 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::EncodedJSValue ${getter}(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);\n");
</del><ins>+ push(@headerContent, "JSC::JSValue ${getter}(JSC::ExecState*, JSC::JSValue, 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::EncodedJSValue ${getter}(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);\n");
</del><ins>+ push(@headerContent, "JSC::JSValue ${getter}(JSC::ExecState*, JSC::JSValue, 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, "EncodedJSValue ${getFunctionName}(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)\n");
</del><ins>+ push(@implContent, "JSValue ${getFunctionName}(ExecState* exec, JSValue slotBase, 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 = jsDynamicCast<$className*>(JSValue::decode(slotBase));\n");
</del><ins>+ push(@implContent, " ${className}* castedThis = jsCast<$className*>(asObject(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 JSValue::encode(jsUndefined());\n");
</del><ins>+ push(@implContent, " return 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 JSValue::encode(jsUndefined());\n");
</del><ins>+ push(@implContent, " return 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 JSValue::encode(jsUndefined());\n");
</del><ins>+ push(@implContent, " return 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 JSValue::encode(jsUndefined());\n");
</del><ins>+ push(@implContent, " return jsUndefined();\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (HasCustomGetter($attribute->signature->extendedAttributes)) {
</span><del>- push(@implContent, " return JSValue::encode(castedThis->$implGetterFunctionName(exec));\n");
</del><ins>+ push(@implContent, " return 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 JSValue::encode(shouldAllowAccessToNode(exec, impl." . $attribute->signature->name . "()) ? " . NativeToJSValue($attribute->signature, 0, $interfaceName, "impl.$implGetterFunctionName()", "castedThis") . " : jsNull());\n");
</del><ins>+ push(@implContent, " return 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 JSValue::encode(jsFunction);\n");
</del><ins>+ push(@implContent, " return jsFunction;\n");
</ins><span class="cx"> push(@implContent, " }\n");
</span><span class="cx"> push(@implContent, " }\n");
</span><del>- push(@implContent, " return JSValue::encode(jsNull());\n");
</del><ins>+ push(@implContent, " return 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 JSValue::encode(JS" . $constructorType . "::get${named}Constructor(exec->vm(), castedThis));\n");
</del><ins>+ push(@implContent, " return 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 JSValue::encode(JS" . $constructorType . "::getConstructor(exec->vm(), castedThis->globalObject()));\n");
</del><ins>+ push(@implContent, " return 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 JSValue::encode(cachedValue);\n");
</del><ins>+ push(@implContent, " return cachedValue;\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- my @callWithArgs = GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContent, "JSValue::encode(jsUndefined())");
</del><ins>+ my @callWithArgs = GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContent, "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 JSValue::encode(jsNull());\n");
</del><ins>+ push(@implContent, " return 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 JSValue::encode(result);\n");
</del><ins>+ push(@implContent, " return 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, "JSValue::encode(jsUndefined())"));
</del><ins>+ unshift(@arguments, GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContent, "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 JSValue::encode(jsNull());\n");
</del><ins>+ push(@implContent, " return 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 JSValue::encode(result);\n");
</del><ins>+ push(@implContent, " return 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, "EncodedJSValue ${constructorFunctionName}(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName)\n");
</del><ins>+ push(@implContent, "JSValue ${constructorFunctionName}(ExecState* exec, JSValue slotBase, PropertyName)\n");
</ins><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " ${className}* domObject = jsDynamicCast<$className*>(JSValue::decode(slotBase));\n");
</del><ins>+ push(@implContent, " ${className}* domObject = jsCast<$className*>(asObject(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 JSValue::encode(jsUndefined());\n");
</del><ins>+ push(@implContent, " return jsUndefined();\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- push(@implContent, " return JSValue::encode(${className}::getConstructor(exec->vm(), domObject->globalObject()));\n");
</del><ins>+ push(@implContent, " return ${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, " $className* castedThis = jsDynamicCast<$className*>(thisValue);\n");
- push(@implContent, " if (!castedThis)\n");
</del><ins>+ push(@implContent, " if (!thisValue.inherits(${className}::info()))\n");
</ins><span class="cx"> push(@implContent, " return throwVMTypeError(exec);\n");
</span><ins>+ push(@implContent, " $className* castedThis = jsCast<$className*>(asObject(thisValue));\n");
</ins><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, "EncodedJSValue ${getter}(ExecState* exec, EncodedJSValue, EncodedJSValue, PropertyName)\n");
</del><ins>+ push(@implContent, "JSValue ${getter}(ExecState* exec, JSValue, PropertyName)\n");
</ins><span class="cx"> push(@implContent, "{\n");
</span><span class="cx"> if ($constant->type eq "DOMString") {
</span><del>- push(@implContent, " return JSValue::encode(jsStringOrNull(exec, String(" . $constant->value . ")));\n");
</del><ins>+ push(@implContent, " return 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 JSValue::encode(jsNumber(static_cast<int>(" . $constant->value . ")));\n");
</del><ins>+ push(@implContent, " return 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, "\nEncodedJSValue ${className}::indexGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, unsigned index)\n");
</del><ins>+ push(@implContent, "\nJSValue ${className}::indexGetter(ExecState* exec, JSValue slotBase, unsigned index)\n");
</ins><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " ${className}* thisObj = jsCast<$className*>(JSValue::decode(slotBase));\n");
</del><ins>+ push(@implContent, " ${className}* thisObj = jsCast<$className*>(asObject(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 JSValue::encode(jsStringOrUndefined(exec, thisObj->impl().item(index)));\n");
</del><ins>+ push(@implContent, " return jsStringOrUndefined(exec, thisObj->impl().item(index));\n");
</ins><span class="cx"> } else {
</span><del>- push(@implContent, " return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().item(index)));\n");
</del><ins>+ push(@implContent, " return 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, "EncodedJSValue ${className}::nameGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)\n");
</del><ins>+ push(@implContent, "JSValue ${className}::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)\n");
</ins><span class="cx"> push(@implContent, "{\n");
</span><del>- 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");
</del><ins>+ push(@implContent, " ${className}* thisObj = jsCast<$className*>(asObject(slotBase));\n");
+ push(@implContent, " return 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*>(value)->impl() : 0");
</del><ins>+ push(@implContent, " return value.inherits(${className}::info()) ? &jsCast<$className*>(asObject(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, jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->uncheckedArgument($argsIndex));\n");
</del><ins>+ push(@$outputArray, " $name = createFunctionOnlyCallback<${callbackClassName}>(exec, static_cast<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, jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->uncheckedArgument($argsIndex));\n");
</del><ins>+ push(@$outputArray, " RefPtr<$argType> $name = createFunctionOnlyCallback<${callbackClassName}>(exec, static_cast<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="trunkSourceWebCorebridgeruntime_arraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/runtime_array.cpp (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/runtime_array.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bridge/runtime_array.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue RuntimeArray::lengthGetter(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue RuntimeArray::lengthGetter(ExecState*, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- RuntimeArray* thisObj = jsCast<RuntimeArray*>(JSValue::decode(slotBase));
- return JSValue::encode(jsNumber(thisObj->getLength()));
</del><ins>+ RuntimeArray* thisObj = static_cast<RuntimeArray*>(asObject(slotBase));
+ return jsNumber(thisObj->getLength());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue RuntimeArray::indexGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, unsigned index)
</del><ins>+JSValue RuntimeArray::indexGetter(ExecState* exec, JSValue slotBase, unsigned index)
</ins><span class="cx"> {
</span><del>- RuntimeArray* thisObj = jsCast<RuntimeArray*>(JSValue::decode(slotBase));
- return JSValue::encode(thisObj->getConcreteArray()->valueAt(exec, index));
</del><ins>+ RuntimeArray* thisObj = static_cast<RuntimeArray*>(asObject(slotBase));
+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/runtime_array.h 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bridge/runtime_array.h 2013-12-06 01:19:42 UTC (rev 160204)
</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 EncodedJSValue lengthGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
- static EncodedJSValue indexGetter(ExecState*, EncodedJSValue, EncodedJSValue, unsigned);
</del><ins>+ static JSValue lengthGetter(ExecState*, JSValue, PropertyName);
+ static JSValue indexGetter(ExecState*, JSValue, 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/runtime_method.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bridge/runtime_method.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue RuntimeMethod::lengthGetter(ExecState*, EncodedJSValue slotBase, EncodedJSValue, PropertyName)
</del><ins>+JSValue RuntimeMethod::lengthGetter(ExecState*, JSValue slotBase, PropertyName)
</ins><span class="cx"> {
</span><del>- RuntimeMethod* thisObj = jsCast<RuntimeMethod*>(JSValue::decode(slotBase));
</del><ins>+ RuntimeMethod* thisObj = static_cast<RuntimeMethod*>(asObject(slotBase));
</ins><span class="cx">
</span><del>- return JSValue::encode(jsNumber(thisObj->m_method->numParameters()));
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/runtime_method.h 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bridge/runtime_method.h 2013-12-06 01:19:42 UTC (rev 160204)
</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 EncodedJSValue lengthGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
</del><ins>+ static JSValue lengthGetter(ExecState*, JSValue, 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/runtime_object.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bridge/runtime_object.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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>-EncodedJSValue RuntimeObject::fallbackObjectGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue RuntimeObject::fallbackObjectGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- RuntimeObject* thisObj = jsCast<RuntimeObject*>(JSValue::decode(slotBase));
</del><ins>+ RuntimeObject* thisObj = static_cast<RuntimeObject*>(asObject(slotBase));
</ins><span class="cx"> RefPtr<Instance> instance = thisObj->m_instance;
</span><span class="cx">
</span><span class="cx"> if (!instance)
</span><del>- return JSValue::encode(throwInvalidAccessError(exec));
</del><ins>+ return 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 JSValue::encode(result);
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue RuntimeObject::fieldGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue RuntimeObject::fieldGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- RuntimeObject* thisObj = jsCast<RuntimeObject*>(JSValue::decode(slotBase));
</del><ins>+ RuntimeObject* thisObj = static_cast<RuntimeObject*>(asObject(slotBase));
</ins><span class="cx"> RefPtr<Instance> instance = thisObj->m_instance;
</span><span class="cx">
</span><span class="cx"> if (!instance)
</span><del>- return JSValue::encode(throwInvalidAccessError(exec));
</del><ins>+ return 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 JSValue::encode(result);
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue RuntimeObject::methodGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue RuntimeObject::methodGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- RuntimeObject* thisObj = jsCast<RuntimeObject*>(JSValue::decode(slotBase));
</del><ins>+ RuntimeObject* thisObj = static_cast<RuntimeObject*>(asObject(slotBase));
</ins><span class="cx"> RefPtr<Instance> instance = thisObj->m_instance;
</span><span class="cx">
</span><span class="cx"> if (!instance)
</span><del>- return JSValue::encode(throwInvalidAccessError(exec));
</del><ins>+ return 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 JSValue::encode(method);
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/runtime_object.h 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebCore/bridge/runtime_object.h 2013-12-06 01:19:42 UTC (rev 160204)
</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 EncodedJSValue fallbackObjectGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
- static EncodedJSValue fieldGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
- static EncodedJSValue methodGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName);
</del><ins>+ static JSValue fallbackObjectGetter(ExecState*, JSValue, PropertyName);
+ static JSValue fieldGetter(ExecState*, JSValue, PropertyName);
+ static JSValue methodGetter(ExecState*, JSValue, 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-06 01:19:42 UTC (rev 160204)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2013-12-05 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r160133.
+ http://trac.webkit.org/changeset/160133
+ https://bugs.webkit.org/show_bug.cgi?id=125325
+
+ broke bindings tests on all the bots (Requested by thorton on
+ #webkit).
+
+ * 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::counterValue):
+
</ins><span class="cx"> 2013-12-05 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Seed: safari extension installation crashes safari under voice over and freezes voice over
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeJSNPMethodcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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 = jsCast<JSNPMethod*>(exec->callee());
</del><ins>+ JSNPMethod* jsNPMethod = static_cast<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 = jsCast<JSHTMLElement*>(asObject(thisValue));
</del><ins>+ JSHTMLElement* element = static_cast<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 = jsCast<JSNPObject*>(asObject(thisValue));
</del><ins>+ JSNPObject* jsNPObject = static_cast<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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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(jsCast<JSNPObject*>(object)->callObject(exec));
</del><ins>+ return JSValue::encode(static_cast<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(jsCast<JSNPObject*>(constructor)->callConstructor(exec));
</del><ins>+ return JSValue::encode(static_cast<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>-EncodedJSValue JSNPObject::propertyGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSNPObject::propertyGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSNPObject* thisObj = jsCast<JSNPObject*>(JSValue::decode(slotBase));
</del><ins>+ JSNPObject* thisObj = static_cast<JSNPObject*>(asObject(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 JSValue::encode(throwInvalidAccessError(exec));
</del><ins>+ return throwInvalidAccessError(exec);
</ins><span class="cx">
</span><span class="cx"> if (!thisObj->m_npObject->_class->getProperty)
</span><del>- return JSValue::encode(jsUndefined());
</del><ins>+ return 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 JSValue::encode(jsUndefined());
</del><ins>+ return 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 JSValue::encode(propertyValue);
</del><ins>+ return propertyValue;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSNPObject::methodGetter(ExecState* exec, EncodedJSValue slotBase, EncodedJSValue, PropertyName propertyName)
</del><ins>+JSValue JSNPObject::methodGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- JSNPObject* thisObj = jsCast<JSNPObject*>(JSValue::decode(slotBase));
</del><ins>+ JSNPObject* thisObj = static_cast<JSNPObject*>(asObject(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 JSValue::encode(throwInvalidAccessError(exec));
</del><ins>+ return throwInvalidAccessError(exec);
</ins><span class="cx">
</span><span class="cx"> NPIdentifier npIdentifier = npIdentifierFromIdentifier(propertyName);
</span><del>- return JSValue::encode(JSNPMethod::create(exec, thisObj->globalObject(), propertyName.publicName(), npIdentifier));
</del><ins>+ return 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h 2013-12-06 01:19:42 UTC (rev 160204)
</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::EncodedJSValue propertyGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
- static JSC::EncodedJSValue methodGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue, JSC::PropertyName);
</del><ins>+ static JSC::JSValue propertyGetter(JSC::ExecState*, JSC::JSValue, JSC::PropertyName);
+ static JSC::JSValue methodGetter(JSC::ExecState*, JSC::JSValue, 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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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 = jsCast<JSNPObject*>(jsObject);
</del><ins>+ JSNPObject* jsNPObject = static_cast<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 = jsCast<JSNPObject*>(handle.get().asCell());
</del><ins>+ JSNPObject* object = static_cast<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 (160203 => 160204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2013-12-06 01:09:09 UTC (rev 160203)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2013-12-06 01:19:42 UTC (rev 160204)
</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(&jsCast<JSElement*>(toJS(element))->impl());
</del><ins>+ return counterValueForElement(&static_cast<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>