Bug 1735261 - Remove unused LayersHelpers. r=gfx-reviewers,sotaro

Differential Revision: https://phabricator.services.mozilla.com/D128154

gfx/layers/Compositor.cpp

@@ -18,7 +18,6 @@
 #include "GeckoProfiler.h"
 #include "gfx2DGlue.h"
 #include "nsAppRunner.h"
-#include "LayersHelpers.h"
 
 namespace mozilla {
 

gfx/layers/LayersHelpers.cpp

@@ -1,60 +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/. */
-
-#include "LayersHelpers.h"
-
-namespace mozilla {
-namespace layers {
-
-using namespace gfx;
-
-gfx::IntRect ComputeBackdropCopyRect(const gfx::Rect& aRect,
-                                     const gfx::IntRect& aClipRect,
-                                     const gfx::Matrix4x4& aTransform,
-                                     const gfx::IntRect& aRenderTargetRect,
-                                     gfx::Matrix4x4* aOutTransform,
-                                     gfx::Rect* aOutLayerQuad) {
-  // Compute the clip.
-  IntPoint rtOffset = aRenderTargetRect.TopLeft();
-  IntSize rtSize = aRenderTargetRect.Size();
-
-  gfx::IntRect renderBounds(0, 0, rtSize.width, rtSize.height);
-  renderBounds.IntersectRect(renderBounds, aClipRect);
-  renderBounds.MoveBy(rtOffset);
-
-  // Apply the layer transform.
-  RectDouble dest = aTransform.TransformAndClipBounds(
-      RectDouble(aRect.X(), aRect.Y(), aRect.Width(), aRect.Height()),
-      RectDouble(renderBounds.X(), renderBounds.Y(), renderBounds.Width(),
-                 renderBounds.Height()));
-  dest -= rtOffset;
-
-  // Ensure we don't round out to -1, which trips up Direct3D.
-  dest.IntersectRect(dest, RectDouble(0, 0, rtSize.width, rtSize.height));
-
-  if (aOutLayerQuad) {
-    *aOutLayerQuad = Rect(dest.X(), dest.Y(), dest.Width(), dest.Height());
-  }
-
-  // Round out to integer.
-  IntRect result;
-  dest.RoundOut();
-  dest.ToIntRect(&result);
-
-  // Create a transform from adjusted clip space to render target space,
-  // translate it for the backdrop rect, then transform it into the backdrop's
-  // uv-space.
-  Matrix4x4 transform;
-  transform.PostScale(rtSize.width, rtSize.height, 1.0);
-  transform.PostTranslate(-result.X(), -result.Y(), 0.0);
-  transform.PostScale(1 / float(result.Width()), 1 / float(result.Height()),
-                      1.0);
-  *aOutTransform = transform;
-  return result;
-}
-
-}  // namespace layers
-}  // namespace mozilla

gfx/layers/LayersHelpers.h

@@ -1,51 +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 mozilla_gfx_layers_LayersHelpers_h
-#define mozilla_gfx_layers_LayersHelpers_h
-
-#include "mozilla/Maybe.h"
-#include "mozilla/gfx/Rect.h"
-#include "mozilla/gfx/Matrix.h"
-#include "mozilla/gfx/Polygon.h"
-#include "nsRegion.h"
-#include "nsTArray.h"
-
-namespace mozilla {
-namespace layers {
-
-class Layer;
-
-// Compute compositor information for copying the backdrop for a mix-blend
-// operation.
-gfx::IntRect ComputeBackdropCopyRect(const gfx::Rect& aRect,
-                                     const gfx::IntRect& aClipRect,
-                                     const gfx::Matrix4x4& aTransform,
-                                     const gfx::IntRect& aRenderTargetRect,
-                                     gfx::Matrix4x4* aOutTransform,
-                                     gfx::Rect* aOutLayerQuad = nullptr);
-
-// Compute uv-coordinates for a rect inside a texture.
-template <typename T>
-static inline gfx::Rect TextureRectToCoords(const T& aRect,
-                                            const gfx::IntSize& aSize) {
-  return gfx::Rect(
-      float(aRect.X()) / aSize.width, float(aRect.Y()) / aSize.height,
-      float(aRect.Width()) / aSize.width, float(aRect.Height()) / aSize.height);
-}
-
-// This is defined in Compositor.cpp.
-nsTArray<gfx::TexturedTriangle> GenerateTexturedTriangles(
-    const gfx::Polygon& aPolygon, const gfx::Rect& aRect,
-    const gfx::Rect& aTexRect);
-
-// This is defined in ContainerLayerComposite.cpp.
-void TransformLayerGeometry(Layer* aLayer, Maybe<gfx::Polygon>& aGeometry);
-
-}  // namespace layers
-}  // namespace mozilla
-
-#endif  // mozilla_gfx_layers_LayersHelpers_h

gfx/layers/moz.build

@@ -177,7 +177,6 @@ EXPORTS.mozilla.layers += [
     "ipc/VideoBridgeUtils.h",
     "LayerAttributes.h",
     "LayerManager.h",
-    "LayersHelpers.h",
     "LayersTypes.h",
     "MemoryPressureObserver.h",
     "NativeLayer.h",
@@ -393,7 +392,6 @@ UNIFIED_SOURCES += [
     "ipc/VideoBridgeParent.cpp",
     "LayerManager.cpp",
     "Layers.cpp",
-    "LayersHelpers.cpp",
     "LayersTypes.cpp",
     "MemoryPressureObserver.cpp",
     "opengl/CompositingRenderTargetOGL.cpp",