Bug 1416448 - Don't update the ASR during merging for an empty container item, since we can't compute the ASR of the contents: fix merge conflict. r=bustage-fix a=bustage-fix on a CLOSED TREE
☠☠ backed out by bab083518607 ☠ ☠
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 22 Nov 2017 16:24:06 +0200
changeset 444857 cdaf608ce668a2fc22df983f9db74dbade65e826
parent 444856 5758facf358ba61b7bebb63d9b8e873f30f33124
child 444858 bab083518607c3e22a09a8befc6a1199748e31a4
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix, bustage-fix
bugs1416448
milestone58.0
Bug 1416448 - Don't update the ASR during merging for an empty container item, since we can't compute the ASR of the contents: fix merge conflict. r=bustage-fix a=bustage-fix on a CLOSED TREE
layout/painting/RetainedDisplayListBuilder.cpp
--- a/layout/painting/RetainedDisplayListBuilder.cpp
+++ b/layout/painting/RetainedDisplayListBuilder.cpp
@@ -349,23 +349,17 @@ void UpdateASR(nsDisplayItem* aItem,
  */
 void
 RetainedDisplayListBuilder::MergeDisplayLists(nsDisplayList* aNewList,
                                               nsDisplayList* aOldList,
                                               nsDisplayList* aOutList,
                                               Maybe<const ActiveScrolledRoot*>& aOutContainerASR)
 {
   nsDisplayList merged(&mBuilder);
-<<<<<<< local
-  const ActiveScrolledRoot* containerASR = nullptr;
-
-  const auto ReuseItem = [&](nsDisplayItem* aItem) {
-=======
   const auto UseItem = [&](nsDisplayItem* aItem) {
->>>>>>> graft
     const ActiveScrolledRoot* itemClipASR =
       aItem->GetClipChain() ? aItem->GetClipChain()->mASR : nullptr;
 
     const ActiveScrolledRoot* finiteBoundsASR = ActiveScrolledRoot::PickDescendant(
       itemClipASR, aItem->GetActiveScrolledRoot());
     if (!aOutContainerASR) {
       aOutContainerASR = Some(finiteBoundsASR);
     } else {