diff options
| author | Ben Murdoch <benm@google.com> | 2010-03-16 11:41:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-16 11:41:46 -0700 |
| commit | bfcd11290caa86fe38f2f6869cb3959f5853171a (patch) | |
| tree | 4c1edf9135840be723ef6bb6c4c83d65c5e23c7d | |
| parent | db3aade0d5051d42694e105fd3ebf30e1986232b (diff) | |
| parent | d84a0d9c2b06d8d7290355f7cf0c4fa822100741 (diff) | |
| download | external_webkit-bfcd11290caa86fe38f2f6869cb3959f5853171a.zip external_webkit-bfcd11290caa86fe38f2f6869cb3959f5853171a.tar.gz external_webkit-bfcd11290caa86fe38f2f6869cb3959f5853171a.tar.bz2 | |
Merge "Revert "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, 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); } } |