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 /layout | |
| 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 'layout')
| -rw-r--r-- | layout/base/nsLayoutUtils.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 17ece8e61..07befdc81 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -8,7 +8,6 @@ #include "mozilla/ArrayUtils.h" #include "mozilla/BasicEvents.h" -#include "mozilla/dom/CanvasUtils.h" #include "mozilla/ClearOnShutdown.h" #include "mozilla/EffectCompositor.h" #include "mozilla/EffectSet.h" @@ -7286,10 +7285,10 @@ nsLayoutUtils::SurfaceFromElement(nsIImageLoadingContent* aElement, } result.mPrincipal = principal.forget(); + // no images, including SVG images, can load content from another domain. + result.mIsWriteOnly = false; result.mImageRequest = imgRequest.forget(); return result; - result.mIsWriteOnly = - CanvasUtils::CheckWriteOnlySecurity(result.mCORSUsed, result.mPrincipal); } nsLayoutUtils::SurfaceFromElementResult @@ -7401,8 +7400,7 @@ nsLayoutUtils::SurfaceFromElement(HTMLVideoElement* aElement, result.mHasSize = true; result.mSize = result.mLayersImage->GetSize(); result.mPrincipal = principal.forget(); - result.mIsWriteOnly = - CanvasUtils::CheckWriteOnlySecurity(result.mCORSUsed, result.mPrincipal); + result.mIsWriteOnly = false; return result; } |