diff options
Diffstat (limited to 'WebCore/bindings/js/JSQuarantinedObjectWrapper.cpp')
-rw-r--r-- | WebCore/bindings/js/JSQuarantinedObjectWrapper.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/WebCore/bindings/js/JSQuarantinedObjectWrapper.cpp b/WebCore/bindings/js/JSQuarantinedObjectWrapper.cpp index b1b0c92..c3fc41f 100644 --- a/WebCore/bindings/js/JSQuarantinedObjectWrapper.cpp +++ b/WebCore/bindings/js/JSQuarantinedObjectWrapper.cpp @@ -32,7 +32,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSQuarantinedObjectWrapper) +ASSERT_CLASS_FITS_IN_CELL(JSQuarantinedObjectWrapper); const ClassInfo JSQuarantinedObjectWrapper::s_info = { "JSQuarantinedObjectWrapper", 0, 0, 0 }; @@ -58,7 +58,7 @@ JSValuePtr JSQuarantinedObjectWrapper::cachedValueGetter(ExecState*, const Ident JSQuarantinedObjectWrapper::JSQuarantinedObjectWrapper(ExecState* unwrappedExec, JSObject* unwrappedObject, PassRefPtr<Structure> structure) : JSObject(structure) - , m_unwrappedGlobalObject(unwrappedExec->dynamicGlobalObject()) + , m_unwrappedGlobalObject(unwrappedExec->lexicalGlobalObject()) , m_unwrappedObject(unwrappedObject) { ASSERT_ARG(unwrappedExec, unwrappedExec); @@ -72,7 +72,7 @@ JSQuarantinedObjectWrapper::~JSQuarantinedObjectWrapper() bool JSQuarantinedObjectWrapper::allowsUnwrappedAccessFrom(ExecState* exec) const { - return m_unwrappedGlobalObject->profileGroup() == exec->dynamicGlobalObject()->profileGroup(); + return m_unwrappedGlobalObject->profileGroup() == exec->lexicalGlobalObject()->profileGroup(); } ExecState* JSQuarantinedObjectWrapper::unwrappedExecState() const @@ -87,8 +87,9 @@ void JSQuarantinedObjectWrapper::transferExceptionToExecState(ExecState* exec) c if (!unwrappedExecState()->hadException()) return; - exec->setException(wrapOutgoingValue(unwrappedExecState(), unwrappedExecState()->exception())); + JSValuePtr exception = unwrappedExecState()->exception(); unwrappedExecState()->clearException(); + exec->setException(wrapOutgoingValue(unwrappedExecState(), exception)); } void JSQuarantinedObjectWrapper::mark() |