Bug 822721 followup: remove bogus assertion to fix orange.
authorL. David Baron <dbaron@dbaron.org>
Wed, 09 Jan 2013 08:51:14 -0800
changeset 118248 dff10a89c17cd2701870682af6a8a189028ca3e6
parent 118247 1ac464d73d8398f053205974423f031cd50c465e
child 118249 efddd115fd76af1e2e0c1273814db0177b7e37b1
push id20948
push userdbaron@mozilla.com
push dateWed, 09 Jan 2013 16:51:44 +0000
treeherdermozilla-inbound@dff10a89c17c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs822721
milestone21.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 822721 followup: remove bogus assertion to fix orange.
layout/style/nsTransitionManager.cpp
--- a/layout/style/nsTransitionManager.cpp
+++ b/layout/style/nsTransitionManager.cpp
@@ -309,22 +309,16 @@ nsTransitionManager::UpdateThrottledStyl
   nsRefPtr<nsStyleContext> newStyle = mPresContext->PresShell()->StyleSet()->
     ResolveStyleForRules(aParentStyle, oldStyle, rules);
 
   // We absolutely must call CalcStyleDifference in order to ensure the
   // new context has all the structs cached that the old context had.
   // We also need it for processing of the changes.
   nsChangeHint styleChange =
     oldStyle->CalcStyleDifference(newStyle, nsChangeHint(0));
-  // This isn't particularly dangerous, but I want to catch if it happens:
-  NS_ABORT_IF_FALSE(NS_IsHintSubset(styleChange,
-                                    NS_CombineHint(nsChangeHint_UpdateOpacityLayer,
-                                      NS_CombineHint(nsChangeHint_UpdateTransformLayer,
-                                                     nsChangeHint_UpdateOverflow))),
-                    "unexpected change hint");
   aChangeList.AppendChange(primaryFrame, primaryFrame->GetContent(),
                            styleChange);
 
   primaryFrame->SetStyleContextWithoutNotification(newStyle);
 
   ReparentBeforeAndAfter(aElement, primaryFrame, newStyle, mPresContext->PresShell()->StyleSet());
 
   return newStyle;