| 8a0914b749bbe7da7768e07a7db5c6d4bb09472b |
|
15-Feb-2010 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r54731 : Initial merge by git
Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
/external/webkit/WebCore/bridge/jni/JNIBridge.cpp
|
| 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.cpp
|
| 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.cpp
|
| 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.cpp
|
| 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.cpp
|
| 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.cpp
|