diff options
| author | Steve Block <steveblock@google.com> | 2010-01-19 15:43:31 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-19 15:45:30 +0000 |
| commit | 30c4e907f29631057297b32e1a4a6e288237472d (patch) | |
| tree | 22e46cdb05607cd77d052267f0c2dc8e5c99ba92 /WebCore/ChangeLog | |
| parent | 23a4578154c0507a6c2a42de452b3bcec971d0ed (diff) | |
| parent | acf4a21d6535f2033dddd0cdc23c2b3c05bb506b (diff) | |
| download | external_webkit-30c4e907f29631057297b32e1a4a6e288237472d.zip external_webkit-30c4e907f29631057297b32e1a4a6e288237472d.tar.gz external_webkit-30c4e907f29631057297b32e1a4a6e288237472d.tar.bz2 | |
resolved conflicts for merge of acf4a21d to master
Change-Id: If8bb4335848f51919608d28a30ee610acb120ae7
Diffstat (limited to 'WebCore/ChangeLog')
| -rw-r--r-- | WebCore/ChangeLog | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index e6d6de6..372d728 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -2,6 +2,24 @@ Reviewed by Adam Barth. + Fix style in WebCore/bridge/jni/jsc/JavaInstanceJSC.[cpp|h] + https://bugs.webkit.org/show_bug.cgi?id=33792 + + No new tests, style fixes only. + + * bridge/jni/jni_runtime.cpp: Modified. + (JavaField::dispatchValueFromInstance): Modified. Updated to use renamed JavaInstance::m_instance + (JavaField::dispatchSetValueToInstance): Modified. Updated to use renamed JavaInstance::m_instance + (JavaArray::JavaArray): Modified. Updated to use renamed JavaInstance::m_instance + * bridge/jni/jni_runtime.h: Modified. + (JSC::Bindings::JavaArray::javaArray): Modified. Updated to use renamed JavaInstance::m_instance + * bridge/jni/jsc/JavaInstanceJSC.cpp: Modified. Fixed style + * bridge/jni/jsc/JavaInstanceJSC.h: Modified. Fixed style + +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 |