Merge branch 'master' into Pale_Moon-release

# Conflicts:
#	application/palemoon/components/feeds/FeedWriter.js
#	application/palemoon/config/version.txt
#	security/manager/ssl/nsSTSPreloadList.errors
#	security/manager/ssl/nsSTSPreloadList.inc

1 files changed, 0 insertions, 59 deletions

diff --git a/gfx/vr/ipc/VRLayerParent.cpp b/gfx/vr/ipc/VRLayerParent.cpp
deleted file mode 100644
index 6c6980817..000000000
--- a/gfx/vr/ipc/VRLayerParent.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; 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/. */
-
-
-#include "VRLayerParent.h"
-#include "mozilla/Unused.h"
-
-namespace mozilla {
-namespace gfx {
-
-VRLayerParent::VRLayerParent(uint32_t aVRDisplayID, const Rect& aLeftEyeRect, const Rect& aRightEyeRect)
-  : mIPCOpen(true)
-  , mVRDisplayID(aVRDisplayID)
-  , mLeftEyeRect(aLeftEyeRect)
-  , mRightEyeRect(aRightEyeRect)
-{
-  MOZ_COUNT_CTOR(VRLayerParent);
-}
-
-VRLayerParent::~VRLayerParent()
-{
-  MOZ_COUNT_DTOR(VRLayerParent);
-}
-
-bool
-VRLayerParent::RecvDestroy()
-{
-  Destroy();
-  return true;
-}
-
-void
-VRLayerParent::ActorDestroy(ActorDestroyReason aWhy)
-{
-  mIPCOpen = false;
-}
-
-void
-VRLayerParent::Destroy()
-{
-  if (mIPCOpen) {
-    Unused << PVRLayerParent::Send__delete__(this);
-  }
-}
-
-bool
-VRLayerParent::RecvSubmitFrame(PTextureParent* texture)
-{
-  VRManager* vm = VRManager::Get();
-  vm->SubmitFrame(this, texture, mLeftEyeRect, mRightEyeRect);
-
-  return true;
-}
-
-
-} // namespace gfx
-} // namespace mozilla