[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
apavlov at chromium.org
apavlov at chromium.org
Wed Dec 22 11:40:42 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit fe3b3b43beccf0485ff1cc4761364d5e026f596f
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 3 17:54:19 2010 +0000
2010-08-03 Alexander Pavlov <apavlov at chromium.org>
Reviewed by Joseph Pecoraro.
Web Inspector: incorrect absolute protocol-less URLs in tooltips of links in the ElementsTreeOutline
https://bugs.webkit.org/show_bug.cgi?id=43246
* inspector/front-end/inspector.js:
(WebInspector.completeURL):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64565 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c50518d..3daa0fc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-03 Alexander Pavlov <apavlov at chromium.org>
+
+ Reviewed by Joseph Pecoraro.
+
+ Web Inspector: incorrect absolute protocol-less URLs in tooltips of links in the ElementsTreeOutline
+ https://bugs.webkit.org/show_bug.cgi?id=43246
+
+ * inspector/front-end/inspector.js:
+ (WebInspector.completeURL):
+
2010-08-03 Adam Roben <aroben at apple.com>
Compile out two Mac-only localized strings on non-Mac platforms
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index d2ac226..9d41766 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -1787,6 +1787,9 @@ WebInspector.completeURL = function(baseURL, href)
if (path.charAt(0) !== "/") {
var basePath = match[4] || "/";
path = basePath.substring(0, basePath.lastIndexOf("/")) + "/" + path;
+ } else if (path.length > 1 && path.charAt(1) === "/") {
+ // href starts with "//" which is a full URL with the protocol dropped (use the baseURL protocol).
+ return match[1] + ":" + path;
}
return match[1] + "://" + match[2] + (match[3] ? (":" + match[3]) : "") + path;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list