Merge branch 'master' into Sync-weave

1 files changed, 0 insertions, 61 deletions

diff --git a/gfx/vr/VRDisplayClient.h b/gfx/vr/VRDisplayClient.h
deleted file mode 100644
index 0cdd24682..000000000
--- a/gfx/vr/VRDisplayClient.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * 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_VR_DISPLAY_CLIENT_H
-#define GFX_VR_DISPLAY_CLIENT_H
-
-#include "nsIScreen.h"
-#include "nsCOMPtr.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/dom/VRDisplayBinding.h"
-
-#include "gfxVR.h"
-
-namespace mozilla {
-namespace gfx {
-class VRDisplayPresentation;
-class VRManagerChild;
-
-class VRDisplayClient
-{
-public:
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VRDisplayClient)
-
-  explicit VRDisplayClient(const VRDisplayInfo& aDisplayInfo);
-
-  void UpdateDisplayInfo(const VRDisplayInfo& aDisplayInfo);
-
-  const VRDisplayInfo& GetDisplayInfo() const { return mDisplayInfo; }
-  virtual VRHMDSensorState GetSensorState();
-  virtual VRHMDSensorState GetImmediateSensorState();
-
-  virtual void ZeroSensor();
-
-  already_AddRefed<VRDisplayPresentation> BeginPresentation(const nsTArray<dom::VRLayer>& aLayers);
-  void PresentationDestroyed();
-
-  void NotifyVsync();
-  void NotifyVRVsync();
-
-  bool GetIsConnected() const;
-  bool GetIsPresenting() const;
-
-  void NotifyDisconnected();
-
-protected:
-  virtual ~VRDisplayClient();
-
-  VRDisplayInfo mDisplayInfo;
-
-  bool bLastEventWasPresenting;
-
-  TimeStamp mLastVSyncTime;
-  int mPresentationCount;
-};
-
-} // namespace gfx
-} // namespace mozilla
-
-#endif /* GFX_VR_DISPLAY_CLIENT_H */