diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-28 13:47:37 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-28 13:47:37 -0400 |
| commit | 8c6c2864439f5757f8e480c9b23f640baacb9f4f (patch) | |
| tree | d93d967930b2526b462e23b4fb5a1db56d18b84a /WebCore/bindings | |
| parent | 4e71352fc03ff3e392a94407c2298c045b610311 (diff) | |
| parent | b999781071d8167a543e0e48ad25d51178d713d1 (diff) | |
| download | external_webkit-8c6c2864439f5757f8e480c9b23f640baacb9f4f.zip external_webkit-8c6c2864439f5757f8e480c9b23f640baacb9f4f.tar.gz external_webkit-8c6c2864439f5757f8e480c9b23f640baacb9f4f.tar.bz2 | |
Merge change I998a5863 into eclair-mr2
* changes:
Use NPAPI headers from WebCore/bridge/ rather than those from V8Bindings/npapi/.
Diffstat (limited to 'WebCore/bindings')
| -rw-r--r-- | WebCore/bindings/v8/npruntime.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/WebCore/bindings/v8/npruntime.cpp b/WebCore/bindings/v8/npruntime.cpp index 3ae2e70..35015b0 100644 --- a/WebCore/bindings/v8/npruntime.cpp +++ b/WebCore/bindings/v8/npruntime.cpp @@ -312,6 +312,15 @@ void _NPN_DeallocateObject(NPObject* npObject) } } +#if PLATFORM(ANDROID) +// Android uses NPN_ReleaseObject (the 'public' version of _NPN_ReleaseObject) +// in WebCoreFrameBridge.cpp. See http://trac.webkit.org/changeset/47021. +// TODO: Upstream this to webkit.org. +void NPN_ReleaseObject(NPObject *obj) +{ + _NPN_ReleaseObject(obj); +} +#endif void _NPN_ReleaseObject(NPObject* npObject) { ASSERT(npObject); |