| 3ddac44fe7d289e2d30214ccda5120c9f789be0a |
|
24-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Fix Java Bridge.
Fix conflicts and reflect the upstream changes made in
http://trac.webkit.org/changeset/80467.
Note that our JNIUtilityPrivate.cpp is significantly forked from
upstream.
Change-Id: I390f1089d861fa29b6c15118638d029dea4356d8
/external/webkit/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h
|
| 81bc750723a18f21cd17d1b173cd2a4dda9cea6e |
|
24-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
/external/webkit/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h
|
| 53733164eb6cabab5a1eddcabb42e4ce27eb0e44 |
|
20-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r76408: Fix Bridge.h
Cherry pick of upstream http://trac.webkit.org/changeset/79988
Needed now due to FastAllocBase and Noncopyable changes in this
merge.
Change-Id: I26c91f7940b106db21e26c37507490acd1546cff
/external/webkit/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h
|
| cad810f21b803229eb11403f9209855525a25d57 |
|
06-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
/external/webkit/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h
|