зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 2 changesets (bug 1415214) for failures in 1415214.html
Backed out changeset 54a656b4c587 (bug 1415214) Backed out changeset dbd2b14a7466 (bug 1415214) MozReview-Commit-ID: 3NOHVkBjMVD
This commit is contained in:
Родитель
543c7f2d74
Коммит
ef24cfe9e6
|
@ -7285,24 +7285,19 @@ nsTextFrame::DrawTextRunAndDecorations(Range aRange,
|
|||
if (!skipClipping) {
|
||||
// Get the inline-size according to the specified range.
|
||||
gfxFloat clipLength = mTextRun->GetAdvanceWidth(aRange, aParams.provider);
|
||||
nsRect visualRect = GetVisualOverflowRect();
|
||||
|
||||
clipRect.width = verticalDec ? frameSize.width : clipLength / app;
|
||||
clipRect.height = verticalDec ? clipLength / app : frameSize.height;
|
||||
|
||||
const bool isInlineReversed = mTextRun->IsInlineReversed();
|
||||
if (verticalDec) {
|
||||
clipRect.x = aParams.framePt.x + visualRect.x;
|
||||
clipRect.y = isInlineReversed ? aTextBaselinePt.y - clipLength
|
||||
: aTextBaselinePt.y;
|
||||
clipRect.width = visualRect.width;
|
||||
clipRect.height = clipLength;
|
||||
clipRect.y = (isInlineReversed ? aTextBaselinePt.y - clipLength
|
||||
: aTextBaselinePt.y) / app;
|
||||
} else {
|
||||
clipRect.x = isInlineReversed ? aTextBaselinePt.x - clipLength
|
||||
: aTextBaselinePt.x;
|
||||
clipRect.y = aParams.framePt.y + visualRect.y;
|
||||
clipRect.width = clipLength;
|
||||
clipRect.height = visualRect.height;
|
||||
clipRect.x = (isInlineReversed ? aTextBaselinePt.x - clipLength
|
||||
: aTextBaselinePt.x) / app;
|
||||
}
|
||||
|
||||
clipRect.Scale(1 / app);
|
||||
clipRect.Round();
|
||||
params.context->Clip(clipRect);
|
||||
}
|
||||
|
|
|
@ -1,18 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>clip-rect-correctness-ref</title>
|
||||
<style>
|
||||
p {
|
||||
font-size: 4px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<p style="position: fixed; bottom: 0; margin: 0">
|
||||
<span>link1</span>
|
||||
<span>link2</span>
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
|
@ -1,18 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>clip-rect-correctness</title>
|
||||
<style>
|
||||
p {
|
||||
font-size: 4px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<p style="position: fixed; bottom: 0; margin: 0">
|
||||
<span style="text-decoration: underline overline line-through">link1</span>
|
||||
<span style="text-decoration: underline overline line-through">link2</span>
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
|
@ -112,4 +112,3 @@ fuzzy-if(skiaContent,4,2) == underline-select-1.html underline-select-1-ref.html
|
|||
== emphasis-style-dynamic.html emphasis-style-dynamic-ref.html
|
||||
== vertical-mode-decorations-1.html vertical-mode-decorations-1-ref.html
|
||||
== vertical-mode-decorations-2.html vertical-mode-decorations-2-ref.html
|
||||
!= 1415214.html 1415214-notref.html
|
||||
|
|
Загрузка…
Ссылка в новой задаче