Merge with mc

browser/base/content/browser.css

@@ -140,6 +140,10 @@ toolbar[mode="icons"] > #reload-button[displaystop] {
   -moz-binding: url(chrome://browser/content/urlbarBindings.xml#urlbar);
 }
 
+#urlbar-progress {
+  -moz-binding: url("chrome://global/content/bindings/progressmeter.xml#progressmeter");
+}
+
 /* Some child nodes want to be ordered based on the locale's direction, while
    everything else should be ltr. */
 .urlbar-input-box:-moz-locale-dir(rtl) {

browser/base/content/browser.js

@@ -4026,7 +4026,7 @@ var XULBrowserWindow = {
 
   get statusMeter () {
     delete this.statusMeter;
-    return this.statusMeter = document.getElementById("statusbar-icon");
+    return this.statusMeter = document.getElementById("urlbar-progress");
   },
   get stopCommand () {
     delete this.stopCommand;
@@ -4162,7 +4162,7 @@ var XULBrowserWindow = {
           this._progressCollapseTimer = 0;
         }
         else
-          this.statusMeter.parentNode.collapsed = false;
+          this.statusMeter.collapsed = false;
 
         // XXX: This needs to be based on window activity...
         this.stopCommand.removeAttribute("disabled");
@@ -4226,7 +4226,7 @@ var XULBrowserWindow = {
 
         // Turn the progress meter and throbber off.
         this._progressCollapseTimer = setTimeout(function (self) {
-          self.statusMeter.parentNode.collapsed = true;
+          self.statusMeter.collapsed = true;
           self._progressCollapseTimer = 0;
         }, 100, this);
 

browser/base/content/browser.xul

@@ -953,6 +953,7 @@
                    tooltiptext="&goEndCap.tooltip;"
                    onclick="gURLBar.handleCommand(event);"/>
           </hbox>
+          <progressmeter id="urlbar-progress" mode="normal"/>
           <toolbarbutton id="urlbar-go-button"
                          onclick="gURLBar.handleCommand(event);"
                          tooltiptext="&goEndCap.tooltip;"/>
@@ -1287,9 +1288,6 @@
 #endif
                >
       <statusbarpanel id="statusbar-display" label="" flex="1"/>
-      <statusbarpanel class="statusbarpanel-progress" collapsed="true" id="statusbar-progresspanel">
-        <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
-      </statusbarpanel>
       <statusbarpanel id="download-monitor" class="statusbarpanel-iconic-text"
                       tooltiptext="&downloadMonitor2.tooltip;" hidden="true"
                       command="Tools:Downloads"/>

browser/base/content/urlbarBindings.xml

@@ -47,53 +47,58 @@
   <binding id="urlbar" extends="chrome://global/content/bindings/autocomplete.xml#autocomplete">
 
     <content sizetopopup="pref">
-      <xul:hbox class="urlbar-frontcap-and-textbox" flex="1">
+      <xul:vbox class="urlbar-contents" flex="1">
-        <xul:hbox class="urlbar-frontcap">
+        <xul:hbox class="urlbar-frontcap-and-textbox" flex="1">
-          <children includes="image|deck|stack|box">
+          <xul:hbox class="urlbar-frontcap">
-            <xul:image class="autocomplete-icon" allowevents="true"/>
+            <children includes="image|deck|stack|box">
-          </children>
+              <xul:image class="autocomplete-icon" allowevents="true"/>
-        </xul:hbox>
+            </children>
-        <xul:stack anonid="stack" class="urlbar-stack" flex="1">
+          </xul:hbox>
-          <xul:scrollbox class="urlbar-over-link-layer" flex="1"
+          <xul:stack anonid="stack" class="urlbar-stack" flex="1">
-                         xbl:inherits="overlinkstate" align="center">
+            <xul:scrollbox class="urlbar-over-link-layer" flex="1"
-            <xul:label anonid="origin-label" class="urlbar-origin-label" flex="1"
+                           xbl:inherits="overlinkstate" align="center">
-                       crop="end"/>
+              <xul:label anonid="origin-label" class="urlbar-origin-label" flex="1"
-            <xul:hbox anonid="over-link-box" class="urlbar-over-link-box"
+                         crop="end"/>
-                      xbl:inherits="overlinkstate" align="center">
+              <xul:hbox anonid="over-link-box" class="urlbar-over-link-box"
-              <xul:label anonid="over-link-host-label"
+                        xbl:inherits="overlinkstate" align="center">
-                         class="urlbar-over-link-host-label"/>
+                <xul:label anonid="over-link-host-label"
-              <xul:label anonid="over-link-path-label"
+                           class="urlbar-over-link-host-label"/>
-                         class="urlbar-over-link-path-label" flex="1"/>
+                <xul:label anonid="over-link-path-label"
-            </xul:hbox>
+                           class="urlbar-over-link-path-label" flex="1"/>
-          </xul:scrollbox>
+              </xul:hbox>
-          <xul:hbox anonid="textbox-container"
+            </xul:scrollbox>
-                    class="autocomplete-textbox-container urlbar-textbox-container"
+            <xul:hbox anonid="textbox-container"
-                    flex="1" xbl:inherits="focused,overlinkstate">
+                      class="autocomplete-textbox-container urlbar-textbox-container"
-            <xul:hbox anonid="textbox-input-box"
+                      flex="1" xbl:inherits="focused,overlinkstate">
-                      class="textbox-input-box urlbar-input-box"
+              <xul:hbox anonid="textbox-input-box"
-                      flex="1" xbl:inherits="tooltiptext=inputtooltiptext">
+                        class="textbox-input-box urlbar-input-box"
+                        flex="1" xbl:inherits="tooltiptext=inputtooltiptext">
+                <xul:hbox class="urlbar-textbox-container-children"
+                          xbl:inherits="overlinkstate">
+                  <children/>
+                </xul:hbox>
+                <html:input anonid="input"
+                            class="autocomplete-textbox urlbar-input textbox-input"
+                            flex="1" allowevents="true"
+                            xbl:inherits="tooltiptext=inputtooltiptext,onfocus,onblur,value,type,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey"/>
+              </xul:hbox>
               <xul:hbox class="urlbar-textbox-container-children"
                         xbl:inherits="overlinkstate">
-                <children/>
+                <children includes="hbox"/>
               </xul:hbox>
-              <html:input anonid="input"
-                          class="autocomplete-textbox urlbar-input textbox-input"
-                          flex="1" allowevents="true"
-                          xbl:inherits="tooltiptext=inputtooltiptext,onfocus,onblur,value,type,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey"/>
             </xul:hbox>
-            <xul:hbox class="urlbar-textbox-container-children"
+          </xul:stack>
-                      xbl:inherits="overlinkstate">
+          <xul:dropmarker anonid="historydropmarker"
-              <children includes="hbox"/>
+                          class="autocomplete-history-dropmarker urlbar-history-dropmarker"
-            </xul:hbox>
+                          allowevents="true"
-          </xul:hbox>
+                          xbl:inherits="open,enablehistory,parentfocused=focused"/>
-        </xul:stack>
+          <xul:popupset anonid="popupset"
-      </xul:hbox>
+                        class="autocomplete-result-popupset"/>
-      <xul:dropmarker anonid="historydropmarker"
+        </xul:hbox>
-                      class="autocomplete-history-dropmarker urlbar-history-dropmarker"
+        <xul:vbox class="urlbar-progress-container" flex="1" pack="end">
-                      allowevents="true"
+          <children includes="progressmeter"/>
-                      xbl:inherits="open,enablehistory,parentfocused=focused"/>
+        </xul:vbox>
-      <xul:popupset anonid="popupset"
+      </xul:vbox>
-                    class="autocomplete-result-popupset"/>
       <children includes="toolbarbutton"/>
     </content>
 

browser/themes/gnomestripe/browser/browser.css

@@ -953,6 +953,56 @@ toolbar[iconsize="small"] #sync-button[status="active"] {
   margin: 0;
 }
 
+/* urlbar progress */
+
+#urlbar-progress {
+  -moz-appearance: none;
+  min-height: 0px;
+  height: 3px;
+  border: 0;
+  margin: -2px 0 -1px;
+  background-color: transparent;
+}
+
+#urlbar-progress[busy][stalled][value="0"] {
+  /* TODO: add connecting state (bug 596812) */
+}
+
+#urlbar-progress > .progress-bar {
+  -moz-appearance: none;
+  min-width: 3px;
+  border-top: 1px solid rgba(100,100,100,.1);
+  border-bottom: 1px solid rgba(0,0,0,.2);
+  background-color: Highlight;
+  background-image: -moz-linear-gradient(left, rgba(255,255,255,.1) 50%,
+                                               rgba(255,255,255,.4) 90%,
+                                               rgba(255,255,255,.8));
+}
+
+#urlbar-progress > .progress-bar:-moz-locale-dir(rtl) {
+  background-image: -moz-linear-gradient(right, rgba(255,255,255,.1) 50%,
+                                                rgba(255,255,255,.4) 90%,
+                                                rgba(255,255,255,.8));
+}
+
+#urlbar-progress > .progress-remainder {
+  border-top: 1px solid rgba(100,100,100,.1);
+  border-bottom: 1px solid rgba(0,0,0,.2);
+  background-image: -moz-linear-gradient(right, ThreeDShadow 80%, ThreeDLightShadow);
+}
+
+#urlbar-progress > .progress-remainder:-moz-locale-dir(rtl) {
+  background-image: -moz-linear-gradient(left, ThreeDShadow 80%, ThreeDLightShadow);
+}
+
+.urlbar-contents {
+  -moz-margin-end: -2px;
+}
+
+.urlbar-history-dropmarker {
+  -moz-margin-end: 2px;
+}
+
 /* Favicon */
 #page-proxy-favicon,
 #urlbar-throbber {

browser/themes/pinstripe/browser/browser.css

@@ -912,6 +912,55 @@ statusbarpanel#statusbar-display {
   margin: 0;
 }
 
+/* urlbar progress */
+
+#urlbar-progress {
+  -moz-appearance: none;
+  height: 3px;
+  margin: -2px 0 -1px;
+}
+
+#urlbar-progress[busy][stalled][value="0"] {
+  /* TODO: add connecting state (bug 596812) */
+}
+
+#urlbar-progress > .progress-bar {
+  -moz-appearance: none;
+  border: 0;
+  border-top: 1px solid rgba(0,0,0,.4);
+  border-bottom: 1px solid rgba(0,0,0,.3);
+  -moz-background-origin: border;
+  background-image: -moz-linear-gradient(left, rgb(107,160,193), rgb(169,223,251));
+}
+
+#urlbar-progress > .progress-bar:-moz-window-inactive {
+  border-top: 1px solid rgba(0,0,0,.2);
+  border-bottom: 1px solid rgba(0,0,0,.1);
+  background-image: -moz-linear-gradient(left, rgb(150,150,150), rgb(210,210,210));
+}
+
+#urlbar-progress > .progress-bar:-moz-locale-dir(rtl) {
+  background-image: -moz-linear-gradient(right, rgb(107,160,193), rgb(169,223,251));
+}
+
+#urlbar-progress > .progress-bar:-moz-window-inactive:-moz-locale-dir(rtl) {
+  background-image: -moz-linear-gradient(right, rgb(150,150,150), rgb(210,210,210));
+}
+
+#urlbar-progress > .progress-remainder {
+  border-top: 1px solid rgba(0,0,0,.1);
+  border-bottom: 1px solid rgba(0,0,0,.1);
+  background-color: rgba(0,0,0,.3);
+}
+
+.urlbar-contents {
+  -moz-margin-end: -2px;
+}
+
+.urlbar-history-dropmarker {
+  -moz-margin-end: 2px;
+}
+
 /* ----- AUTOCOMPLETE ----- */
 
 #treecolAutoCompleteImage {

browser/themes/winstripe/browser/browser.css

@@ -1090,6 +1090,56 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   margin: 0;
 }
 
+/* urlbar progress */
+
+#urlbar-progress {
+  -moz-appearance: none;
+  min-height: 0px;
+  height: 3px;
+  border: 0;
+  margin: -2px 0 -1px;
+  background-color: transparent;
+}
+
+#urlbar-progress[busy][stalled][value="0"] {
+  /* TODO: add connecting state (bug 596812) */
+}
+
+#urlbar-progress > .progress-bar {
+  -moz-appearance: none;
+  min-width: 3px;
+  border-top: 1px solid rgba(100,100,100,.1);
+  border-bottom: 1px solid rgba(0,0,0,.2);
+  background-color: Highlight;
+  background-image: -moz-linear-gradient(left, rgba(255,255,255,.1) 50%,
+                                               rgba(255,255,255,.4) 90%,
+                                               rgba(255,255,255,.8));
+}
+
+#urlbar-progress > .progress-bar:-moz-locale-dir(rtl) {
+  background-image: -moz-linear-gradient(right, rgba(255,255,255,.1) 50%,
+                                                rgba(255,255,255,.4) 90%,
+                                                rgba(255,255,255,.8));
+}
+
+#urlbar-progress > .progress-remainder {
+  border-top: 1px solid rgba(100,100,100,.1);
+  border-bottom: 1px solid rgba(0,0,0,.2);
+  background-image: -moz-linear-gradient(right, ThreeDShadow 80%, ThreeDLightShadow);
+}
+
+#urlbar-progress > .progress-remainder:-moz-locale-dir(rtl) {
+  background-image: -moz-linear-gradient(left, ThreeDShadow 80%, ThreeDLightShadow);
+}
+
+.urlbar-contents {
+  -moz-margin-end: -2px;
+}
+
+.urlbar-history-dropmarker {
+  -moz-margin-end: 2px;
+}
+
 /* identity box */
 
 #identity-box {

widget/src/windows/nsWindow.cpp

@@ -2746,11 +2746,23 @@ nsWindow::MakeFullScreen(PRBool aFullScreen)
 
   UpdateNonClientMargins();
 
+  // Prevent window updates during the transition.
+  DWORD style;
+  if (nsUXThemeData::CheckForCompositor()) {
+    style = GetWindowLong(mWnd, GWL_STYLE);
+    SetWindowLong(mWnd, GWL_STYLE, style & ~WS_VISIBLE);
+  }
+
   // Will call hide chrome, reposition window. Note this will
   // also cache dimensions for restoration, so it should only
   // be called once per fullscreen request.
   nsresult rv = nsBaseWidget::MakeFullScreen(aFullScreen);
 
+  if (nsUXThemeData::CheckForCompositor()) {
+    style = GetWindowLong(mWnd, GWL_STYLE);
+    SetWindowLong(mWnd, GWL_STYLE, style | WS_VISIBLE);
+  }
+
   // Let the dom know via web shell window
   nsSizeModeEvent event(PR_TRUE, NS_SIZEMODE, this);
   event.mSizeMode = mSizeMode;