Bug 1437184. Inline FillAzure() r=bas

There's only one caller so let's just eliminate inline FillAzure into
Fill.

MozReview-Commit-ID: JYpAQMkhEcS

--HG--
extra : rebase_source : 962b046405949d435537a77baea50f631a8aee72
This commit is contained in:
Jeff Muizelaar 2018-02-10 10:54:54 -05:00
Родитель 61cdff34c5
Коммит 54461122d4
2 изменённых файлов: 18 добавлений и 25 удалений

Просмотреть файл

@ -229,7 +229,24 @@ void
gfxContext::Fill(const Pattern& aPattern)
{
AUTO_PROFILER_LABEL("gfxContext::Fill", GRAPHICS);
FillAzure(aPattern, 1.0f);
AzureState &state = CurrentState();
CompositionOp op = GetOp();
if (mPathIsRect) {
MOZ_ASSERT(!mTransformChanged);
if (op == CompositionOp::OP_SOURCE) {
// Emulate cairo operator source which is bound by mask!
mDT->ClearRect(mRect);
mDT->FillRect(mRect, aPattern, DrawOptions(1.0f));
} else {
mDT->FillRect(mRect, aPattern, DrawOptions(1.0f, op, state.aaMode));
}
} else {
EnsurePath();
mDT->Fill(mPath, aPattern, DrawOptions(1.0f, op, state.aaMode));
}
}
void
@ -889,29 +906,6 @@ gfxContext::EnsurePathBuilder()
mPathIsRect = false;
}
void
gfxContext::FillAzure(const Pattern& aPattern, Float aOpacity)
{
AzureState &state = CurrentState();
CompositionOp op = GetOp();
if (mPathIsRect) {
MOZ_ASSERT(!mTransformChanged);
if (op == CompositionOp::OP_SOURCE) {
// Emulate cairo operator source which is bound by mask!
mDT->ClearRect(mRect);
mDT->FillRect(mRect, aPattern, DrawOptions(aOpacity));
} else {
mDT->FillRect(mRect, aPattern, DrawOptions(aOpacity, op, state.aaMode));
}
} else {
EnsurePath();
mDT->Fill(mPath, aPattern, DrawOptions(aOpacity, op, state.aaMode));
}
}
CompositionOp
gfxContext::GetOp()
{

Просмотреть файл

@ -505,7 +505,6 @@ private:
void EnsurePath();
// This ensures mPathBuilder contains a valid PathBuilder (in user space!)
void EnsurePathBuilder();
void FillAzure(const Pattern& aPattern, mozilla::gfx::Float aOpacity);
CompositionOp GetOp();
void ChangeTransform(const mozilla::gfx::Matrix &aNewMatrix, bool aUpdatePatternTransform = true);
Rect GetAzureDeviceSpaceClipBounds() const;