Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 17:55:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1269971 - Part 1. Rename IsForGenerateGlyphPath to IsForGenerateGlyphMask; r=jfkthame

Browse Source 
MozReview-Commit-ID: 80DZsEAvXxB

--HG--
extra : rebase_source : 2b6205ad119265679b28d06056c3b433aab445c8
This commit is contained in:
CJKu 2016-05-13 00:08:30 +08:00
parent bf8a5a183d
commit ea85bf6191
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/base/nsDisplayList.h
View File

@ -292,7 +292,7 @@ public:
* items should only create glyph paths in target context, instead of
* drawing text into it.
*/
bool IsForGenerateGlyphPath()
bool IsForGenerateGlyphMask()
{
return mMode == nsDisplayListBuilderMode::GENERATE_GLYPH;
}

2
layout/base/nsLayoutUtils.cpp
View File

@ -3443,7 +3443,7 @@ nsLayoutUtils::PaintFrame(nsRenderingContext* aRenderingContext, nsIFrame* aFram
aFrame->BuildDisplayListForStackingContext(&builder, dirtyRect, &list);
#ifdef DEBUG
if (builder.IsForGenerateGlyphPath()) {
if (builder.IsForGenerateGlyphMask()) {
// PaintFrame is called to generate text glyph by
// nsDisplayBackgroundImage::Paint or nsDisplayBackgroundColor::Paint.
//

4
layout/generic/nsFrame.cpp
View File

@ -2510,7 +2510,7 @@ nsIFrame::BuildDisplayListForStackingContext(nsDisplayListBuilder* aBuilder,
buildingDisplayList.SetReferenceFrameAndCurrentOffset(outerReferenceFrame,
GetOffsetToCrossDoc(outerReferenceFrame));
if (!aBuilder->IsForGenerateGlyphPath()) {
if (!aBuilder->IsForGenerateGlyphMask()) {
nsDisplayTransform *transformItem =
new (aBuilder) nsDisplayTransform(aBuilder, this, &resultList, dirtyRect);
resultList.AppendNewToTop(transformItem);
@ -2604,7 +2604,7 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
if (aBuilder->IsBackgroundOnly())
return;
if (aBuilder->IsForGenerateGlyphPath()) {
if (aBuilder->IsForGenerateGlyphMask()) {
if (nsGkAtoms::textFrame != aChild->GetType() && aChild->IsLeaf()) {
return;
}

4
layout/generic/nsTextFrame.cpp
View File

@ -4771,7 +4771,7 @@ nsDisplayText::Paint(nsDisplayListBuilder* aBuilder,
pixelVisible.Inflate(2);
pixelVisible.RoundOut();
if (!aBuilder->IsForGenerateGlyphPath()) {
if (!aBuilder->IsForGenerateGlyphMask()) {
ctx->NewPath();
ctx->Rectangle(pixelVisible);
ctx->Clip();
@ -4798,7 +4798,7 @@ nsDisplayText::Paint(nsDisplayListBuilder* aBuilder,
params.dirtyRect = extraVisible;
nsTextFrame::DrawPathCallbacks callbacks;
if (aBuilder->IsForGenerateGlyphPath()) {
if (aBuilder->IsForGenerateGlyphMask()) {
params.callbacks = &callbacks;
}