From e1e299bc045af7d4fd92d6fe83b54cab4e1756ba Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Sun, 12 Feb 2012 22:21:50 +0100
Subject: [PATCH] Bug 725535 - "ASSERTION: Only transformed frames should have
UpdateTransformLayer hint". r=roc
---
layout/base/crashtests/725535.html | 8 ++++++++
layout/base/crashtests/crashtests.list | 1 +
layout/base/nsCSSFrameConstructor.cpp | 6 +++---
3 files changed, 12 insertions(+), 3 deletions(-)
create mode 100644 layout/base/crashtests/725535.html
diff --git a/layout/base/crashtests/725535.html b/layout/base/crashtests/725535.html
new file mode 100644
index 0000000000000..b0d504e5a260d
--- /dev/null
+++ b/layout/base/crashtests/725535.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html style="-moz-transform-style: preserve-3d">
+<body>
+<script>
+document.addEventListener("MozReftestInvalidate", function() {document.documentElement.style.MozTransform = 'rotate(0)';}, false);
+</script>
+</body>
+</html>
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index f6bec8d8af5f4..b6b9926f7101e 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -349,3 +349,4 @@ load 698335.html
needs-focus pref(accessibility.browsewithcaret,true) load 699353-1.html
load 707098.html
load 722137.html
+load 725535.html
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 64c01fb0b0f01..7ba99cd8946a4 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -7674,9 +7674,6 @@ DoApplyRenderingChangeToTree(nsIFrame* aFrame,
"should only be called within ApplyRenderingChangeToTree");
for ( ; aFrame; aFrame = nsLayoutUtils::GetNextContinuationOrSpecialSibling(aFrame)) {
- NS_ASSERTION(!(aChange & nsChangeHint_UpdateTransformLayer) || aFrame->IsTransformed(),
- "Only transformed frames should have UpdateTransformLayer hint");
-
// Get view if this frame has one and trigger an update. If the
// frame doesn't have a view, find the nearest containing view
// (adjusting r's coordinate system to reflect the nesting) and
@@ -7718,6 +7715,9 @@ ApplyRenderingChangeToTree(nsPresContext* aPresContext,
nsIFrame* aFrame,
nsChangeHint aChange)
{
+ NS_ASSERTION(!(aChange & nsChangeHint_UpdateTransformLayer) || aFrame->IsTransformed(),
+ "Only transformed frames should have UpdateTransformLayer hint");
+
nsIPresShell *shell = aPresContext->PresShell();
if (shell->IsPaintingSuppressed()) {
// Don't allow synchronous rendering changes when painting is turned off.
--
GitLab