OSDN Git Service

V8 can now use WebCore/bridge/jni/JNIBridge.h
authorSteve Block <steveblock@google.com>
Thu, 21 Jan 2010 19:08:14 +0000 (19:08 +0000)
committerSteve Block <steveblock@google.com>
Wed, 27 Jan 2010 16:06:32 +0000 (16:06 +0000)
commit4aeef553983e9d7a42b18646498bbd4b5a1c8c0a
tree59581fd46b666a6a37a024c1dcc16e4a74b11b25
parented2f5b0c199158ed3dc87410b9cb5cb89964f6c3
V8 can now use WebCore/bridge/jni/JNIBridge.h

JNIBridge.h is now used by both JSC and V8

$ diff WebCore/bridge/jni/JNIBridge.h V8Binding/jni/jni_runtime.h
2d1
<  * Copyright (C) 2003, 2004, 2005, 2007, 2009, 2010 Apple Inc. All rights reserved.
27,30c26,27
< #ifndef JNIBridge_h
< #define JNIBridge_h
<
< #if ENABLE(MAC_JAVA_BRIDGE)
---
> #ifndef jni_runtime_h
> #define jni_runtime_h
31a29
> #include "Bridge.h"
34,35c32,33
< #if USE(JSC)
< #include "JavaStringJSC.h"
---
> #if USE(V8)
> #include "JavaStringV8.h"
64,66d61
< #if USE(JSC)
<     operator UString() const { return m_impl.uString(); }
< #endif
118,120c113
< #endif // ENABLE(MAC_JAVA_BRIDGE)
<
< #endif // JNIBridge_h
---
> #endif // jni_runtime_h

Change-Id: I59c7dafb295aa7c81e79283333266c3f9f5a9a52
Android.mk
V8Binding/jni/jni_runtime.cpp
V8Binding/jni/jni_runtime.h [deleted file]
WebCore/Android.v8bindings.mk
WebCore/bridge/jni/JNIBridge.h
WebCore/bridge/jni/v8/JNIBridgeV8.h
WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
WebCore/bridge/jni/v8/JavaClassV8.cpp
WebCore/bridge/jni/v8/JavaInstanceV8.cpp
WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
WebCore/bridge/jni/v8/JavaNPObjectV8.h