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

Bug 1167930 - Handle direction:rtl in vertical modes when converting a LogicalMargin to physical. r=smontagu

Browse Source
This commit is contained in:
Jonathan Kew 2015-05-28 18:29:07 +01:00
parent d014435f6d
commit 412e118c03
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
layout/generic/WritingModes.h
View File

@ -1219,13 +1219,17 @@ public:
nsMargin GetPhysicalMargin(WritingMode aWritingMode) const
{
CHECK_WRITING_MODE(aWritingMode);
return aWritingMode.IsVertical() ?
(aWritingMode.IsVerticalLR() ?
nsMargin(IStart(), BEnd(), IEnd(), BStart()) :
nsMargin(IStart(), BStart(), IEnd(), BEnd())) :
(aWritingMode.IsBidiLTR() ?
nsMargin(BStart(), IEnd(), BEnd(), IStart()) :
nsMargin(BStart(), IStart(), BEnd(), IEnd()));
return aWritingMode.IsVertical()
? (aWritingMode.IsVerticalLR()
? (aWritingMode.IsBidiLTR()
? nsMargin(IStart(), BEnd(), IEnd(), BStart())
: nsMargin(IEnd(), BEnd(), IStart(), BStart()))
: (aWritingMode.IsBidiLTR()
? nsMargin(IStart(), BStart(), IEnd(), BEnd())
: nsMargin(IEnd(), BStart(), IStart(), BEnd())))
: (aWritingMode.IsBidiLTR()
? nsMargin(BStart(), IEnd(), BEnd(), IStart())
: nsMargin(BStart(), IStart(), BEnd(), IEnd()));
}
/**

4
layout/reftests/floats/reftest.list
View File

@ -50,7 +50,7 @@ default-preferences pref(layout.css.vertical-text.enabled,true)
== float-in-rtl-vlr-2a.html float-in-rtl-vlr-2-ref.html
== float-in-rtl-vlr-2b.html float-in-rtl-vlr-2-ref.html
== float-in-rtl-vlr-2c.html float-in-rtl-vlr-2-ref.html
fails == float-in-rtl-vlr-2d.html float-in-rtl-vlr-2-ref.html # bug 1122253
== float-in-rtl-vlr-2d.html float-in-rtl-vlr-2-ref.html
fails == float-in-rtl-vlr-3a.html float-in-rtl-vlr-3-ref.html # bug 1131451
fails == float-in-rtl-vlr-3b.html float-in-rtl-vlr-3-ref.html # bug 1131451
fails == float-in-rtl-vlr-3c.html float-in-rtl-vlr-3-ref.html # bug 1131451
@ -66,7 +66,7 @@ fails == float-in-rtl-vlr-4d.html float-in-rtl-vlr-4-ref.html # bug 1131451
== float-in-rtl-vrl-2a.html float-in-rtl-vrl-2-ref.html
== float-in-rtl-vrl-2b.html float-in-rtl-vrl-2-ref.html
== float-in-rtl-vrl-2c.html float-in-rtl-vrl-2-ref.html
fails == float-in-rtl-vrl-2d.html float-in-rtl-vrl-2-ref.html # bug 1122253
== float-in-rtl-vrl-2d.html float-in-rtl-vrl-2-ref.html
fails == float-in-rtl-vrl-3a.html float-in-rtl-vrl-3-ref.html # bug 1131451
fails == float-in-rtl-vrl-3b.html float-in-rtl-vrl-3-ref.html # bug 1131451
fails == float-in-rtl-vrl-3c.html float-in-rtl-vrl-3-ref.html # bug 1131451