Backed out 2 changesets (bug 1084183) for b2g crashes

Backed out changeset a7e75614e955 (bug 1084183) Backed out changeset af96c149900b (bug 1084183)
dothq · Nov 17, 2014 · 5cdbb89 · 5cdbb89
1 parent 89a0a8b
commit 5cdbb89
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 72 deletions.
diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp
@@ -4871,12 +4871,8 @@ nsTextFrame::GetTextDecorations(
 
     // In all modes, if we're on an inline-block or inline-table (or
     // inline-stack, inline-box, inline-grid), we're done.
-    // If we're on a ruby frame other than ruby text container, we
-    // should continue.
     uint8_t display = f->GetDisplay();
     if (display != NS_STYLE_DISPLAY_INLINE &&
-        (!nsStyleDisplay::IsRubyDisplayType(display) ||
-         display == NS_STYLE_DISPLAY_RUBY_TEXT_CONTAINER) &&
         nsStyleDisplay::IsDisplayTypeInlineOutside(display)) {
       break;
     }

diff --git a/layout/reftests/w3c-css/submitted/reftest.list b/layout/reftests/w3c-css/submitted/reftest.list
@@ -43,9 +43,6 @@ include multicol3/reftest.list
 # Text Level 3
 # include text3/reftest.list
 
-# Text Decoration Level 3
-include text-decor-3/reftest.list
-
 # Transforms
 # include transforms/reftest.list
 

diff --git a/layout/reftests/w3c-css/submitted/text-decor-3/reftest.list b/layout/reftests/w3c-css/submitted/text-decor-3/reftest.list
diff --git a/layout/reftests/w3c-css/submitted/text-decor-3/ruby-text-decoration-01-ref.html b/layout/reftests/w3c-css/submitted/text-decor-3/ruby-text-decoration-01-ref.html
diff --git a/layout/reftests/w3c-css/submitted/text-decor-3/ruby-text-decoration-01.html b/layout/reftests/w3c-css/submitted/text-decor-3/ruby-text-decoration-01.html
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
@@ -2137,16 +2137,12 @@ struct nsStyleDisplay {
            NS_STYLE_POSITION_STICKY == mPosition;
   }
 
-  static bool IsRubyDisplayType(uint8_t aDisplay) {
-    return NS_STYLE_DISPLAY_RUBY == aDisplay ||
-           NS_STYLE_DISPLAY_RUBY_BASE == aDisplay ||
-           NS_STYLE_DISPLAY_RUBY_BASE_CONTAINER == aDisplay ||
-           NS_STYLE_DISPLAY_RUBY_TEXT == aDisplay ||
-           NS_STYLE_DISPLAY_RUBY_TEXT_CONTAINER == aDisplay;
-  }
-
   bool IsRubyDisplayType() const {
-    return IsRubyDisplayType(mDisplay);
+    return NS_STYLE_DISPLAY_RUBY == mDisplay ||
+           NS_STYLE_DISPLAY_RUBY_BASE == mDisplay ||
+           NS_STYLE_DISPLAY_RUBY_BASE_CONTAINER == mDisplay ||
+           NS_STYLE_DISPLAY_RUBY_TEXT == mDisplay ||
+           NS_STYLE_DISPLAY_RUBY_TEXT_CONTAINER == mDisplay;
   }
 
   bool IsFlexOrGridDisplayType() const {