diff --git a/build/win32/orderfile.txt b/build/win32/orderfile.txt index aa2c6098da97..dca462f833e0 100644 --- a/build/win32/orderfile.txt +++ b/build/win32/orderfile.txt @@ -12026,7 +12026,6 @@ ARGBSetRow_X86 ?HasMultipleChildren@ContainerLayer@layers@mozilla@@QAE_NXZ ?GetEffectiveOpacity@Layer@layers@mozilla@@QAEMXZ ?ComputeEffectiveTransformsForChildren@ContainerLayer@layers@mozilla@@IAEXABV?$Matrix4x4Typed@UUnknownUnits@gfx@mozilla@@U123@M@gfx@3@@Z -??_GReadbackLayer@layers@mozilla@@UAEPAXI@Z ?JS_GetFunctionDisplayId@@YAPAVJSString@@PAVJSFunction@@@Z ??1ReadbackProcessor@layers@mozilla@@QAE@XZ ?GetClipExtents@gfxContext@@QBE?AU?$RectTyped@UUnknownUnits@gfx@mozilla@@N@gfx@mozilla@@W4ClipExtentsSpace@1@@Z @@ -17447,7 +17446,6 @@ FluentBuiltInDateTimeFormatterFormat ?Unlink@cycleCollection@DOMEventTargetHelper@mozilla@@UAGXPAX@Z ?nsCycleCollector_doDeferredDeletion@@YA_NXZ ?WriteToFile@nsINIParser_internal@@QAE?AW4nsresult@@PAVnsIFile@@@Z -?GetType@ReadbackLayer@layers@mozilla@@UBE?AW4LayerType@Layer@23@XZ ?functionBodyString@ScriptSource@js@@QAEPAVJSLinearString@@PAUJSContext@@@Z ??0Compressor@js@@QAE@PBEI@Z ?init@Compressor@js@@QAE_NXZ diff --git a/build/win64/orderfile.txt b/build/win64/orderfile.txt index da537d1ee626..87f0af561f60 100644 --- a/build/win64/orderfile.txt +++ b/build/win64/orderfile.txt @@ -13261,7 +13261,6 @@ ZN5style10properties9longhands11caret_color16cascade_property17hc6f704988876f49c ?GetEffectiveOperator@layers@mozilla@@YA?AW4CompositionOp@gfx@2@PEAVLayer@12@@Z ?HasMultipleChildren@ContainerLayer@layers@mozilla@@QEAA_NXZ ?ComputeEffectiveTransformsForChildren@ContainerLayer@layers@mozilla@@IEAAXAEBV?$Matrix4x4Typed@UUnknownUnits@gfx@mozilla@@U123@M@gfx@3@@Z -??_GReadbackLayer@layers@mozilla@@UEAAPEAXI@Z ?GetClipExtents@gfxContext@@QEBA?AU?$RectTyped@UUnknownUnits@gfx@mozilla@@N@gfx@mozilla@@W4ClipExtentsSpace@1@@Z ?GetRect@DrawTarget@gfx@mozilla@@UEBA?AU?$IntRectTyped@UUnknownUnits@gfx@mozilla@@@23@XZ ?ToOutsideIntRect@layers@mozilla@@YA?AU?$IntRectTyped@UUnknownUnits@gfx@mozilla@@@gfx@2@AEBU?$RectTyped@UUnknownUnits@gfx@mozilla@@N@42@@Z diff --git a/gfx/layers/Layers.cpp b/gfx/layers/Layers.cpp index 5c0def830d8d..364b32a29ff7 100644 --- a/gfx/layers/Layers.cpp +++ b/gfx/layers/Layers.cpp @@ -16,7 +16,6 @@ #include "CompositableHost.h" // for CompositableHost #include "GeckoProfiler.h" // for profiler_can_accept_markers, PROFILER_MARKER_TEXT #include "LayerUserData.h" // for LayerUserData -#include "ReadbackLayer.h" // for ReadbackLayer #include "TreeTraversal.h" // for ForwardIterator, ForEachNode, DepthFirstSearch, TraversalFlag, TraversalFl... #include "UnitTransforms.h" // for ViewAs, PixelCastJustification, PixelCastJustification::RenderTargetIsPare... #include "apz/src/AsyncPanZoomController.h" // for AsyncPanZoomController diff --git a/gfx/layers/ReadbackLayer.h b/gfx/layers/ReadbackLayer.h deleted file mode 100644 index ae419eef5817..000000000000 --- a/gfx/layers/ReadbackLayer.h +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef GFX_READBACKLAYER_H -#define GFX_READBACKLAYER_H - -#include // for uint64_t -#include "Layers.h" // for Layer, etc -#include "mozilla/gfx/Rect.h" // for gfxRect -#include "mozilla/gfx/Point.h" // for IntPoint -#include "mozilla/mozalloc.h" // for operator delete -#include "nsCOMPtr.h" // for already_AddRefed -#include "nsDebug.h" // for NS_ASSERTION -#include "nsPoint.h" // for nsIntPoint -#include "nscore.h" // for nsACString - -class gfxContext; - -namespace mozilla { -namespace layers { - -class ReadbackProcessor; - -/** - * A ReadbackSink receives a stream of updates to a rectangle of pixels. - * These update callbacks are always called on the main thread, either during - * EndTransaction or from the event loop. - */ -class ReadbackSink { - public: - ReadbackSink() = default; - virtual ~ReadbackSink() = default; - - /** - * Sends an update to indicate that the background is currently unknown. - */ - virtual void SetUnknown(uint64_t aSequenceNumber) = 0; - /** - * Called by the layer system to indicate that the contents of part of - * the readback area are changing. - * @param aRect is the rectangle of content that is being updated, - * in the coordinate system of the ReadbackLayer. - * @param aSequenceNumber updates issued out of order should be ignored. - * Only use updates whose sequence counter is greater than all other updates - * seen so far. Return null when a non-fresh sequence value is given. - * @return a context into which the update should be drawn. This should be - * set up to clip to aRect. Zero should never be passed as a sequence number. - * If this returns null, EndUpdate should NOT be called. If it returns - * non-null, EndUpdate must be called. - * - * We don't support partially unknown backgrounds. Therefore, the - * first BeginUpdate after a SetUnknown will have the complete background. - */ - virtual already_AddRefed BeginUpdate( - const gfx::IntRect& aRect, uint64_t aSequenceNumber) = 0; - /** - * EndUpdate must be called immediately after BeginUpdate, without returning - * to the event loop. - * @param aContext the context returned by BeginUpdate - * Implicitly Restore()s the state of aContext. - */ - virtual void EndUpdate(const gfx::IntRect& aRect) = 0; -}; - -} // namespace layers -} // namespace mozilla - -#endif /* GFX_READBACKLAYER_H */ diff --git a/gfx/layers/d3d11/ReadbackManagerD3D11.cpp b/gfx/layers/d3d11/ReadbackManagerD3D11.cpp index ed6399f3397e..d716ab047d98 100644 --- a/gfx/layers/d3d11/ReadbackManagerD3D11.cpp +++ b/gfx/layers/d3d11/ReadbackManagerD3D11.cpp @@ -5,7 +5,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "ReadbackManagerD3D11.h" -#include "ReadbackLayer.h" #include "mozilla/layers/TextureClient.h" #include "mozilla/gfx/2D.h" diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index 1d50e9594ae9..2a2b5716747f 100755 --- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -25,7 +25,6 @@ EXPORTS += [ "LayerUserData.h", "opengl/OGLShaderConfig.h", "opengl/OGLShaderProgram.h", - "ReadbackLayer.h", ] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":