summaryrefslogtreecommitdiff
path: root/image
diff options
context:
space:
mode:
authorBrian Smith <brian@dbsoft.org>2022-04-28 20:27:47 -0500
committerBrian Smith <brian@dbsoft.org>2022-04-28 20:27:47 -0500
commitd78e03d528ba9e7395160a23bce23726067600dd (patch)
treee8314f3d55f136a6db6bb9e2a035ae68a04dc3e9 /image
parentbebeb4e26a35df99e19b6c44fc957ad6c14e9059 (diff)
parent33523f5d5ed0c3b8000aae21a50a56c238422db3 (diff)
downloaduxp-d78e03d528ba9e7395160a23bce23726067600dd.tar.gz
Merge branch 'master' into 1829
* master: No issue - Update README and SECURITY Issue #1885 - Follow-up: Update error message if invalid rootMargin specified. Issue #1879 - Follow-up: Update config/external/nss/target to security/target. Issue #1885 - Allow unitless rootMargin entries for IntersectionObserver. Issue #1879 - Revert changes to cryptox.h Revert "Issue #1879 - spot-fix typo in cryptox.h" Issue #1879 - spot-fix typo in cryptox.h Issue #21 - Change MappedAttrParser to store its nsIPrincipal instead of nsSVGElement Issue #21 - Remove use counters telemetry Issue #1881 - Interpret empty or whitespace root margin string as zero length Issue #1877 - Resolve NIGHTLY_BUILD conditionals. Issue #1880 - Boot Comic Sans out of the font configuration.
Diffstat (limited to 'image')
-rw-r--r--image/DynamicImage.cpp6
-rw-r--r--image/ImageWrapper.cpp6
-rw-r--r--image/RasterImage.cpp6
-rw-r--r--image/VectorImage.cpp10
-rw-r--r--image/imgIContainer.idl11
5 files changed, 1 insertions, 38 deletions
diff --git a/image/DynamicImage.cpp b/image/DynamicImage.cpp
index aeb1fcf78e..dfdc3e5d81 100644
--- a/image/DynamicImage.cpp
+++ b/image/DynamicImage.cpp
@@ -337,11 +337,5 @@ DynamicImage::Unwrap()
return self.forget();
}
-void
-DynamicImage::PropagateUseCounters(nsIDocument*)
-{
- // No use counters.
-}
-
} // namespace image
} // namespace mozilla
diff --git a/image/ImageWrapper.cpp b/image/ImageWrapper.cpp
index 5ed6c78179..7d2fbfa363 100644
--- a/image/ImageWrapper.cpp
+++ b/image/ImageWrapper.cpp
@@ -291,12 +291,6 @@ ImageWrapper::SetAnimationStartTime(const TimeStamp& aTime)
mInnerImage->SetAnimationStartTime(aTime);
}
-void
-ImageWrapper::PropagateUseCounters(nsIDocument* aParentDocument)
-{
- mInnerImage->PropagateUseCounters(aParentDocument);
-}
-
nsIntSize
ImageWrapper::OptimalImageSizeForDest(const gfxSize& aDest,
uint32_t aWhichFrame,
diff --git a/image/RasterImage.cpp b/image/RasterImage.cpp
index eff6cb7b38..4fd3797bb0 100644
--- a/image/RasterImage.cpp
+++ b/image/RasterImage.cpp
@@ -1661,12 +1661,6 @@ RasterImage::Unwrap()
return self.forget();
}
-void
-RasterImage::PropagateUseCounters(nsIDocument*)
-{
- // No use counters.
-}
-
IntSize
RasterImage::OptimalImageSizeForDest(const gfxSize& aDest, uint32_t aWhichFrame,
SamplingFilter aSamplingFilter, uint32_t aFlags)
diff --git a/image/VectorImage.cpp b/image/VectorImage.cpp
index 3fcb296f5f..59b31be47e 100644
--- a/image/VectorImage.cpp
+++ b/image/VectorImage.cpp
@@ -34,7 +34,6 @@
#include "SVGDocumentWrapper.h"
#include "nsIDOMEventListener.h"
#include "SurfaceCache.h"
-#include "nsDocument.h"
// undef the GetCurrentTime macro defined in WinBase.h from the MS Platform SDK
#undef GetCurrentTime
@@ -1328,15 +1327,6 @@ VectorImage::InvalidateObserversOnNextRefreshDriverTick()
}
}
-void
-VectorImage::PropagateUseCounters(nsIDocument* aParentDocument)
-{
- nsIDocument* doc = mSVGDocumentWrapper->GetDocument();
- if (doc) {
- doc->PropagateUseCounters(aParentDocument);
- }
-}
-
nsIntSize
VectorImage::OptimalImageSizeForDest(const gfxSize& aDest,
uint32_t aWhichFrame,
diff --git a/image/imgIContainer.idl b/image/imgIContainer.idl
index ba1c494af6..ce663a73e1 100644
--- a/image/imgIContainer.idl
+++ b/image/imgIContainer.idl
@@ -19,8 +19,6 @@
#include "nsSize.h"
#include "limits.h"
-class nsIDocument;
-
namespace mozilla {
namespace layers {
class LayerManager;
@@ -67,7 +65,6 @@ native Orientation(mozilla::image::Orientation);
native TempRefSourceSurface(already_AddRefed<mozilla::gfx::SourceSurface>);
native TempRefImgIContainer(already_AddRefed<imgIContainer>);
native nsIntSizeByVal(nsIntSize);
-[ptr] native nsIDocument(nsIDocument);
/**
@@ -77,7 +74,7 @@ native nsIntSizeByVal(nsIntSize);
*
* Internally, imgIContainer also manages animation of images.
*/
-[scriptable, builtinclass, uuid(a8dbee24-ff86-4755-b40e-51175caf31af)]
+[scriptable, builtinclass, uuid(7ba72242-28da-4c5f-b53f-54da8874775e)]
interface imgIContainer : nsISupports
{
/**
@@ -542,10 +539,4 @@ interface imgIContainer : nsISupports
* Removes any ImageWrappers and returns the unwrapped base image.
*/
[notxpcom, nostdcall] TempRefImgIContainer unwrap();
-
- /*
- * Propagate the use counters (if any) from this container to the passed in
- * document.
- */
- [noscript, notxpcom] void propagateUseCounters(in nsIDocument aDocument);
};