Merge mozilla-central to autoland CLOSED TREE
authorarthur.iakab <aiakab@mozilla.com>
Wed, 26 Sep 2018 17:03:48 +0300
changeset 494040 635cf6a1a1fb06972b632e0b962edb022a48ea55
parent 494039 fa1e16a898259cb2181a5871dd45001df84ddb64 (current diff)
parent 494025 48cc597db296ea5234a96321e2ce0c52094cc254 (diff)
child 494041 f41fce9645d1360b46f38c9109b48f55f47828b0
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 autoland 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());