summaryrefslogtreecommitdiffstats
path: root/layout/base/nsLayoutUtils.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-06-04 23:58:47 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-06-04 23:58:47 +0200
commitf47d45be4b6c8a1fc758d50497a964fc7a75154b (patch)
tree497657ef7d2d3dc2e2c752146a524a2c725dd26a /layout/base/nsLayoutUtils.cpp
parent363bfeb2c06e5f57136ebdab8da1ebeba0591520 (diff)
downloadUXP-f47d45be4b6c8a1fc758d50497a964fc7a75154b.tar
UXP-f47d45be4b6c8a1fc758d50497a964fc7a75154b.tar.gz
UXP-f47d45be4b6c8a1fc758d50497a964fc7a75154b.tar.lz
UXP-f47d45be4b6c8a1fc758d50497a964fc7a75154b.tar.xz
UXP-f47d45be4b6c8a1fc758d50497a964fc7a75154b.zip
Revert "Improve origin-clean algorithm"
This reverts commit e69b3f567c4b8957cc09ba4359e84939f77781c5.
Diffstat (limited to 'layout/base/nsLayoutUtils.cpp')
-rw-r--r--layout/base/nsLayoutUtils.cpp8
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;
}