| 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 void DrawCursor(const gvr::Mat4f& render_matrix); | 154 void DrawCursor(const gvr::Mat4f& render_matrix); |
| 155 void DrawWebVr(); | 155 void DrawWebVr(); |
| 156 bool WebVrPoseByteIsValid(int pose_index_byte); | 156 bool WebVrPoseByteIsValid(int pose_index_byte); |
| 157 | 157 |
| 158 void UpdateController(const gvr::Vec3f& forward_vector); | 158 void UpdateController(const gvr::Vec3f& forward_vector); |
| 159 void SendEventsToTarget(InputTarget input_target, int pixel_x, int pixel_y); | 159 void SendEventsToTarget(InputTarget input_target, int pixel_x, int pixel_y); |
| 160 // This function should only be called from the GL thread. | 160 // This function should only be called from the GL thread. |
| 161 void SendGesture(InputTarget input_target, | 161 void SendGesture(InputTarget input_target, |
| 162 std::unique_ptr<blink::WebInputEvent> event); | 162 std::unique_ptr<blink::WebInputEvent> event); |
| 163 | 163 |
| 164 void SetShowingOverscrollGlow(bool showing_glow); |
| 164 void HandleQueuedTasks(); | 165 void HandleQueuedTasks(); |
| 165 | 166 |
| 166 // content::WebContentsObserver implementation. | 167 // content::WebContentsObserver implementation. |
| 167 void RenderViewHostChanged(content::RenderViewHost* old_host, | 168 void RenderViewHostChanged(content::RenderViewHost* old_host, |
| 168 content::RenderViewHost* new_host) override; | 169 content::RenderViewHost* new_host) override; |
| 169 void MainFrameWasResized(bool width_changed) override; | 170 void MainFrameWasResized(bool width_changed) override; |
| 170 void WebContentsDestroyed() override; | 171 void WebContentsDestroyed() override; |
| 171 | 172 |
| 172 // samplerExternalOES texture data for UI content image. | 173 // samplerExternalOES texture data for UI content image. |
| 173 jint ui_texture_id_ = 0; | 174 jint ui_texture_id_ = 0; |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 base::WeakPtrFactory<VrShell> weak_ptr_factory_; | 243 base::WeakPtrFactory<VrShell> weak_ptr_factory_; |
| 243 | 244 |
| 244 DISALLOW_COPY_AND_ASSIGN(VrShell); | 245 DISALLOW_COPY_AND_ASSIGN(VrShell); |
| 245 }; | 246 }; |
| 246 | 247 |
| 247 bool RegisterVrShell(JNIEnv* env); | 248 bool RegisterVrShell(JNIEnv* env); |
| 248 | 249 |
| 249 } // namespace vr_shell | 250 } // namespace vr_shell |
| 250 | 251 |
| 251 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 252 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| OLD | NEW |