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

Bug 652914. If we are not drawing background colors draw white instead of the default background color. r=roc

Browse Source
This commit is contained in:
Timothy Nikkel 2011-09-07 16:40:41 -05:00
parent 36730b55b4
commit b562d98170
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
layout/base/nsPresShell.cpp
View File

@ -1434,6 +1434,9 @@ public:
protected:
void QueryIsActive();
nsresult UpdateImageLockingState();
private:
nscolor GetDefaultBackgroundColorToDraw();
};
NS_IMPL_ISUPPORTS1(PresShell::MemoryReporter, nsIMemoryMultiReporter)
@ -5851,6 +5854,14 @@ static PRBool IsTransparentContainerElement(nsPresContext* aPresContext)
containerElement->HasAttr(kNameSpaceID_None, nsGkAtoms::transparent);
}
nscolor PresShell::GetDefaultBackgroundColorToDraw()
{
if (!mPresContext || !mPresContext->GetBackgroundColorDraw()) {
return NS_RGB(255,255,255);
}
return mPresContext->DefaultBackgroundColor();
}
void PresShell::UpdateCanvasBackground()
{
// If we have a frame tree and it has style information that
@ -5870,7 +5881,7 @@ void PresShell::UpdateCanvasBackground()
if (GetPresContext()->IsRootContentDocument() &&
!IsTransparentContainerElement(mPresContext)) {
mCanvasBackgroundColor =
NS_ComposeColors(mPresContext->DefaultBackgroundColor(), mCanvasBackgroundColor);
NS_ComposeColors(GetDefaultBackgroundColorToDraw(), mCanvasBackgroundColor);
}
}
@ -5878,7 +5889,7 @@ void PresShell::UpdateCanvasBackground()
// then the document's background color does not get drawn; cache the
// color we actually draw.
if (!FrameConstructor()->GetRootElementFrame()) {
mCanvasBackgroundColor = mPresContext->DefaultBackgroundColor();
mCanvasBackgroundColor = GetDefaultBackgroundColorToDraw();
}
}
@ -5893,7 +5904,7 @@ nscolor PresShell::ComputeBackstopColor(nsIView* aDisplayRoot)
// Within an opaque widget (or no widget at all), so the backstop
// color must be totally opaque. The user's default background
// as reported by the prescontext is guaranteed to be opaque.
return GetPresContext()->DefaultBackgroundColor();
return GetDefaultBackgroundColorToDraw();
}
struct PaintParams {