Bug 1410239 - Ensure the mozPrintCallback gets invoked when painting canvases. r?jrmuizel
MozReview-Commit-ID: ADKQb3vVuPs
--- a/layout/generic/nsHTMLCanvasFrame.cpp
+++ b/layout/generic/nsHTMLCanvasFrame.cpp
@@ -125,16 +125,18 @@ public:
virtual bool CreateWebRenderCommands(mozilla::wr::DisplayListBuilder& aBuilder,
wr::IpcResourceUpdateQueue& aResources,
const StackingContextHelper& aSc,
mozilla::layers::WebRenderLayerManager* aManager,
nsDisplayListBuilder* aDisplayListBuilder) override
{
HTMLCanvasElement* element = static_cast<HTMLCanvasElement*>(mFrame->GetContent());
+ element->HandlePrintCallback(mFrame->PresContext()->Type());
+
switch(element->GetCurrentContextType()) {
case CanvasContextType::Canvas2D:
case CanvasContextType::WebGL1:
case CanvasContextType::WebGL2:
{
bool isRecycled;
RefPtr<WebRenderCanvasData> canvasData =
aManager->CommandBuilder().CreateOrRecycleWebRenderUserData<WebRenderCanvasData>(this, &isRecycled);
--- a/layout/reftests/pagination/reftest.list
+++ b/layout/reftests/pagination/reftest.list
@@ -98,17 +98,17 @@ fuzzy-if(skiaContent,1,23) == resize-ref
== 626395-2b.html 626395-2-ref.html
== 626395-2c.html 626395-2-ref.html
== 626395-2d.html 626395-2-ref.html
== 652178-1.html 652178-1-ref.html
== 115199-1.html 115199-1-ref.html
== 115199-2a.html 115199-2-ref.html
== 115199-2b.html 115199-2-ref.html
== 652178-1.html 652178-1-ref2.html
-fuzzy-if(cocoaWidget,1,5000) skip-if(webrender) == 745025-1.html 745025-1-ref.html
+fuzzy-if(cocoaWidget,1,5000) == 745025-1.html 745025-1-ref.html
== 820496-1.html 820496-1-ref.html
# NOTE: These tests don't yet rigorously test what they're
# trying to test (shrink-to-fit behavior), due to bug 967311.
== 960822.html 960822-ref.html
== 966419-1.html 966419-1-ref.html
== 966419-2.html 966419-2-ref.html
# asserts(3) HTTP(..) fails 1108104.html 1108104-ref.html # bug 1067755, 1135556