corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1348596 - Back out incorrectly-landed (and unreviewed) change to ContinueTextRunAcrossFrames that was mistakenly pushed. r=dbaron

Browse Source
This commit is contained in:
Jonathan Kew
2017-03-20 09:44:02 +00:00
parent 8a95de3153
commit 2fb347e10e
1 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
layout/generic/nsTextFrame.cpp
View File

@@ -1785,23 +1785,6 @@ GetSpacingFlags(nsIFrame* aFrame, const nsStyleText* aStyleText = nullptr)
return nonStandardSpacing ? gfxTextRunFactory::TEXT_ENABLE_SPACING : 0;
}
static bool
IsBaselineAligned(const nsStyleCoord& aCoord)
{
switch (aCoord.GetUnit()) {
case eStyleUnit_Enumerated:
return aCoord.GetIntValue() == NS_STYLE_VERTICAL_ALIGN_BASELINE;
case eStyleUnit_Coord:
return aCoord.GetCoordValue() == 0;
case eStyleUnit_Percent:
return aCoord.GetPercentValue() == 0;
case eStyleUnit_Calc:
return aCoord.GetCalcValue()->IsDefinitelyZero();
default:
return false;
}
}
bool
BuildTextRunsScanner::ContinueTextRunAcrossFrames(nsTextFrame* aFrame1, nsTextFrame* aFrame2)
{
@@ -1831,10 +1814,6 @@ BuildTextRunsScanner::ContinueTextRunAcrossFrames(nsTextFrame* aFrame1, nsTextFr
if (textStyle1->NewlineIsSignificant(aFrame1) && HasTerminalNewline(aFrame1))
return false;
if (!IsBaselineAligned(sc1->StyleDisplay()->mVerticalAlign)) {
return false;
}
if (aFrame1->GetContent() == aFrame2->GetContent() &&
aFrame1->GetNextInFlow() != aFrame2) {
// aFrame2 must be a non-fluid continuation of aFrame1. This can happen
@@ -1851,10 +1830,6 @@ BuildTextRunsScanner::ContinueTextRunAcrossFrames(nsTextFrame* aFrame1, nsTextFr
if (sc1 == sc2)
return true;
if (!IsBaselineAligned(sc1->StyleDisplay()->mVerticalAlign)) {
return false;
}
const nsStyleFont* fontStyle1 = sc1->StyleFont();
const nsStyleFont* fontStyle2 = sc2->StyleFont();
nscoord letterSpacing1 = LetterSpacing(aFrame1);