diff options
Diffstat (limited to 'src/3rdparty/webkit/WebCore/bindings/js/JSInspectedObjectWrapper.cpp')
-rw-r--r-- | src/3rdparty/webkit/WebCore/bindings/js/JSInspectedObjectWrapper.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSInspectedObjectWrapper.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSInspectedObjectWrapper.cpp index 80c35df..fff7aee 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSInspectedObjectWrapper.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSInspectedObjectWrapper.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSInspectedObjectWrapper) +ASSERT_CLASS_FITS_IN_CELL(JSInspectedObjectWrapper); typedef HashMap<JSObject*, JSInspectedObjectWrapper*> WrapperMap; typedef HashMap<JSGlobalObject*, WrapperMap*> GlobalObjectWrapperMap; @@ -47,9 +47,9 @@ static GlobalObjectWrapperMap& wrappers() const ClassInfo JSInspectedObjectWrapper::s_info = { "JSInspectedObjectWrapper", &JSQuarantinedObjectWrapper::s_info, 0, 0 }; -JSValuePtr JSInspectedObjectWrapper::wrap(ExecState* unwrappedExec, JSValuePtr unwrappedValue) +JSValue JSInspectedObjectWrapper::wrap(ExecState* unwrappedExec, JSValue unwrappedValue) { - if (!unwrappedValue->isObject()) + if (!unwrappedValue.isObject()) return unwrappedValue; JSObject* unwrappedObject = asObject(unwrappedValue); @@ -57,14 +57,14 @@ JSValuePtr JSInspectedObjectWrapper::wrap(ExecState* unwrappedExec, JSValuePtr u if (unwrappedObject->inherits(&JSInspectedObjectWrapper::s_info)) return unwrappedObject; - if (WrapperMap* wrapperMap = wrappers().get(unwrappedExec->dynamicGlobalObject())) + if (WrapperMap* wrapperMap = wrappers().get(unwrappedExec->lexicalGlobalObject())) if (JSInspectedObjectWrapper* wrapper = wrapperMap->get(unwrappedObject)) return wrapper; - JSValuePtr prototype = unwrappedObject->prototype(); - ASSERT(prototype->isNull() || prototype->isObject()); + JSValue prototype = unwrappedObject->prototype(); + ASSERT(prototype.isNull() || prototype.isObject()); - if (prototype->isNull()) + if (prototype.isNull()) return new (unwrappedExec) JSInspectedObjectWrapper(unwrappedExec, unwrappedObject, JSQuarantinedObjectWrapper::createStructure(jsNull())); return new (unwrappedExec) JSInspectedObjectWrapper(unwrappedExec, unwrappedObject, JSQuarantinedObjectWrapper::createStructure(asObject(wrap(unwrappedExec, prototype)))); } @@ -96,11 +96,11 @@ JSInspectedObjectWrapper::~JSInspectedObjectWrapper() } } -JSValuePtr JSInspectedObjectWrapper::prepareIncomingValue(ExecState*, JSValuePtr value) const +JSValue JSInspectedObjectWrapper::prepareIncomingValue(ExecState*, JSValue value) const { // The Inspector is only allowed to pass primitive values and wrapped objects to objects from the inspected page. - if (!value->isObject()) + if (!value.isObject()) return value; JSQuarantinedObjectWrapper* wrapper = asWrapper(value); |