diff options
| author | Steve Block <steveblock@google.com> | 2010-01-21 19:12:36 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-27 16:09:22 +0000 |
| commit | fbd2688ec2a4d79adf95888484958ee80341a5a2 (patch) | |
| tree | 80c0930e35de99ee73593b734cd43defb2915edc /WebCore | |
| parent | 4aeef553983e9d7a42b18646498bbd4b5a1c8c0a (diff) | |
| download | external_webkit-fbd2688ec2a4d79adf95888484958ee80341a5a2.zip external_webkit-fbd2688ec2a4d79adf95888484958ee80341a5a2.tar.gz external_webkit-fbd2688ec2a4d79adf95888484958ee80341a5a2.tar.bz2 | |
V8 can now use WebCore/bridge/jni/JNIBridge.cpp
JNIBridge.cpp is now used by both JSC and V8
This removes the last file from V8Bindings
$ diff WebCore/bridge/jni/JNIBridge.cpp V8Binding/jni/jni_runtime.cpp
2d1
< * Copyright (C) 2003, 2004, 2005, 2007, 2009 Apple Inc. All rights reserved.
28c27
< #include "JNIBridge.h"
---
> #include "jni_runtime.h"
30,32c29
< #if ENABLE(MAC_JAVA_BRIDGE)
<
< #include "CString.h"
---
> #include "JNIUtility.h"
35,45d31
<
< #ifdef NDEBUG
< #define JS_LOG(formatAndArgs...) ((void)0)
< #else
< #define JS_LOG(formatAndArgs...) { \
< fprintf(stderr, "%s:%d -- %s: ", __FILE__, __LINE__, __FUNCTION__); \
< fprintf(stderr, formatAndArgs); \
< }
< #endif
<
< using namespace JSC;
49d34
<
106,109d90
< #if USE(JSC)
< ASSERT(JSLock::lockCount() > 0);
< #endif
<
127,130d107
< #if USE(JSC)
< JSLock lock(SilenceAssertionsOnly);
< #endif
<
177,178d153
<
< #endif // ENABLE(MAC_JAVA_BRIDGE)
Change-Id: I3f0aabc5af56083aa950eca1609b2fe9b46726c9
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/Android.v8bindings.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index 6aa18d4..ffbcc20 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -175,6 +175,7 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8XMLSerializerConstructor.cpp LOCAL_SRC_FILES += \ + bridge/jni/JNIBridge.cpp \ bridge/jni/JNIUtility.cpp \ bridge/jni/v8/JNIBridgeV8.cpp \ bridge/jni/v8/JNIUtilityPrivate.cpp \ |