[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
ap at apple.com
ap at apple.com
Thu Apr 8 01:55:52 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 5dde077b593290c262a793381e3f2afd2b5936d3
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Feb 22 23:27:02 2010 +0000
Rubber-stamped by Geoff Garen.
Rename RuntimeObjectImp to RuntimeObject.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 350e039..cc17407 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,71 @@
+2010-02-22 Alexey Proskuryakov <ap at apple.com>
+
+ Rubber-stamped by Geoff Garen.
+
+ Rename RuntimeObjectImp to RuntimeObject.
+
+ * WebCore.PluginHostProcess.exp:
+ * bindings/js/JSPluginElementFunctions.cpp:
+ (WebCore::getRuntimeObject):
+ (WebCore::runtimeObjectPropertyGetter):
+ (WebCore::runtimeObjectCustomGetOwnPropertySlot):
+ (WebCore::runtimeObjectCustomGetOwnPropertyDescriptor):
+ (WebCore::runtimeObjectCustomPut):
+ * bindings/objc/WebScriptObject.mm:
+ (+[WebScriptObject _convertValueToObjcValue:originRootObject:rootObject:]):
+ * bridge/c/c_utility.cpp:
+ (JSC::Bindings::convertValueToNPVariant):
+ * bridge/jni/jni_jsobject.mm:
+ (JavaJSObject::convertValueToJObject):
+ * bridge/jni/jsc/JNIUtilityPrivate.cpp:
+ (JSC::Bindings::convertValueToJValue):
+ * bridge/jsc/BridgeJSC.cpp:
+ (JSC::Bindings::Instance::createRuntimeObject):
+ (JSC::Bindings::Instance::newRuntimeObject):
+ * bridge/jsc/BridgeJSC.h:
+ * bridge/objc/objc_runtime.mm:
+ (JSC::Bindings::callObjCFallbackObject):
+ * bridge/qt/qt_instance.cpp:
+ (JSC::Bindings::QtRuntimeObject::markChildren):
+ (JSC::Bindings::):
+ (JSC::Bindings::QtRuntimeObject::QtRuntimeObject):
+ (JSC::Bindings::QtInstance::getInstance):
+ (JSC::Bindings::QtInstance::newRuntimeObject):
+ * bridge/qt/qt_instance.h:
+ * bridge/qt/qt_pixmapruntime.cpp:
+ (JSC::Bindings::QtPixmapRuntimeObject::QtPixmapRuntimeObject):
+ (JSC::Bindings::):
+ (JSC::Bindings::QtPixmapInstance::variantFromObject):
+ (JSC::Bindings::QtPixmapInstance::createRuntimeObject):
+ * bridge/qt/qt_runtime.cpp:
+ (JSC::Bindings::valueRealType):
+ * bridge/runtime_method.cpp:
+ (JSC::callRuntimeMethod):
+ * bridge/runtime_object.cpp:
+ (JSC::RuntimeObject::RuntimeObject):
+ (JSC::RuntimeObject::~RuntimeObject):
+ (JSC::RuntimeObject::invalidate):
+ (JSC::RuntimeObject::fallbackObjectGetter):
+ (JSC::RuntimeObject::fieldGetter):
+ (JSC::RuntimeObject::methodGetter):
+ (JSC::RuntimeObject::getOwnPropertySlot):
+ (JSC::RuntimeObject::getOwnPropertyDescriptor):
+ (JSC::RuntimeObject::put):
+ (JSC::RuntimeObject::deleteProperty):
+ (JSC::RuntimeObject::defaultValue):
+ (JSC::callRuntimeObject):
+ (JSC::RuntimeObject::getCallData):
+ (JSC::callRuntimeConstructor):
+ (JSC::RuntimeObject::getConstructData):
+ (JSC::RuntimeObject::getOwnPropertyNames):
+ (JSC::RuntimeObject::throwInvalidAccessError):
+ * bridge/runtime_object.h:
+ * bridge/runtime_root.cpp:
+ (JSC::Bindings::RootObject::invalidate):
+ (JSC::Bindings::RootObject::addRuntimeObject):
+ (JSC::Bindings::RootObject::removeRuntimeObject):
+ * bridge/runtime_root.h:
+
2010-02-19 Peter Kasting <pkasting at google.com>
Reviewed by Eric Seidel.
diff --git a/WebCore/WebCore.PluginHostProcess.exp b/WebCore/WebCore.PluginHostProcess.exp
index 4b78966..da20473 100644
--- a/WebCore/WebCore.PluginHostProcess.exp
+++ b/WebCore/WebCore.PluginHostProcess.exp
@@ -1,6 +1,6 @@
# This file gets appended to WebCore.exp when USE(PLUGIN_HOST_PROCESS) is 1.
-__ZN3JSC16RuntimeObjectImp6s_infoE
+__ZN3JSC13RuntimeObject6s_infoE
__ZN3JSC8Bindings10RootObjectD1Ev
__ZN3JSC8Bindings8Instance19createRuntimeObjectEPNS_9ExecStateE
__ZN3JSC8Bindings8InstanceC2EN3WTF10PassRefPtrINS0_10RootObjectEEE
diff --git a/WebCore/bindings/js/JSPluginElementFunctions.cpp b/WebCore/bindings/js/JSPluginElementFunctions.cpp
index 4f5f1af..d9057de 100644
--- a/WebCore/bindings/js/JSPluginElementFunctions.cpp
+++ b/WebCore/bindings/js/JSPluginElementFunctions.cpp
@@ -49,7 +49,7 @@ Instance* pluginInstance(Node* node)
return instance;
}
-static RuntimeObjectImp* getRuntimeObject(ExecState* exec, Node* node)
+static RuntimeObject* getRuntimeObject(ExecState* exec, Node* node)
{
Instance* instance = pluginInstance(node);
if (!instance)
@@ -61,7 +61,7 @@ JSValue runtimeObjectPropertyGetter(ExecState* exec, const Identifier& propertyN
{
JSHTMLElement* thisObj = static_cast<JSHTMLElement*>(asObject(slot.slotBase()));
HTMLElement* element = static_cast<HTMLElement*>(thisObj->impl());
- RuntimeObjectImp* runtimeObject = getRuntimeObject(exec, element);
+ RuntimeObject* runtimeObject = getRuntimeObject(exec, element);
if (!runtimeObject)
return jsUndefined();
return runtimeObject->get(exec, propertyName);
@@ -69,7 +69,7 @@ JSValue runtimeObjectPropertyGetter(ExecState* exec, const Identifier& propertyN
bool runtimeObjectCustomGetOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot, JSHTMLElement* element)
{
- RuntimeObjectImp* runtimeObject = getRuntimeObject(exec, element->impl());
+ RuntimeObject* runtimeObject = getRuntimeObject(exec, element->impl());
if (!runtimeObject)
return false;
if (!runtimeObject->hasProperty(exec, propertyName))
@@ -80,7 +80,7 @@ bool runtimeObjectCustomGetOwnPropertySlot(ExecState* exec, const Identifier& pr
bool runtimeObjectCustomGetOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor, JSHTMLElement* element)
{
- RuntimeObjectImp* runtimeObject = getRuntimeObject(exec, element->impl());
+ RuntimeObject* runtimeObject = getRuntimeObject(exec, element->impl());
if (!runtimeObject)
return false;
if (!runtimeObject->hasProperty(exec, propertyName))
@@ -96,7 +96,7 @@ bool runtimeObjectCustomGetOwnPropertyDescriptor(ExecState* exec, const Identifi
bool runtimeObjectCustomPut(ExecState* exec, const Identifier& propertyName, JSValue value, HTMLElement* element, PutPropertySlot& slot)
{
- RuntimeObjectImp* runtimeObject = getRuntimeObject(exec, element);
+ RuntimeObject* runtimeObject = getRuntimeObject(exec, element);
if (!runtimeObject)
return 0;
if (!runtimeObject->hasProperty(exec, propertyName))
diff --git a/WebCore/bindings/objc/WebScriptObject.mm b/WebCore/bindings/objc/WebScriptObject.mm
index d4c78d2..b346654 100644
--- a/WebCore/bindings/objc/WebScriptObject.mm
+++ b/WebCore/bindings/objc/WebScriptObject.mm
@@ -518,9 +518,9 @@ static void getListFromNSArray(ExecState *exec, NSArray *array, RootObject* root
ObjcInstance* instance = static_cast<ObjcInstance*>(pluginInstance(el));
if (instance)
return instance->getObject();
- } else if (object->inherits(&RuntimeObjectImp::s_info)) {
- RuntimeObjectImp* imp = static_cast<RuntimeObjectImp*>(object);
- ObjcInstance* instance = static_cast<ObjcInstance*>(imp->getInternalInstance());
+ } else if (object->inherits(&RuntimeObject::s_info)) {
+ RuntimeObject* runtimeObject = static_cast<RuntimeObject*>(object);
+ ObjcInstance* instance = static_cast<ObjcInstance*>(runtimeObject->getInternalInstance());
if (instance)
return instance->getObject();
return nil;
diff --git a/WebCore/bridge/c/c_utility.cpp b/WebCore/bridge/c/c_utility.cpp
index 7ff77e7..420a822 100644
--- a/WebCore/bridge/c/c_utility.cpp
+++ b/WebCore/bridge/c/c_utility.cpp
@@ -85,9 +85,9 @@ void convertValueToNPVariant(ExecState* exec, JSValue value, NPVariant* result)
NULL_TO_NPVARIANT(*result);
} else if (value.isObject()) {
JSObject* object = asObject(value);
- if (object->classInfo() == &RuntimeObjectImp::s_info) {
- RuntimeObjectImp* imp = static_cast<RuntimeObjectImp*>(object);
- CInstance* instance = static_cast<CInstance*>(imp->getInternalInstance());
+ if (object->classInfo() == &RuntimeObject::s_info) {
+ RuntimeObject* runtimeObject = static_cast<RuntimeObject*>(object);
+ CInstance* instance = static_cast<CInstance*>(runtimeObject->getInternalInstance());
if (instance) {
NPObject* obj = instance->getObject();
_NPN_RetainObject(obj);
diff --git a/WebCore/bridge/jni/jni_jsobject.mm b/WebCore/bridge/jni/jni_jsobject.mm
index 68682bb..4ea4ee2 100644
--- a/WebCore/bridge/jni/jni_jsobject.mm
+++ b/WebCore/bridge/jni/jni_jsobject.mm
@@ -512,27 +512,25 @@ jobject JavaJSObject::convertValueToJObject(JSValue value) const
jlong nativeHandle;
if (value.isObject()) {
- JSObject* imp = asObject(value);
+ JSObject* object = asObject(value);
// We either have a wrapper around a Java instance or a JavaScript
// object. If we have a wrapper around a Java instance, return that
// instance, otherwise create a new Java JavaJSObject with the JSObject*
// as its nativeHandle.
- if (imp->classInfo() && strcmp(imp->classInfo()->className, "RuntimeObject") == 0) {
- RuntimeObjectImp* runtimeImp = static_cast<RuntimeObjectImp*>(imp);
- JavaInstance *runtimeInstance = static_cast<JavaInstance *>(runtimeImp->getInternalInstance());
+ if (object->classInfo() && strcmp(object->classInfo()->className, "RuntimeObject") == 0) {
+ RuntimeObject* runtimeObject = static_cast<RuntimeObject*>(object);
+ JavaInstance* runtimeInstance = static_cast<JavaInstance*>(runtimeObject->getInternalInstance());
if (!runtimeInstance)
return 0;
return runtimeInstance->javaInstance();
+ } else {
+ nativeHandle = ptr_to_jlong(object);
+ rootObject->gcProtect(object);
}
- else {
- nativeHandle = ptr_to_jlong(imp);
- rootObject->gcProtect(imp);
- }
- }
+ } else {
// All other types will result in an undefined object.
- else {
nativeHandle = UndefinedHandle;
}
diff --git a/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp b/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp
index 600314e..38f74eb 100644
--- a/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp
+++ b/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp
@@ -184,18 +184,18 @@ jvalue convertValueToJValue(ExecState* exec, JSValue value, JNIType jniType, con
// First see if we have a Java instance.
if (value.isObject()) {
- JSObject* objectImp = asObject(value);
- if (objectImp->classInfo() == &RuntimeObjectImp::s_info) {
- RuntimeObjectImp* imp = static_cast<RuntimeObjectImp*>(objectImp);
- JavaInstance* instance = static_cast<JavaInstance*>(imp->getInternalInstance());
+ JSObject* object = asObject(value);
+ if (object->classInfo() == &RuntimeObject::s_info) {
+ RuntimeObject* runtimeObject = static_cast<RuntimeObject*>(object);
+ JavaInstance* instance = static_cast<JavaInstance*>(runtimeObject->getInternalInstance());
if (instance)
result.l = instance->javaInstance();
- } else if (objectImp->classInfo() == &RuntimeArray::s_info) {
+ } else if (object->classInfo() == &RuntimeArray::s_info) {
// Input is a JavaScript Array that was originally created from a Java Array
- RuntimeArray* imp = static_cast<RuntimeArray*>(objectImp);
+ RuntimeArray* imp = static_cast<RuntimeArray*>(object);
JavaArray* array = static_cast<JavaArray*>(imp->getConcreteArray());
result.l = array->javaArray();
- } else if (objectImp->classInfo() == &JSArray::info) {
+ } else if (object->classInfo() == &JSArray::info) {
// Input is a Javascript Array. We need to create it to a Java Array.
result.l = convertArrayInstanceToJavaArray(exec, asArray(value), javaClassName);
}
diff --git a/WebCore/bridge/jsc/BridgeJSC.cpp b/WebCore/bridge/jsc/BridgeJSC.cpp
index ed582d3..3d8f62d 100644
--- a/WebCore/bridge/jsc/BridgeJSC.cpp
+++ b/WebCore/bridge/jsc/BridgeJSC.cpp
@@ -83,7 +83,7 @@ void Instance::end()
virtualEnd();
}
-RuntimeObjectImp* Instance::createRuntimeObject(ExecState* exec)
+RuntimeObject* Instance::createRuntimeObject(ExecState* exec)
{
ASSERT(m_rootObject);
ASSERT(m_rootObject->isValid());
@@ -95,10 +95,10 @@ RuntimeObjectImp* Instance::createRuntimeObject(ExecState* exec)
return m_runtimeObject;
}
-RuntimeObjectImp* Instance::newRuntimeObject(ExecState* exec)
+RuntimeObject* Instance::newRuntimeObject(ExecState* exec)
{
JSLock lock(SilenceAssertionsOnly);
- return new (exec)RuntimeObjectImp(exec, this);
+ return new (exec)RuntimeObject(exec, this);
}
void Instance::willDestroyRuntimeObject()
diff --git a/WebCore/bridge/jsc/BridgeJSC.h b/WebCore/bridge/jsc/BridgeJSC.h
index 8e2cb2b..8a10815 100644
--- a/WebCore/bridge/jsc/BridgeJSC.h
+++ b/WebCore/bridge/jsc/BridgeJSC.h
@@ -40,7 +40,7 @@ class ArgList;
class Identifier;
class JSGlobalObject;
class PropertyNameArray;
-class RuntimeObjectImp;
+class RuntimeObject;
namespace Bindings {
@@ -83,7 +83,7 @@ public:
void end();
virtual Class* getClass() const = 0;
- RuntimeObjectImp* createRuntimeObject(ExecState*);
+ RuntimeObject* createRuntimeObject(ExecState*);
void willInvalidateRuntimeObject();
void willDestroyRuntimeObject();
@@ -115,12 +115,12 @@ public:
protected:
virtual void virtualBegin() { }
virtual void virtualEnd() { }
- virtual RuntimeObjectImp* newRuntimeObject(ExecState*);
+ virtual RuntimeObject* newRuntimeObject(ExecState*);
RefPtr<RootObject> m_rootObject;
private:
- RuntimeObjectImp* m_runtimeObject;
+ RuntimeObject* m_runtimeObject;
};
class Array : public Noncopyable {
diff --git a/WebCore/bridge/objc/objc_runtime.mm b/WebCore/bridge/objc/objc_runtime.mm
index 772695c..f85df9a 100644
--- a/WebCore/bridge/objc/objc_runtime.mm
+++ b/WebCore/bridge/objc/objc_runtime.mm
@@ -216,16 +216,16 @@ void ObjcFallbackObjectImp::put(ExecState*, const Identifier&, JSValue, PutPrope
static JSValue JSC_HOST_CALL callObjCFallbackObject(ExecState* exec, JSObject* function, JSValue thisValue, const ArgList& args)
{
- if (!thisValue.inherits(&RuntimeObjectImp::s_info))
+ if (!thisValue.inherits(&RuntimeObject::s_info))
return throwError(exec, TypeError);
JSValue result = jsUndefined();
- RuntimeObjectImp* imp = static_cast<RuntimeObjectImp*>(asObject(thisValue));
- Instance* instance = imp->getInternalInstance();
+ RuntimeObject* runtimeObject = static_cast<RuntimeObject*>(asObject(thisValue));
+ Instance* instance = runtimeObject->getInternalInstance();
if (!instance)
- return RuntimeObjectImp::throwInvalidAccessError(exec);
+ return RuntimeObject::throwInvalidAccessError(exec);
instance->begin();
diff --git a/WebCore/bridge/qt/qt_instance.cpp b/WebCore/bridge/qt/qt_instance.cpp
index fcfe1cd..8822c72 100644
--- a/WebCore/bridge/qt/qt_instance.cpp
+++ b/WebCore/bridge/qt/qt_instance.cpp
@@ -44,15 +44,15 @@ typedef QMultiHash<void*, QtInstance*> QObjectInstanceMap;
static QObjectInstanceMap cachedInstances;
// Derived RuntimeObject
-class QtRuntimeObjectImp : public RuntimeObjectImp {
+class QtRuntimeObject : public RuntimeObject {
public:
- QtRuntimeObjectImp(ExecState*, PassRefPtr<Instance>);
+ QtRuntimeObject(ExecState*, PassRefPtr<Instance>);
static const ClassInfo s_info;
virtual void markChildren(MarkStack& markStack)
{
- RuntimeObjectImp::markChildren(markStack);
+ RuntimeObject::markChildren(markStack);
QtInstance* instance = static_cast<QtInstance*>(getInternalInstance());
if (instance)
instance->markAggregate(markStack);
@@ -64,16 +64,16 @@ public:
}
protected:
- static const unsigned StructureFlags = RuntimeObjectImp::StructureFlags | OverridesMarkChildren;
+ static const unsigned StructureFlags = RuntimeObject::StructureFlags | OverridesMarkChildren;
private:
virtual const ClassInfo* classInfo() const { return &s_info; }
};
-const ClassInfo QtRuntimeObjectImp::s_info = { "QtRuntimeObject", &RuntimeObjectImp::s_info, 0, 0 };
+const ClassInfo QtRuntimeObject::s_info = { "QtRuntimeObject", &RuntimeObject::s_info, 0, 0 };
-QtRuntimeObjectImp::QtRuntimeObjectImp(ExecState* exec, PassRefPtr<Instance> instance)
- : RuntimeObjectImp(exec, WebCore::deprecatedGetDOMStructure<QtRuntimeObjectImp>(exec), instance)
+QtRuntimeObject::QtRuntimeObject(ExecState* exec, PassRefPtr<Instance> instance)
+ : RuntimeObject(exec, WebCore::deprecatedGetDOMStructure<QtRuntimeObject>(exec), instance)
{
}
@@ -164,9 +164,9 @@ QtInstance* QtInstance::getInstance(JSObject* object)
{
if (!object)
return 0;
- if (!object->inherits(&QtRuntimeObjectImp::s_info))
+ if (!object->inherits(&QtRuntimeObject::s_info))
return 0;
- return static_cast<QtInstance*>(static_cast<RuntimeObjectImp*>(object)->getInternalInstance());
+ return static_cast<QtInstance*>(static_cast<RuntimeObject*>(object)->getInternalInstance());
}
Class* QtInstance::getClass() const
@@ -176,10 +176,10 @@ Class* QtInstance::getClass() const
return m_class;
}
-RuntimeObjectImp* QtInstance::newRuntimeObject(ExecState* exec)
+RuntimeObject* QtInstance::newRuntimeObject(ExecState* exec)
{
JSLock lock(SilenceAssertionsOnly);
- return new (exec) QtRuntimeObjectImp(exec, this);
+ return new (exec) QtRuntimeObject(exec, this);
}
void QtInstance::markAggregate(MarkStack& markStack)
diff --git a/WebCore/bridge/qt/qt_instance.h b/WebCore/bridge/qt/qt_instance.h
index 1fc253a..3a938a3 100644
--- a/WebCore/bridge/qt/qt_instance.h
+++ b/WebCore/bridge/qt/qt_instance.h
@@ -40,7 +40,7 @@ public:
~QtInstance();
virtual Class* getClass() const;
- virtual RuntimeObjectImp* newRuntimeObject(ExecState*);
+ virtual RuntimeObject* newRuntimeObject(ExecState*);
virtual void begin();
virtual void end();
diff --git a/WebCore/bridge/qt/qt_pixmapruntime.cpp b/WebCore/bridge/qt/qt_pixmapruntime.cpp
index 5978804..4ef472c 100644
--- a/WebCore/bridge/qt/qt_pixmapruntime.cpp
+++ b/WebCore/bridge/qt/qt_pixmapruntime.cpp
@@ -142,9 +142,9 @@ struct QtPixmapMetaData {
} qt_pixmap_metaData;
// Derived RuntimeObject
-class QtPixmapRuntimeObjectImp : public RuntimeObjectImp {
+class QtPixmapRuntimeObject : public RuntimeObject {
public:
- QtPixmapRuntimeObjectImp(ExecState*, PassRefPtr<Instance>);
+ QtPixmapRuntimeObject(ExecState*, PassRefPtr<Instance>);
static const ClassInfo s_info;
@@ -154,18 +154,18 @@ public:
}
protected:
- static const unsigned StructureFlags = RuntimeObjectImp::StructureFlags | OverridesMarkChildren;
+ static const unsigned StructureFlags = RuntimeObject::StructureFlags | OverridesMarkChildren;
private:
virtual const ClassInfo* classInfo() const { return &s_info; }
};
-QtPixmapRuntimeObjectImp::QtPixmapRuntimeObjectImp(ExecState* exec, PassRefPtr<Instance> instance)
- : RuntimeObjectImp(exec, WebCore::deprecatedGetDOMStructure<QtPixmapRuntimeObjectImp>(exec), instance)
+QtPixmapRuntimeObject::QtPixmapRuntimeObject(ExecState* exec, PassRefPtr<Instance> instance)
+ : RuntimeObject(exec, WebCore::deprecatedGetDOMStructure<QtPixmapRuntimeObject>(exec), instance)
{
}
-const ClassInfo QtPixmapRuntimeObjectImp::s_info = { "QtPixmapRuntimeObject", &RuntimeObjectImp::s_info, 0, 0 };
+const ClassInfo QtPixmapRuntimeObject::s_info = { "QtPixmapRuntimeObject", &RuntimeObject::s_info, 0, 0 };
QtPixmapClass::QtPixmapClass()
{
@@ -317,9 +317,9 @@ QVariant QtPixmapInstance::variantFromObject(JSObject* object, QMetaType::Type h
: QVariant::fromValue<QImage>(pixmap->toImage());
}
- if (object->inherits(&QtPixmapRuntimeObjectImp::s_info)) {
- QtPixmapRuntimeObjectImp* imp = static_cast<QtPixmapRuntimeObjectImp*>(object);
- QtPixmapInstance* instance = static_cast<QtPixmapInstance*>(imp->getInternalInstance());
+ if (object->inherits(&QtPixmapRuntimeObject::s_info)) {
+ QtPixmapRuntimeObject* runtimeObject = static_cast<QtPixmapRuntimeObject*>(object);
+ QtPixmapInstance* instance = static_cast<QtPixmapInstance*>(runtimeObject->getInternalInstance());
if (!instance)
goto returnEmptyVariant;
@@ -340,7 +340,7 @@ returnEmptyVariant:
JSObject* QtPixmapInstance::createRuntimeObject(ExecState* exec, PassRefPtr<RootObject> root, const QVariant& data)
{
JSLock lock(SilenceAssertionsOnly);
- return new(exec) QtPixmapRuntimeObjectImp(exec, new QtPixmapInstance(root, data));
+ return new(exec) QtPixmapRuntimeObject(exec, new QtPixmapInstance(root, data));
}
bool QtPixmapInstance::canHandle(QMetaType::Type hint)
diff --git a/WebCore/bridge/qt/qt_runtime.cpp b/WebCore/bridge/qt/qt_runtime.cpp
index ada9f01..262d4fb 100644
--- a/WebCore/bridge/qt/qt_runtime.cpp
+++ b/WebCore/bridge/qt/qt_runtime.cpp
@@ -154,7 +154,7 @@ static JSRealType valueRealType(ExecState* exec, JSValue val)
return Date;
else if (object->inherits(&RegExpObject::info))
return RegExp;
- else if (object->inherits(&RuntimeObjectImp::s_info))
+ else if (object->inherits(&RuntimeObject::s_info))
return QObj;
return Object;
}
diff --git a/WebCore/bridge/runtime_method.cpp b/WebCore/bridge/runtime_method.cpp
index f5b7eac..ff1280a 100644
--- a/WebCore/bridge/runtime_method.cpp
+++ b/WebCore/bridge/runtime_method.cpp
@@ -96,11 +96,11 @@ static JSValue JSC_HOST_CALL callRuntimeMethod(ExecState* exec, JSObject* functi
RefPtr<Instance> instance;
- if (thisValue.inherits(&RuntimeObjectImp::s_info)) {
- RuntimeObjectImp* imp = static_cast<RuntimeObjectImp*>(asObject(thisValue));
- instance = imp->getInternalInstance();
+ if (thisValue.inherits(&RuntimeObject::s_info)) {
+ RuntimeObject* runtimeObject = static_cast<RuntimeObject*>(asObject(thisValue));
+ instance = runtimeObject->getInternalInstance();
if (!instance)
- return RuntimeObjectImp::throwInvalidAccessError(exec);
+ return RuntimeObject::throwInvalidAccessError(exec);
} else {
// Calling a runtime object of a plugin element?
if (thisValue.inherits(&JSHTMLElement::s_info)) {
diff --git a/WebCore/bridge/runtime_object.cpp b/WebCore/bridge/runtime_object.cpp
index 26b85f9..872cea3 100644
--- a/WebCore/bridge/runtime_object.cpp
+++ b/WebCore/bridge/runtime_object.cpp
@@ -37,29 +37,29 @@ namespace JSC {
using namespace Bindings;
-const ClassInfo RuntimeObjectImp::s_info = { "RuntimeObject", 0, 0, 0 };
+const ClassInfo RuntimeObject::s_info = { "RuntimeObject", 0, 0, 0 };
-RuntimeObjectImp::RuntimeObjectImp(ExecState* exec, PassRefPtr<Instance> instance)
+RuntimeObject::RuntimeObject(ExecState* exec, PassRefPtr<Instance> instance)
// FIXME: deprecatedGetDOMStructure uses the prototype off of the wrong global object
// We need to pass in the right global object for "i".
- : JSObject(deprecatedGetDOMStructure<RuntimeObjectImp>(exec))
+ : JSObject(deprecatedGetDOMStructure<RuntimeObject>(exec))
, m_instance(instance)
{
}
-RuntimeObjectImp::RuntimeObjectImp(ExecState*, NonNullPassRefPtr<Structure> structure, PassRefPtr<Instance> instance)
+RuntimeObject::RuntimeObject(ExecState*, NonNullPassRefPtr<Structure> structure, PassRefPtr<Instance> instance)
: JSObject(structure)
, m_instance(instance)
{
}
-RuntimeObjectImp::~RuntimeObjectImp()
+RuntimeObject::~RuntimeObject()
{
if (m_instance)
m_instance->willDestroyRuntimeObject();
}
-void RuntimeObjectImp::invalidate()
+void RuntimeObject::invalidate()
{
ASSERT(m_instance);
if (m_instance)
@@ -67,9 +67,9 @@ void RuntimeObjectImp::invalidate()
m_instance = 0;
}
-JSValue RuntimeObjectImp::fallbackObjectGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue RuntimeObject::fallbackObjectGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
{
- RuntimeObjectImp* thisObj = static_cast<RuntimeObjectImp*>(asObject(slot.slotBase()));
+ RuntimeObject* thisObj = static_cast<RuntimeObject*>(asObject(slot.slotBase()));
RefPtr<Instance> instance = thisObj->m_instance;
if (!instance)
@@ -85,9 +85,9 @@ JSValue RuntimeObjectImp::fallbackObjectGetter(ExecState* exec, const Identifier
return result;
}
-JSValue RuntimeObjectImp::fieldGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue RuntimeObject::fieldGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
{
- RuntimeObjectImp* thisObj = static_cast<RuntimeObjectImp*>(asObject(slot.slotBase()));
+ RuntimeObject* thisObj = static_cast<RuntimeObject*>(asObject(slot.slotBase()));
RefPtr<Instance> instance = thisObj->m_instance;
if (!instance)
@@ -104,9 +104,9 @@ JSValue RuntimeObjectImp::fieldGetter(ExecState* exec, const Identifier& propert
return result;
}
-JSValue RuntimeObjectImp::methodGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue RuntimeObject::methodGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
{
- RuntimeObjectImp* thisObj = static_cast<RuntimeObjectImp*>(asObject(slot.slotBase()));
+ RuntimeObject* thisObj = static_cast<RuntimeObject*>(asObject(slot.slotBase()));
RefPtr<Instance> instance = thisObj->m_instance;
if (!instance)
@@ -123,7 +123,7 @@ JSValue RuntimeObjectImp::methodGetter(ExecState* exec, const Identifier& proper
return result;
}
-bool RuntimeObjectImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
+bool RuntimeObject::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
{
if (!m_instance) {
throwInvalidAccessError(exec);
@@ -168,7 +168,7 @@ bool RuntimeObjectImp::getOwnPropertySlot(ExecState *exec, const Identifier& pro
return instance->getOwnPropertySlot(this, exec, propertyName, slot);
}
-bool RuntimeObjectImp::getOwnPropertyDescriptor(ExecState *exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
+bool RuntimeObject::getOwnPropertyDescriptor(ExecState *exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
{
if (!m_instance) {
throwInvalidAccessError(exec);
@@ -217,7 +217,7 @@ bool RuntimeObjectImp::getOwnPropertyDescriptor(ExecState *exec, const Identifie
return instance->getOwnPropertyDescriptor(this, exec, propertyName, descriptor);
}
-void RuntimeObjectImp::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot)
+void RuntimeObject::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot)
{
if (!m_instance) {
throwInvalidAccessError(exec);
@@ -237,13 +237,13 @@ void RuntimeObjectImp::put(ExecState* exec, const Identifier& propertyName, JSVa
instance->end();
}
-bool RuntimeObjectImp::deleteProperty(ExecState*, const Identifier&)
+bool RuntimeObject::deleteProperty(ExecState*, const Identifier&)
{
// Can never remove a property of a RuntimeObject.
return false;
}
-JSValue RuntimeObjectImp::defaultValue(ExecState* exec, PreferredPrimitiveType hint) const
+JSValue RuntimeObject::defaultValue(ExecState* exec, PreferredPrimitiveType hint) const
{
if (!m_instance)
return throwInvalidAccessError(exec);
@@ -258,14 +258,14 @@ JSValue RuntimeObjectImp::defaultValue(ExecState* exec, PreferredPrimitiveType h
static JSValue JSC_HOST_CALL callRuntimeObject(ExecState* exec, JSObject* function, JSValue, const ArgList& args)
{
- RefPtr<Instance> instance(static_cast<RuntimeObjectImp*>(function)->getInternalInstance());
+ RefPtr<Instance> instance(static_cast<RuntimeObject*>(function)->getInternalInstance());
instance->begin();
JSValue result = instance->invokeDefaultMethod(exec, args);
instance->end();
return result;
}
-CallType RuntimeObjectImp::getCallData(CallData& callData)
+CallType RuntimeObject::getCallData(CallData& callData)
{
if (!m_instance)
return CallTypeNone;
@@ -280,7 +280,7 @@ CallType RuntimeObjectImp::getCallData(CallData& callData)
static JSObject* callRuntimeConstructor(ExecState* exec, JSObject* constructor, const ArgList& args)
{
- RefPtr<Instance> instance(static_cast<RuntimeObjectImp*>(constructor)->getInternalInstance());
+ RefPtr<Instance> instance(static_cast<RuntimeObject*>(constructor)->getInternalInstance());
instance->begin();
JSValue result = instance->invokeConstruct(exec, args);
instance->end();
@@ -289,7 +289,7 @@ static JSObject* callRuntimeConstructor(ExecState* exec, JSObject* constructor,
return result.isObject() ? static_cast<JSObject*>(result.asCell()) : constructor;
}
-ConstructType RuntimeObjectImp::getConstructData(ConstructData& constructData)
+ConstructType RuntimeObject::getConstructData(ConstructData& constructData)
{
if (!m_instance)
return ConstructTypeNone;
@@ -302,7 +302,7 @@ ConstructType RuntimeObjectImp::getConstructData(ConstructData& constructData)
return ConstructTypeHost;
}
-void RuntimeObjectImp::getOwnPropertyNames(ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode)
+void RuntimeObject::getOwnPropertyNames(ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode)
{
if (!m_instance) {
throwInvalidAccessError(exec);
@@ -316,7 +316,7 @@ void RuntimeObjectImp::getOwnPropertyNames(ExecState* exec, PropertyNameArray& p
instance->end();
}
-JSObject* RuntimeObjectImp::throwInvalidAccessError(ExecState* exec)
+JSObject* RuntimeObject::throwInvalidAccessError(ExecState* exec)
{
return throwError(exec, ReferenceError, "Trying to access object from destroyed plug-in.");
}
diff --git a/WebCore/bridge/runtime_object.h b/WebCore/bridge/runtime_object.h
index ef5a2f7..66d50ed 100644
--- a/WebCore/bridge/runtime_object.h
+++ b/WebCore/bridge/runtime_object.h
@@ -31,10 +31,10 @@
namespace JSC {
-class RuntimeObjectImp : public JSObject {
+class RuntimeObject : public JSObject {
public:
- RuntimeObjectImp(ExecState*, PassRefPtr<Bindings::Instance>);
- virtual ~RuntimeObjectImp();
+ RuntimeObject(ExecState*, PassRefPtr<Bindings::Instance>);
+ virtual ~RuntimeObject();
virtual bool getOwnPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot&);
virtual bool getOwnPropertyDescriptor(ExecState*, const Identifier& propertyName, PropertyDescriptor&);
@@ -66,7 +66,7 @@ public:
protected:
static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesGetPropertyNames | JSObject::StructureFlags;
- RuntimeObjectImp(ExecState*, NonNullPassRefPtr<Structure>, PassRefPtr<Bindings::Instance>);
+ RuntimeObject(ExecState*, NonNullPassRefPtr<Structure>, PassRefPtr<Bindings::Instance>);
private:
virtual const ClassInfo* classInfo() const { return &s_info; }
diff --git a/WebCore/bridge/runtime_root.cpp b/WebCore/bridge/runtime_root.cpp
index b179d56..09fd43b 100644
--- a/WebCore/bridge/runtime_root.cpp
+++ b/WebCore/bridge/runtime_root.cpp
@@ -101,8 +101,8 @@ void RootObject::invalidate()
return;
{
- HashSet<RuntimeObjectImp*>::iterator end = m_runtimeObjects.end();
- for (HashSet<RuntimeObjectImp*>::iterator it = m_runtimeObjects.begin(); it != end; ++it)
+ HashSet<RuntimeObject*>::iterator end = m_runtimeObjects.end();
+ for (HashSet<RuntimeObject*>::iterator it = m_runtimeObjects.begin(); it != end; ++it)
(*it)->invalidate();
m_runtimeObjects.clear();
@@ -168,7 +168,7 @@ JSGlobalObject* RootObject::globalObject() const
return m_globalObject;
}
-void RootObject::addRuntimeObject(RuntimeObjectImp* object)
+void RootObject::addRuntimeObject(RuntimeObject* object)
{
ASSERT(m_isValid);
ASSERT(!m_runtimeObjects.contains(object));
@@ -176,7 +176,7 @@ void RootObject::addRuntimeObject(RuntimeObjectImp* object)
m_runtimeObjects.add(object);
}
-void RootObject::removeRuntimeObject(RuntimeObjectImp* object)
+void RootObject::removeRuntimeObject(RuntimeObject* object)
{
ASSERT(m_isValid);
ASSERT(m_runtimeObjects.contains(object));
diff --git a/WebCore/bridge/runtime_root.h b/WebCore/bridge/runtime_root.h
index a81afb8..5435c3e 100644
--- a/WebCore/bridge/runtime_root.h
+++ b/WebCore/bridge/runtime_root.h
@@ -41,7 +41,7 @@ namespace JSC {
class Interpreter;
class JSGlobalObject;
-class RuntimeObjectImp;
+class RuntimeObject;
namespace Bindings {
@@ -70,8 +70,8 @@ public:
const void* nativeHandle() const;
JSGlobalObject* globalObject() const;
- void addRuntimeObject(RuntimeObjectImp*);
- void removeRuntimeObject(RuntimeObjectImp*);
+ void addRuntimeObject(RuntimeObject*);
+ void removeRuntimeObject(RuntimeObject*);
struct InvalidationCallback {
virtual void operator()(RootObject*) = 0;
@@ -88,7 +88,7 @@ private:
ProtectedPtr<JSGlobalObject> m_globalObject;
ProtectCountSet m_protectCountSet;
- HashSet<RuntimeObjectImp*> m_runtimeObjects;
+ HashSet<RuntimeObject*> m_runtimeObjects;
HashSet<InvalidationCallback*> m_invalidationCallbacks;
};
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 35f6165..2640e5c 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-22 Alexey Proskuryakov <ap at apple.com>
+
+ Rubber-stamped by Geoff Garen.
+
+ Rename RuntimeObjectImp to RuntimeObject.
+
+ * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+ (WebKit::NetscapePluginInstanceProxy::addValueToArray):
+ (WebKit::NetscapePluginInstanceProxy::retainLocalObject):
+ (WebKit::NetscapePluginInstanceProxy::releaseLocalObject):
+
2010-02-22 Brady Eidson <beidson at apple.com>
Reviewed by Tim Hatcher.
diff --git a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
index 515f9f7..37e4327 100644
--- a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
+++ b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
@@ -1206,9 +1206,9 @@ void NetscapePluginInstanceProxy::addValueToArray(NSMutableArray *array, ExecSta
[array addObject:[NSNumber numberWithInt:NullValueType]];
else if (value.isObject()) {
JSObject* object = asObject(value);
- if (object->classInfo() == &RuntimeObjectImp::s_info) {
- RuntimeObjectImp* imp = static_cast<RuntimeObjectImp*>(object);
- if (ProxyInstance* instance = static_cast<ProxyInstance*>(imp->getInternalInstance())) {
+ if (object->classInfo() == &RuntimeObject::s_info) {
+ RuntimeObject* runtimeObject = static_cast<RuntimeObject*>(object);
+ if (ProxyInstance* instance = static_cast<ProxyInstance*>(runtimeObject->getInternalInstance())) {
[array addObject:[NSNumber numberWithInt:NPObjectValueType]];
[array addObject:[NSNumber numberWithInt:instance->objectID()]];
}
@@ -1339,7 +1339,7 @@ void NetscapePluginInstanceProxy::retainLocalObject(JSC::JSValue value)
return;
JSObject* object = asObject(value);
- if (object->classInfo() == &RuntimeObjectImp::s_info)
+ if (object->classInfo() == &RuntimeObject::s_info)
return;
m_localObjects.retain(object);
@@ -1351,7 +1351,7 @@ void NetscapePluginInstanceProxy::releaseLocalObject(JSC::JSValue value)
return;
JSObject* object = asObject(value);
- if (object->classInfo() == &RuntimeObjectImp::s_info)
+ if (object->classInfo() == &RuntimeObject::s_info)
return;
m_localObjects.release(object);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list