Bug 509569. Avoid assertion by not storing structs with unused inherit logical box props in them, even though it would be ok to do so. r=dbaron

2010-04-01 22:09:05 -04:00 · 2010-04-01 22:09:05 -04:00 · f203c2ec0f
--- a/layout/style/crashtests/509569-1.html
+++ b/layout/style/crashtests/509569-1.html
@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<html style="-moz-border-start: inherit; border: none"><body></body></html>
--- a/layout/style/crashtests/crashtests.list
+++ b/layout/style/crashtests/crashtests.list
@ -48,6 +48,7 @@ load 495269-2.html
 load 498036-1.html
 load 509155-1.html
 load 509156-1.html
+load 509569-1.html
 load 524252-1.html
 load font-face-truncated-src.html 
 load 536789-1.html
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@ -2326,6 +2326,12 @@ nsRuleNode::AdjustLogicalBoxProp(nsStyleContext* aContext,
      if (RTLlogical)
        aValueRect.*(nsCSSRect::sides[aSide]) = aRTLLogicalValue;
    }
+  } else if (aLTRLogicalValue.GetUnit() == eCSSUnit_Inherit ||
+             aRTLLogicalValue.GetUnit() == eCSSUnit_Inherit) {
+    // It actually is valid to store this in the ruletree, since
+    // LTRlogical and RTLlogical are both false, but doing that will
+    // trigger asserts.  Silence those.
+    aCanStoreInRuleTree = PR_FALSE;
  }
 }