summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore/ChangeLog
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-01-04 07:31:12 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-04 07:31:12 -0800
commitdcfdcbd80716c1ccc3ff3d122c96d36b09c46a60 (patch)
tree15925e17e733012a93257f5498d91717a1d6bf98 /JavaScriptCore/ChangeLog
parent3cc6d80119d793fd256083020b992f1ab02d4a8b (diff)
parentedb4aa515ddaa7a5832d7c2896cb0ed9f7dcbbf0 (diff)
downloadexternal_webkit-dcfdcbd80716c1ccc3ff3d122c96d36b09c46a60.zip
external_webkit-dcfdcbd80716c1ccc3ff3d122c96d36b09c46a60.tar.gz
external_webkit-dcfdcbd80716c1ccc3ff3d122c96d36b09c46a60.tar.bz2
am edb4aa51: Merge "Cherry-picks a WebKit change to revert recent changes to String addition for JSC." into eclair-mr2
Merge commit 'edb4aa515ddaa7a5832d7c2896cb0ed9f7dcbbf0' into eclair-mr2-plus-aosp * commit 'edb4aa515ddaa7a5832d7c2896cb0ed9f7dcbbf0': Cherry-picks a WebKit change to revert recent changes to String addition for JSC.
Diffstat (limited to 'JavaScriptCore/ChangeLog')
-rw-r--r--JavaScriptCore/ChangeLog16
1 files changed, 16 insertions, 0 deletions
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3e9187b..829cc98 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2009-12-10 Adam Barth <abarth@webkit.org>
+
+ No review, rolling out r51975.
+ http://trac.webkit.org/changeset/51975
+
+ * jit/JITStubs.cpp:
+ (JSC::DEFINE_STUB_FUNCTION):
+ * runtime/JSString.h:
+ (JSC::JSString::JSString):
+ (JSC::JSString::appendStringInConstruct):
+ * runtime/Operations.cpp:
+ (JSC::jsAddSlowCase):
+ * runtime/Operations.h:
+ (JSC::jsString):
+ (JSC::jsAdd):
+
2009-12-10 Oliver Hunt <oliver@apple.com>
Reviewed by Gavin Barraclough.