Merge backout of changeset ad7f9821597e, bug 573973.
authorMarkus Stange <mstange@themasta.com>
Fri, 02 Jul 2010 08:23:34 +0200
changeset 47123 c173731c9d90c7e97c47f0a824b53f7f115b9e83
parent 47121 df4e140d6c18606a6627c5889433d05665342293 (current diff)
parent 47122 751b3e72a7eb76f78246d0806714ac8c4e7f8b7d (diff)
child 47124 6c1fcdfdc2c878a0b0786b8709d9df251b490ae1
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs573973
milestone2.0b2pre
first release with
nightly linux32
c173731c9d90 / 4.0b2pre / 20100702031025 / files
nightly linux64
c173731c9d90 / 4.0b2pre / 20100702031956 / files
nightly mac
c173731c9d90 / 4.0b2pre / 20100702031157 / files
nightly win32
c173731c9d90 / 4.0b2pre / 20100702041539 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
Merge backout of changeset ad7f9821597e, bug 573973.
xpfe/appshell/src/nsXULWindow.cpp
--- a/widget/tests/window_bug522217.xul
+++ b/widget/tests/window_bug522217.xul
@@ -44,27 +44,18 @@ function start() {
     is(window.outerHeight, oldOuterHeight, "wrong outerHeight after fullscreen mode");
     is(window.innerWidth, oldOuterWidth, "wrong innerWidth after fullscreen mode");
     is(window.innerHeight, oldOuterHeight, "wrong innerHeight after fullscreen mode");
     document.documentElement.removeAttribute("drawintitlebar");
     is(window.outerWidth, oldOuterWidth, "wrong outerWidth after removing drawintitlebar");
     is(window.outerHeight, oldOuterHeight, "wrong outerHeight after removing drawintitlebar");
     is(window.innerWidth, oldInnerWidth, "wrong innerWidth after removing drawintitlebar");
     is(window.innerHeight, oldInnerHeight, "wrong innerHeight after removing drawintitlebar");
-
-    // Test whether having drawintitlebar also works when it's set on the window
-    // from the beginning.
-    var win = open('data:application/vnd.mozilla.xul+xml,<?xml version="1.0"?><?xml-stylesheet href="chrome://global/skin" type="text/css"?><window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" drawintitlebar="true" width="200" height="200"/>', '_blank', 'chrome');
-    win.onfocus = function () {
-      is(win.innerWidth, win.outerWidth, "if drawintitlebar is set, innerWidth and outerWidth should be the same");
-      is(win.innerHeight, win.outerHeight, "if drawintitlebar is set, innerHeight and outerHeight should be the same");
-      win.close();
-      window.opener.wrappedJSObject.SimpleTest.finish();
-      window.close();
-    }
+    window.opener.wrappedJSObject.SimpleTest.finish();
+    window.close();
   }
 }
 
 
 ]]>
 </script>
 
 </window>
--- a/xpfe/appshell/src/nsXULWindow.cpp
+++ b/xpfe/appshell/src/nsXULWindow.cpp
@@ -1413,22 +1413,16 @@ void nsXULWindow::SyncAttributesToWidget
   }
   mWindow->SetIcon(attr);
 
   // "toggletoolbar" attribute
   rv = windowElement->GetAttribute(NS_LITERAL_STRING("toggletoolbar"), attr);
   if (NS_SUCCEEDED(rv)) {
     mWindow->SetShowsToolbarButton(attr.LowerCaseEqualsLiteral("true"));
   }
-
-  // "drawintitlebar" attribute
-  rv = windowElement->GetAttribute(NS_LITERAL_STRING("drawintitlebar"), attr);
-  if (NS_SUCCEEDED(rv)) {
-    mWindow->SetDrawsInTitlebar(attr.EqualsLiteral("true"));
-  }
 }
 
 NS_IMETHODIMP nsXULWindow::SavePersistentAttributes()
 {
   // can happen when the persistence timer fires at an inopportune time
   // during window shutdown
   if (!mDocShell)
     return NS_ERROR_FAILURE;