Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(936)

Side by Side Diff: chrome/browser/android/vr_shell/vr_shell_gl.h

Issue 2808723003: VR: Sending the fling event to the right target (Closed)
Patch Set: rebase Created 3 years, 8 months 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
« no previous file with comments | « no previous file | chrome/browser/android/vr_shell/vr_shell_gl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_GL_H_ 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_
6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <queue> 9 #include <queue>
10 #include <utility> 10 #include <utility>
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 gfx::Size render_size_vrshell_; 193 gfx::Size render_size_vrshell_;
194 194
195 std::unique_ptr<VrShellRenderer> vr_shell_renderer_; 195 std::unique_ptr<VrShellRenderer> vr_shell_renderer_;
196 196
197 bool touch_pending_ = false; 197 bool touch_pending_ = false;
198 vr::Quatf controller_quat_; 198 vr::Quatf controller_quat_;
199 199
200 gfx::Point3F target_point_; 200 gfx::Point3F target_point_;
201 const UiElement* target_element_ = nullptr; 201 const UiElement* target_element_ = nullptr;
202 InputTarget current_input_target_ = InputTarget::NONE; 202 InputTarget current_input_target_ = InputTarget::NONE;
203 InputTarget current_scroll_target = InputTarget::NONE; 203 InputTarget current_scroll_target_ = InputTarget::NONE;
204 InputTarget current_fling_target_ = InputTarget::NONE;
204 int ui_tex_css_width_ = 0; 205 int ui_tex_css_width_ = 0;
205 int ui_tex_css_height_ = 0; 206 int ui_tex_css_height_ = 0;
206 int content_tex_css_width_ = 0; 207 int content_tex_css_width_ = 0;
207 int content_tex_css_height_ = 0; 208 int content_tex_css_height_ = 0;
208 gfx::Size content_tex_physical_size_ = {0, 0}; 209 gfx::Size content_tex_physical_size_ = {0, 0};
209 gfx::Size webvr_surface_size_ = {0, 0}; 210 gfx::Size webvr_surface_size_ = {0, 0};
210 gfx::Size ui_tex_physical_size_ = {0, 0}; 211 gfx::Size ui_tex_physical_size_ = {0, 0};
211 212
212 std::vector<vr::Mat4f> webvr_head_pose_; 213 std::vector<vr::Mat4f> webvr_head_pose_;
213 bool web_vr_mode_; 214 bool web_vr_mode_;
(...skipping 27 matching lines...) Expand all
241 std::unique_ptr<FPSMeter> fps_meter_; 242 std::unique_ptr<FPSMeter> fps_meter_;
242 243
243 base::WeakPtrFactory<VrShellGl> weak_ptr_factory_; 244 base::WeakPtrFactory<VrShellGl> weak_ptr_factory_;
244 245
245 DISALLOW_COPY_AND_ASSIGN(VrShellGl); 246 DISALLOW_COPY_AND_ASSIGN(VrShellGl);
246 }; 247 };
247 248
248 } // namespace vr_shell 249 } // namespace vr_shell
249 250
250 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ 251 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/android/vr_shell/vr_shell_gl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698