wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 966424 - Intermittent browser_bug765105_background_image_tooltip.js - Remove the timeout; r=miker

Browse Source
This commit is contained in:
Patrick Brosset 2014-03-31 11:11:37 +02:00
parent 2719440ad9
commit 82a95ae7f6
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
browser/devtools/styleinspector/test/head.js
View File

@ -6,8 +6,8 @@
const TEST_BASE_HTTP = "http://example.com/browser/browser/devtools/styleinspector/test/";
const TEST_BASE_HTTPS = "https://example.com/browser/browser/devtools/styleinspector/test/";
//Services.prefs.setBoolPref("devtools.dump.emit", true);
Services.prefs.setBoolPref("devtools.debugger.log", true);
// Services.prefs.setBoolPref("devtools.dump.emit", true);
// Services.prefs.setBoolPref("devtools.debugger.log", true);
let tempScope = {};
@ -31,7 +31,7 @@ SimpleTest.registerCleanupFunction(() => {
});
SimpleTest.registerCleanupFunction(() => {
Services.prefs.clearUserPref("devtools.debugger.log");
// Services.prefs.clearUserPref("devtools.debugger.log");
Services.prefs.clearUserPref("devtools.dump.emit");
});
@ -74,7 +74,7 @@ function openView(name, callback)
callback(inspector, view);
}
if (inspector.sidebar.getTab(name)) {
if (inspector.sidebar.getWindowForTab(name)) {
onReady();
} else {
inspector.sidebar.once(name + "-ready", onReady);

12
toolkit/devtools/server/actors/inspector.js
View File

@ -105,6 +105,8 @@ HELPER_SHEET += ":-moz-devtools-highlighted { outline: 2px dashed #F06!important
Cu.import("resource://gre/modules/devtools/LayoutHelpers.jsm");
loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm");
loader.lazyGetter(this, "DOMParser", function() {
return Cc["@mozilla.org/xmlextras/domparser;1"].createInstance(Ci.nsIDOMParser);
});
@ -2602,10 +2604,12 @@ var InspectorActor = protocol.ActorClass({
}
// If the request hangs for too long, kill it to avoid queuing up other requests
// to the same actor
this.window.setTimeout(() => {
deferred.reject(new Error("Image " + url + " could not be retrieved in time"));
}, IMAGE_FETCHING_TIMEOUT);
// to the same actor, except if we're running tests
if (!gDevTools.testing) {
this.window.setTimeout(() => {
deferred.reject(new Error("Image " + url + " could not be retrieved in time"));
}, IMAGE_FETCHING_TIMEOUT);
}
img.src = url;