Fix bogus assertion in nsLayoutUtils::SetDisplayPortMargins. (bug 1156409, r=botond, a=philor)
authorDavid Anderson <danderson@mozilla.com>
Tue, 21 Apr 2015 23:01:41 -0400
changeset 240313 946ac85af8f43e6bfa39d9edca6adbe2cad5d7ca
parent 240312 86725d1a2cf345520412ef89fab2225b383541e6
child 240321 c2e457097f73f258e30c8051849ec51e645513e4
child 240342 fc5fe99decdb1edc4c38543bc85ef657b1eedb2d
child 240459 54ac214814d4fdba249308442bdb4f9d6a3246b7
push id28629
push userdanderson@mozilla.com
push dateWed, 22 Apr 2015 03:03:11 +0000
treeherdermozilla-central@946ac85af8f4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbotond, philor
bugs1156409
milestone40.0a1
first release with
nightly linux32
946ac85af8f4 / 40.0a1 / 20150422030206 / files
nightly linux64
946ac85af8f4 / 40.0a1 / 20150422030206 / files
nightly mac
946ac85af8f4 / 40.0a1 / 20150422030206 / files
nightly win32
946ac85af8f4 / 40.0a1 / 20150422030206 / files
nightly win64
946ac85af8f4 / 40.0a1 / 20150422030206 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Fix bogus assertion in nsLayoutUtils::SetDisplayPortMargins. (bug 1156409, r=botond, a=philor)
layout/base/nsLayoutUtils.cpp
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1064,17 +1064,17 @@ nsLayoutUtils::GetDisplayPort(nsIContent
 bool
 nsLayoutUtils::SetDisplayPortMargins(nsIContent* aContent,
                                      nsIPresShell* aPresShell,
                                      const ScreenMargin& aMargins,
                                      uint32_t aPriority,
                                      RepaintMode aRepaintMode)
 {
   MOZ_ASSERT(aContent);
-  MOZ_ASSERT(aContent->GetCurrentDoc() == aPresShell->GetDocument());
+  MOZ_ASSERT(aContent->GetComposedDoc() == aPresShell->GetDocument());
 
   DisplayPortMarginsPropertyData* currentData =
     static_cast<DisplayPortMarginsPropertyData*>(aContent->GetProperty(nsGkAtoms::DisplayPortMargins));
   if (currentData && currentData->mPriority > aPriority) {
     return false;
   }
 
   aContent->SetProperty(nsGkAtoms::DisplayPortMargins,