diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-20 16:48:45 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:18 +0100 |
| commit | 53733164eb6cabab5a1eddcabb42e4ce27eb0e44 (patch) | |
| tree | 1ba5405cbf0bf31341e2e260a7ed05c9dcce8e4b /Source/WebCore/bridge/jni | |
| parent | 9bbecbe38e6249c7b1c0874e80503f6162f13613 (diff) | |
| download | external_webkit-53733164eb6cabab5a1eddcabb42e4ce27eb0e44.zip external_webkit-53733164eb6cabab5a1eddcabb42e4ce27eb0e44.tar.gz external_webkit-53733164eb6cabab5a1eddcabb42e4ce27eb0e44.tar.bz2 | |
Merge WebKit at r76408: Fix Bridge.h
Cherry pick of upstream http://trac.webkit.org/changeset/79988
Needed now due to FastAllocBase and Noncopyable changes in this
merge.
Change-Id: I26c91f7940b106db21e26c37507490acd1546cff
Diffstat (limited to 'Source/WebCore/bridge/jni')
| -rw-r--r-- | Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h | 2 | ||||
| -rw-r--r-- | Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h b/Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h index afb1bce..39f64e2 100644 --- a/Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h +++ b/Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h @@ -29,7 +29,7 @@ #if ENABLE(JAVA_BRIDGE) -#include "Bridge.h" +#include "BridgeJSC.h" #include "JNIBridge.h" #include <JavaVM/jni.h> diff --git a/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h b/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h index dbfcf75..004635d 100644 --- a/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h +++ b/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h @@ -28,7 +28,7 @@ #if ENABLE(JAVA_BRIDGE) -#include "Bridge.h" +#include "BridgeJSC.h" #include "runtime_root.h" #include <JavaVM/jni.h> |