Bug 1150021 - Backout the patch for bug 1077085 on beta and aurora. a=sledru
authorTimothy Nikkel <tnikkel@gmail.com>
Tue, 07 Apr 2015 21:42:00 -0400
changeset 258392 188117472132
parent 258391 89de3c04af8b
child 258393 bfff2ca94766
push id4657
push userryanvm@gmail.com
push date2015-04-08 20:55 +0000
treeherdermozilla-beta@bfff2ca94766 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssledru
bugs1150021, 1077085
milestone38.0
Bug 1150021 - Backout the patch for bug 1077085 on beta and aurora. a=sledru The patch for bug 1077085 is only important right now for e10s, which is only relevant on mozilla-central. The proper fix for bug 1150021 is risky and needs to ride the trains.
layout/base/nsDocumentViewer.cpp
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -1932,23 +1932,24 @@ nsDocumentViewer::SetPreviousViewer(nsIC
 }
 
 NS_IMETHODIMP
 nsDocumentViewer::SetBounds(const nsIntRect& aBounds)
 {
   NS_ENSURE_TRUE(mDocument, NS_ERROR_NOT_AVAILABLE);
 
   mBounds = aBounds;
-
-  if (mWindow && !mAttachedToParent) {
-    // Resize the widget, but don't trigger repaint. Layout will generate
-    // repaint requests during reflow.
-    mWindow->Resize(aBounds.x, aBounds.y,
-                    aBounds.width, aBounds.height,
-                    false);
+  if (mWindow) {
+    if (!mAttachedToParent) {
+      // Don't have the widget repaint. Layout will generate repaint requests
+      // during reflow.
+      mWindow->Resize(aBounds.x, aBounds.y,
+                      aBounds.width, aBounds.height,
+                      false);
+    }
   } else if (mPresContext && mViewManager) {
     int32_t p2a = mPresContext->AppUnitsPerDevPixel();
     mViewManager->SetWindowDimensions(NSIntPixelsToAppUnits(mBounds.width, p2a),
                                       NSIntPixelsToAppUnits(mBounds.height, p2a));
   }
 
   // If there's a previous viewer, it's the one that's actually showing,
   // so be sure to resize it as well so it paints over the right area.