[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 15:20:20 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 30748d5ce69e997881711436de83507ede929423
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 1 15:50:19 2010 +0000
2010-11-01 Søren Gjesse <sgjesse at chromium.org>
Reviewed by Andreas Kling.
Fix warning when compiling the chromium port of DumpRenderShell
with clang.
https://bugs.webkit.org/show_bug.cgi?id=48414
* DumpRenderTree/chromium/TestShell.h:
(TestShell::javaScriptFlagsForLoad):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71030 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 53ce45b..d11d585 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-01 Søren Gjesse <sgjesse at chromium.org>
+
+ Reviewed by Andreas Kling.
+
+ Fix warning when compiling the chromium port of DumpRenderShell
+ with clang.
+ https://bugs.webkit.org/show_bug.cgi?id=48414
+
+ * DumpRenderTree/chromium/TestShell.h:
+ (TestShell::javaScriptFlagsForLoad):
+
2010-11-01 Adam Roben <aroben at apple.com>
Fix typo from r71022
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.h b/WebKitTools/DumpRenderTree/chromium/TestShell.h
index ca06812..06e77cc 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShell.h
+++ b/WebKitTools/DumpRenderTree/chromium/TestShell.h
@@ -144,7 +144,7 @@ public:
// The JavaScript flags are specified as a vector of strings. Each element of the vector is full flags string
// which can contain multiple flags (e.g. "--xxx --yyy"). With multiple load testing it is possible to specify
// separate sets of flags to each load.
- std::string javaScriptFlagsForLoad(size_t load) { return (load >= 0 && load < m_javaScriptFlags.size()) ? m_javaScriptFlags[load] : ""; }
+ std::string javaScriptFlagsForLoad(size_t load) { return (load < m_javaScriptFlags.size()) ? m_javaScriptFlags[load] : ""; }
void setJavaScriptFlags(Vector<std::string> javaScriptFlags) { m_javaScriptFlags = javaScriptFlags; }
// Set whether to dump when the loaded page has finished processing. This is used with multiple load
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list