[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
barraclough at apple.com
barraclough at apple.com
Thu Apr 8 00:42:37 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 921ee55259f948dc423cf9288bce992c1bc3374b
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 18 20:02:34 2009 +0000
JavaScriptCore: https://bugs.webkit.org/show_bug.cgi?id=32720
Reviewed by Sam Weinig.
* JavaScriptCore.exp:
- Remove exports for UString::append
* JavaScriptCore.xcodeproj/project.pbxproj:
- Make StringBuilder a private header (was project).
WebCore: https://bugs.webkit.org/show_bug.cgi?id=32720
Replace UString addition/append with use of JSC::StringBuilder.
Reviewed by Sam Weinig.
* ForwardingHeaders/runtime/StringBuilder.h: Added.
* bindings/js/ScriptString.h:
(WebCore::ScriptString::operator+=):
* bridge/jni/jni_runtime.cpp:
(appendClassName):
(JavaMethod::signature):
* inspector/InspectorController.cpp:
(WebCore::InspectorController::addProfileFinishedMessageToConsole):
(WebCore::InspectorController::addStartProfilingMessageToConsole):
(WebCore::InspectorController::getCurrentUserInitiatedProfileName):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52329 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 5dded1e..fea95a4 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-18 Gavin Barraclough <barraclough at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ https://bugs.webkit.org/show_bug.cgi?id=32720
+
+ * JavaScriptCore.exp:
+ - Remove exports for UString::append
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ - Make StringBuilder a private header (was project).
+
2009-12-18 Martin Robinson <martin.james.robinson at gmail.com>
Reviewed by Gustavo Noronha Silva.
diff --git a/JavaScriptCore/JavaScriptCore.exp b/JavaScriptCore/JavaScriptCore.exp
index 931b94a..0897947 100644
--- a/JavaScriptCore/JavaScriptCore.exp
+++ b/JavaScriptCore/JavaScriptCore.exp
@@ -236,10 +236,9 @@ __ZN3JSC7UString4fromEd
__ZN3JSC7UString4fromEi
__ZN3JSC7UString4fromEj
__ZN3JSC7UString4fromEl
-__ZN3JSC7UString6appendEPKc
-__ZN3JSC7UString6appendERKS0_
__ZN3JSC7UStringC1EPKc
__ZN3JSC7UStringC1EPKti
+__ZN3JSC7UStringC1EPtib
__ZN3JSC7UStringaSEPKc
__ZN3JSC8Debugger23recompileAllJSFunctionsEPNS_12JSGlobalDataE
__ZN3JSC8Debugger6attachEPNS_14JSGlobalObjectE
diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 1c0b86c..c667ca8 100644
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -205,7 +205,7 @@
863B23E00FC6118900703AA4 /* MacroAssemblerCodeRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 863B23DF0FC60E6200703AA4 /* MacroAssemblerCodeRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
869083150E6518D7000D36ED /* WREC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 869083130E6518D7000D36ED /* WREC.cpp */; };
869083160E6518D7000D36ED /* WREC.h in Headers */ = {isa = PBXBuildFile; fileRef = 869083140E6518D7000D36ED /* WREC.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 8698B86910D44D9400D8D01B /* StringBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 8698B86810D44D9400D8D01B /* StringBuilder.h */; };
+ 8698B86910D44D9400D8D01B /* StringBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 8698B86810D44D9400D8D01B /* StringBuilder.h */; settings = {ATTRIBUTES = (Private, ); }; };
869EBCB70E8C6D4A008722CC /* ResultType.h in Headers */ = {isa = PBXBuildFile; fileRef = 869EBCB60E8C6D4A008722CC /* ResultType.h */; settings = {ATTRIBUTES = (Private, ); }; };
86A90ED00EE7D51F00AB350D /* JITArithmetic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86A90ECF0EE7D51F00AB350D /* JITArithmetic.cpp */; };
86ADD1450FDDEA980006EEC2 /* ARMv7Assembler.h in Headers */ = {isa = PBXBuildFile; fileRef = 86ADD1430FDDEA980006EEC2 /* ARMv7Assembler.h */; };
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f8f291d..abd49ab 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2009-12-18 Gavin Barraclough <barraclough at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ https://bugs.webkit.org/show_bug.cgi?id=32720
+ Replace UString addition/append with use of JSC::StringBuilder.
+
+ * ForwardingHeaders/runtime/StringBuilder.h: Added.
+ * bindings/js/ScriptString.h:
+ (WebCore::ScriptString::operator+=):
+ * bridge/jni/jni_runtime.cpp:
+ (appendClassName):
+ (JavaMethod::signature):
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::addProfileFinishedMessageToConsole):
+ (WebCore::InspectorController::addStartProfilingMessageToConsole):
+ (WebCore::InspectorController::getCurrentUserInitiatedProfileName):
+
2009-12-18 Kenneth Russell <kbr at google.com>
Reviewed by Darin Fisher.
diff --git a/WebCore/ForwardingHeaders/runtime/StringBuilder.h b/WebCore/ForwardingHeaders/runtime/StringBuilder.h
new file mode 100644
index 0000000..115db06
--- /dev/null
+++ b/WebCore/ForwardingHeaders/runtime/StringBuilder.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_StringBuilder_h
+#define WebCore_FWD_StringBuilder_h
+#include <JavaScriptCore/StringBuilder.h>
+#endif
diff --git a/WebCore/bindings/js/ScriptString.h b/WebCore/bindings/js/ScriptString.h
index 6dab9a0..a33d639 100644
--- a/WebCore/bindings/js/ScriptString.h
+++ b/WebCore/bindings/js/ScriptString.h
@@ -33,6 +33,7 @@
#include "PlatformString.h"
#include <runtime/UString.h>
+#include <runtime/StringBuilder.h>
namespace WebCore {
@@ -57,7 +58,10 @@ public:
ScriptString& operator+=(const String& s)
{
- m_str += s;
+ JSC::StringBuilder buffer;
+ buffer.append(m_str);
+ buffer.append(s);
+ m_str = buffer.release();
return *this;
}
diff --git a/WebCore/bridge/jni/jni_runtime.cpp b/WebCore/bridge/jni/jni_runtime.cpp
index be11981..4380f7b 100644
--- a/WebCore/bridge/jni/jni_runtime.cpp
+++ b/WebCore/bridge/jni/jni_runtime.cpp
@@ -35,6 +35,7 @@
#include "runtime_root.h"
#include <runtime/Error.h>
#include <runtime/JSLock.h>
+#include <runtime/StringBuilder.h>
#ifdef NDEBUG
#define JS_LOG(formatAndArgs...) ((void)0)
@@ -296,7 +297,7 @@ JavaMethod::~JavaMethod()
// JNI method signatures use '/' between components of a class name, but
// we get '.' between components from the reflection API.
-static void appendClassName(UString& aString, const char* className)
+static void appendClassName(StringBuilder& builder, const char* className)
{
ASSERT(JSLock::lockCount() > 0);
@@ -309,9 +310,9 @@ static void appendClassName(UString& aString, const char* className)
cp++;
}
- aString.append(result);
+ builder.append(result);
- free (result);
+ free(result);
}
const char *JavaMethod::signature() const
@@ -319,7 +320,8 @@ const char *JavaMethod::signature() const
if (!_signature) {
JSLock lock(SilenceAssertionsOnly);
- UString signatureBuilder("(");
+ StringBuilder signatureBuilder;
+ signatureBuilder.append("(");
for (int i = 0; i < _numParameters; i++) {
JavaParameter* aParameter = parameterAt(i);
JNIType _JNIType = aParameter->getJNIType();
@@ -346,7 +348,8 @@ const char *JavaMethod::signature() const
}
}
- _signature = strdup(signatureBuilder.ascii());
+ UString signatureUString = signatureBuilder.release();
+ _signature = strdup(signatureUString.ascii());
}
return _signature;
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 7e41db5..841bbf4 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -101,6 +101,7 @@
#include <profiler/Profile.h>
#include <profiler/Profiler.h>
#include <runtime/JSLock.h>
+#include <runtime/StringBuilder.h>
#include <runtime/UString.h>
using namespace JSC;
@@ -1356,24 +1357,26 @@ void InspectorController::addProfileFinishedMessageToConsole(PassRefPtr<Profile>
{
RefPtr<Profile> profile = prpProfile;
- UString message = "Profile \"webkit-profile://";
- message += encodeWithURLEscapeSequences(CPUProfileType);
- message += "/";
- message += encodeWithURLEscapeSequences(profile->title());
- message += "#";
- message += UString::from(profile->uid());
- message += "\" finished.";
- addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message, lineNumber, sourceURL);
+ JSC::StringBuilder message;
+ message.append("Profile \"webkit-profile://");
+ message.append((UString)encodeWithURLEscapeSequences(CPUProfileType));
+ message.append("/");
+ message.append((UString)encodeWithURLEscapeSequences(profile->title()));
+ message.append("#");
+ message.append(UString::from(profile->uid()));
+ message.append("\" finished.");
+ addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message.release(), lineNumber, sourceURL);
}
void InspectorController::addStartProfilingMessageToConsole(const UString& title, unsigned lineNumber, const UString& sourceURL)
{
- UString message = "Profile \"webkit-profile://";
- message += encodeWithURLEscapeSequences(CPUProfileType);
- message += "/";
- message += encodeWithURLEscapeSequences(title);
- message += "#0\" started.";
- addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message, lineNumber, sourceURL);
+ JSC::StringBuilder message;
+ message.append("Profile \"webkit-profile://");
+ message.append(encodeWithURLEscapeSequences(CPUProfileType));
+ message.append("/");
+ message.append(encodeWithURLEscapeSequences(title));
+ message.append("#0\" started.");
+ addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message.release(), lineNumber, sourceURL);
}
void InspectorController::getProfileHeaders(long callId)
@@ -1411,11 +1414,12 @@ UString InspectorController::getCurrentUserInitiatedProfileName(bool incrementPr
if (incrementProfileNumber)
m_currentUserInitiatedProfileNumber = m_nextUserInitiatedProfileNumber++;
- UString title = UserInitiatedProfileName;
- title += ".";
- title += UString::from(m_currentUserInitiatedProfileNumber);
+ JSC::StringBuilder title;
+ title.append(UserInitiatedProfileName);
+ title.append(".");
+ title.append(UString::from(m_currentUserInitiatedProfileNumber));
- return title;
+ return title.release();
}
void InspectorController::startUserInitiatedProfilingSoon()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list