summaryrefslogtreecommitdiffstats
path: root/V8Binding/jni
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2009-10-26 18:08:41 +0000
committerSteve Block <steveblock@google.com>2009-10-28 17:25:17 +0000
commitb999781071d8167a543e0e48ad25d51178d713d1 (patch)
treef1e84ab516bfb5c6e4b0b5e25fe7853efce9771d /V8Binding/jni
parent7b035dc1012763a04adddc6de25256647fea50bd (diff)
downloadexternal_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 'V8Binding/jni')
-rw-r--r--V8Binding/jni/jni_npobject.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/V8Binding/jni/jni_npobject.cpp b/V8Binding/jni/jni_npobject.cpp
index 9f59045..3480ac5 100644
--- a/V8Binding/jni/jni_npobject.cpp
+++ b/V8Binding/jni/jni_npobject.cpp
@@ -31,6 +31,9 @@
#include "jni_instance.h"
#include "jni_runtime.h"
#include "jni_utility.h"
+// This source file should be in bridge/jni, so it's OK to use the private
+// NPAPI header from here.
+#include "npruntime_impl.h"
namespace JSC { namespace Bindings {
static NPObject* AllocJavaNPObject(NPP, NPClass*)