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

Bug 1224013 part 3 - Render text-emphasis outside ruby. r=jfkthame

Browse Source
This commit is contained in:
Xidorn Quan
2015-12-04 12:02:41 +11:00
parent 039afa606a
commit cc42ace6c0
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
layout/generic/nsTextFrame.cpp
View File

@@ -52,6 +52,7 @@
#include "nsExpirationTracker.h" #include "nsExpirationTracker.h"
#include "nsUnicodeProperties.h" #include "nsUnicodeProperties.h"
#include "nsStyleUtil.h" #include "nsStyleUtil.h"
#include "nsRubyBaseContainerFrame.h"
#include "nsTextFragment.h" #include "nsTextFragment.h"
#include "nsGkAtoms.h" #include "nsGkAtoms.h"
@@ -5155,6 +5156,19 @@ GenerateTextRunForEmphasisMarks(nsTextFrame* aFrame, nsFontMetrics* aFontMetrics
ctx, appUnitsPerDevUnit, flags, nullptr); ctx, appUnitsPerDevUnit, flags, nullptr);
} }
static nsRubyBaseContainerFrame*
FindRubyBaseContainerAncestor(nsTextFrame* aFrame)
{
for (nsIFrame* frame = aFrame->GetParent();
frame && frame->IsFrameOfType(nsIFrame::eLineParticipant);
frame = frame->GetParent()) {
if (frame->GetType() == nsGkAtoms::rubyBaseContainerFrame) {
return static_cast<nsRubyBaseContainerFrame*>(frame);
}
}
return nullptr;
}
nsRect nsRect
nsTextFrame::UpdateTextEmphasis(WritingMode aWM, PropertyProvider& aProvider) nsTextFrame::UpdateTextEmphasis(WritingMode aWM, PropertyProvider& aProvider)
{ {
@@ -5188,14 +5202,18 @@ nsTextFrame::UpdateTextEmphasis(WritingMode aWM, PropertyProvider& aProvider)
nscoord absOffset = (side == eLogicalSideBStart) != aWM.IsLineInverted() ? nscoord absOffset = (side == eLogicalSideBStart) != aWM.IsLineInverted() ?
baseFontMetrics->MaxAscent() + fm->MaxDescent() : baseFontMetrics->MaxAscent() + fm->MaxDescent() :
baseFontMetrics->MaxDescent() + fm->MaxAscent(); baseFontMetrics->MaxDescent() + fm->MaxAscent();
// XXX emphasis marks should be drawn outside ruby, see bug 1224013. nscoord startLeading = 0;
nscoord endLeading = 0;
if (nsRubyBaseContainerFrame* rbc = FindRubyBaseContainerAncestor(this)) {
rbc->GetBlockLeadings(&startLeading, &endLeading);
}
if (side == eLogicalSideBStart) { if (side == eLogicalSideBStart) {
info->baselineOffset = -absOffset; info->baselineOffset = -absOffset - startLeading;
overflowRect.BStart(aWM) = -overflowRect.BSize(aWM); overflowRect.BStart(aWM) = -overflowRect.BSize(aWM) - startLeading;
} else { } else {
MOZ_ASSERT(side == eLogicalSideBEnd); MOZ_ASSERT(side == eLogicalSideBEnd);
info->baselineOffset = absOffset; info->baselineOffset = absOffset + endLeading;
overflowRect.BStart(aWM) = frameSize.BSize(aWM); overflowRect.BStart(aWM) = frameSize.BSize(aWM) + endLeading;
} }
Properties().Set(EmphasisMarkProperty(), info); Properties().Set(EmphasisMarkProperty(), info);