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

Bug 1058040, part 8 - Make AutoSetRestoreSVGContextPaint::Init's SVGContextPaint argument const. r=dholbert

Browse Source 
This patch is needed because in a later patch we need to pass
VectorImage::Draw's const SVGImageContext to
AutoSetRestoreSVGContextPaint::Init.
This commit is contained in:
Jonathan Watt 2017-01-09 19:12:03 +00:00
parent de51524080
commit 43ca85cc9a
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
layout/svg/SVGContextPaint.cpp
View File

@ -142,6 +142,17 @@ SVGContextPaint::GetContextPaint(nsIContent* aContent)
return nullptr;
}
// XXX The SVGContextPaint that was passed to SetProperty was const. Ideally
// we could and should re-apply that constness to the SVGContextPaint that
// we get here (SVGImageContext is never changed after it is initialized).
// Unfortunately lazy initialization of SVGContextPaint (which is a member of
// SVGImageContext, and also conceptually never changes after construction)
// prevents some of SVGContextPaint's conceptually const methods from being
// const. Trying to fix SVGContextPaint (perhaps by using |mutable|) is a
// bit of a headache so for now we punt on that, don't reapply the constness
// to the SVGContextPaint here, and trust that no one will add code that
// actually modifies the object.
return static_cast<SVGContextPaint*>(
ownerDoc->GetProperty(nsGkAtoms::svgContextPaint));
}
@ -229,7 +240,7 @@ SVGContextPaintImpl::Paint::GetPattern(const DrawTarget* aDrawTarget,
}
AutoSetRestoreSVGContextPaint::AutoSetRestoreSVGContextPaint(
SVGContextPaint* aContextPaint,
const SVGContextPaint* aContextPaint,
nsIDocument* aSVGDocument)
: mSVGDocument(aSVGDocument)
, mOuterContextPaint(aSVGDocument->GetProperty(nsGkAtoms::svgContextPaint))
@ -247,7 +258,8 @@ AutoSetRestoreSVGContextPaint::AutoSetRestoreSVGContextPaint(
}
DebugOnly<nsresult> res =
mSVGDocument->SetProperty(nsGkAtoms::svgContextPaint, aContextPaint);
mSVGDocument->SetProperty(nsGkAtoms::svgContextPaint,
const_cast<SVGContextPaint*>(aContextPaint));
NS_WARNING_ASSERTION(NS_SUCCEEDED(res), "Failed to set context paint");
}

2
layout/svg/SVGContextPaint.h
View File

@ -109,7 +109,7 @@ private:
class MOZ_RAII AutoSetRestoreSVGContextPaint
{
public:
AutoSetRestoreSVGContextPaint(SVGContextPaint* aContextPaint,
AutoSetRestoreSVGContextPaint(const SVGContextPaint* aContextPaint,
nsIDocument* aSVGDocument);
~AutoSetRestoreSVGContextPaint();
private: