Back out 068fa73fa918 (bug 1154125) for e10s timeouts in test_bug1166138.html and test_img_mutations.html
authorPhil Ringnalda <philringnalda@gmail.com>
Wed, 29 Jun 2016 19:15:36 -0700
changeset 303160 3d503858ee3347ad5361af51de16e8bf049de4de
parent 303159 00203ba4e8bf47ef52a4f99ce705d6bde0577342
child 303161 48bd14a01b55464215c0bfe973f5657a7b5b7f9c
push id79000
push userphilringnalda@gmail.com
push dateThu, 30 Jun 2016 02:15:44 +0000
treeherdermozilla-inbound@3d503858ee33 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1154125, 1166138
milestone50.0a1
backs out068fa73fa918388dc076d78f257fbe8dc87b332f
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out 068fa73fa918 (bug 1154125) for e10s timeouts in test_bug1166138.html and test_img_mutations.html
layout/base/nsDocumentViewer.cpp
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -1914,22 +1914,16 @@ nsDocumentViewer::SetBoundsWithFlags(con
 
   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);
   } else if (mPresContext && mViewManager) {
-    // Ensure presContext's deviceContext is up to date, as we sometimes get
-    // here before a resolution-change notification has been fully handled
-    // during display configuration changes, especially when there are lots
-    // of windows/widgets competing to handle the notifications.
-    // (See bug 1154125.)
-    mPresContext->DeviceContext()->CheckDPIChange();
     int32_t p2a = mPresContext->AppUnitsPerDevPixel();
     mViewManager->SetWindowDimensions(NSIntPixelsToAppUnits(mBounds.width, p2a),
                                       NSIntPixelsToAppUnits(mBounds.height, p2a),
                                       !!(aFlags & nsIContentViewer::eDelayResize));
   }
 
   // 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.