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

Bug 1351440 - Part 5. typedef DrawResult in nsDisplayItem to avoid the image:: qualification. r=jwatt

Browse Source 
MozReview-Commit-ID: 1l8DUL1z6U2
This commit is contained in:
cku 2017-05-18 22:03:54 +02:00
parent 4790d4da73
commit 4b27190a36
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/painting/nsDisplayList.cpp
View File

@ -3509,7 +3509,7 @@ nsDisplayBackgroundImage::CreateWebRenderCommands(wr::DisplayListBuilder& aBuild
CompositionOp::OP_OVER);
params.bgClipRect = &mBounds;
image::DrawResult result =
DrawResult result =
nsCSSRendering::BuildWebRenderDisplayItemsForStyleImageLayer(params, aBuilder, aSc, aParentCommands, aLayer);
nsDisplayBackgroundGeometry::UpdateDrawResult(this, result);
@ -3685,8 +3685,7 @@ nsDisplayBackgroundImage::PaintInternal(nsDisplayListBuilder* aBuilder,
StyleFrame(), flags, mLayer,
CompositionOp::OP_OVER);
params.bgClipRect = aClipRect;
image::DrawResult result =
nsCSSRendering::PaintStyleImageLayer(params, *aCtx);
DrawResult result = nsCSSRendering::PaintStyleImageLayer(params, *aCtx);
if (clip == StyleGeometryBox::Text) {
ctx->PopGroupAndBlend();
@ -3970,8 +3969,7 @@ nsDisplayImageContainer::ConfigureLayer(ImageLayer* aLayer,
if (imageWidth > 0 && imageHeight > 0) {
// We're actually using the ImageContainer. Let our frame know that it
// should consider itself to have painted successfully.
nsDisplayBackgroundGeometry::UpdateDrawResult(this,
image::DrawResult::SUCCESS);
nsDisplayBackgroundGeometry::UpdateDrawResult(this, DrawResult::SUCCESS);
}
// XXX(seth): Right now we ignore aParameters.Scale() and
@ -4978,7 +4976,7 @@ nsDisplayBorder::Paint(nsDisplayListBuilder* aBuilder,
? PaintBorderFlags::SYNC_DECODE_IMAGES
: PaintBorderFlags();
image::DrawResult result =
DrawResult result =
nsCSSRendering::PaintBorder(mFrame->PresContext(), *aCtx, mFrame,
mVisibleRect,
nsRect(offset, mFrame->GetSize()),

1
layout/painting/nsDisplayList.h
View File

@ -1615,6 +1615,7 @@ public:
typedef mozilla::layers::WebRenderDisplayItemLayer WebRenderDisplayItemLayer;
typedef mozilla::LayerState LayerState;
typedef mozilla::image::imgDrawingParams imgDrawingParams;
typedef mozilla::image::DrawResult DrawResult;
typedef class mozilla::gfx::DrawTarget DrawTarget;
// This is never instantiated directly (it has pure virtual methods), so no