| 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 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 void DrawElements(const gvr::Mat4f& render_matrix, | 132 void DrawElements(const gvr::Mat4f& render_matrix, |
| 133 const std::vector<const ContentRectangle*>& elements); | 133 const std::vector<const ContentRectangle*>& elements); |
| 134 void DrawCursor(const gvr::Mat4f& render_matrix); | 134 void DrawCursor(const gvr::Mat4f& render_matrix); |
| 135 void DrawWebVr(); | 135 void DrawWebVr(); |
| 136 | 136 |
| 137 void UpdateController(const gvr::Vec3f& forward_vector); | 137 void UpdateController(const gvr::Vec3f& forward_vector); |
| 138 void SendEventsToTarget(VrInputManager* input_target, | 138 void SendEventsToTarget(VrInputManager* input_target, |
| 139 int pixel_x, | 139 int pixel_x, |
| 140 int pixel_y); | 140 int pixel_y); |
| 141 | 141 |
| 142 void SetShowingOverscrollGlow(bool showing_glow); |
| 142 void HandleQueuedTasks(); | 143 void HandleQueuedTasks(); |
| 143 | 144 |
| 144 // content::WebContentsObserver implementation. | 145 // content::WebContentsObserver implementation. |
| 145 void RenderViewHostChanged(content::RenderViewHost* old_host, | 146 void RenderViewHostChanged(content::RenderViewHost* old_host, |
| 146 content::RenderViewHost* new_host) override; | 147 content::RenderViewHost* new_host) override; |
| 147 | 148 |
| 148 // samplerExternalOES texture data for UI content image. | 149 // samplerExternalOES texture data for UI content image. |
| 149 jint ui_texture_id_ = 0; | 150 jint ui_texture_id_ = 0; |
| 150 // samplerExternalOES texture data for main content image. | 151 // samplerExternalOES texture data for main content image. |
| 151 jint content_texture_id_ = 0; | 152 jint content_texture_id_ = 0; |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 base::WeakPtrFactory<VrShell> weak_ptr_factory_; | 216 base::WeakPtrFactory<VrShell> weak_ptr_factory_; |
| 216 | 217 |
| 217 DISALLOW_COPY_AND_ASSIGN(VrShell); | 218 DISALLOW_COPY_AND_ASSIGN(VrShell); |
| 218 }; | 219 }; |
| 219 | 220 |
| 220 bool RegisterVrShell(JNIEnv* env); | 221 bool RegisterVrShell(JNIEnv* env); |
| 221 | 222 |
| 222 } // namespace vr_shell | 223 } // namespace vr_shell |
| 223 | 224 |
| 224 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 225 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| OLD | NEW |