nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1870970 - Ensure we call DrawEventRecorder::DetachResources to avoid memory leaks. r=gfx-reviewers,lsalzman

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D196936
This commit is contained in:
Andrew Osmond 2023-12-20 12:59:26 +00:00
parent 1b7e49f639
commit 40d33b8232
2 changed files with 12 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
gfx/ipc/CrossProcessPaint.cpp
View file

@ -152,6 +152,7 @@ PaintFragment PaintFragment::Record(dom::BrowsingContext* aBc,
} }
if (!recorder->mOutputStream.mValid) { if (!recorder->mOutputStream.mValid) {
recorder->DetachResources();
return PaintFragment{}; return PaintFragment{};
} }
@ -162,11 +163,14 @@ PaintFragment PaintFragment::Record(dom::BrowsingContext* aBc,
recorder->mOutputStream.mLength = 0; recorder->mOutputStream.mLength = 0;
recorder->mOutputStream.mCapacity = 0; recorder->mOutputStream.mCapacity = 0;
return PaintFragment{ PaintFragment fragment{
surfaceSize.ToUnknownSize(), surfaceSize.ToUnknownSize(),
std::move(recording), std::move(recording),
std::move(recorder->TakeDependentSurfaces()), std::move(recorder->TakeDependentSurfaces()),
}; };
recorder->DetachResources();
return fragment;
} }
bool PaintFragment::IsEmpty() const { bool PaintFragment::IsEmpty() const {
@ -323,7 +327,7 @@ CrossProcessPaint::CrossProcessPaint(float aScale, dom::TabId aRoot,
CrossProcessPaintFlags aFlags) CrossProcessPaintFlags aFlags)
: mRoot{aRoot}, mScale{aScale}, mPendingFragments{0}, mFlags{aFlags} {} : mRoot{aRoot}, mScale{aScale}, mPendingFragments{0}, mFlags{aFlags} {}
CrossProcessPaint::~CrossProcessPaint() = default; CrossProcessPaint::~CrossProcessPaint() { Clear(NS_ERROR_ABORT); }
void CrossProcessPaint::ReceiveFragment(dom::WindowGlobalParent* aWGP, void CrossProcessPaint::ReceiveFragment(dom::WindowGlobalParent* aWGP,
PaintFragment&& aFragment) { PaintFragment&& aFragment) {

6
widget/nsDeviceContextSpecProxy.cpp
View file

@ -125,6 +125,12 @@ nsDeviceContextSpecProxy::EndDocument() {
Unused << mRemotePrintJob->SendFinalizePrint(); Unused << mRemotePrintJob->SendFinalizePrint();
if (mRecorder) {
MOZ_ASSERT(!mRecorder->IsOpen());
mRecorder->DetachResources();
mRecorder = nullptr;
}
return mozilla::gfx::PrintEndDocumentPromise::CreateAndResolve(true, return mozilla::gfx::PrintEndDocumentPromise::CreateAndResolve(true,
__func__); __func__);
} }