device/vr/android/gvr/gvr_device.cc - Issue 2598093002: Update GVR to 1.10.0

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: device/vr/android/gvr/gvr_device.cc

Issue 2598093002: Update GVR to 1.10.0 (Closed)

Patch Set: Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "device/vr/android/gvr/gvr_device.h"	5 #include "device/vr/android/gvr/gvr_device.h"

6	6

7 #include <math.h>	7 #include <math.h>

8 #include <algorithm>	8 #include <algorithm>

9	9

10 #include "base/time/time.h"	10 #include "base/time/time.h"

11 #include "base/trace_event/trace_event.h"	11 #include "base/trace_event/trace_event.h"

12 #include "device/vr/android/gvr/gvr_delegate.h"	12 #include "device/vr/android/gvr/gvr_delegate.h"

13 #include "device/vr/android/gvr/gvr_device_provider.h"	13 #include "device/vr/android/gvr/gvr_device_provider.h"

14 #include "device/vr/vr_device_manager.h"	14 #include "device/vr/vr_device_manager.h"

15 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr.h"	15 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/ gvr.h"

16 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_ty pes.h"	16 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/ gvr_types.h"

17 #include "ui/gfx/transform.h"	17 #include "ui/gfx/transform.h"

18 #include "ui/gfx/transform_util.h"	18 #include "ui/gfx/transform_util.h"

19	19

20 namespace device {	20 namespace device {

21	21

22 namespace {	22 namespace {

23	23

24 static const uint64_t kPredictionTimeWithoutVsyncNanos = 50000000;	24 static const uint64_t kPredictionTimeWithoutVsyncNanos = 50000000;

25	25

26 } // namespace	26 } // namespace

(...skipping 245 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
272 }	272 }

273	273

274 gvr::GvrApi* GvrDevice::GetGvrApi() {	274 gvr::GvrApi* GvrDevice::GetGvrApi() {

275 if (!delegate_)	275 if (!delegate_)

276 return nullptr;	276 return nullptr;

277	277

278 return delegate_->gvr_api();	278 return delegate_->gvr_api();

279 }	279 }

280	280

281 } // namespace device	281 } // namespace device

OLD	NEW

« no previous file with comments | « device/vr/android/gvr/gvr_delegate.h ('k') | device/vr/android/gvr/gvr_device_provider.cc » ('j') | no next file with comments »