Merge mozilla-central to mozilla-inbound. CLOSED TREE
authorarthur.iakab <aiakab@mozilla.com>
Wed, 26 Sep 2018 17:05:21 +0300
changeset 494077 034e167ff3ab0ea12160ccaba68c6cfaa32745b8
parent 494076 178218e7b57ca24ceb7f6aca3674611012fa6b2c (current diff)
parent 494025 48cc597db296ea5234a96321e2ce0c52094cc254 (diff)
child 494078 315f887ca1849f694be69f79f72ea5453e0fc702
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to mozilla-inbound. CLOSED TREE
--- a/gfx/vr/gfxVROculus.cpp
+++ b/gfx/vr/gfxVROculus.cpp
@@ -2025,21 +2025,17 @@ VRSystemManagerOculus::ScanForController
       switch (activeControllerArray[i]) {
         case ovrControllerType::ovrControllerType_LTouch:
           hand = GamepadHand::Left;
           break;
         case ovrControllerType::ovrControllerType_RTouch:
           hand = GamepadHand::Right;
           break;
         default:
-<<<<<<< working copy
           continue;
-=======
-          break;
->>>>>>> merge rev
       }
       RefPtr<VRControllerOculus> oculusController = new VRControllerOculus(hand,
                                                       mDisplay->GetDisplayInfo().GetDisplayID());
       mOculusController.AppendElement(oculusController);
 
       // Not already present, add it.
       AddGamepad(oculusController->GetControllerInfo());