From e16ed69f90f1050344c2b96f4189fa2646f7b442 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 16 Jul 2019 10:04:55 +0200 Subject: [PATCH] Bug 1519636 - Fix some conflicts r=bustage . CLOSED TREE --HG-- extra : histedit_source : a2071905aa294d25be82b0c29e27fbb8a2e4ccc6 --- gfx/layers/wr/WebRenderCommandBuilder.cpp | 11 ----------- gfx/webrender_bindings/Moz2DImageRenderer.cpp | 6 ------ 2 files changed, 17 deletions(-) diff --git a/gfx/layers/wr/WebRenderCommandBuilder.cpp b/gfx/layers/wr/WebRenderCommandBuilder.cpp index f2130da61727..5f69b210e68c 100644 --- a/gfx/layers/wr/WebRenderCommandBuilder.cpp +++ b/gfx/layers/wr/WebRenderCommandBuilder.cpp @@ -977,12 +977,7 @@ void Grouper::PaintContainerItem(DIGroup* aGroup, nsDisplayItem* aItem, auto blendItem = static_cast(aItem); auto blendMode = blendItem->BlendMode(); aContext->GetDrawTarget()->PushLayerWithBlend( -<<<<<<< dest false, 1.0, nullptr, mozilla::gfx::Matrix(), aItemBounds, false, -======= - false, 1.0, nullptr, mozilla::gfx::Matrix(), - aItemBounds + aGroup->mLayerBounds.ToUnknownRect().TopLeft(), false, ->>>>>>> source blendMode); GP("beginGroup %s %p-%d\n", aItem->Name(), aItem->Frame(), aItem->GetPerFrameKey()); @@ -996,14 +991,8 @@ void Grouper::PaintContainerItem(DIGroup* aGroup, nsDisplayItem* aItem, break; } case DisplayItemType::TYPE_BLEND_CONTAINER: { -<<<<<<< dest aContext->GetDrawTarget()->PushLayer(false, 1.0, nullptr, mozilla::gfx::Matrix(), aItemBounds); -======= - aContext->GetDrawTarget()->PushLayer( - false, 1.0, nullptr, mozilla::gfx::Matrix(), - aItemBounds + aGroup->mLayerBounds.ToUnknownRect().TopLeft()); ->>>>>>> source GP("beginGroup %s %p-%d\n", aItem->Name(), aItem->Frame(), aItem->GetPerFrameKey()); aContext->GetDrawTarget()->FlushItem(aItemBounds); diff --git a/gfx/webrender_bindings/Moz2DImageRenderer.cpp b/gfx/webrender_bindings/Moz2DImageRenderer.cpp index fe5d593cbb47..ba26f3fa7399 100644 --- a/gfx/webrender_bindings/Moz2DImageRenderer.cpp +++ b/gfx/webrender_bindings/Moz2DImageRenderer.cpp @@ -388,14 +388,8 @@ static bool Moz2DRenderCallback(const Range aBlob, auto bounds = gfx::IntRect(origin, aSize); if (aDirtyRect) { -<<<<<<< dest Rect dirty(aDirtyRect->origin.x, aDirtyRect->origin.y, aDirtyRect->size.width, aDirtyRect->size.height); -======= - Rect dirty(aDirtyRect->origin.x + recordingOrigin.x, - aDirtyRect->origin.y + recordingOrigin.y, aDirtyRect->size.width, - aDirtyRect->size.height); ->>>>>>> source dt->PushClipRect(dirty); bounds = bounds.Intersect( IntRect(aDirtyRect->origin.x, aDirtyRect->origin.y,