From 03f68881d23be1c80f90e72e8845c863d8141d90 Mon Sep 17 00:00:00 2001 From: Morris Tseng Date: Wed, 28 Jun 2017 13:42:24 -0700 Subject: [PATCH] Bug 1376855 - Removed unused variables and interfaces. r=kats MozReview-Commit-ID: 5rPI7jNI94K --HG-- extra : rebase_source : 20ffeb6e064de9ccf19729aa6045ffa595c51429 --- gfx/layers/wr/WebRenderDisplayItemLayer.cpp | 102 +------------------- gfx/layers/wr/WebRenderDisplayItemLayer.h | 9 -- layout/painting/nsDisplayList.cpp | 25 ----- layout/painting/nsDisplayList.h | 16 +-- 4 files changed, 3 insertions(+), 149 deletions(-) diff --git a/gfx/layers/wr/WebRenderDisplayItemLayer.cpp b/gfx/layers/wr/WebRenderDisplayItemLayer.cpp index 3e12381e0b18..a18655331621 100644 --- a/gfx/layers/wr/WebRenderDisplayItemLayer.cpp +++ b/gfx/layers/wr/WebRenderDisplayItemLayer.cpp @@ -12,7 +12,6 @@ #include "mozilla/layers/StackingContextHelper.h" #include "mozilla/layers/WebRenderBridgeChild.h" #include "nsDisplayList.h" -#include "mozilla/gfx/DrawEventRecorder.h" #include "mozilla/gfx/Matrix.h" #include "UnitTransforms.h" @@ -22,12 +21,6 @@ namespace layers { WebRenderDisplayItemLayer::~WebRenderDisplayItemLayer() { MOZ_COUNT_DTOR(WebRenderDisplayItemLayer); - if (mKey.isSome()) { - WrManager()->AddImageKeyForDiscard(mKey.value()); - } - if (mExternalImageId.isSome()) { - WrBridge()->DeallocExternalImageId(mExternalImageId.ref()); - } } void @@ -46,14 +39,8 @@ WebRenderDisplayItemLayer::RenderLayer(wr::DisplayListBuilder& aBuilder, // We might have recycled this layer. Throw away the old commands. mParentCommands.Clear(); - // TODO: Remove the old interface once we add support for image type display items. - if (mItem->GetType() == nsDisplayItem::TYPE_BACKGROUND || - mItem->GetType() == nsDisplayItem::TYPE_BULLET) { - mItem->CreateWebRenderCommand(builder, aSc, mParentCommands, this); - } else { - mItem->CreateWebRenderCommands(builder, aSc, mParentCommands, WrManager(), - GetDisplayListBuilder()); - } + mItem->CreateWebRenderCommands(builder, aSc, mParentCommands, WrManager(), + GetDisplayListBuilder()); builder.Finalize(contentSize, mBuiltDisplayList); } else { // else we have an empty transaction and just use the @@ -73,90 +60,5 @@ WebRenderDisplayItemLayer::RenderLayer(wr::DisplayListBuilder& aBuilder, WrBridge()->AddWebRenderParentCommands(mParentCommands); } -Maybe -WebRenderDisplayItemLayer::SendImageContainer(ImageContainer* aContainer, - nsTArray& aParentCommands) -{ - MOZ_ASSERT(aContainer); - - if (mImageContainer != aContainer) { - AutoLockImage autoLock(aContainer); - Image* image = autoLock.GetImage(); - if (!image) { - return Nothing(); - } - - if (!mImageClient) { - mImageClient = ImageClient::CreateImageClient(CompositableType::IMAGE, - WrBridge(), - TextureFlags::DEFAULT); - if (!mImageClient) { - return Nothing(); - } - mImageClient->Connect(); - } - - if (mExternalImageId.isNothing()) { - MOZ_ASSERT(mImageClient); - mExternalImageId = Some(WrBridge()->AllocExternalImageIdForCompositable(mImageClient)); - } - MOZ_ASSERT(mExternalImageId.isSome()); - MOZ_ASSERT(mImageClient->AsImageClientSingle()); - - mKey = UpdateImageKey(mImageClient->AsImageClientSingle(), - aContainer, - mKey, - mExternalImageId.ref()); - - mImageContainer = aContainer; - } - - return mKey; -} - -bool -WebRenderDisplayItemLayer::PushItemAsBlobImage(wr::DisplayListBuilder& aBuilder, - const StackingContextHelper& aSc) -{ - const int32_t appUnitsPerDevPixel = mItem->Frame()->PresContext()->AppUnitsPerDevPixel(); - - bool snap; - LayerRect bounds = ViewAs( - LayoutDeviceRect::FromAppUnits(mItem->GetBounds(mBuilder, &snap), appUnitsPerDevPixel), - PixelCastJustification::WebRenderHasUnitResolution); - LayerIntSize imageSize = RoundedToInt(bounds.Size()); - LayerRect imageRect; - imageRect.SizeTo(LayerSize(imageSize)); - - RefPtr recorder = MakeAndAddRef(); - RefPtr dummyDt = - gfx::Factory::CreateDrawTarget(gfx::BackendType::SKIA, gfx::IntSize(1, 1), gfx::SurfaceFormat::B8G8R8X8); - RefPtr dt = gfx::Factory::CreateRecordingDrawTarget(recorder, dummyDt, imageSize.ToUnknownSize()); - LayerPoint offset = ViewAs( - LayoutDevicePoint::FromAppUnits(mItem->ToReferenceFrame(), appUnitsPerDevPixel), - PixelCastJustification::WebRenderHasUnitResolution); - - { - dt->ClearRect(imageRect.ToUnknownRect()); - RefPtr context = gfxContext::CreateOrNull(dt, offset.ToUnknownPoint()); - MOZ_ASSERT(context); - - mItem->Paint(mBuilder, context); - } - - wr::ByteBuffer bytes(recorder->mOutputStream.mLength, (uint8_t*)recorder->mOutputStream.mData); - - WrRect dest = aSc.ToRelativeWrRect(imageRect + offset); - WrImageKey key = GetImageKey(); - WrBridge()->SendAddBlobImage(key, imageSize.ToUnknownSize(), imageSize.width * 4, dt->GetFormat(), bytes); - WrManager()->AddImageKeyForDiscard(key); - - aBuilder.PushImage(dest, - dest, - wr::ImageRendering::Auto, - key); - return true; -} - } // namespace layers } // namespace mozilla diff --git a/gfx/layers/wr/WebRenderDisplayItemLayer.h b/gfx/layers/wr/WebRenderDisplayItemLayer.h index 0d4e46ee3e1c..5be581b4b99a 100644 --- a/gfx/layers/wr/WebRenderDisplayItemLayer.h +++ b/gfx/layers/wr/WebRenderDisplayItemLayer.h @@ -26,11 +26,6 @@ public: MOZ_COUNT_CTOR(WebRenderDisplayItemLayer); } - Maybe SendImageContainer(ImageContainer* aContainer, - nsTArray& aParentCommands); - bool PushItemAsBlobImage(wr::DisplayListBuilder& aBuilder, - const StackingContextHelper& aSc); - protected: virtual ~WebRenderDisplayItemLayer(); @@ -42,10 +37,6 @@ public: private: wr::BuiltDisplayList mBuiltDisplayList; nsTArray mParentCommands; - RefPtr mImageClient; - RefPtr mImageContainer; - wr::MaybeExternalImageId mExternalImageId; - Maybe mKey; }; } // namespace layers diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp index c49c10709e8c..859aee1dcd4c 100644 --- a/layout/painting/nsDisplayList.cpp +++ b/layout/painting/nsDisplayList.cpp @@ -3561,31 +3561,6 @@ nsDisplayBackgroundImage::CreateWebRenderCommands(mozilla::wr::DisplayListBuilde return true; } -void -nsDisplayBackgroundImage::CreateWebRenderCommand(wr::DisplayListBuilder& aBuilder, - const StackingContextHelper& aSc, - nsTArray& aParentCommands, - WebRenderDisplayItemLayer* aLayer) -{ - nsCSSRendering::PaintBGParams params = - nsCSSRendering::PaintBGParams::ForSingleLayer(*StyleFrame()->PresContext(), - mVisibleRect, mBackgroundRect, - StyleFrame(), mImageFlags, mLayer, - CompositionOp::OP_OVER); - params.bgClipRect = &mBounds; - - DrawResult result = - nsCSSRendering::BuildWebRenderDisplayItemsForStyleImageLayer(params, - aBuilder, - aSc, - aParentCommands, - aLayer, - aLayer->WrManager(), - this); - - nsDisplayBackgroundGeometry::UpdateDrawResult(this, result); -} - void nsDisplayBackgroundImage::HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect, diff --git a/layout/painting/nsDisplayList.h b/layout/painting/nsDisplayList.h index f1e46f41e0be..a39476b0b9cf 100644 --- a/layout/painting/nsDisplayList.h +++ b/layout/painting/nsDisplayList.h @@ -1951,17 +1951,7 @@ public: { return nullptr; } /** - * Create the WebRenderCommands required to paint this display item. - * The layer this item is in is passed in as rects must be relative - * to their parent. - */ - virtual void CreateWebRenderCommand(mozilla::wr::DisplayListBuilder& aBuilder, - const StackingContextHelper& aSc, - nsTArray& aParentCommands, - WebRenderDisplayItemLayer* aLayer) {} - - /** - * Alternate function to create the WebRenderCommands without + * Function to create the WebRenderCommands without * Layer. For layers mode, aManager->IsLayersFreeTransaction() * should be false to prevent doing GetLayerState again. For * layers-free mode, we should check if the layer state is @@ -3129,10 +3119,6 @@ public: LayerManager* aManager, const ContainerLayerParameters& aContainerParameters) override; - virtual void CreateWebRenderCommand(mozilla::wr::DisplayListBuilder& aBuilder, - const StackingContextHelper& aSc, - nsTArray& aParentCommands, - WebRenderDisplayItemLayer* aLayer) override; virtual bool CreateWebRenderCommands(mozilla::wr::DisplayListBuilder& aBuilder, const StackingContextHelper& aSc, nsTArray& aParentCommands,