summaryrefslogtreecommitdiffstats
path: root/webkit/port
diff options
context:
space:
mode:
authorfqian@google.com <fqian@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-07 18:54:31 +0000
committerfqian@google.com <fqian@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-07 18:54:31 +0000
commit085feb2e39dffed938d7faa149a46017ed8e67c1 (patch)
tree255a9199d2ebdadddf53c69cc2b384f938e5869e /webkit/port
parent7bb860aa9310e178431f0cb83696b7d2a5856f37 (diff)
downloadchromium_src-085feb2e39dffed938d7faa149a46017ed8e67c1.zip
chromium_src-085feb2e39dffed938d7faa149a46017ed8e67c1.tar.gz
chromium_src-085feb2e39dffed938d7faa149a46017ed8e67c1.tar.bz2
Forget V8Object before removing it from g_live_objects set can cause a crash on Android:
0005fad6 _NPN_UnregisterObject external/webkit/V8Binding/v8/npruntime.cpp:401 0005fb6a _NPN_DeallocateObject external/webkit/V8Binding/v8/npruntime.cpp:296 0005fba2 NPN_ReleaseObject external/webkit/V8Binding/v8/npruntime.cpp:312 0005e1e6 ForgetV8ObjectForNPObject(NPObject*) external/webkit/V8Binding/v8/V8NPObject.cpp:367 0005fb1e _NPN_UnregisterObject external/webkit/V8Binding/v8/npruntime.cpp:428 Review URL: http://codereview.chromium.org/113107 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
-rw-r--r--webkit/port/bindings/v8/npruntime.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/port/bindings/v8/npruntime.cpp b/webkit/port/bindings/v8/npruntime.cpp
index bfcd8ea..c120959 100644
--- a/webkit/port/bindings/v8/npruntime.cpp
+++ b/webkit/port/bindings/v8/npruntime.cpp
@@ -425,9 +425,9 @@ void _NPN_UnregisterObject(NPObject* obj) {
list->remove(obj);
}
}
- ForgetV8ObjectForNPObject(obj);
g_live_objects.remove(obj);
+ ForgetV8ObjectForNPObject(obj);
}
bool _NPN_IsAlive(NPObject* obj) {