mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-30 00:01:50 +00:00
Backed out changeset 51234d23d640 (bug 1160837) for browser_projecteditor_contextmenu_02.js failures.
--HG-- extra : rebase_source : e31d51bfb853753e29f8f8713b159848c772109f
This commit is contained in:
Ryan VanderMeulen
parent
3512c5b545
commit
0b43d41761
@ -193,10 +193,6 @@ let NetMonitorView = {
|
||||
* @return string (e.g, "network-inspector-view" or "network-statistics-view")
|
||||
*/
|
||||
get currentFrontendMode() {
|
||||
// The getter may be called from a timeout after the panel is destroyed.
|
||||
if (!this._body.selectedPanel) {
|
||||
return null;
|
||||
}
|
||||
return this._body.selectedPanel.id;
|
||||
},
|
||||
|
||||
|
||||
@ -21,7 +21,6 @@ support-files =
|
||||
html_post-raw-test-page.html
|
||||
html_post-raw-with-headers-test-page.html
|
||||
html_simple-test-page.html
|
||||
html_send-beacon.html
|
||||
html_sorting-test-page.html
|
||||
html_statistics-test-page.html
|
||||
html_status-codes-test-page.html
|
||||
@ -100,8 +99,6 @@ skip-if = e10s # Bug 1091612
|
||||
[browser_net_security-tab-deselect.js]
|
||||
[browser_net_security-tab-visibility.js]
|
||||
[browser_net_security-warnings.js]
|
||||
[browser_net_send-beacon.js]
|
||||
[browser_net_send-beacon-other-tab.js]
|
||||
[browser_net_simple-init.js]
|
||||
[browser_net_simple-request-data.js]
|
||||
[browser_net_simple-request-details.js]
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
/* Any copyright is dedicated to the Public Domain.
|
||||
http://creativecommons.org/publicdomain/zero/1.0/ */
|
||||
|
||||
/**
|
||||
* Tests if beacons from other tabs are properly ignored.
|
||||
*/
|
||||
|
||||
let test = Task.async(function*() {
|
||||
let [, debuggee, monitor] = yield initNetMonitor(SIMPLE_URL);
|
||||
let { RequestsMenu } = monitor.panelWin.NetMonitorView;
|
||||
RequestsMenu.lazyUpdate = false;
|
||||
|
||||
let tab = yield addTab(SEND_BEACON_URL);
|
||||
let beaconDebuggee = tab.linkedBrowser.contentWindow.wrappedJSObject;
|
||||
info("Beacon tab added successfully.");
|
||||
|
||||
is(RequestsMenu.itemCount, 0, "The requests menu should be empty.");
|
||||
|
||||
beaconDebuggee.performRequest();
|
||||
debuggee.location.reload();
|
||||
|
||||
yield waitForNetworkEvents(monitor, 1);
|
||||
is(RequestsMenu.itemCount, 1, "Only the reload should be recorded.");
|
||||
let request = RequestsMenu.getItemAtIndex(0);
|
||||
is(request.attachment.method, "GET", "The method is correct.");
|
||||
is(request.attachment.status, "200", "The status is correct.");
|
||||
|
||||
yield teardown(monitor);
|
||||
removeTab(tab);
|
||||
finish();
|
||||
});
|
||||
@ -1,27 +0,0 @@
|
||||
/* Any copyright is dedicated to the Public Domain.
|
||||
http://creativecommons.org/publicdomain/zero/1.0/ */
|
||||
|
||||
/**
|
||||
* Tests if beacons are handled correctly.
|
||||
*/
|
||||
|
||||
let test = Task.async(function*() {
|
||||
let [, debuggee, monitor] = yield initNetMonitor(SEND_BEACON_URL);
|
||||
let { RequestsMenu } = monitor.panelWin.NetMonitorView;
|
||||
|
||||
RequestsMenu.lazyUpdate = false;
|
||||
|
||||
is(RequestsMenu.itemCount, 0, "The requests menu should be empty.");
|
||||
|
||||
debuggee.performRequest();
|
||||
|
||||
yield waitForNetworkEvents(monitor, 1);
|
||||
is(RequestsMenu.itemCount, 1, "The beacon should be recorded.");
|
||||
let request = RequestsMenu.getItemAtIndex(0);
|
||||
is(request.attachment.method, "POST", "The method is correct.");
|
||||
ok(request.attachment.url.endsWith("beacon_request"), "The URL is correct.");
|
||||
is(request.attachment.status, "404", "The status is correct.");
|
||||
|
||||
yield teardown(monitor);
|
||||
finish();
|
||||
});
|
||||
@ -40,7 +40,6 @@ const SINGLE_GET_URL = EXAMPLE_URL + "html_single-get-page.html";
|
||||
const STATISTICS_URL = EXAMPLE_URL + "html_statistics-test-page.html";
|
||||
const CURL_URL = EXAMPLE_URL + "html_copy-as-curl.html";
|
||||
const CURL_UTILS_URL = EXAMPLE_URL + "html_curl-utils.html";
|
||||
const SEND_BEACON_URL = EXAMPLE_URL + "html_send-beacon.html";
|
||||
|
||||
const SIMPLE_SJS = EXAMPLE_URL + "sjs_simple-test-server.sjs";
|
||||
const CONTENT_TYPE_SJS = EXAMPLE_URL + "sjs_content-type-test-server.sjs";
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
<!-- Any copyright is dedicated to the Public Domain.
|
||||
http://creativecommons.org/publicdomain/zero/1.0/ -->
|
||||
<!doctype html>
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8"/>
|
||||
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
|
||||
<meta http-equiv="Pragma" content="no-cache" />
|
||||
<meta http-equiv="Expires" content="0" />
|
||||
<title>Network Monitor test page</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<p>Send beacon test</p>
|
||||
|
||||
<script type="text/javascript">
|
||||
function performRequest() {
|
||||
navigator.sendBeacon("beacon_request");
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@ -15,18 +15,7 @@ loader.lazyImporter(this, "NetUtil", "resource://gre/modules/NetUtil.jsm");
|
||||
loader.lazyServiceGetter(this, "gActivityDistributor",
|
||||
"@mozilla.org/network/http-activity-distributor;1",
|
||||
"nsIHttpActivityDistributor");
|
||||
let _testing = false;
|
||||
Object.defineProperty(this, "gTesting", {
|
||||
get: function() {
|
||||
try {
|
||||
const { gDevTools } = require("resource:///modules/devtools/gDevTools.jsm");
|
||||
_testing = gDevTools.testing;
|
||||
} catch (e) {
|
||||
// gDevTools is not present on B2G.
|
||||
}
|
||||
return _testing;
|
||||
}
|
||||
});
|
||||
loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm");
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Network logging
|
||||
@ -758,7 +747,7 @@ NetworkMonitor.prototype = {
|
||||
// TODO: one particular test (browser_styleeditor_fetch-from-cache.js) needs
|
||||
// the gDevTools.testing check. We will move to a better way to serve its
|
||||
// needs in bug 1167188, where this check should be removed.
|
||||
if (!gTesting && aChannel.loadInfo &&
|
||||
if (!gDevTools.testing && aChannel.loadInfo &&
|
||||
aChannel.loadInfo.loadingDocument === null &&
|
||||
aChannel.loadInfo.loadingPrincipal === Services.scriptSecurityManager.getSystemPrincipal()) {
|
||||
return false;
|
||||
@ -779,6 +768,12 @@ NetworkMonitor.prototype = {
|
||||
}
|
||||
}
|
||||
|
||||
if (aChannel.loadInfo) {
|
||||
if (aChannel.loadInfo.contentPolicyType == Ci.nsIContentPolicy.TYPE_BEACON) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if (this.topFrame) {
|
||||
let topFrame = NetworkHelper.getTopFrameForRequest(aChannel);
|
||||
if (topFrame && topFrame === this.topFrame) {
|
||||
@ -793,24 +788,6 @@ NetworkMonitor.prototype = {
|
||||
}
|
||||
}
|
||||
|
||||
// The following check is necessary because beacon channels don't come
|
||||
// associated with a load group. Bug 1160837 will hopefully introduce a
|
||||
// platform fix that will render the following code entirely useless.
|
||||
if (aChannel.loadInfo &&
|
||||
aChannel.loadInfo.contentPolicyType == Ci.nsIContentPolicy.TYPE_BEACON) {
|
||||
let nonE10sMatch = this.window &&
|
||||
aChannel.loadInfo.loadingDocument === this.window.document;
|
||||
let e10sMatch = this.topFrame &&
|
||||
this.topFrame.contentPrincipal &&
|
||||
this.topFrame.contentPrincipal.equals(aChannel.loadInfo.loadingPrincipal) &&
|
||||
this.topFrame.contentPrincipal.URI.spec == aChannel.referrer.spec;
|
||||
let b2gMatch = this.appId &&
|
||||
aChannel.loadInfo.loadingPrincipal.appId === this.appId;
|
||||
if (nonE10sMatch || e10sMatch || b2gMatch) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
},
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user