diff options
| author | Steve Block <steveblock@google.com> | 2009-10-26 18:08:41 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-28 17:25:17 +0000 |
| commit | b999781071d8167a543e0e48ad25d51178d713d1 (patch) | |
| tree | f1e84ab516bfb5c6e4b0b5e25fe7853efce9771d /WebCore | |
| parent | 7b035dc1012763a04adddc6de25256647fea50bd (diff) | |
| download | external_webkit-b999781071d8167a543e0e48ad25d51178d713d1.zip external_webkit-b999781071d8167a543e0e48ad25d51178d713d1.tar.gz external_webkit-b999781071d8167a543e0e48ad25d51178d713d1.tar.bz2 | |
Use NPAPI headers from WebCore/bridge/ rather than those from V8Bindings/npapi/.
The files in question are npapi.h and npruntime.h. The Android versions at
V8Bindings/npapi/ are identical to the WebKit versions, other than a couple of
trivial changes, which are accounted for in this patch.
Change-Id: I998a5863181283aa6153c84a745b1923d9b5721b
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/bindings/v8/npruntime.cpp | 9 | ||||
| -rw-r--r-- | WebCore/bridge/npapi.h | 1 |
2 files changed, 10 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); diff --git a/WebCore/bridge/npapi.h b/WebCore/bridge/npapi.h index ca70dcf..af54acd 100644 --- a/WebCore/bridge/npapi.h +++ b/WebCore/bridge/npapi.h @@ -369,6 +369,7 @@ typedef enum { #endif #ifdef ANDROID + // TODO(andreip): Remove? NPPFakeValueToForce32Bits = 0x7FFFFFFF #endif } NPPVariable; |