Merge m-c to a CLOSED TREE m-i
authorPhil Ringnalda <philringnalda@gmail.com>
Tue, 21 Apr 2015 20:17:57 -0700
changeset 259367 54ac214814d4fdba249308442bdb4f9d6a3246b7
parent 259366 bc6db8bcf480798a066eb9a6910e7445299d1ff4 (current diff)
parent 259221 946ac85af8f43e6bfa39d9edca6adbe2cad5d7ca (diff)
child 259368 d3e10d7ea4773ce4b3ab9b1c7e81c0a13d6f219e
push id8007
push userraliiev@mozilla.com
push dateMon, 11 May 2015 19:23:16 +0000
treeherdermozilla-aurora@e2ce1aac996e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone40.0a1
Merge m-c to a CLOSED TREE m-i
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,