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

Bug 1238438 (part 3) - Inline both PathFromRegionInternal() functions. r=nical.

Browse Source 
They both have a single call site, so aren't worth being in separate functions.

--HG--
extra : rebase_source : 09961affe0902cfd44448b75445438d9900a0942
This commit is contained in:
Nicholas Nethercote 2016-01-10 16:48:55 -08:00
parent c58fca74ef
commit 23b425f2f7
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gfx/thebes/gfxUtils.cpp
View File

@ -801,8 +801,8 @@ gfxUtils::ImageFormatToDepth(gfxImageFormat aFormat)
return 0;
}
static void
PathFromRegionInternal(gfxContext* aContext, const nsIntRegion& aRegion)
/*static*/ void
gfxUtils::ClipToRegion(gfxContext* aContext, const nsIntRegion& aRegion)
{
aContext->NewPath();
nsIntRegionRectIterator iter(aRegion);
@ -810,29 +810,6 @@ PathFromRegionInternal(gfxContext* aContext, const nsIntRegion& aRegion)
while ((r = iter.Next()) != nullptr) {
aContext->Rectangle(gfxRect(r->x, r->y, r->width, r->height));
}
}
static already_AddRefed<Path>
PathFromRegionInternal(DrawTarget* aTarget, const nsIntRegion& aRegion)
{
RefPtr<PathBuilder> pb = aTarget->CreatePathBuilder();
nsIntRegionRectIterator iter(aRegion);
const IntRect* r;
while ((r = iter.Next()) != nullptr) {
pb->MoveTo(Point(r->x, r->y));
pb->LineTo(Point(r->XMost(), r->y));
pb->LineTo(Point(r->XMost(), r->YMost()));
pb->LineTo(Point(r->x, r->YMost()));
pb->Close();
}
return pb->Finish();
}
/*static*/ void
gfxUtils::ClipToRegion(gfxContext* aContext, const nsIntRegion& aRegion)
{
PathFromRegionInternal(aContext, aRegion);
aContext->Clip();
}
@ -845,7 +822,19 @@ gfxUtils::ClipToRegion(DrawTarget* aTarget, const nsIntRegion& aRegion)
return;
}
RefPtr<Path> path = PathFromRegionInternal(aTarget, aRegion);
RefPtr<PathBuilder> pb = aTarget->CreatePathBuilder();
nsIntRegionRectIterator iter(aRegion);
const IntRect* r;
while ((r = iter.Next()) != nullptr) {
pb->MoveTo(Point(r->x, r->y));
pb->LineTo(Point(r->XMost(), r->y));
pb->LineTo(Point(r->XMost(), r->YMost()));
pb->LineTo(Point(r->x, r->YMost()));
pb->Close();
}
RefPtr<Path> path = pb->Finish();
aTarget->PushClip(path);
}