Bug 1728205 - Remove DrawTargetDual. r=jrmuizel

Differential Revision: https://phabricator.services.mozilla.com/D123978
dothq · Aug 30, 2021 · 82c2f97 · 82c2f97
1 parent 45dbaa8
commit 82c2f97
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 612 deletions.
diff --git a/gfx/2d/2D.h b/gfx/2d/2D.h
@@ -1600,7 +1600,6 @@ class DrawTarget : public external::AtomicRefCounted<DrawTarget> {
    */
   virtual void* GetNativeSurface(NativeSurfaceType aType) { return nullptr; }
 
-  virtual bool IsDualDrawTarget() const { return false; }
   virtual bool IsTiledDrawTarget() const { return false; }
   virtual bool SupportsRegionClipping() const { return true; }
 
@@ -1857,20 +1856,6 @@ class GFX2D_API Factory {
  public:
   static void PurgeAllCaches();
 
-  static already_AddRefed<DrawTarget> CreateDualDrawTarget(DrawTarget* targetA,
-                                                           DrawTarget* targetB);
-
-  static already_AddRefed<SourceSurface> CreateDualSourceSurface(
-      SourceSurface* sourceA, SourceSurface* sourceB);
-
-  /*
-   * This creates a new tiled DrawTarget. When a tiled drawtarget is used the
-   * drawing is distributed over number of tiles which may each hold an
-   * individual offset. The tiles in the set must each have the same backend
-   * and format.
-   */
-  static already_AddRefed<DrawTarget> CreateTiledDrawTarget(
-      const TileSet& aTileSet);
   static already_AddRefed<DrawTarget> CreateOffsetDrawTarget(
       DrawTarget* aDrawTarget, IntPoint aTileOrigin);
 

diff --git a/gfx/2d/DrawTargetCairo.cpp b/gfx/2d/DrawTargetCairo.cpp
@@ -2148,8 +2148,7 @@ bool BorrowedXlibDrawable::Init(DrawTarget* aDT) {
   mDrawable = X11None;
 
 #  ifdef CAIRO_HAS_XLIB_SURFACE
-  if (aDT->GetBackendType() != BackendType::CAIRO || aDT->IsDualDrawTarget() ||
-      aDT->IsTiledDrawTarget()) {
+  if (aDT->GetBackendType() != BackendType::CAIRO || aDT->IsTiledDrawTarget()) {
     return false;
   }
 

diff --git a/gfx/2d/DrawTargetD2D1.cpp b/gfx/2d/DrawTargetD2D1.cpp
@@ -11,7 +11,6 @@
 #include "FilterNodeSoftware.h"
 #include "GradientStopsD2D.h"
 #include "SourceSurfaceD2D1.h"
-#include "SourceSurfaceDual.h"
 #include "ConicGradientEffectD2D1.h"
 #include "RadialGradientEffectD2D1.h"
 
@@ -2222,21 +2221,6 @@ already_AddRefed<ID2D1Image> DrawTargetD2D1::GetImageForSurface(
       image = surf->GetImage();
       AddDependencyOnSource(surf);
     } break;
-    case SurfaceType::DUAL_DT: {
-      // Sometimes we have a dual drawtarget but the underlying targets
-      // are d2d surfaces. Let's not readback and reupload in those cases.
-      SourceSurfaceDual* dualSurface =
-          static_cast<SourceSurfaceDual*>(surface.get());
-      SourceSurface* first = dualSurface->GetFirstSurface();
-      if (first->GetType() == SurfaceType::D2D1_1_IMAGE) {
-        MOZ_ASSERT(dualSurface->SameSurfaceTypes());
-        SourceSurfaceD2D1* d2dSurface = static_cast<SourceSurfaceD2D1*>(first);
-        image = d2dSurface->GetImage();
-        AddDependencyOnSource(d2dSurface);
-        break;
-      }
-      // Otherwise fall through
-    }
     default: {
       RefPtr<DataSourceSurface> dataSurf = surface->GetDataSurface();
       if (!dataSurf) {

diff --git a/gfx/2d/DrawTargetDual.cpp b/gfx/2d/DrawTargetDual.cpp