OSDN Git Service

V8 can now use WebCore/bridge/jni/JNIBridge.cpp
authorSteve Block <steveblock@google.com>
Thu, 21 Jan 2010 19:12:36 +0000 (19:12 +0000)
committerSteve Block <steveblock@google.com>
Wed, 27 Jan 2010 16:09:22 +0000 (16:09 +0000)
commitfbd2688ec2a4d79adf95888484958ee80341a5a2
tree80c0930e35de99ee73593b734cd43defb2915edc
parent4aeef553983e9d7a42b18646498bbd4b5a1c8c0a
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
Android.mk
V8Binding/jni/jni_runtime.cpp [deleted file]
WebCore/Android.v8bindings.mk