mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-23 12:51:06 +00:00
c73c31cbe8
When not using blob recordings for vector images we use simple surface providers. When we get an invalidation we will call SurfaceCache::InvalidateImage which will set a dirty bit on all blob recordings and remove all other surfaces from the surface cache. And if it finds a blob recording we will call ResumeHonoringInvalidations. This is not enough to invalidate in the case of a non-animated vector image using the webrender GetImageProvider path. Even though the surface isn't in the surface cache anymore it is still cached on the frame and when we tell it about the invalidation it will just has the image provider to update its key. That will call this code https://searchfox.org/mozilla-central/rev/cdddec7fd690700efa4d6b48532cf70155e0386b/image/DecodedSurfaceProvider.cpp#222 which will just share the same surface as before the invalidation happened again. That will let us handle one invalidation but it still won't fix the bug, we need to call ResumeHonoringInvalidations so that we handle further invalidations. When not using the image provider path, we don't save an image provider on the frame, that alone would avoid this problem. But we also call ResumeHonoringInvalidations for every successful call of VectorImage::Draw. * * * imported patch asvfref Differential Revision: https://phabricator.services.mozilla.com/D174450
142 lines
4.7 KiB
C++
142 lines
4.7 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef MOZILLA_IMAGE_BLOBSURFACEPROVIDER_H_
|
|
#define MOZILLA_IMAGE_BLOBSURFACEPROVIDER_H_
|
|
|
|
#include "mozilla/Maybe.h"
|
|
#include "mozilla/SVGImageContext.h"
|
|
#include "mozilla/gfx/2D.h"
|
|
#include "mozilla/gfx/DrawEventRecorder.h"
|
|
#include "mozilla/layers/WebRenderLayerManager.h"
|
|
#include "ImageRegion.h"
|
|
#include "ISurfaceProvider.h"
|
|
|
|
#include <vector>
|
|
|
|
namespace mozilla {
|
|
namespace image {
|
|
|
|
class BlobImageKeyData final {
|
|
public:
|
|
BlobImageKeyData(
|
|
layers::WebRenderLayerManager* aManager, const wr::BlobImageKey& aBlobKey,
|
|
std::vector<RefPtr<gfx::ScaledFont>>&& aScaledFonts,
|
|
gfx::DrawEventRecorderPrivate::ExternalSurfacesHolder&& aExternalSurfaces)
|
|
: mManager(aManager),
|
|
mBlobKey(aBlobKey),
|
|
mScaledFonts(std::move(aScaledFonts)),
|
|
mExternalSurfaces(std::move(aExternalSurfaces)),
|
|
mDirty(false) {}
|
|
|
|
BlobImageKeyData(BlobImageKeyData&& aOther) noexcept
|
|
: mManager(std::move(aOther.mManager)),
|
|
mBlobKey(aOther.mBlobKey),
|
|
mScaledFonts(std::move(aOther.mScaledFonts)),
|
|
mExternalSurfaces(std::move(aOther.mExternalSurfaces)),
|
|
mDirty(aOther.mDirty) {}
|
|
|
|
BlobImageKeyData& operator=(BlobImageKeyData&& aOther) noexcept {
|
|
mManager = std::move(aOther.mManager);
|
|
mBlobKey = aOther.mBlobKey;
|
|
mScaledFonts = std::move(aOther.mScaledFonts);
|
|
mExternalSurfaces = std::move(aOther.mExternalSurfaces);
|
|
mDirty = aOther.mDirty;
|
|
return *this;
|
|
}
|
|
|
|
BlobImageKeyData(const BlobImageKeyData&) = delete;
|
|
BlobImageKeyData& operator=(const BlobImageKeyData&) = delete;
|
|
|
|
RefPtr<layers::WebRenderLayerManager> mManager;
|
|
wr::BlobImageKey mBlobKey;
|
|
std::vector<RefPtr<gfx::ScaledFont>> mScaledFonts;
|
|
gfx::DrawEventRecorderPrivate::ExternalSurfacesHolder mExternalSurfaces;
|
|
bool mDirty;
|
|
};
|
|
|
|
} // namespace image
|
|
} // namespace mozilla
|
|
|
|
MOZ_DECLARE_RELOCATE_USING_MOVE_CONSTRUCTOR(mozilla::image::BlobImageKeyData);
|
|
|
|
namespace mozilla {
|
|
namespace wr {
|
|
class IpcResourceUpdateQueue;
|
|
} // namespace wr
|
|
|
|
namespace image {
|
|
class SVGDocumentWrapper;
|
|
|
|
/**
|
|
* An ISurfaceProvider that manages blob recordings of SVG images. Unlike the
|
|
* rasterized ISurfaceProviders, it only provides a recording which may be
|
|
* replayed in the compositor process by WebRender. It may be invalidated
|
|
* directly in order to reuse the resource ids and underlying buffers when the
|
|
* SVG image has changed (e.g. it is animated).
|
|
*/
|
|
class BlobSurfaceProvider final : public ISurfaceProvider {
|
|
public:
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(BlobSurfaceProvider, override)
|
|
|
|
BlobSurfaceProvider(ImageKey aImageKey, const SurfaceKey& aSurfaceKey,
|
|
SVGDocumentWrapper* aSVGDocumentWrapper,
|
|
uint32_t aImageFlags);
|
|
|
|
bool IsFinished() const override { return true; }
|
|
|
|
size_t LogicalSizeInBytes() const override {
|
|
const gfx::IntSize& size = GetSurfaceKey().Size();
|
|
return size.width * size.height * sizeof(uint32_t);
|
|
}
|
|
|
|
nsresult UpdateKey(layers::RenderRootStateManager* aManager,
|
|
wr::IpcResourceUpdateQueue& aResources,
|
|
wr::ImageKey& aKey) override;
|
|
|
|
void InvalidateSurface() override;
|
|
|
|
void AddSizeOfExcludingThis(MallocSizeOf aMallocSizeOf,
|
|
const AddSizeOfCb& aCallback) override {
|
|
AddSizeOfCbData metadata;
|
|
metadata.mFinished = true;
|
|
metadata.mHeapBytes += mKeys.ShallowSizeOfExcludingThis(aMallocSizeOf);
|
|
|
|
gfx::SourceSurface::SizeOfInfo info;
|
|
info.AddType(gfx::SurfaceType::BLOB_IMAGE);
|
|
metadata.Accumulate(info);
|
|
|
|
aCallback(metadata);
|
|
}
|
|
|
|
protected:
|
|
DrawableFrameRef DrawableRef(size_t aFrame) override {
|
|
MOZ_ASSERT_UNREACHABLE("BlobSurfaceProvider::DrawableRef not supported!");
|
|
return DrawableFrameRef();
|
|
}
|
|
bool IsLocked() const override { return true; }
|
|
void SetLocked(bool) override {}
|
|
|
|
private:
|
|
~BlobSurfaceProvider() override;
|
|
|
|
Maybe<BlobImageKeyData> RecordDrawing(layers::WebRenderLayerManager* aManager,
|
|
wr::IpcResourceUpdateQueue& aResources,
|
|
Maybe<wr::BlobImageKey> aBlobKey);
|
|
|
|
static void DestroyKeys(const AutoTArray<BlobImageKeyData, 1>& aKeys);
|
|
|
|
AutoTArray<BlobImageKeyData, 1> mKeys;
|
|
|
|
RefPtr<image::SVGDocumentWrapper> mSVGDocumentWrapper;
|
|
uint32_t mImageFlags;
|
|
};
|
|
|
|
} // namespace image
|
|
} // namespace mozilla
|
|
|
|
#endif /* MOZILLA_IMAGE_BLOBSURFACEPROVIDER_H_ */
|