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/JSInspectorCallbackWrapper.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/JSInspectorCallbackWrapper.cpp')
-rw-r--r-- | WebCore/bindings/js/JSInspectorCallbackWrapper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/bindings/js/JSInspectorCallbackWrapper.cpp b/WebCore/bindings/js/JSInspectorCallbackWrapper.cpp index 1fb5eae..0e14109 100644 --- a/WebCore/bindings/js/JSInspectorCallbackWrapper.cpp +++ b/WebCore/bindings/js/JSInspectorCallbackWrapper.cpp @@ -53,7 +53,7 @@ static Structure* leakInspectorCallbackWrapperStructure() return structure; } -JSValuePtr JSInspectorCallbackWrapper::wrap(ExecState* unwrappedExec, JSValuePtr unwrappedValue) +JSValue JSInspectorCallbackWrapper::wrap(ExecState* unwrappedExec, JSValue unwrappedValue) { if (!unwrappedValue.isObject()) return unwrappedValue; @@ -66,7 +66,7 @@ JSValuePtr JSInspectorCallbackWrapper::wrap(ExecState* unwrappedExec, JSValuePtr if (JSInspectorCallbackWrapper* wrapper = wrappers().get(unwrappedObject)) return wrapper; - JSValuePtr prototype = unwrappedObject->prototype(); + JSValue prototype = unwrappedObject->prototype(); ASSERT(prototype.isNull() || prototype.isObject()); if (prototype.isNull()) { @@ -88,7 +88,7 @@ JSInspectorCallbackWrapper::~JSInspectorCallbackWrapper() wrappers().remove(unwrappedObject()); } -JSValuePtr JSInspectorCallbackWrapper::prepareIncomingValue(ExecState* unwrappedExec, JSValuePtr unwrappedValue) const +JSValue JSInspectorCallbackWrapper::prepareIncomingValue(ExecState* unwrappedExec, JSValue unwrappedValue) const { if (JSQuarantinedObjectWrapper* wrapper = asWrapper(unwrappedValue)) { // The only time a wrapper should be passed into a JSInspectorCallbackWrapper is when a client-side storage callback |