summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-03-16 18:37:48 +0000
committerBen Murdoch <benm@google.com>2010-03-16 18:37:48 +0000
commitd84a0d9c2b06d8d7290355f7cf0c4fa822100741 (patch)
tree918b7e08fd5516f52b8cf45405dfb41929568dee
parent9e0d526d0170e26b1dc2d0da8347cca28b5f3507 (diff)
downloadexternal_webkit-d84a0d9c2b06d8d7290355f7cf0c4fa822100741.zip
external_webkit-d84a0d9c2b06d8d7290355f7cf0c4fa822100741.tar.gz
external_webkit-d84a0d9c2b06d8d7290355f7cf0c4fa822100741.tar.bz2
Revert "Fix V8 crashes with plugins. The extra call to _NPN_ReleaseObject inside forgetV8ObjectForNPObject is causing a double deletion."
Right problem, wrong fix. This reverts commit 9e0d526d0170e26b1dc2d0da8347cca28b5f3507.
-rw-r--r--WebCore/bindings/v8/V8NPObject.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/WebCore/bindings/v8/V8NPObject.cpp b/WebCore/bindings/v8/V8NPObject.cpp
index bace84d..b873d5f 100644
--- a/WebCore/bindings/v8/V8NPObject.cpp
+++ b/WebCore/bindings/v8/V8NPObject.cpp
@@ -396,5 +396,6 @@ void forgetV8ObjectForNPObject(NPObject* object)
v8::Persistent<v8::Object> handle(staticNPObjectMap.get(object));
V8DOMWrapper::setDOMWrapper(handle, WebCore::V8ClassIndex::NPOBJECT, 0);
staticNPObjectMap.forget(object);
+ _NPN_ReleaseObject(object);
}
}