diff options
| author | Steve Block <steveblock@google.com> | 2010-01-19 05:45:55 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-19 05:45:55 -0800 |
| commit | df644d06988b2a2839113b5f4fc7b8dd1717d964 (patch) | |
| tree | 41bab2aabf9163307a86914e18e46107856d7245 /WebCore/ChangeLog | |
| parent | 9611825c90fe01b75193ac4163b022178404e1f3 (diff) | |
| parent | eeada71d41faa13ef971e1e95b2b6d25b3c76abf (diff) | |
| download | external_webkit-df644d06988b2a2839113b5f4fc7b8dd1717d964.zip external_webkit-df644d06988b2a2839113b5f4fc7b8dd1717d964.tar.gz external_webkit-df644d06988b2a2839113b5f4fc7b8dd1717d964.tar.bz2 | |
am eeada71d: Merge "Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSC" into eclair-mr2
Merge commit 'eeada71d41faa13ef971e1e95b2b6d25b3c76abf' into eclair-mr2-plus-aosp
* commit 'eeada71d41faa13ef971e1e95b2b6d25b3c76abf':
Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSC
Diffstat (limited to 'WebCore/ChangeLog')
| -rw-r--r-- | WebCore/ChangeLog | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 67567ab..d60de59 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,22 @@ +2010-01-18 Steve Block <steveblock@google.com> + + Reviewed by Adam Barth. + + Moves JSC-specific version of JavaInstance from bridge/jni/jni_instance to bridge/jni/jsc/JavaInstanceJSC + https://bugs.webkit.org/show_bug.cgi?id=33672 + + No new tests, refactoring only. + + * Android.jscbindings.mk: Modified. Removed jni_instance.cpp and added JavaInstanceJSC.cpp + * GNUmakefile.am: Modified. Removed jni_instance.h and added JavaInstanceJSC.h + * WebCore.xcodeproj/project.pbxproj: Modified. Removed jni_instance.[cpp|h] and added JavaInstanceJSC.[cpp|h] + * bindings/js/ScriptControllerMac.mm: Modified. Includes JavaInstanceJSC.h + * bridge/jni/jni_instance.cpp: Removed. + * bridge/jni/jni_instance.h: Removed. + * bridge/jni/jni_runtime.h: Modified. Includes JavaInstanceJSC.h + * bridge/jni/jsc/JavaInstanceJSC.cpp: Copied from WebCore/bridge/jni/jni_instance.cpp. + * bridge/jni/jsc/JavaInstanceJSC.h: Copied from WebCore/bridge/jni/jni_instance.h. + 2009-12-10 Alexey Proskuryakov <ap@apple.com> Reviewed by Darin Adler. |