diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-04 23:58:47 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-08 19:31:36 +0200 |
commit | 684778cb2292e3ad6721a1bc820a2eeb3c6d0680 (patch) | |
tree | 652dcfc5e9cc106ba73e76187393d8a9a0d83d58 /dom/canvas/CanvasRenderingContext2D.cpp | |
parent | dee00a8a79394559e0e868cc72464c2de24583ac (diff) | |
download | UXP-684778cb2292e3ad6721a1bc820a2eeb3c6d0680.tar UXP-684778cb2292e3ad6721a1bc820a2eeb3c6d0680.tar.gz UXP-684778cb2292e3ad6721a1bc820a2eeb3c6d0680.tar.lz UXP-684778cb2292e3ad6721a1bc820a2eeb3c6d0680.tar.xz UXP-684778cb2292e3ad6721a1bc820a2eeb3c6d0680.zip |
Revert "Improve origin-clean algorithm"
This reverts commit e69b3f567c4b8957cc09ba4359e84939f77781c5.
Diffstat (limited to 'dom/canvas/CanvasRenderingContext2D.cpp')
-rw-r--r-- | dom/canvas/CanvasRenderingContext2D.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp index 2bf40732a..4849fda57 100644 --- a/dom/canvas/CanvasRenderingContext2D.cpp +++ b/dom/canvas/CanvasRenderingContext2D.cpp @@ -2406,11 +2406,7 @@ CanvasRenderingContext2D::SetStyleFromUnion(const StringOrCanvasGradientOrCanvas } if (aValue.IsCanvasPattern()) { - CanvasPattern& pattern = aValue.GetAsCanvasPattern(); - SetStyleFromPattern(pattern, aWhichStyle); - if (pattern.mForceWriteOnly) { - SetWriteOnly(); - } + SetStyleFromPattern(aValue.GetAsCanvasPattern(), aWhichStyle); return; } @@ -2585,12 +2581,11 @@ CanvasRenderingContext2D::CreatePattern(const CanvasImageSource& aSource, nsLayoutUtils::SurfaceFromElement(element, nsLayoutUtils::SFE_WANT_FIRST_FRAME, mTarget); - RefPtr<SourceSurface> surface = res.GetSourceSurface(); - if (!surface) { + if (!res.GetSourceSurface()) { return nullptr; } - RefPtr<CanvasPattern> pat = new CanvasPattern(this, surface, repeatMode, + RefPtr<CanvasPattern> pat = new CanvasPattern(this, res.GetSourceSurface(), repeatMode, res.mPrincipal, res.mIsWriteOnly, res.mCORSUsed); return pat.forget(); @@ -4900,8 +4895,8 @@ CanvasRenderingContext2D::CachedSurfaceFromElement(Element* aElement) res.mSize = res.mSourceSurface->GetSize(); res.mPrincipal = principal.forget(); + res.mIsWriteOnly = false; res.mImageRequest = imgRequest.forget(); - res.mIsWriteOnly = CheckWriteOnlySecurity(res.mCORSUsed, res.mPrincipal); return res; } |