From c5771580ff78acd26c6ea7011c7339a6181c6456 Mon Sep 17 00:00:00 2001 From: Mats Palmgren Date: Thu, 1 Mar 2012 13:34:19 +0100 Subject: [PATCH] Bug 727601 - "ASSERTION: Only transformed frames should have UpdateTransformLayer hint" with display:table. r=roc --- layout/base/crashtests/727601.html | 3 +++ layout/base/crashtests/crashtests.list | 1 + layout/base/nsCSSFrameConstructor.cpp | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 layout/base/crashtests/727601.html diff --git a/layout/base/crashtests/727601.html b/layout/base/crashtests/727601.html new file mode 100644 index 000000000000..cc6ef390b1e6 --- /dev/null +++ b/layout/base/crashtests/727601.html @@ -0,0 +1,3 @@ + + + diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list index b6b9926f7101..dc4353163670 100644 --- a/layout/base/crashtests/crashtests.list +++ b/layout/base/crashtests/crashtests.list @@ -350,3 +350,4 @@ needs-focus pref(accessibility.browsewithcaret,true) load 699353-1.html load 707098.html load 722137.html load 725535.html +load 727601.html diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index d7c4646989cd..f553e425bc7d 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -7606,8 +7606,9 @@ ApplyRenderingChangeToTree(nsPresContext* aPresContext, nsIFrame* aFrame, nsChangeHint aChange) { - NS_ASSERTION(!(aChange & nsChangeHint_UpdateTransformLayer) || aFrame->IsTransformed(), - "Only transformed frames should have UpdateTransformLayer hint"); + NS_ASSERTION(!(aChange & nsChangeHint_UpdateTransformLayer) || + aFrame->GetStyleDisplay()->HasTransform(), + "Only transform style should give a UpdateTransformLayer hint"); nsIPresShell *shell = aPresContext->PresShell(); if (shell->IsPaintingSuppressed()) {