diff options
| author | Ben Murdoch <benm@google.com> | 2010-03-16 08:58:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-16 08:58:16 -0700 |
| commit | 6b2f5b07a28fdd79f0e164906828083142dc4721 (patch) | |
| tree | 5a4a1a2597b507eef2952942832c5ba961646cdd | |
| parent | c2874fc0a80c2eba019fac221dd05d49454553d6 (diff) | |
| parent | 9e0d526d0170e26b1dc2d0da8347cca28b5f3507 (diff) | |
| download | external_webkit-6b2f5b07a28fdd79f0e164906828083142dc4721.zip external_webkit-6b2f5b07a28fdd79f0e164906828083142dc4721.tar.gz external_webkit-6b2f5b07a28fdd79f0e164906828083142dc4721.tar.bz2 | |
Merge "Fix V8 crashes with plugins. The extra call to _NPN_ReleaseObject inside forgetV8ObjectForNPObject is causing a double deletion."
| -rw-r--r-- | WebCore/bindings/v8/V8NPObject.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/WebCore/bindings/v8/V8NPObject.cpp b/WebCore/bindings/v8/V8NPObject.cpp index b873d5f..bace84d 100644 --- a/WebCore/bindings/v8/V8NPObject.cpp +++ b/WebCore/bindings/v8/V8NPObject.cpp @@ -396,6 +396,5 @@ 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); } } |