mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1042423 - Part 5: Remove PaintBackgroundColor. r=roc

This commit is contained in:
Matt Woodrow 2014-07-23 17:23:38 +12:00
Родитель 8028bbe23b
Коммит 14faf75e9b
3 изменённых файлов: 9 добавлений и 127 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

106
layout/base/nsCSSRendering.cpp
Просмотреть файл

@ -1601,45 +1601,6 @@ nsCSSRendering::PaintBackground(nsPresContext* aPresContext,
aBGClipRect, aLayer);
}
void
nsCSSRendering::PaintBackgroundColor(gfxRGBA aColor,
nsRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,
const nsRect& aBorderArea,
const nsRect& aBGClipRect,
uint32_t aFlags)
{
PROFILER_LABEL("nsCSSRendering", "PaintBackgroundColor",
js::ProfileEntry::Category::GRAPHICS);
NS_PRECONDITION(aForFrame,
"Frame is expected to be provided to PaintBackground");
nsStyleContext *sc;
if (!FindBackground(aForFrame, &sc)) {
// We don't want to bail out if moz-appearance is set on a root
// node. If it has a parent content node, bail because it's not
// a root, other wise keep going in order to let the theme stuff
// draw the background. The canvas really should be drawing the
// bg, but there's no way to hook that up via css.
if (!aForFrame->StyleDisplay()->mAppearance) {
return;
}
nsIContent* content = aForFrame->GetContent();
if (!content || content->GetParent()) {
return;
}
sc = aForFrame->StyleContext();
}
PaintBackgroundColorWithSC(aColor, aRenderingContext, aForFrame,
aDirtyRect, aBorderArea, aBGClipRect, sc,
*aForFrame->StyleBorder(), aFlags);
}
static bool
IsOpaqueBorderEdge(const nsStyleBorder& aBorder, mozilla::css::Side aSide)
{
@ -2835,73 +2796,6 @@ nsCSSRendering::PaintBackgroundWithSC(nsPresContext* aPresContext,
}
}
void
nsCSSRendering::PaintBackgroundColorWithSC(gfxRGBA aColor,
nsRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,
const nsRect& aBorderArea,
const nsRect& aBGClipRect,
nsStyleContext* aBackgroundSC,
const nsStyleBorder& aBorder,
uint32_t aFlags)
{
NS_PRECONDITION(aForFrame,
"Frame is expected to be provided to PaintBackground");
// Check to see if we have an appearance defined. If so, we let the theme
// renderer draw the background and bail out.
const nsStyleDisplay* displayData = aForFrame->StyleDisplay();
if (displayData->mAppearance) {
nsITheme *theme = aForFrame->PresContext()->GetTheme();
if (theme && theme->ThemeSupportsWidget(aForFrame->PresContext(), aForFrame,
displayData->mAppearance)) {
NS_ERROR("Shouldn't be trying to paint a background color if we are themed!");
return;
}
}
NS_ASSERTION(!IsCanvasFrame(aForFrame), "Should not be trying to paint a background color for canvas frames!");
// Determine whether we are drawing background images and/or
// background colors.
bool drawBackgroundImage;
bool drawBackgroundColor;
DetermineBackgroundColor(aForFrame->PresContext(),
aBackgroundSC,
aForFrame,
drawBackgroundImage,
drawBackgroundColor);
NS_ASSERTION(drawBackgroundImage || drawBackgroundColor,
"Should not be trying to paint a background if we don't have one");
if (!drawBackgroundColor) {
return;
}
// The background is rendered over the 'background-clip' area,
// which is normally equal to the border area but may be reduced
// to the padding area by CSS. Also, if the border is solid, we
// don't need to draw outside the padding area. In either case,
// if the borders are rounded, make sure we use the same inner
// radii as the border code will.
// The background-color is drawn based on the bottom
// background-clip.
gfxContext* ctx = aRenderingContext.ThebesContext();
nscoord appUnitsPerPixel = aForFrame->PresContext()->AppUnitsPerDevPixel();
BackgroundClipState clipState;
clipState.mBGClipArea = aBGClipRect;
clipState.mCustomClip = true;
SetupDirtyRects(clipState.mBGClipArea, aDirtyRect, appUnitsPerPixel,
&clipState.mDirtyRect, &clipState.mDirtyRectGfx);
ctx->SetColor(aColor);
gfxContextAutoSaveRestore autoSR;
DrawBackgroundColor(clipState, ctx, appUnitsPerPixel);
}
static inline bool
IsTransformed(nsIFrame* aForFrame, nsIFrame* aTopFrame)
{

17
layout/base/nsCSSRendering.h
Просмотреть файл

@ -525,14 +525,6 @@ struct nsCSSRendering {
nsRect* aBGClipRect = nullptr,
int32_t aLayer = -1);
static void PaintBackgroundColor(gfxRGBA aColor,
nsRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,
const nsRect& aBorderArea,
const nsRect& aBGClipRect,
uint32_t aFlags);
/**
* Same as |PaintBackground|, except using the provided style structs.
* This short-circuits the code that ensures that the root element's
@ -553,15 +545,6 @@ struct nsCSSRendering {
nsRect* aBGClipRect = nullptr,
int32_t aLayer = -1);
static void PaintBackgroundColorWithSC(gfxRGBA aColor,
nsRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,
const nsRect& aBorderArea,
const nsRect& aBGClipRect,
nsStyleContext *aStyleContext,
const nsStyleBorder& aBorder,
uint32_t aFlags);
/**
* Returns the rectangle covered by the given background layer image, taking
* into account background positioning, sizing, and repetition, but not

13
layout/base/nsDisplayList.cpp
Просмотреть файл

@ -2540,11 +2540,16 @@ nsDisplayBackgroundColor::Paint(nsDisplayListBuilder* aBuilder,
return;
}
uint32_t flags = aBuilder->GetBackgroundPaintFlags();
CheckForBorderItem(this, flags);
gfxContext* ctx = aCtx->ThebesContext();
nsRect borderBox = nsRect(ToReferenceFrame(), mFrame->GetSize());
nsCSSRendering::PaintBackgroundColor(mColor, *aCtx, mFrame,
mVisibleRect, borderBox, borderBox, flags);
gfxRect bounds =
nsLayoutUtils::RectToGfxRect(borderBox, mFrame->PresContext()->AppUnitsPerDevPixel());
ctx->SetColor(mColor);
ctx->NewPath();
ctx->Rectangle(bounds, true);
ctx->Fill();
}
nsRegion