diff options
| author | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
| commit | 5f1ab04193ad0130ca8204aadaceae083aca9881 (patch) | |
| tree | 5a92cd389e2cfe7fb67197ce14b38469462379f8 /WebCore/bindings/js/JSInspectedObjectWrapper.cpp | |
| parent | 194315e5a908cc8ed67d597010544803eef1ac59 (diff) | |
| download | external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.zip external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.gz external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.bz2 | |
Get WebKit r44544.
Diffstat (limited to 'WebCore/bindings/js/JSInspectedObjectWrapper.cpp')
| -rw-r--r-- | WebCore/bindings/js/JSInspectedObjectWrapper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/bindings/js/JSInspectedObjectWrapper.cpp b/WebCore/bindings/js/JSInspectedObjectWrapper.cpp index 09007c1..fff7aee 100644 --- a/WebCore/bindings/js/JSInspectedObjectWrapper.cpp +++ b/WebCore/bindings/js/JSInspectedObjectWrapper.cpp @@ -47,7 +47,7 @@ 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()) return unwrappedValue; @@ -61,7 +61,7 @@ JSValuePtr JSInspectedObjectWrapper::wrap(ExecState* unwrappedExec, JSValuePtr u if (JSInspectedObjectWrapper* wrapper = wrapperMap->get(unwrappedObject)) return wrapper; - JSValuePtr prototype = unwrappedObject->prototype(); + JSValue prototype = unwrappedObject->prototype(); ASSERT(prototype.isNull() || prototype.isObject()); if (prototype.isNull()) @@ -96,7 +96,7 @@ 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. |