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

Backout cset 98e19635eb97 (bug 849500) for suspicion of breakage

Browse Source
This commit is contained in:
Panos Astithas 2013-04-04 11:09:46 +03:00
parent 9971435139
commit 8b6c7494ef
4 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
browser/devtools/framework/Target.jsm
View File

@ -306,21 +306,19 @@ TabTarget.prototype = {
* Setup listeners for remote debugging, updating existing ones as necessary.
*/
_setupRemoteListeners: function TabTarget__setupRemoteListeners() {
// Reset any conflicting event handlers that were set before makeRemote().
if (this._webProgressListener) {
this._webProgressListener.destroy();
}
this.client.addListener("tabDetached", this.destroy);
this._onTabNavigated = function onRemoteTabNavigated(aType, aPacket) {
let event = Object.create(null);
event.url = aPacket.url;
event.title = aPacket.title;
// Send any stored event payload (DOMWindow or nsIRequest) for backwards
// compatibility with non-remotable tools.
event._navPayload = this._navPayload;
if (aPacket.state == "start") {
this.emit("will-navigate", event);
this.emit("will-navigate", aPacket);
} else {
this.emit("navigate", event);
this.emit("navigate", aPacket);
}
this._navPayload = null;
}.bind(this);
this.client.addListener("tabNavigated", this._onTabNavigated);
},
@ -379,10 +377,6 @@ TabTarget.prototype = {
this.off("thread-paused", this._handleThreadState);
if (this._tab) {
if (this._webProgressListener) {
this._webProgressListener.destroy();
}
this._tab.ownerDocument.defaultView.removeEventListener("unload", this);
this._tab.removeEventListener("TabClose", this);
this._tab.parentNode.removeEventListener("TabSelect", this);
@ -391,6 +385,10 @@ TabTarget.prototype = {
// If this target was not remoted, the promise will be resolved before the
// function returns.
if (this._tab && !this._client) {
if (this._webProgressListener) {
this._webProgressListener.destroy();
}
targets.delete(this._tab);
this._tab = null;
this._client = null;
@ -456,13 +454,7 @@ TabWebProgressListener.prototype = {
// emit event if the top frame is navigating
if (this.target && this.target.window == progress.DOMWindow) {
// Emit the event if the target is not remoted or store the payload for
// later emission otherwise.
if (this.target._client) {
this.target._navPayload = request;
} else {
this.target.emit("will-navigate", request);
}
this.target.emit("will-navigate", request);
}
},
@ -474,13 +466,7 @@ TabWebProgressListener.prototype = {
if (this.target &&
!(flags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT)) {
let window = webProgress.DOMWindow;
// Emit the event if the target is not remoted or store the payload for
// later emission otherwise.
if (this.target._client) {
this.target._navPayload = window;
} else {
this.target.emit("navigate", window);
}
this.target.emit("navigate", window);
}
},

9
browser/devtools/inspector/InspectorPanel.jsm
View File

@ -248,8 +248,7 @@ InspectorPanel.prototype = {
/**
* Reset the inspector on navigate away.
*/
onNavigatedAway: function InspectorPanel_onNavigatedAway(event, payload) {
let newWindow = payload._navPayload || payload;
onNavigatedAway: function InspectorPanel_onNavigatedAway(event, newWindow) {
this.selection.setNode(null);
this._destroyMarkup();
this.isDirty = false;
@ -504,11 +503,7 @@ InspectorPanel.prototype = {
*/
clearPseudoClasses: function InspectorPanel_clearPseudoClasses() {
this.breadcrumbs.nodeHierarchy.forEach(function(crumb) {
try {
DOMUtils.clearPseudoClassLocks(crumb.node);
} catch(e) {
// Ignore dead nodes after navigation.
}
DOMUtils.clearPseudoClassLocks(crumb.node);
});
},

1
browser/devtools/inspector/Selection.jsm
View File

@ -162,7 +162,6 @@ Selection.prototype = {
isNode: function SN_isNode() {
return (this.node &&
!Components.utils.isDeadWrapper(this.node) &&
this.node.ownerDocument &&
this.node.ownerDocument.defaultView &&
this.node instanceof this.node.ownerDocument.defaultView.Node);

8
browser/devtools/styleeditor/StyleEditorPanel.jsm
View File

@ -86,8 +86,7 @@ StyleEditorPanel.prototype = {
/**
* Navigated to a new page.
*/
newPage: function StyleEditor_newPage(event, payload) {
let window = payload._navPayload || payload;
newPage: function StyleEditor_newPage(event, window) {
this.reset();
this.setPage(window);
},
@ -95,8 +94,7 @@ StyleEditorPanel.prototype = {
/**
* Before navigating to a new page or reloading the page.
*/
beforeNavigate: function StyleEditor_beforeNavigate(event, payload) {
let request = payload._navPayload || payload;
beforeNavigate: function StyleEditor_beforeNavigate(event, request) {
if (this.styleEditorChrome.isDirty) {
this.preventNavigate(request);
}
@ -208,4 +206,4 @@ XPCOMUtils.defineLazyGetter(StyleEditorPanel.prototype, "strings",
function () {
return Services.strings.createBundle(
"chrome://browser/locale/devtools/styleeditor.properties");
});
});