Bug 1452464 - Followup to fix bustage. CLOSED TREE
authorMatt Woodrow <mwoodrow@mozilla.com>
Thu, 10 May 2018 16:34:25 +1200
changeset 417699 f242ab72c59b4febad06111306fa228d477fee7c
parent 417698 1feb2371c435c5928e8c7b0abcc1a695b4ef4b60
child 417700 c8d6bf455ae5ac9a31ff9fc5418e87a66f12e89c
push id33977
push userncsoregi@mozilla.com
push dateThu, 10 May 2018 16:43:24 +0000
treeherdermozilla-central@17db33b6a124 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1452464
milestone62.0a1
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
Bug 1452464 - Followup to fix bustage. CLOSED TREE
layout/painting/nsDisplayList.cpp
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -7088,17 +7088,17 @@ nsDisplaySubDocument::nsDisplaySubDocume
 
   // The SubDocument display item is conceptually outside the viewport frame,
   // so in cases where the viewport frame is an AGR, the SubDocument's AGR
   // should be not the viewport frame itself, but its parent AGR.
   if (*mAnimatedGeometryRoot == mFrame && mAnimatedGeometryRoot->mParentAGR) {
     mAnimatedGeometryRoot = mAnimatedGeometryRoot->mParentAGR;
   }
 
-  if (mSubDocFrame) {
+  if (mSubDocFrame && mSubDocFrame != mFrame) {
     mSubDocFrame->AddDisplayItem(this);
   }
 }
 
 nsDisplaySubDocument::~nsDisplaySubDocument() {
   MOZ_COUNT_DTOR(nsDisplaySubDocument);
   if (mSubDocFrame) {
     mSubDocFrame->RemoveDisplayItem(this);