Changeset 97006 in webkit for trunk/Source/JavaScriptCore/runtime/JSCell.h

Timestamp:

Oct 8, 2011, 1:54:57 AM (14 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r96996.
​http://trac.webkit.org/changeset/96996
​https://bugs.webkit.org/show_bug.cgi?id=69697

It broke all tests on the Qt bot (Requested by Ossy_night on
#webkit).

Patch by Sheriff Bot <​[email protected]> on 2011-10-08

Source/JavaScriptCore:

• API/JSCallbackFunction.cpp:

(JSC::JSCallbackFunction::getCallDataVirtual):

• API/JSCallbackFunction.h:
• API/JSCallbackObject.h:
• API/JSCallbackObjectFunctions.h:

(JSC::::getCallDataVirtual):

• API/JSObjectRef.cpp:

(JSObjectIsFunction):
(JSObjectCallAsFunction):

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• runtime/ArrayConstructor.cpp:

(JSC::ArrayConstructor::getCallDataVirtual):

• runtime/ArrayConstructor.h:
• runtime/BooleanConstructor.cpp:

(JSC::BooleanConstructor::getCallDataVirtual):

• runtime/BooleanConstructor.h:
• runtime/DateConstructor.cpp:

(JSC::DateConstructor::getCallDataVirtual):

• runtime/DateConstructor.h:
• runtime/Error.cpp:

(JSC::StrictModeTypeErrorFunction::StrictModeTypeErrorFunction):
(JSC::StrictModeTypeErrorFunction::create):
(JSC::StrictModeTypeErrorFunction::constructThrowTypeError):
(JSC::StrictModeTypeErrorFunction::getConstructData):
(JSC::StrictModeTypeErrorFunction::callThrowTypeError):
(JSC::StrictModeTypeErrorFunction::getCallDataVirtual):
(JSC::StrictModeTypeErrorFunction::getCallData):
(JSC::StrictModeTypeErrorFunction::createStructure):
(JSC::createTypeErrorFunction):

• runtime/Error.h:
• runtime/ErrorConstructor.cpp:

(JSC::ErrorConstructor::getCallDataVirtual):

• runtime/ErrorConstructor.h:
• runtime/FunctionConstructor.cpp:

(JSC::FunctionConstructor::getCallDataVirtual):

• runtime/FunctionConstructor.h:
• runtime/FunctionPrototype.cpp:

(JSC::FunctionPrototype::getCallDataVirtual):

• runtime/FunctionPrototype.h:
• runtime/InternalFunction.cpp:

(JSC::InternalFunction::finishCreation):

• runtime/InternalFunction.h:
• runtime/JSCell.cpp:

(JSC::JSCell::getCallDataVirtual):

• runtime/JSCell.h:

(JSC::getCallData):

• runtime/JSFunction.cpp:

(JSC::JSFunction::getCallDataVirtual):

• runtime/JSFunction.h:
• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::reset):
(JSC::JSGlobalObject::visitChildren):

• runtime/JSGlobalObject.h:
• runtime/JSONObject.cpp:

(JSC::Stringifier::Stringifier):
(JSC::Stringifier::toJSON):
(JSC::Stringifier::appendStringifiedValue):

• runtime/JSObject.cpp:

(JSC::JSObject::put):

• runtime/JSObject.h:
• runtime/NativeErrorConstructor.cpp:

(JSC::NativeErrorConstructor::getCallDataVirtual):

• runtime/NativeErrorConstructor.h:
• runtime/NumberConstructor.cpp:

(JSC::NumberConstructor::getCallDataVirtual):

• runtime/NumberConstructor.h:
• runtime/ObjectConstructor.cpp:

(JSC::ObjectConstructor::getCallDataVirtual):

• runtime/ObjectConstructor.h:
• runtime/Operations.cpp:

(JSC::jsTypeStringForValue):
(JSC::jsIsObjectType):
(JSC::jsIsFunctionType):

• runtime/PropertySlot.cpp:

(JSC::PropertySlot::functionGetter):

• runtime/RegExpConstructor.cpp:

(JSC::RegExpConstructor::getCallDataVirtual):

• runtime/RegExpConstructor.h:
• runtime/StringConstructor.cpp:

(JSC::StringConstructor::getCallDataVirtual):

• runtime/StringConstructor.h:
• runtime/Structure.h:

Source/JavaScriptGlue:

• JSValueWrapper.cpp:

(JSValueWrapper::JSObjectCallFunction):

• UserObjectImp.cpp:

(UserObjectImp::getCallDataVirtual):

• UserObjectImp.h:

Source/WebCore:

• WebCore.exp.in:
• bindings/js/JSCallbackData.cpp:

(WebCore::JSCallbackData::invokeCallback):

• bindings/js/JSCustomXPathNSResolver.cpp:

(WebCore::JSCustomXPathNSResolver::lookupNamespaceURI):

• bindings/js/JSErrorHandler.cpp:

(WebCore::JSErrorHandler::handleEvent):

• bindings/js/JSEventListener.cpp:

(WebCore::JSEventListener::handleEvent):

• bindings/js/JSHTMLAllCollectionCustom.cpp:

(WebCore::JSHTMLAllCollection::getCallDataVirtual):

• bindings/js/JSHTMLAppletElementCustom.cpp:

(WebCore::JSHTMLAppletElement::getCallDataVirtual):

• bindings/js/JSHTMLEmbedElementCustom.cpp:

(WebCore::JSHTMLEmbedElement::getCallDataVirtual):

• bindings/js/JSHTMLObjectElementCustom.cpp:

(WebCore::JSHTMLObjectElement::getCallDataVirtual):

• bindings/js/JSInjectedScriptHostCustom.cpp:

(WebCore::JSInjectedScriptHost::evaluate):

• bindings/js/JSPluginElementFunctions.cpp:

(WebCore::runtimeObjectGetCallData):

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateHeader):

• bridge/objc/objc_runtime.h:
• bridge/objc/objc_runtime.mm:

(JSC::Bindings::ObjcFallbackObjectImp::getCallDataVirtual):

• bridge/qt/qt_runtime.cpp:

(JSC::Bindings::QtRuntimeMetaMethod::getCallDataVirtual):
(JSC::Bindings::QtRuntimeConnectionMethod::call):
(JSC::Bindings::QtRuntimeConnectionMethod::getCallDataVirtual):
(JSC::Bindings::isJavaScriptFunction):

• bridge/qt/qt_runtime.h:
• bridge/runtime_method.cpp:

(JSC::RuntimeMethod::getCallDataVirtual):

• bridge/runtime_method.h:
• bridge/runtime_object.cpp:

(JSC::Bindings::RuntimeObject::getCallDataVirtual):

• bridge/runtime_object.h:

Source/WebKit/mac:

• Plugins/Hosted/NetscapePluginInstanceProxy.mm:

(WebKit::NetscapePluginInstanceProxy::invokeDefault):

Source/WebKit2:

• WebProcess/Plugins/Netscape/JSNPMethod.cpp:

(WebKit::JSNPMethod::getCallDataVirtual):

• WebProcess/Plugins/Netscape/JSNPMethod.h:
• WebProcess/Plugins/Netscape/JSNPObject.cpp:

(WebKit::JSNPObject::getCallDataVirtual):

• WebProcess/Plugins/Netscape/JSNPObject.h:

File:

• trunk/Source/JavaScriptCore/runtime/JSCell.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/JSCell.h

@@ -74 +74 @@
         const JSObject* getObject() const; // NULL if not an object
         
+        virtual CallType getCallDataVirtual(CallData&);
         static CallType getCallData(JSCell*, CallData&);
         virtual ConstructType getConstructData(ConstructData&);
@@ -140 +141 @@
         WriteBarrier<Structure> m_structure;
     };
-    
+
     inline JSCell::JSCell(JSGlobalData& globalData, Structure* structure)
         : m_structure(globalData, this, structure)
@@ -231 +232 @@
     {
         return isCell() ? asCell()->getObject() : 0;
+    }
+
+    inline CallType getCallData(JSValue value, CallData& callData)
+    {
+        CallType result = value.isCell() ? value.asCell()->getCallDataVirtual(callData) : CallTypeNone;
+        ASSERT(result == CallTypeNone || value.isValidCallee());
+        return result;
     }