diff options
Diffstat (limited to 'WebCore/bridge')
| -rw-r--r-- | WebCore/bridge/jni/JNIBridge.cpp (renamed from WebCore/bridge/jni/jni_runtime.cpp) | 2 | ||||
| -rw-r--r-- | WebCore/bridge/jni/JNIBridge.h (renamed from WebCore/bridge/jni/jni_runtime.h) | 6 | ||||
| -rw-r--r-- | WebCore/bridge/jni/jni_jsobject.mm | 2 | ||||
| -rw-r--r-- | WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp | 2 | ||||
| -rw-r--r-- | WebCore/bridge/jni/jsc/JavaClassJSC.cpp | 1 | ||||
| -rw-r--r-- | WebCore/bridge/jni/jsc/JavaClassJSC.h | 2 | ||||
| -rw-r--r-- | WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp | 2 |
7 files changed, 8 insertions, 9 deletions
diff --git a/WebCore/bridge/jni/jni_runtime.cpp b/WebCore/bridge/jni/JNIBridge.cpp index 2f5ba19..042e8dc 100644 --- a/WebCore/bridge/jni/jni_runtime.cpp +++ b/WebCore/bridge/jni/JNIBridge.cpp @@ -24,7 +24,7 @@ */ #include "config.h" -#include <jni_runtime.h> +#include "JNIBridge.h" #if ENABLE(MAC_JAVA_BRIDGE) diff --git a/WebCore/bridge/jni/jni_runtime.h b/WebCore/bridge/jni/JNIBridge.h index d0a9753..f3942c5 100644 --- a/WebCore/bridge/jni/jni_runtime.h +++ b/WebCore/bridge/jni/JNIBridge.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _JNI_RUNTIME_H_ -#define _JNI_RUNTIME_H_ +#ifndef JNIBridge_h +#define JNIBridge_h #if ENABLE(MAC_JAVA_BRIDGE) @@ -169,4 +169,4 @@ private: #endif // ENABLE(MAC_JAVA_BRIDGE) -#endif // _JNI_RUNTIME_H_ +#endif // JNIBridge_h diff --git a/WebCore/bridge/jni/jni_jsobject.mm b/WebCore/bridge/jni/jni_jsobject.mm index 2d288b4..de67711 100644 --- a/WebCore/bridge/jni/jni_jsobject.mm +++ b/WebCore/bridge/jni/jni_jsobject.mm @@ -29,13 +29,13 @@ #if ENABLE(MAC_JAVA_BRIDGE) #include "Frame.h" +#include "JNIBridge.h" #include "JNIUtility.h" #include "JNIUtilityPrivate.h" #include "JSDOMBinding.h" #include "ScriptController.h" #include "StringSourceProvider.h" #include "WebCoreFrameView.h" -#include "jni_runtime.h" #include "runtime_object.h" #include "runtime_root.h" #include <interpreter/CallFrame.h> diff --git a/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp b/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp index 424c9d2..e89d0e0 100644 --- a/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp +++ b/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp @@ -29,7 +29,7 @@ #if ENABLE(MAC_JAVA_BRIDGE) -#include "jni_runtime.h" +#include "JNIBridge.h" #include "runtime_array.h" #include "runtime_object.h" #include <runtime/JSArray.h> diff --git a/WebCore/bridge/jni/jsc/JavaClassJSC.cpp b/WebCore/bridge/jni/jsc/JavaClassJSC.cpp index 2c88314..350c8ae 100644 --- a/WebCore/bridge/jni/jsc/JavaClassJSC.cpp +++ b/WebCore/bridge/jni/jsc/JavaClassJSC.cpp @@ -30,7 +30,6 @@ #include "JNIUtility.h" #include "JSDOMWindow.h" -#include "jni_runtime.h" #include <runtime/Identifier.h> #include <runtime/JSLock.h> diff --git a/WebCore/bridge/jni/jsc/JavaClassJSC.h b/WebCore/bridge/jni/jsc/JavaClassJSC.h index 0c5983c..b20781b 100644 --- a/WebCore/bridge/jni/jsc/JavaClassJSC.h +++ b/WebCore/bridge/jni/jsc/JavaClassJSC.h @@ -28,7 +28,7 @@ #if ENABLE(MAC_JAVA_BRIDGE) -#include "jni_runtime.h" +#include "JNIBridge.h" #include <wtf/HashMap.h> namespace JSC { diff --git a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp index 60db151..d9e0f60 100644 --- a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp +++ b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp @@ -28,10 +28,10 @@ #if ENABLE(MAC_JAVA_BRIDGE) +#include "JNIBridge.h" #include "JNIUtility.h" #include "JNIUtilityPrivate.h" #include "JavaClassJSC.h" -#include "jni_runtime.h" #include "runtime_object.h" #include "runtime_root.h" #include <runtime/ArgList.h> |
