Bug 708746 - Part 4: Remove viewport metadata updates that occur after the document is shown. r=mbrubeck

This commit is contained in:
Patrick Walton 2012-01-06 16:42:47 -08:00
parent 7fe42fef53
commit a731c7e15a

View File

@ -2869,18 +2869,12 @@ var ViewportHandler = {
_nextDocumentId: 0, _nextDocumentId: 0,
init: function init() { init: function init() {
addEventListener("DOMWindowCreated", this, false);
addEventListener("DOMMetaAdded", this, false); addEventListener("DOMMetaAdded", this, false);
addEventListener("DOMContentLoaded", this, false);
addEventListener("pageshow", this, false);
addEventListener("resize", this, false); addEventListener("resize", this, false);
}, },
uninit: function uninit() { uninit: function uninit() {
removeEventListener("DOMWindowCreated", this, false);
removeEventListener("DOMMetaAdded", this, false); removeEventListener("DOMMetaAdded", this, false);
removeEventListener("DOMContentLoaded", this, false);
removeEventListener("pageshow", this, false);
removeEventListener("resize", this, false); removeEventListener("resize", this, false);
}, },
@ -2893,20 +2887,11 @@ var ViewportHandler = {
return; return;
switch (aEvent.type) { switch (aEvent.type) {
case "DOMWindowCreated":
this.resetMetadata(tab);
break;
case "DOMMetaAdded": case "DOMMetaAdded":
if (target.name == "viewport") if (target.name == "viewport")
this.updateMetadata(tab); this.updateMetadata(tab);
break; break;
case "DOMContentLoaded":
case "pageshow":
this.updateMetadata(tab);
break;
case "resize": case "resize":
this.onResize(); this.onResize();
break; break;