Bug 1318780 - Split CompositorVsyncScheduleOwner to its own file r=kats

--HG-- rename : gfx/layers/ipc/CompositorVsyncScheduler.h => gfx/layers/ipc/CompositorVsyncSchedulerOwner.h
sailfishos · May 27, 2020 · a2433c8 · a2433c8
1 parent 0806405
commit a2433c8
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 8 deletions.
diff --git a/gfx/layers/ipc/CompositorBridgeParent.cpp b/gfx/layers/ipc/CompositorBridgeParent.cpp
@@ -41,6 +41,7 @@
 #include "mozilla/layers/CompositorOGL.h"  // for CompositorOGL
 #include "mozilla/layers/CompositorThread.h"
 #include "mozilla/layers/CompositorTypes.h"
+#include "mozilla/layers/CompositorVsyncScheduler.h"
 #include "mozilla/layers/CrossProcessCompositorBridgeParent.h"
 #include "mozilla/layers/FrameUniformityData.h"
 #include "mozilla/layers/ImageBridgeParent.h"

diff --git a/gfx/layers/ipc/CompositorBridgeParent.h b/gfx/layers/ipc/CompositorBridgeParent.h
@@ -28,7 +28,7 @@
 #include "mozilla/ipc/ProtocolUtils.h"
 #include "mozilla/ipc/SharedMemory.h"
 #include "mozilla/layers/CompositorController.h"
-#include "mozilla/layers/CompositorVsyncScheduler.h"
+#include "mozilla/layers/CompositorVsyncSchedulerOwner.h"
 #include "mozilla/layers/GeckoContentController.h"
 #include "mozilla/layers/ISurfaceAllocator.h" // for ShmemAllocator
 #include "mozilla/layers/LayersMessages.h"  // for TargetConfig
@@ -63,6 +63,7 @@ class APZCTreeManagerParent;
 class AsyncCompositionManager;
 class Compositor;
 class CompositorBridgeParent;
+class CompositorVsyncScheduler;
 class LayerManagerComposite;
 class LayerTransactionParent;
 class PAPZParent;

diff --git a/gfx/layers/ipc/CompositorVsyncScheduler.cpp b/gfx/layers/ipc/CompositorVsyncScheduler.cpp
@@ -21,6 +21,7 @@
 #include "mozilla/gfx/Point.h"          // for IntSize
 #include "mozilla/gfx/Rect.h"           // for IntSize
 #include "mozilla/layers/CompositorThread.h"
+#include "mozilla/layers/CompositorVsyncSchedulerOwner.h"
 #include "mozilla/mozalloc.h"           // for operator new, etc
 #include "nsCOMPtr.h"                   // for already_AddRefed
 #include "nsDebug.h"                    // for NS_ASSERTION, etc

diff --git a/gfx/layers/ipc/CompositorVsyncScheduler.h b/gfx/layers/ipc/CompositorVsyncScheduler.h
@@ -32,13 +32,7 @@ class DrawTarget;
 
 namespace layers {
 
-class CompositorVsyncSchedulerOwner
-{
-public:
-  virtual bool IsPendingComposite() = 0;
-  virtual void FinishPendingComposite() = 0;
-  virtual void CompositeToTarget(gfx::DrawTarget* aTarget, const gfx::IntRect* aRect = nullptr) = 0;
-};
+class CompositorVsyncSchedulerOwner;
 
 /**
  * Manages the vsync (de)registration and tracking on behalf of the

diff --git a/gfx/layers/ipc/CompositorVsyncSchedulerOwner.h b/gfx/layers/ipc/CompositorVsyncSchedulerOwner.h
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set sw=4 ts=8 et 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_layers_CompositorVsyncSchedulerOwner_h
+#define mozilla_layers_CompositorVsyncSchedulerOwner_h
+
+namespace mozilla {
+
+namespace gfx {
+class DrawTarget;
+} // namespace gfx
+
+namespace layers {
+
+class CompositorVsyncSchedulerOwner
+{
+public:
+  virtual bool IsPendingComposite() = 0;
+  virtual void FinishPendingComposite() = 0;
+  virtual void CompositeToTarget(gfx::DrawTarget* aTarget, const gfx::IntRect* aRect = nullptr) = 0;
+};
+
+} // namespace layers
+} // namespace mozilla
+
+#endif // mozilla_layers_CompositorVsyncSchedulerOwner_h
diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
@@ -169,6 +169,7 @@ EXPORTS.mozilla.layers += [
     'ipc/CompositorBridgeParent.h',
     'ipc/CompositorThread.h',
     'ipc/CompositorVsyncScheduler.h',
+    'ipc/CompositorVsyncSchedulerOwner.h',
     'ipc/CrossProcessCompositorBridgeParent.h',
     'ipc/GonkNativeHandle.h',
     'ipc/GonkNativeHandleUtils.h',