Backed out changeset 6679237a4672 (bug 1383367) for conflicting with m-c to m-i merge
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 28 Jul 2017 09:45:42 +0200
changeset 420313 d53d6c1d5c70d4f8849dd188d8b9460eb1a60960
parent 420312 f74d81e43bb5b9b13a6fd5351205582949f97870
child 420314 72316ddbb5483fab6ed65ace45caff16219c37cd
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)
bugs1383367
milestone56.0a1
backs out6679237a46723432264361b5542454bb91d4831e
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 6679237a4672 (bug 1383367) for conflicting with m-c to m-i merge
dom/base/nsDOMWindowUtils.cpp
dom/interfaces/base/nsIDOMWindowUtils.idl
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -1847,49 +1847,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();
 
   /**