summaryrefslogtreecommitdiffstats
path: root/WebCore/ChangeLog
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-01-19 00:56:35 +0000
committerSteve Block <steveblock@google.com>2010-01-19 15:04:37 +0000
commit7fb686e7b9de38c5d493745bcff821cd1782102b (patch)
tree0fdfd019c856986d8d065ed93068af683103b6e3 /WebCore/ChangeLog
parenteeada71d41faa13ef971e1e95b2b6d25b3c76abf (diff)
downloadexternal_webkit-7fb686e7b9de38c5d493745bcff821cd1782102b.zip
external_webkit-7fb686e7b9de38c5d493745bcff821cd1782102b.tar.gz
external_webkit-7fb686e7b9de38c5d493745bcff821cd1782102b.tar.bz2
Cherry-pick WebKit change 53436 to fix style in JavaInstanceJSC
See http://trac.webkit.org/changeset/53436 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Note that changes to the following were required as a result of this cherry-pick. - WebCoreFrameBridge.cpp - updated to use JavaInstance::m_instance - V8Binding/jni/jni_instance - Updated to rename the V8 version of JavaInstance::_instance to JavaInstance::m_instance to allow the same code path to be used in WebCoreFrameBridge. Change-Id: I6884f7424c8a0917095f828bda4ca62452e527b5
Diffstat (limited to 'WebCore/ChangeLog')
-rw-r--r--WebCore/ChangeLog18
1 files changed, 18 insertions, 0 deletions
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d60de59..95285c8 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