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

Bug 627273, part 3: Add gfxContext::FillWithOpacity. sr=vlad

Browse Source
This commit is contained in:
Chris Jones 2011-01-26 00:26:37 -06:00
parent 567d1f2540
commit d56af48d67
3 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gfx/layers/basic/BasicLayers.cpp
View File

@ -743,14 +743,7 @@ BasicImageLayer::PaintContext(gfxPattern* aPattern,
// No need to snap here; our transform has already taken care of it.
aContext->Rectangle(gfxRect(0, 0, aSize.width, aSize.height));
aContext->SetPattern(aPattern);
if (aOpacity != 1.0) {
aContext->Save();
aContext->Clip();
aContext->Paint(aOpacity);
aContext->Restore();
} else {
aContext->Fill();
}
aContext->FillWithOpacity(aOpacity);
}
class BasicColorLayer : public ColorLayer, BasicImplData {
@ -962,14 +955,7 @@ BasicCanvasLayer::PaintWithOpacity(gfxContext* aContext,
// No need to snap here; our transform is already set up to snap our rect
aContext->Rectangle(gfxRect(0, 0, mBounds.width, mBounds.height));
aContext->SetPattern(pat);
if (aOpacity != 1.0) {
aContext->Save();
aContext->Clip();
aContext->Paint(aOpacity);
aContext->Restore();
} else {
aContext->Fill();
}
aContext->FillWithOpacity(aOpacity);
if (mNeedsYFlip) {
aContext->SetMatrix(m);
@ -2496,7 +2482,7 @@ BasicShadowCanvasLayer::Paint(gfxContext* aContext,
// No need to snap here; our transform has already taken care of it
aContext->Rectangle(r);
aContext->SetPattern(pat);
aContext->Fill();
aContext->FillWithOpacity(GetEffectiveOpacity());
}
// Create a shadow layer (PLayerChild) for aLayer, if we're forwarding

15
gfx/thebes/gfxContext.cpp
View File

@ -151,6 +151,21 @@ gfxContext::Fill()
cairo_fill_preserve(mCairo);
}
void
gfxContext::FillWithOpacity(gfxFloat aOpacity)
{
// This method exists in the hope that one day cairo gets a direct
// API for this, and then we would change this method to use that
// API instead.
if (aOpacity != 1.0) {
gfxContextAutoSaveRestore saveRestore(this);
Clip();
Paint(aOpacity);
} else {
Fill();
}
}
void
gfxContext::MoveTo(const gfxPoint& pt)
{

8
gfx/thebes/gfxContext.h
View File

@ -129,6 +129,14 @@ public:
*/
void Fill();
/**
* Fill the current path according to the current settings and
* with |aOpacity|.
*
* Does not consume the current path.
*/
void FillWithOpacity(gfxFloat aOpacity);
/**
* Forgets the current path.
*/