diff options
| author | Steve Block <steveblock@google.com> | 2010-02-15 12:23:52 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-16 11:48:32 +0000 |
| commit | 8a0914b749bbe7da7768e07a7db5c6d4bb09472b (patch) | |
| tree | 73f9065f370435d6fde32ae129d458a8c77c8dff /WebCore/bridge/c | |
| parent | bf14be70295513b8076f3fa47a268a7e42b2c478 (diff) | |
| download | external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.zip external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.tar.gz external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.tar.bz2 | |
Merge webkit.org at r54731 : Initial merge by git
Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
Diffstat (limited to 'WebCore/bridge/c')
| -rw-r--r-- | WebCore/bridge/c/c_instance.h | 2 | ||||
| -rw-r--r-- | WebCore/bridge/c/c_runtime.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/WebCore/bridge/c/c_instance.h b/WebCore/bridge/c/c_instance.h index 7109582..abbabad 100644 --- a/WebCore/bridge/c/c_instance.h +++ b/WebCore/bridge/c/c_instance.h @@ -50,6 +50,7 @@ public: } static void setGlobalException(JSC::UString exception); + static void moveGlobalExceptionToExecState(ExecState*); ~CInstance (); @@ -74,7 +75,6 @@ public: NPObject *getObject() const { return _object; } private: - static void moveGlobalExceptionToExecState(ExecState* exec); CInstance(NPObject*, PassRefPtr<RootObject>); mutable CClass *_class; diff --git a/WebCore/bridge/c/c_runtime.cpp b/WebCore/bridge/c/c_runtime.cpp index e9a7bb6..e038cd4 100644 --- a/WebCore/bridge/c/c_runtime.cpp +++ b/WebCore/bridge/c/c_runtime.cpp @@ -49,6 +49,7 @@ JSValue CField::valueFromInstance(ExecState* exec, const Instance* inst) const { JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); result = obj->_class->getProperty(obj, _fieldIdentifier, &property); + CInstance::moveGlobalExceptionToExecState(exec); } if (result) { JSValue result = convertNPVariantToValue(exec, &property, instance->rootObject()); @@ -70,6 +71,7 @@ void CField::setValueToInstance(ExecState *exec, const Instance *inst, JSValue a { JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); obj->_class->setProperty(obj, _fieldIdentifier, &variant); + CInstance::moveGlobalExceptionToExecState(exec); } _NPN_ReleaseVariantValue(&variant); |