зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1180443 - Consider whitespace collapse when calculating intrinsic isize of ruby. r=dbaron
--HG-- extra : source : f3bc6f334e57602ee8be8d9fd32f87c3d0af7db3
This commit is contained in:
Xidorn Quan
Родитель
6565c918a7
Коммит
7e8beb711d
|
|
@ -128,9 +128,18 @@ GetIsLineBreakAllowed(nsIFrame* aFrame, bool aIsLineBreakable,
|
|||
*aAllowLineBreak = allowLineBreak;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param aBaseISizeData is an in/out param. This method updates the
|
||||
* `skipWhitespace` and `trailingWhitespace` fields of the struct with
|
||||
* the base level frame. Note that we don't need to do the same thing
|
||||
* for ruby text frames, because they are text run container themselves
|
||||
* (see nsTextFrame.cpp:BuildTextRuns), and thus no whitespace collapse
|
||||
* happens across the boundary of those frames.
|
||||
*/
|
||||
static nscoord
|
||||
CalculateColumnPrefISize(nsRenderingContext* aRenderingContext,
|
||||
const RubyColumnEnumerator& aEnumerator)
|
||||
const RubyColumnEnumerator& aEnumerator,
|
||||
nsIFrame::InlineIntrinsicISizeData* aBaseISizeData)
|
||||
{
|
||||
nscoord max = 0;
|
||||
uint32_t levelCount = aEnumerator.GetLevelCount();
|
||||
|
|
@ -138,9 +147,22 @@ CalculateColumnPrefISize(nsRenderingContext* aRenderingContext,
|
|||
nsIFrame* frame = aEnumerator.GetFrameAtLevel(i);
|
||||
if (frame) {
|
||||
nsIFrame::InlinePrefISizeData data;
|
||||
if (i == 0) {
|
||||
data.lineContainer = aBaseISizeData->lineContainer;
|
||||
data.skipWhitespace = aBaseISizeData->skipWhitespace;
|
||||
data.trailingWhitespace = aBaseISizeData->trailingWhitespace;
|
||||
} else {
|
||||
// The line container of ruby text frames is their parent,
|
||||
// ruby text container frame.
|
||||
data.lineContainer = frame->GetParent();
|
||||
}
|
||||
frame->AddInlinePrefISize(aRenderingContext, &data);
|
||||
MOZ_ASSERT(data.prevLines == 0, "Shouldn't have prev lines");
|
||||
max = std::max(max, data.currentLine);
|
||||
if (i == 0) {
|
||||
aBaseISizeData->skipWhitespace = data.skipWhitespace;
|
||||
aBaseISizeData->trailingWhitespace = data.trailingWhitespace;
|
||||
}
|
||||
}
|
||||
}
|
||||
return max;
|
||||
|
|
@ -160,11 +182,16 @@ nsRubyBaseContainerFrame::AddInlineMinISize(
|
|||
// Since spans are not breakable internally, use our pref isize
|
||||
// directly if there is any span.
|
||||
nsIFrame::InlinePrefISizeData data;
|
||||
data.lineContainer = aData->lineContainer;
|
||||
data.skipWhitespace = aData->skipWhitespace;
|
||||
data.trailingWhitespace = aData->trailingWhitespace;
|
||||
AddInlinePrefISize(aRenderingContext, &data);
|
||||
aData->currentLine += data.currentLine;
|
||||
if (data.currentLine > 0) {
|
||||
aData->atStartOfLine = false;
|
||||
}
|
||||
aData->skipWhitespace = data.skipWhitespace;
|
||||
aData->trailingWhitespace = data.trailingWhitespace;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -188,7 +215,8 @@ nsRubyBaseContainerFrame::AddInlineMinISize(
|
|||
}
|
||||
}
|
||||
firstFrame = false;
|
||||
nscoord isize = CalculateColumnPrefISize(aRenderingContext, enumerator);
|
||||
nscoord isize = CalculateColumnPrefISize(aRenderingContext,
|
||||
enumerator, aData);
|
||||
aData->currentLine += isize;
|
||||
if (isize > 0) {
|
||||
aData->atStartOfLine = false;
|
||||
|
|
@ -208,7 +236,7 @@ nsRubyBaseContainerFrame::AddInlinePrefISize(
|
|||
RubyColumnEnumerator enumerator(
|
||||
static_cast<nsRubyBaseContainerFrame*>(frame), textContainers);
|
||||
for (; !enumerator.AtEnd(); enumerator.Next()) {
|
||||
sum += CalculateColumnPrefISize(aRenderingContext, enumerator);
|
||||
sum += CalculateColumnPrefISize(aRenderingContext, enumerator, aData);
|
||||
}
|
||||
}
|
||||
for (uint32_t i = 0, iend = textContainers.Length(); i < iend; i++) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="ja">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Bug 1180443 - Intrinsic ISize calculation of ruby with whitespace</title>
|
||||
<style>
|
||||
div {
|
||||
display: inline-block;
|
||||
border: 1px solid black;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<p>No line break should happen in any block, and the content should just fit in the block.</p>
|
||||
|
||||
<div>
|
||||
ABC DEF
|
||||
</div>
|
||||
<div>
|
||||
XYZ ABCDEF XYZ
|
||||
</div>
|
||||
|
||||
<div>
|
||||
あい うえ
|
||||
</div>
|
||||
<div>
|
||||
お あいうえ お
|
||||
</div>
|
||||
<br>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="ja">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Bug 1180443 - Intrinsic ISize calculation of ruby with whitespace</title>
|
||||
<style>
|
||||
div {
|
||||
display: inline-block;
|
||||
border: 1px solid black;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<p>No line break should happen in any block, and the content should just fit in the block.</p>
|
||||
|
||||
<div>
|
||||
<ruby><rb>ABC</rb> <rb>DEF</rb></ruby>
|
||||
</div>
|
||||
<div>
|
||||
XYZ <ruby><rb>ABC</rb><rb>DEF</rb></ruby> XYZ
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<ruby><rb>あい</rb> <rb>うえ</rb></ruby>
|
||||
</div>
|
||||
<div>
|
||||
お <ruby><rb>あい</rb><rb>うえ</rb></ruby> お
|
||||
</div>
|
||||
<br>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -23,6 +23,7 @@ test-pref(dom.meta-viewport.enabled,true) test-pref(font.size.inflation.emPerLin
|
|||
== intra-level-whitespace-2.html intra-level-whitespace-2-ref.html
|
||||
== intra-level-whitespace-3.html intra-level-whitespace-3-ref.html
|
||||
== intrinsic-isize-1.html intrinsic-isize-1-ref.html
|
||||
== intrinsic-isize-2.html intrinsic-isize-2-ref.html
|
||||
== justification-1.html justification-1-ref.html
|
||||
== justification-2.html justification-2-ref.html
|
||||
fuzzy-if(winWidget,255,792) == lang-specific-style-1.html lang-specific-style-1-ref.html # bug 1134947
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче