| e5261c62245272b7442a8c5135a2bf85202de0a4 |
|
02-Feb-2010 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r54127 : Resolve conflicts in WebCore/bridge
Keep ours for generic bridge code as this is a work in progress.
Take theirs for conflicts on other platforms due to bridge changes.
Take theirs for updates for recently moved JSC JNI bridge.
Change-Id: I7db68450a369bb652755cc4b9555083c76b07510
/external/webkit/WebCore/bridge/jni/JNIBridge.h
|
| d0825bca7fe65beaee391d30da42e937db621564 |
|
02-Feb-2010 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
/external/webkit/WebCore/bridge/jni/JNIBridge.h
|
| 09e3a0d3e5e0725e32330137c505146270a2fc84 |
|
29-Jan-2010 |
Steve Block <steveblock@google.com> |
Update V8 JNI bridge code to match final version submitted to webkit.org
No functional changes, style changes only
See the following WebKit changes ...
JavaStringV8 : http://trac.webkit.org/changeset/54132
JavaInstanceV8 : http://trac.webkit.org/changeset/54165
JavaClassV8 : http://trac.webkit.org/changeset/54169
JNIUtilityPrivate : http://trac.webkit.org/changeset/54171
JNIBridgeV8 : http://trac.webkit.org/changeset/54175
JavaNPObjectV8 : http://trac.webkit.org/changeset/54237
Change-Id: I7cc9d19e74043d1bac1a576cdc97a780fe317b5d
/external/webkit/WebCore/bridge/jni/JNIBridge.h
|
| 4aeef553983e9d7a42b18646498bbd4b5a1c8c0a |
|
21-Jan-2010 |
Steve Block <steveblock@google.com> |
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
/external/webkit/WebCore/bridge/jni/JNIBridge.h
|
| a96d9eff8bdc7ed33739f5779a8d40ab1b3ae24f |
|
26-Jan-2010 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change 53849 to move JavaField and JavaArray from JNIBridge to JNIBridgeJSC
See http://trac.webkit.org/changeset/53849
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Change-Id: Ic73bf8213ae677b69e763a6b04f8c94f7f1eaed1
/external/webkit/WebCore/bridge/jni/JNIBridge.h
|
| 4e226d42cbe1a5d3bd6b7e92663df661fc14adc3 |
|
21-Jan-2010 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change 53619 to fix style in JNIBridge
See http://trac.webkit.org/changeset/53619
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Change-Id: Ic34c760d412b022935a8770cc4b842619c008f15
/external/webkit/WebCore/bridge/jni/JNIBridge.h
|
| e1ac8b286215f0cb7df30bca8d3057d6992f2851 |
|
21-Jan-2010 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change 53557 to rename jni_runtime to JNIBridge
See http://trac.webkit.org/changeset/53557
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Change-Id: I9a74b4dbdb0a9580372d69cec9e8f9fcab750e49
/external/webkit/WebCore/bridge/jni/JNIBridge.h
|