Backed out 2 changesets (bug 1084183) for b2g crashes
authorPhil Ringnalda <philringnalda@gmail.com>
Sun, 16 Nov 2014 20:21:55 -0800
changeset 240273 28be41369dfeacebb6d96b0c5254a5f839a781cc
parent 240272 f5f0ee65aa5bc03c2eac5007e60073674d246ed0
child 240274 e0c970d0bcc330548e1e344ea1b2c83c5eb303df
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1084183
milestone36.0a1
backs outa7e75614e955943637db0ffb63bf2c7d60c991b3
af96c149900b9527c5ad73988fd2da6917f06838
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
Backed out 2 changesets (bug 1084183) for b2g crashes Backed out changeset a7e75614e955 (bug 1084183) Backed out changeset af96c149900b (bug 1084183)
layout/generic/nsTextFrame.cpp
layout/reftests/w3c-css/submitted/reftest.list
layout/reftests/w3c-css/submitted/text-decor-3/reftest.list
layout/reftests/w3c-css/submitted/text-decor-3/ruby-text-decoration-01-ref.html
layout/reftests/w3c-css/submitted/text-decor-3/ruby-text-decoration-01.html
layout/style/nsStyleStruct.h
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -4866,22 +4866,18 @@ nsTextFrame::GetTextDecorations(
       if (textDecorations & NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH) {
         aDecorations.mStrikes.AppendElement(
           nsTextFrame::LineDecoration(f, baselineOffset, color, style));
       }
     }
 
     // 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;
     }
 
     if (compatMode == eCompatibility_NavQuirks) {
       // In quirks mode, if we're on an HTML table element, we're done.
       if (f->GetContent()->IsHTML(nsGkAtoms::table)) {
         break;
--- a/layout/reftests/w3c-css/submitted/reftest.list
+++ b/layout/reftests/w3c-css/submitted/reftest.list
@@ -38,19 +38,16 @@ include multicol3/reftest.list
 # include selectors3/reftest.list
 
 # Selectors Level 4
 # include selectors4/reftest.list
 
 # Text Level 3
 # include text3/reftest.list
 
-# Text Decoration Level 3
-include text-decor-3/reftest.list
-
 # Transforms
 # include transforms/reftest.list
 
 # Transitions
 # include transitions/reftest.list
 
 # User Interface Level 3
 include ui3/reftest.list
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/text-decor-3/reftest.list
+++ /dev/null
@@ -1,1 +0,0 @@
-pref(layout.css.ruby.enabled,true) == ruby-text-decoration-01.html ruby-text-decoration-01-ref.html
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/text-decor-3/ruby-text-decoration-01-ref.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html lang="ja">
-<head>
-  <meta charset="UTF-8">
-  <title>CSS Test: text-decoration on rubies</title>
-  <link rel="author" title="Xidorn Quan" href="http://www.upsuper.org/">
-</head>
-<style type="text/css">
-  ruby { display: ruby; }
-  rb { display: ruby-base; white-space: nowrap; }
-  rt { display: ruby-text; white-space: nowrap; }
-  p { line-height: 3em; }
-  span {
-    text-decoration: underline;
-  }
-</style>
-<body>
-  <p>
-    <ruby><rb><span>慶</span></rb><rt>けい</rt
-         ><rb><span>應</span></rb><rt>おう</rt
-         ><rb><span>義</span></rb><rt>ぎ</rt
-         ><rb><span>塾</span></rb><rt>じゅく</rt
-         ><rb><span>大</span></rb><rt>だい</rt
-         ><rb><span>学</span></rb><rt>がく</rt></ruby>
-  </p>
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/text-decor-3/ruby-text-decoration-01.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html lang="ja">
-<head>
-  <meta charset="UTF-8">
-  <title>CSS Test: text-decoration on rubies</title>
-  <link rel="author" title="Xidorn Quan" href="http://www.upsuper.org/">
-  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#line-decoration">
-</head>
-<style type="text/css">
-  ruby { display: ruby; }
-  rb { display: ruby-base; white-space: nowrap; }
-  rt { display: ruby-text; white-space: nowrap; }
-  p { line-height: 3em; }
-  p {
-    text-decoration: underline;
-  }
-</style>
-<body>
-  <p>
-    <ruby><rb>慶</rb><rt>けい</rt
-         ><rb>應</rb><rt>おう</rt
-         ><rb>義</rb><rt>ぎ</rt
-         ><rb>塾</rb><rt>じゅく</rt
-         ><rb>大</rb><rt>だい</rt
-         ><rb>学</rb><rt>がく</rt></ruby>
-  </p>
-</body>
-</html>
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -2132,26 +2132,22 @@ struct nsStyleDisplay {
            NS_STYLE_POSITION_FIXED == mPosition;
   }
 
   bool IsRelativelyPositionedStyle() const {
     return NS_STYLE_POSITION_RELATIVE == mPosition ||
            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 {
     return NS_STYLE_DISPLAY_FLEX == mDisplay ||
            NS_STYLE_DISPLAY_INLINE_FLEX == mDisplay ||
            NS_STYLE_DISPLAY_GRID == mDisplay ||
            NS_STYLE_DISPLAY_INLINE_GRID == mDisplay;
   }