Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-28 03:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge fx-team to m-c

Browse Source
This commit is contained in:
Wes Kocher 2013-12-21 21:22:32 -08:00
commit 9936131f67
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
browser/components/sessionstore/content/content-sessionStore.js
View File

@ -229,6 +229,10 @@ let ScrollPositionListener = {
}
},
onFrameTreeCollected: function () {
MessageQueue.push("scroll", () => this.collect());
},
onFrameTreeReset: function () {
MessageQueue.push("scroll", () => null);
},
@ -268,6 +272,10 @@ let PageStyleListener = {
return PageStyle.collect(docShell, gFrameTree);
},
onFrameTreeCollected: function () {
MessageQueue.push("pageStyle", () => this.collect());
},
onFrameTreeReset: function () {
MessageQueue.push("pageStyle", () => null);
},

4
browser/components/sessionstore/src/SessionStore.jsm
View File

@ -2983,10 +2983,10 @@ let SessionStoreInternal = {
if (typeof(pageStyle) === "string") {
PageStyle.restore(aBrowser.docShell, frameList, pageStyle);
} else {
ScrollPosition.restoreTree(aBrowser.contentWindow, scrollPositions);
PageStyle.restoreTree(aBrowser.docShell, pageStyle);
}
PageStyle.restoreTree(aBrowser.docShell, pageStyle);
ScrollPosition.restoreTree(aBrowser.contentWindow, scrollPositions);
TextAndScrollData.restore(frameList);
let tab = aBrowser.__SS_restore_tab;

7
browser/themes/shared/devtools/toolbars.inc.css
View File

@ -461,10 +461,9 @@
.devtools-tabbar {
-moz-appearance: none;
background: #252c33;
border-color: #434a51;
border-style: solid;
border-width: 1px 0;
box-shadow: 0 -2px 0 rgba(0,0,0,.25) inset;
border: 0px solid #000;
border-bottom-width: 1px;
box-shadow: 0 -2px 0 rgba(0,0,0,.1) inset;
min-height: 32px;
padding: 0;
}