Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1084183) for b2g crashes

Browse Source 
Backed out changeset a7e75614e955 (bug 1084183)
Backed out changeset af96c149900b (bug 1084183)
This commit is contained in:
Phil Ringnalda 2014-11-16 20:21:55 -08:00
parent 89a0a8b4f6
commit 5cdbb8940e
6 changed files with 5 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/generic/nsTextFrame.cpp
View File

@ -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;
}

3
layout/reftests/w3c-css/submitted/reftest.list
View File

@ -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

1
layout/reftests/w3c-css/submitted/text-decor-3/reftest.list
View File

@ -1 +0,0 @@
pref(layout.css.ruby.enabled,true) == ruby-text-decoration-01.html ruby-text-decoration-01-ref.html

27
layout/reftests/w3c-css/submitted/text-decor-3/ruby-text-decoration-01-ref.html
View File

@ -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>

28
layout/reftests/w3c-css/submitted/text-decor-3/ruby-text-decoration-01.html
View File

@ -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>

14
layout/style/nsStyleStruct.h
View File

@ -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 {