Diff
Modified: trunk/Tools/ChangeLog (187974 => 187975)
--- trunk/Tools/ChangeLog 2015-08-05 19:31:35 UTC (rev 187974)
+++ trunk/Tools/ChangeLog 2015-08-05 19:54:12 UTC (rev 187975)
@@ -1,3 +1,17 @@
+2015-08-05 Alexey Proskuryakov <a...@apple.com>
+
+ AppScale: Use https URLs for subresources and links
+ https://bugs.webkit.org/show_bug.cgi?id=147686
+
+ Reviewed by Ryosuke Niwa.
+
+ * QueueStatusServer/filters/webkit_extras.py:
+ * TestResultServer/static-dashboards/dashboard_base.js:
+ * TestResultServer/static-dashboards/flakiness_dashboard.js:
+ * TestResultServer/static-dashboards/flakiness_dashboard_unittests.js:
+ * TestResultServer/static-dashboards/treemap.js:
+ * TestResultServer/static-dashboards/ui.js:
+
2015-08-04 Filip Pizlo <fpi...@apple.com>
Rename Mutex to DeprecatedMutex
Modified: trunk/Tools/QueueStatusServer/filters/webkit_extras.py (187974 => 187975)
--- trunk/Tools/QueueStatusServer/filters/webkit_extras.py 2015-08-05 19:31:35 UTC (rev 187974)
+++ trunk/Tools/QueueStatusServer/filters/webkit_extras.py 2015-08-05 19:54:12 UTC (rev 187975)
@@ -40,7 +40,7 @@
@register.filter
@stringfilter
def webkit_linkify(value):
- value = bug_regexp.sub(r'<a href="" \g<bug_id></a>', value)
+ value = bug_regexp.sub(r'<a href="" \g<bug_id></a>', value)
value = patch_regexp.sub(r'<a href="" \g<patch_id></a>', value)
return value
@@ -48,7 +48,7 @@
@register.filter
@stringfilter
def webkit_bug_id(value):
- return '<a href="" % (value, value)
+ return '<a href="" % (value, value)
@register.filter
Modified: trunk/Tools/TestResultServer/static-dashboards/dashboard_base.js (187974 => 187975)
--- trunk/Tools/TestResultServer/static-dashboards/dashboard_base.js 2015-08-05 19:31:35 UTC (rev 187974)
+++ trunk/Tools/TestResultServer/static-dashboards/dashboard_base.js 2015-08-05 19:54:12 UTC (rev 187975)
@@ -73,7 +73,7 @@
var _ONE_WEEK_SECONDS_ = ONE_DAY_SECONDS * 7;
// These should match the testtype uploaded to webkit-test-results.webkit.org.
-// See http://webkit-test-results.webkit.org/testfile.
+// See https://webkit-test-results.webkit.org/testfile.
var TEST_TYPES = [
'layout-tests'
];
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js (187974 => 187975)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js 2015-08-05 19:31:35 UTC (rev 187974)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js 2015-08-05 19:54:12 UTC (rev 187975)
@@ -33,8 +33,8 @@
var FORWARD = 'forward';
var BACKWARD = 'backward';
var GTEST_MODIFIERS = ['FLAKY', 'FAILS', 'MAYBE', 'DISABLED'];
-var TEST_URL_BASE_PATH_TRAC = 'http://trac.webkit.org/browser/trunk/LayoutTests/';
-var TEST_URL_BASE_PATH = "http://svn.webkit.org/repository/webkit/trunk/LayoutTests/";
+var TEST_URL_BASE_PATH_TRAC = 'https://trac.webkit.org/browser/trunk/LayoutTests/';
+var TEST_URL_BASE_PATH = "https://svn.webkit.org/repository/webkit/trunk/LayoutTests/";
var EXPECTATIONS_URL_BASE_PATH = TEST_URL_BASE_PATH + "platform/";
var PLATFORMS = {
@@ -1092,7 +1092,7 @@
}
-var BUG_URL_PREFIX = '<a href=""
+var BUG_URL_PREFIX = '<a href=""
var BUG_URL_POSTFIX = '/$1">crbug.com/$1</a> ';
var WEBKIT_BUG_URL_POSTFIX = '/$1">webkit.org/b/$1</a> ';
var INTERNAL_BUG_REPLACE_VALUE = BUG_URL_PREFIX + 'b' + BUG_URL_POSTFIX;
@@ -1182,7 +1182,7 @@
html += '<ul><li>' + linkHTMLToOpenWindow(buildBasePath, 'Build log') +
'</li><li>' +
createBlameListHTML(g_resultsByBuilder[builder].webkitRevision, index,
- 'http://trac.webkit.org/log/?verbose=on&rev=', '&stop_rev=',
+ 'https://trac.webkit.org/log/?verbose=on&rev=', '&stop_rev=',
'WebKit') +
'</li>';
@@ -1857,14 +1857,14 @@
};
var url = "" + platformPart + path;
- if (isImage || !string.startsWith(base, 'http://svn.webkit.org')) {
+ if (isImage || !string.startsWith(base, 'https://svn.webkit.org')) {
var dummyNode = document.createElement(isImage ? 'img' : 'script');
dummyNode.src = ""
dummyNode._onload_ = function() {
var item;
if (isImage) {
item = dummyNode;
- if (string.startsWith(base, 'http://svn.webkit.org'))
+ if (string.startsWith(base, 'https://svn.webkit.org'))
maybeAddPngChecksum(item, url);
} else {
item = document.createElement('iframe');
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js (187974 => 187975)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js 2015-08-05 19:31:35 UTC (rev 187974)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js 2015-08-05 19:54:12 UTC (rev 187975)
@@ -400,7 +400,7 @@
var tests = [test1, test2];
equal(htmlForIndividualTests(tests),
- '<h2><a href="" target="_blank">foo/nonexistant.html</a></h2>' +
+ '<h2><a href="" target="_blank">foo/nonexistant.html</a></h2>' +
htmlForIndividualTestOnAllBuilders(test1) +
'<div class=expectations test=foo/nonexistant.html>' +
'<div><span class=link _onclick_=\"g_history.setQueryParameter(\'showExpectations\', true)\">Show results</span> | ' +
@@ -408,7 +408,7 @@
'<b>Only shows actual results/diffs from the most recent *failure* on each bot.</b></div>' +
'</div>' +
'<hr>' +
- '<h2><a href="" target="_blank">bar/nonexistant.html</a></h2>' +
+ '<h2><a href="" target="_blank">bar/nonexistant.html</a></h2>' +
htmlForIndividualTestOnAllBuilders(test2) +
'<div class=expectations test=bar/nonexistant.html>' +
'<div><span class=link _onclick_=\"g_history.setQueryParameter(\'showExpectations\', true)\">Show results</span> | ' +
@@ -427,14 +427,14 @@
historyInstance.dashboardSpecificState.showChrome = true;
equal(htmlForIndividualTests(tests),
- '<h2><a href="" target="_blank">foo/nonexistant.html</a></h2>' +
+ '<h2><a href="" target="_blank">foo/nonexistant.html</a></h2>' +
htmlForIndividualTestOnAllBuildersWithResultsLinks(test1));
tests = [test1, test2];
equal(htmlForIndividualTests(tests),
- '<h2><a href="" target="_blank">foo/nonexistant.html</a></h2>' +
+ '<h2><a href="" target="_blank">foo/nonexistant.html</a></h2>' +
htmlForIndividualTestOnAllBuildersWithResultsLinks(test1) + '<hr>' +
- '<h2><a href="" target="_blank">bar/nonexistant.html</a></h2>' +
+ '<h2><a href="" target="_blank">bar/nonexistant.html</a></h2>' +
htmlForIndividualTestOnAllBuildersWithResultsLinks(test2));
});
Modified: trunk/Tools/TestResultServer/static-dashboards/treemap.js (187974 => 187975)
--- trunk/Tools/TestResultServer/static-dashboards/treemap.js 2015-08-05 19:31:35 UTC (rev 187974)
+++ trunk/Tools/TestResultServer/static-dashboards/treemap.js 2015-08-05 19:54:12 UTC (rev 187975)
@@ -97,7 +97,7 @@
var g_history = new history.History(treemapConfig);
g_history.parseCrossDashboardParameters();
-var TEST_URL_BASE_PATH = "http://svn.webkit.org/repository/webkit/trunk/";
+var TEST_URL_BASE_PATH = "https://svn.webkit.org/repository/webkit/trunk/";
function humanReadableTime(milliseconds)
{
Modified: trunk/Tools/TestResultServer/static-dashboards/ui.js (187974 => 187975)
--- trunk/Tools/TestResultServer/static-dashboards/ui.js 2015-08-05 19:31:35 UTC (rev 187974)
+++ trunk/Tools/TestResultServer/static-dashboards/ui.js 2015-08-05 19:54:12 UTC (rev 187975)
@@ -182,8 +182,8 @@
results,
index,
WEBKIT_REVISIONS_KEY,
- 'http://trac.webkit.org/changeset/<rev>',
- 'http://trac.webkit.org/log/trunk/?rev=<rev1>&stop_rev=<rev2>&limit=100&verbose=on');
+ 'https://trac.webkit.org/changeset/<rev>',
+ 'https://trac.webkit.org/log/trunk/?rev=<rev1>&stop_rev=<rev2>&limit=100&verbose=on');
}
