Backed out 2 changesets (bug 1506687) for causing mochitest mass fail…

…ures. CLOSED TREE Backed out changeset f93f179fb3b4 (bug 1506687) Backed out changeset d8230f3fdd2c (bug 1506687)
dothq · Nov 17, 2018 · 06a105e · 06a105e
1 parent 1f1188e
commit 06a105e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 161 deletions.
diff --git a/dom/chrome-webidl/Flex.webidl b/dom/chrome-webidl/Flex.webidl
@@ -83,7 +83,6 @@ enum FlexItemClampState {
 interface FlexItemValues
 {
   readonly attribute Node? node;
-  readonly attribute DOMRectReadOnly frameRect;
   readonly attribute double mainBaseSize;
   readonly attribute double mainDeltaSize;
   readonly attribute double mainMinSize;

diff --git a/dom/flex/FlexItemValues.cpp b/dom/flex/FlexItemValues.cpp
@@ -12,8 +12,7 @@
 namespace mozilla {
 namespace dom {
 
-NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(FlexItemValues, mParent, mNode,
-                                      mFrameRect)
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(FlexItemValues, mParent)
 NS_IMPL_CYCLE_COLLECTING_ADDREF(FlexItemValues)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(FlexItemValues)
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FlexItemValues)
@@ -50,14 +49,6 @@ FlexItemValues::FlexItemValues(FlexLineValues* aParent,
   // going to keep it around.
   mNode = aItem->mNode;
 
-  // Since mNode might be null, we associate the mFrameRect with
-  // our parent.
-  mFrameRect = new DOMRectReadOnly(mParent,
-    nsPresContext::AppUnitsToDoubleCSSPixels(aItem->mFrameRect.X()),
-    nsPresContext::AppUnitsToDoubleCSSPixels(aItem->mFrameRect.Y()),
-    nsPresContext::AppUnitsToDoubleCSSPixels(aItem->mFrameRect.Width()),
-    nsPresContext::AppUnitsToDoubleCSSPixels(aItem->mFrameRect.Height()));
-
   // Convert app unit sizes to css pixel sizes.
   mMainBaseSize = nsPresContext::AppUnitsToDoubleCSSPixels(
     aItem->mMainBaseSize);
@@ -85,12 +76,6 @@ FlexItemValues::GetNode() const
   return mNode;
 }
 
-DOMRectReadOnly*
-FlexItemValues::FrameRect() const
-{
-  return mFrameRect;
-}
-
 double
 FlexItemValues::MainBaseSize() const
 {

diff --git a/dom/flex/FlexItemValues.h b/dom/flex/FlexItemValues.h
@@ -39,7 +39,6 @@ class FlexItemValues : public nsISupports
   }
 
   nsINode* GetNode() const;
-  DOMRectReadOnly* FrameRect() const;
   double MainBaseSize() const;
   double MainDeltaSize() const;
   double MainMinSize() const;
@@ -51,7 +50,6 @@ class FlexItemValues : public nsISupports
 protected:
   RefPtr<FlexLineValues> mParent;
   RefPtr<nsINode> mNode;
-  RefPtr<DOMRectReadOnly> mFrameRect;
 
   // These sizes are all CSS pixel units.
   double mMainBaseSize;

diff --git a/dom/flex/test/chrome.ini b/dom/flex/test/chrome.ini
@@ -1,5 +1,4 @@
 [chrome/test_flex_axis_directions.html]
-[chrome/test_flex_item_clamp.html]
-[chrome/test_flex_item_rect.html]
 [chrome/test_flex_items.html]
+[chrome/test_flex_item_clamp.html]
 [chrome/test_flex_lines.html]
diff --git a/dom/flex/test/chrome/test_flex_item_rect.html b/dom/flex/test/chrome/test_flex_item_rect.html
diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp
@@ -4849,9 +4849,14 @@ nsFlexContainerFrame::DoFlexLayout(nsPresContext*           aPresContext,
 
         itemInfo->mNode = content;
 
-        // itemInfo->mMainBaseSize and mMainDeltaSize will be filled out
-        // in ResolveFlexibleLengths(). Other measurements will be captured
-        // at the end of this function.
+        // mMainBaseSize and itemInfo->mMainDeltaSize will
+        // be filled out in ResolveFlexibleLengths().
+
+        // Other FlexItem properties can be captured now.
+        itemInfo->mMainMinSize = item->GetMainMinSize();
+        itemInfo->mMainMaxSize = item->GetMainMaxSize();
+        itemInfo->mCrossMinSize = item->GetCrossMinSize();
+        itemInfo->mCrossMaxSize = item->GetCrossMaxSize();
       }
     }
   }
@@ -5256,7 +5261,7 @@ nsFlexContainerFrame::DoFlexLayout(nsPresContext*           aPresContext,
 
   NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize)
 
-  // Finally update our line and item measurements in our containerInfo.
+  // Finally update our line sizing values in our containerInfo.
   if (MOZ_UNLIKELY(containerInfo)) {
     lineIndex = 0;
     for (const FlexLine* line = lines.getFirst(); line;
@@ -5266,17 +5271,6 @@ nsFlexContainerFrame::DoFlexLayout(nsPresContext*           aPresContext,
       lineInfo.mCrossSize = line->GetLineCrossSize();
       lineInfo.mFirstBaselineOffset = line->GetFirstBaselineOffset();
       lineInfo.mLastBaselineOffset = line->GetLastBaselineOffset();
-
-      uint32_t itemIndex = 0;
-      for (const FlexItem* item = line->GetFirstItem(); item;
-           item = item->getNext(), ++itemIndex) {
-        ComputedFlexItemInfo& itemInfo = lineInfo.mItems[itemIndex];
-        itemInfo.mFrameRect = item->Frame()->GetRect();
-        itemInfo.mMainMinSize = item->GetMainMinSize();
-        itemInfo.mMainMaxSize = item->GetMainMaxSize();
-        itemInfo.mCrossMinSize = item->GetCrossMinSize();
-        itemInfo.mCrossMaxSize = item->GetCrossMaxSize();
-      }
     }
   }
 }

diff --git a/layout/generic/nsFlexContainerFrame.h b/layout/generic/nsFlexContainerFrame.h
@@ -33,7 +33,6 @@ nsContainerFrame* NS_NewFlexContainerFrame(nsIPresShell* aPresShell,
 struct ComputedFlexItemInfo
 {
   nsCOMPtr<nsINode> mNode;
-  nsRect mFrameRect;
   /**
    * mMainBaseSize is a measure of the size of the item in the main
    * axis before the flex sizing algorithm is applied. In the spec,