Backed out changeset 46d1fa12a082 (bug 1383367) for failing browser_windowopen_reflows.js after merge, especially on OS X. r=backout a=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sun, 30 Jul 2017 14:08:38 +0200
changeset 420619 6d1b50a370b4adffbb1ee73b9f51707c90d6a2b1
parent 420618 c23906663721688473844f931bbc59de938517f2
child 420620 89a4dd1ba384127da48a2804f59f6edf61835645
child 420632 f1c1543f046e53aefdb7562a57182169bf345ae8
child 420664 3362528e5e2524be4fce4bb8cf3496bb01fe2e82
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout, backout
bugs1383367
milestone56.0a1
backs out46d1fa12a0829046f2bee4ffd10d7af38616bba9
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
Backed out changeset 46d1fa12a082 (bug 1383367) for failing browser_windowopen_reflows.js after merge, especially on OS X. r=backout a=backout MozReview-Commit-ID: B4wxvVgTP1Q
dom/base/nsDOMWindowUtils.cpp
dom/interfaces/base/nsIDOMWindowUtils.idl
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -1821,49 +1821,16 @@ nsDOMWindowUtils::GetBoundsWithoutFlushi
     rect->SetLayoutRect(r);
   }
 
   rect.forget(aResult);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsDOMWindowUtils::NeedsFlush(int32_t aFlushType, bool* aResult)
-{
-  MOZ_ASSERT(aResult);
-
-  nsCOMPtr<nsIDocument> doc = GetDocument();
-  NS_ENSURE_STATE(doc);
-
-  nsIPresShell* presShell = doc->GetShell();
-  NS_ENSURE_STATE(presShell);
-
-  FlushType flushType;
-  switch (aFlushType) {
-  case FLUSH_STYLE:
-    flushType = FlushType::Style;
-    break;
-
-  case FLUSH_LAYOUT:
-    flushType = FlushType::Layout;
-    break;
-
-  case FLUSH_DISPLAY:
-    flushType = FlushType::Display;
-    break;
-
-  default:
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  *aResult = presShell->NeedFlush(flushType);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
 nsDOMWindowUtils::GetRootBounds(nsIDOMClientRect** aResult)
 {
   nsIDocument* doc = GetDocument();
   NS_ENSURE_STATE(doc);
 
   nsRect bounds(0, 0, 0, 0);
   nsIPresShell* presShell = doc->GetShell();
   if (presShell) {
--- a/dom/interfaces/base/nsIDOMWindowUtils.idl
+++ b/dom/interfaces/base/nsIDOMWindowUtils.idl
@@ -990,25 +990,16 @@ interface nsIDOMWindowUtils : nsISupport
    */
   void getScrollbarSize(in boolean aFlushLayout, out long aWidth, out long aHeight);
 
   /**
    * Returns the given element's bounds without flushing pending layout changes.
    */
   nsIDOMClientRect getBoundsWithoutFlushing(in nsIDOMElement aElement);
 
-  const long FLUSH_STYLE = 0;
-  const long FLUSH_LAYOUT = 1;
-  const long FLUSH_DISPLAY = 2;
-
-  /**
-   * Returns true if a flush of the given type is needed.
-   */
-  bool needsFlush(in long aFlushtype);
-
   /**
    * Returns the bounds of the window's currently loaded document. This will
    * generally be (0, 0, pageWidth, pageHeight) but in some cases (e.g. RTL
    * documents) may have a negative left value.
    */
   nsIDOMClientRect getRootBounds();
 
   /**