| Index: chrome/browser/android/vr_shell/vr_shell_gl.h
|
| diff --git a/chrome/browser/android/vr_shell/vr_shell_gl.h b/chrome/browser/android/vr_shell/vr_shell_gl.h
|
| index 4ae52c4921d67b90a18517b4ac1645897ef74280..2d0fc126a752f329d5fb1e0cd70469ca178248c6 100644
|
| --- a/chrome/browser/android/vr_shell/vr_shell_gl.h
|
| +++ b/chrome/browser/android/vr_shell/vr_shell_gl.h
|
| @@ -22,10 +22,6 @@
|
| #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_types.h"
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| -namespace base {
|
| -class ListValue;
|
| -}
|
| -
|
| namespace blink {
|
| class WebInputEvent;
|
| }
|
| @@ -72,7 +68,8 @@ class VrShellGl : public device::mojom::VRVSyncProvider {
|
| scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner,
|
| gvr_context* gvr_api,
|
| bool initially_web_vr,
|
| - bool reprojected_rendering);
|
| + bool reprojected_rendering,
|
| + UiScene* scene);
|
| ~VrShellGl() override;
|
|
|
| void Initialize();
|
| @@ -98,8 +95,6 @@ class VrShellGl : public device::mojom::VRVSyncProvider {
|
| const gvr::Rectf& right_bounds,
|
| const gvr::Sizei& source_size);
|
|
|
| - void UpdateScene(std::unique_ptr<base::ListValue> commands);
|
| -
|
| void UpdateVSyncInterval(int64_t timebase_nanos, double interval_seconds);
|
|
|
| void OnRequest(device::mojom::VRVSyncProviderRequest request);
|
| @@ -161,7 +156,7 @@ class VrShellGl : public device::mojom::VRVSyncProvider {
|
| // samplerExternalOES texture data for WebVR content image.
|
| int webvr_texture_id_ = 0;
|
|
|
| - std::unique_ptr<UiScene> scene_;
|
| + UiScene* scene_;
|
|
|
| scoped_refptr<gl::GLSurface> surface_;
|
| scoped_refptr<gl::GLContext> context_;
|
|
|