Backed out changeset 7f3879f42151

browser/base/content/browser-tabPreviews.js

@@ -287,7 +287,7 @@ var ctrlTab = {
           let boxes = this.container.childNodes;
           for (let i = boxes.length - 1; i >= 0; i--) {
             if (boxes[i]._tab == aTab && boxes[i] == this.selected) {
-              this.label[aAttrName == "label" ? "textContent" : aAttrName] =
+              this.label[aAttrName == "label" ? "value" : aAttrName] =
                 aTab.getAttribute(aAttrName);
               break;
             }
@@ -306,8 +306,8 @@ var ctrlTab = {
     this.stopScroll();
     let (next = this.invertDirection ? this.selected.previousSibling : this.selected.nextSibling) {
       this.setStatusbarValue(next);
-      this.label.textContent = next._tab.label;
-      //this.label.crop = next._tab.crop;
+      this.label.value = next._tab.label;
+      this.label.crop = next._tab.crop;
     }
 
     const FRAME_LENGTH = 40;
@@ -380,8 +380,8 @@ var ctrlTab = {
     if (selected) {
       box.setAttribute("selected", "true");
       this.setStatusbarValue(box);
-      this.label.textContent = box._tab.label;
-      //this.label.crop = box._tab.crop;
+      this.label.value = box._tab.label;
+      this.label.crop = box._tab.crop;
     } else {
       box.removeAttribute("selected");
     }
@@ -488,7 +488,7 @@ var ctrlTab = {
     this.selected = null;
     this.invertDirection = false;
     this._uniqid = 0;
-    this.label.textContent = "";
+    this.label.value = "";
     this.setStatusbarValue();
     this.container.removeAttribute("transform");
     this.svgRoot.forceRedraw();

browser/base/content/browser.xul

@@ -62,7 +62,6 @@
 
 <window id="main-window"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:svg="http://www.w3.org/2000/svg"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="BrowserStartup()" onunload="BrowserShutdown()" onclose="return WindowIsClosing();"
@@ -236,9 +235,7 @@
     </tooltip>
 
     <panel id="ctrlTab-panel" class="KUI-panel" hidden="true">
-      <html:div id="ctrlTab-label-parent">
-        <html:span id="ctrlTab-label" height="100%"></html:span>
-      </html:div>
+      <label id="ctrlTab-label" flex="1"/>
       <svg:svg id="ctrlTab-svgRoot">
         <svg:defs>
           <svg:linearGradient id="ctrlTab-fadeGradient" x1="1" y1="1" x2="1" y2="0">

browser/themes/winstripe/browser/browser-aero.css

@@ -81,23 +81,3 @@
   position: relative;
   z-index: 10;
 }
-
-.KUI-panel:-moz-system-metric(windows-compositor) {
-  background: transparent;
-  -moz-appearance: -moz-win-glass;
-  -moz-border-radius: 0 0 0 0;
-  border: none;
-}
-
-html|*#ctrlTab-label:-moz-system-metric(windows-compositor) {
-  font: Segoe UI, window;
-  font-weight: normal;
-  font-size: 16px;
-  color: black;
-  text-shadow: white 0px 0px 9px, white 0px 0px 9px, white 0px 0px 9px;
-}
-
-svg|*#ctrlTab-groundFade:-moz-system-metric(windows-compositor),
-svg|*.ctrlTab-reflection:-moz-system-metric(windows-compositor) {
-  display: none;
-}

browser/themes/winstripe/browser/browser.css

@@ -2086,16 +2086,12 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   -moz-border-bottom-colors: #ccc black black black black black black black black;
 }
 
-html|*#ctrlTab-label-parent {
-  text-align: center;
-  overflow: hidden;
-  margin-top: 6px;
-  margin-bottom: 10px;
-}
-
-html|*#ctrlTab-label {
+#ctrlTab-label {
   font-weight: bold;
   font-size: 14px;
+  text-align: center;
+  margin-top: 6px;
+  margin-bottom: 10px;
 }
 
 svg|*.ctrlTab-thumbnailborder {

layout/xul/base/src/nsMenuPopupFrame.cpp

@@ -210,10 +210,9 @@ nsMenuPopupFrame::CreateWidgetForView(nsIView* aView)
   widgetData.clipSiblings = PR_TRUE;
   widgetData.mPopupHint = mPopupType;
 
-  nsTransparencyMode mode = nsLayoutUtils::GetFrameTransparency(this);
   PRBool viewHasTransparentContent = !mInContentShell &&
                                      (eTransparencyTransparent ==
-                                      mode);
+                                      nsLayoutUtils::GetFrameTransparency(this));
   nsIContent* parentContent = GetContent()->GetParent();
   nsIAtom *tag = nsnull;
   if (parentContent)
@@ -248,7 +247,8 @@ nsMenuPopupFrame::CreateWidgetForView(nsIView* aView)
   aView->CreateWidget(kCChildCID, &widgetData, nsnull, PR_TRUE, PR_TRUE,
                       eContentTypeInherit, parentWidget);
 #endif
-  aView->GetWidget()->SetTransparencyMode(mode);
+  aView->GetWidget()->SetTransparencyMode(viewHasTransparentContent ?
+      eTransparencyTransparent : eTransparencyOpaque);
   return NS_OK;
 }
 

widget/src/windows/nsWindow.cpp

@@ -5152,13 +5152,12 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
     }
     break;
   case WM_DWMCOMPOSITIONCHANGED:
-    BroadcastMsg(mWnd, WM_DWMCOMPOSITIONCHANGED);
-    DispatchStandardEvent(NS_THEMECHANGED);
     if (nsUXThemeData::CheckForCompositor() && mTransparencyMode == eTransparencyGlass) {
       MARGINS margins = { -1, -1, -1, -1 };
       nsUXThemeData::dwmExtendFrameIntoClientAreaPtr(mWnd, &margins);
     }
-    Invalidate(PR_FALSE);
+    BroadcastMsg(mWnd, WM_DWMCOMPOSITIONCHANGED);
+    DispatchStandardEvent(NS_THEMECHANGED);
     break;
   }
 
@@ -5365,11 +5364,7 @@ DWORD nsWindow::WindowStyle()
       break;
 
     case eWindowType_popup:
-      if (mTransparencyMode == eTransparencyGlass) {
-        style = WS_OVERLAPPED | WS_CAPTION;
-      } else {
-        style = WS_OVERLAPPED | WS_POPUP;
-      }
+      style = WS_OVERLAPPED | WS_POPUP;
       break;
 
     default:
@@ -7873,7 +7868,10 @@ void nsWindow::SetWindowTranslucencyInner(nsTransparencyMode aMode)
     return;
   }
 
-  LONG style = 0, exStyle = 0;
+  LONG style, exStyle;
+
+  style = topWindow->WindowStyle();
+  exStyle = topWindow->WindowExStyle();
 
   switch(aMode) {
     case eTransparencyTransparent:
@@ -7883,10 +7881,6 @@ void nsWindow::SetWindowTranslucencyInner(nsTransparencyMode aMode)
       topWindow->mTransparencyMode = aMode;
       break;
   }
-
-  style |= topWindow->WindowStyle();
-  exStyle |= topWindow->WindowExStyle();
-
   ::SetWindowLongW(hWnd, GWL_STYLE, style);
   ::SetWindowLongW(hWnd, GWL_EXSTYLE, exStyle);