Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-05 00:25:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 737873 - Make HUDService-content send the new page location earlier; r=rcampbell

Browse Source
This commit is contained in:
Mihai Sucan 2012-06-27 14:17:40 +03:00
parent 182923d620
commit e65d31d421
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
browser/devtools/webconsole/HUDService-content.js
View File

@ -289,7 +289,8 @@ let Manager = {
case "LocationChange":
ConsoleProgressListener.startMonitor(ConsoleProgressListener
.MONITOR_LOCATION_CHANGE);
ConsoleProgressListener.sendLocation();
ConsoleProgressListener.sendLocation(this.window.location.href,
this.window.document.title);
break;
default:
Cu.reportError("Web Console content: unknown feature " + aFeature);
@ -2225,7 +2226,7 @@ let NetworkMonitor = {
// DNS timing information is available only in when the DNS record is not
// cached.
harTimings.dns = timings.STATUS_RESOLVING ?
harTimings.dns = timings.STATUS_RESOLVING && timings.STATUS_RESOLVED ?
timings.STATUS_RESOLVED.last -
timings.STATUS_RESOLVING.first : -1;
@ -2471,17 +2472,24 @@ let ConsoleProgressListener = {
_checkLocationChange:
function CPL__checkLocationChange(aProgress, aRequest, aState, aStatus)
{
let isStart = aState & Ci.nsIWebProgressListener.STATE_START;
let isStop = aState & Ci.nsIWebProgressListener.STATE_STOP;
let isNetwork = aState & Ci.nsIWebProgressListener.STATE_IS_NETWORK;
let isWindow = aState & Ci.nsIWebProgressListener.STATE_IS_WINDOW;
// Skip non-interesting states.
if (!isStop || !isNetwork || !isWindow ||
if (!isNetwork || !isWindow ||
aProgress.DOMWindow != Manager.window) {
return;
}
this.sendLocation();
if (isStart && aRequest instanceof Ci.nsIChannel) {
this.sendLocation(aRequest.URI.spec, "");
}
else if (isStop) {
this.sendLocation(Manager.window.location.href,
Manager.window.document.title);
}
},
onLocationChange: function() {},
@ -2493,12 +2501,17 @@ let ConsoleProgressListener = {
* Send the location of the current top window to the remote Web Console.
* A "WebConsole:LocationChange" message is sent. The JSON object holds two
* properties: location and title.
*
* @param string aLocation
* Current page address.
* @param string aTitle
* Current page title.
*/
sendLocation: function CPL_sendLocation()
sendLocation: function CPL_sendLocation(aLocation, aTitle)
{
let message = {
"location": Manager.window.location.href,
"title": Manager.window.document.title,
"location": aLocation,
"title": aTitle,
};
Manager.sendMessage("WebConsole:LocationChange", message);
},