Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1724839 - Don't use BasicLayerManager for painting CanvasRenderer backed canvas elements. r=jrmuizel

Browse Source 
Depends on D122171

Differential Revision: https://phabricator.services.mozilla.com/D122172
This commit is contained in:
Matt Woodrow 2021-08-10 03:38:40 +00:00
parent 8a447ade17
commit 1d5382e878
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/canvas/nsICanvasRenderingContextInternal.h
View File

@ -157,7 +157,7 @@ class nsICanvasRenderingContextInternal : public nsISupports,
}
virtual bool InitializeCanvasRenderer(mozilla::nsDisplayListBuilder* aBuilder,
CanvasRenderer* aRenderer) {
return true;
return false;
}
// Return true if the canvas should be forced to be "inactive" to ensure

35
layout/generic/nsHTMLCanvasFrame.cpp
View File

@ -334,6 +334,7 @@ class nsDisplayCanvas final : public nsPaintedDisplayItem {
Matrix transform = Matrix::Translation(p.x, p.y);
transform.PreScale(destGFXRect.Width() / canvasSizeInPx.width,
destGFXRect.Height() / canvasSizeInPx.height);
gfxContextMatrixAutoSaveRestore saveMatrix(aCtx);
if (RefPtr<layers::Image> image = canvas->GetAsImage()) {
RefPtr<gfx::SourceSurface> surface = image->GetAsSourceSurface();
@ -341,7 +342,6 @@ class nsDisplayCanvas final : public nsPaintedDisplayItem {
return;
}
gfxContextMatrixAutoSaveRestore saveMatrix(aCtx);
aCtx->Multiply(transform);
gfx::IntSize size = surface->GetSize();
@ -352,23 +352,28 @@ class nsDisplayCanvas final : public nsPaintedDisplayItem {
return;
}
// This currently uses BasicLayerManager to re-use the code for extracting
// the current CanvasRenderer/Image and generating DrawTarget rendering
// commands for it.
// Ideally we'll factor out that code and use it directly soon.
RefPtr<BasicLayerManager> layerManager =
new BasicLayerManager(BasicLayerManager::BLM_OFFSCREEN);
layerManager->BeginTransactionWithTarget(aCtx);
RefPtr<Layer> layer =
BuildLayer(aBuilder, layerManager, ContainerLayerParameters());
if (!layer) {
layerManager->AbortTransaction();
RefPtr<CanvasRenderer> renderer = new CanvasRenderer();
if (!canvas->InitializeCanvasRenderer(aBuilder, renderer)) {
return;
}
renderer->FirePreTransactionCallback();
const auto snapshot = renderer->BorrowSnapshot();
if (!snapshot) return;
const auto& surface = snapshot->mSurf;
layerManager->SetRoot(layer);
layerManager->EndEmptyTransaction();
if (!renderer->YIsDown()) {
// y-flip
transform.PreTranslate(0.0f, canvasSizeInPx.height).PreScale(1.0f, -1.0f);
}
aCtx->Multiply(transform);
aCtx->GetDrawTarget()->FillRect(
Rect(0, 0, canvasSizeInPx.width, canvasSizeInPx.height),
SurfacePattern(surface, ExtendMode::CLAMP, Matrix(),
nsLayoutUtils::GetSamplingFilterForFrame(f)));
renderer->FireDidTransactionCallback();
renderer->ResetDirty();
}
};