Merge m-c to a CLOSED TREE m-i

This commit is contained in:
Phil Ringnalda 2015-04-21 20:17:57 -07:00
commit 857dc93f7f

View File

@ -1069,7 +1069,7 @@ nsLayoutUtils::SetDisplayPortMargins(nsIContent* aContent,
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));