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

Bug 1134783 - Fix ruby-align problem on annotation when it has different align with its base. r=roc

Browse Source 
--HG--
extra : source : 01382cc28e956490cb6b69d430ad1ac12c7a27b2
This commit is contained in:
Xidorn Quan 2015-02-20 13:45:49 +13:00
parent 016af04e89
commit a5435b8759
4 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/generic/nsLineLayout.cpp
View File

@ -2971,7 +2971,7 @@ nsLineLayout::ExpandRubyBoxWithAnnotations(PerFrameData* aFrame,
if (!computeState.mFirstParticipant) {
continue;
}
if (IsRubyAlignSpaceAround(aFrame->mFrame)) {
if (IsRubyAlignSpaceAround(annotation->mFrame)) {
// Add one gap at each side of this annotation.
computeState.mFirstParticipant->mJustificationAssignment.mGapsAtStart = 1;
computeState.mLastParticipant->mJustificationAssignment.mGapsAtEnd = 1;

2
layout/reftests/css-ruby/reftest.list
View File

@ -31,7 +31,9 @@ load nested-ruby-1.html
== relative-positioning-1.html relative-positioning-1-ref.html
== relative-positioning-2.html relative-positioning-2-ref.html
== ruby-align-1.html ruby-align-1-ref.html
== ruby-align-1a.html ruby-align-1-ref.html
== ruby-align-2.html ruby-align-2-ref.html
== ruby-align-2a.html ruby-align-2-ref.html
== ruby-position-horizontal.html ruby-position-horizontal-ref.html
pref(layout.css.vertical-text.enabled,true) fails == ruby-position-vertical-lr.html ruby-position-vertical-lr-ref.html # bug 1112474
pref(layout.css.vertical-text.enabled,true) fails == ruby-position-vertical-rl.html ruby-position-vertical-rl-ref.html # bug 1112474

26
layout/reftests/css-ruby/ruby-align-1a.html Normal file
View File

@ -0,0 +1,26 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Bug 1055676 - Tests for ruby-align</title>
<link rel="stylesheet" href="common.css">
<style>
ruby { line-height: 0; }
rt > div { width: 160px; }
</style>
</head>
<body style="font: 16px/3 Ahem">
<ruby>
<rb style="ruby-align: start">X X X<rt><div></div></rt>
</ruby><br>
<ruby>
<rb style="ruby-align: center">X X X<rt><div></div></rt>
</ruby><br>
<ruby>
<rb style="ruby-align: space-between">X X X<rt><div></div></rt>
</ruby><br>
<ruby>
<rb style="ruby-align: space-around">X X X<rt><div></div></rt>
</ruby>
</body>
</html>

27
layout/reftests/css-ruby/ruby-align-2a.html Normal file
View File

@ -0,0 +1,27 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Bug 1055676 - Tests for ruby-align</title>
<link rel="stylesheet" href="common.css">
<style>
ruby { line-height: 0; }
rt { font-size: 100%; }
rb > div { width: 160px; }
</style>
</head>
<body style="font: 16px/3 Ahem">
<ruby>
<rb><div></div><rt style="ruby-align: start">X X X</rt>
</ruby><br>
<ruby>
<rb><div></div><rt style="ruby-align: center">X X X</rt>
</ruby><br>
<ruby>
<rb><div></div><rt style="ruby-align: space-between">X X X</rt>
</ruby><br>
<ruby>
<rb><div></div><rt style="ruby-align: space-around">X X X</rt>
</ruby>
</body>
</html>