From eb864e519d068c6f12ec6f12461bcb05887b6ce6 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Tue, 14 Nov 2017 19:04:44 +0000 Subject: www/firefox: update to 57.0 (marketed as "Firefox Quantum") Not a MFH candidate due to POLA violation per redesigned UI, broken legacy addons and auto-reviewed new addons. Changes: https://www.mozilla.org/firefox/57.0/releasenotes/ PR: 222693 Tested by: pi, tobik, TrueOS --- www/firefox/files/patch-bug1395138 | 49 -------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 www/firefox/files/patch-bug1395138 (limited to 'www/firefox/files/patch-bug1395138') diff --git a/www/firefox/files/patch-bug1395138 b/www/firefox/files/patch-bug1395138 deleted file mode 100644 index 5422a708ab5c..000000000000 --- a/www/firefox/files/patch-bug1395138 +++ /dev/null @@ -1,49 +0,0 @@ -commit 8ab8a207d511 -Author: Jamie Nicol -Date: Mon Oct 9 17:48:59 2017 +0100 - - Bug 1395138 - Hold reference to layers in ContainerLayerComposite::mPrepared. r=mattwoodrow, a=sledru - - MozReview-Commit-ID: 6qUDRnRcFAw ---- - gfx/layers/composite/ContainerLayerComposite.cpp | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git gfx/layers/composite/ContainerLayerComposite.cpp gfx/layers/composite/ContainerLayerComposite.cpp -index aad2993629fc..28d9e79925a0 100755 ---- gfx/layers/composite/ContainerLayerComposite.cpp -+++ gfx/layers/composite/ContainerLayerComposite.cpp -@@ -161,12 +161,12 @@ static gfx::IntRect ContainerVisibleRect(ContainerT* aContainer) - /* all of the per-layer prepared data we need to maintain */ - struct PreparedLayer - { -- PreparedLayer(LayerComposite *aLayer, -+ PreparedLayer(Layer *aLayer, - RenderTargetIntRect aClipRect, - Maybe&& aGeometry) - : mLayer(aLayer), mClipRect(aClipRect), mGeometry(Move(aGeometry)) {} - -- LayerComposite* mLayer; -+ RefPtr mLayer; - RenderTargetIntRect mClipRect; - Maybe mGeometry; - }; -@@ -230,7 +230,8 @@ ContainerPrepare(ContainerT* aContainer, - CULLING_LOG("Preparing sublayer %p\n", layerToRender->GetLayer()); - - layerToRender->Prepare(clipRect); -- aContainer->mPrepared->mLayers.AppendElement(PreparedLayer(layerToRender, clipRect, -+ aContainer->mPrepared->mLayers.AppendElement(PreparedLayer(layerToRender->GetLayer(), -+ clipRect, - Move(layer.geometry))); - } - -@@ -408,7 +409,7 @@ RenderLayers(ContainerT* aContainer, LayerManagerComposite* aManager, - PreparedLayer& preparedData = aContainer->mPrepared->mLayers[i]; - - const gfx::IntRect clipRect = preparedData.mClipRect.ToUnknownRect(); -- LayerComposite* layerToRender = preparedData.mLayer; -+ LayerComposite* layerToRender = static_cast(preparedData.mLayer->ImplData()); - const Maybe& childGeometry = preparedData.mGeometry; - - Layer* layer = layerToRender->GetLayer(); -- cgit v1.2.3