[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
dbates at webkit.org
dbates at webkit.org
Wed Dec 22 12:26:08 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 361a72c681ab1f335c14e4615c04fac8115597d6
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 23 16:56:36 2010 +0000
2010-08-23 Daniel Bates <dbates at rim.com>
Rubber-stamped by Adam Roben.
Substitute "sizeof("javascript:") - 1" for the hardcoded constant 11 when
extracting the JavaScript code portion of a JavaScript URL so as to make
it clearer that the 11 represents the length of the scheme portion of
a JavaScript URL.
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::performJavaScriptURLRequest):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65817 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 2d1ceb3..a2830c0 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-23 Daniel Bates <dbates at rim.com>
+
+ Rubber-stamped by Adam Roben.
+
+ Substitute "sizeof("javascript:") - 1" for the hardcoded constant 11 when
+ extracting the JavaScript code portion of a JavaScript URL so as to make
+ it clearer that the 11 represents the length of the scheme portion of
+ a JavaScript URL.
+
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::performJavaScriptURLRequest):
+
2010-08-23 Balazs Kelemen <kb at inf.u-szeged.hu>
Reviewed by Ariya Hidayat.
diff --git a/WebKit2/WebProcess/Plugins/PluginView.cpp b/WebKit2/WebProcess/Plugins/PluginView.cpp
index c618a8e..fc07e3e 100644
--- a/WebKit2/WebProcess/Plugins/PluginView.cpp
+++ b/WebKit2/WebProcess/Plugins/PluginView.cpp
@@ -555,7 +555,7 @@ void PluginView::performJavaScriptURLRequest(URLRequest* request)
if (!frame)
return;
- String jsString = decodeURLEscapeSequences(request->request().url().string().substring(11));
+ String jsString = decodeURLEscapeSequences(request->request().url().string().substring(sizeof("javascript:") - 1));
if (!request->target().isNull()) {
// For security reasons, only allow JS requests to be made on the frame that contains the plug-in.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list