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

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: Add current_fling_target_ 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
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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 gvr::Sizei render_size_vrshell_; 194 gvr::Sizei render_size_vrshell_;
195 195
196 std::unique_ptr<VrShellRenderer> vr_shell_renderer_; 196 std::unique_ptr<VrShellRenderer> vr_shell_renderer_;
197 197
198 bool touch_pending_ = false; 198 bool touch_pending_ = false;
199 gvr::Quatf controller_quat_; 199 gvr::Quatf controller_quat_;
200 200
201 gvr::Vec3f target_point_; 201 gvr::Vec3f target_point_;
202 const ContentRectangle* target_element_ = nullptr; 202 const ContentRectangle* target_element_ = nullptr;
203 InputTarget current_input_target_ = InputTarget::NONE; 203 InputTarget current_input_target_ = InputTarget::NONE;
204 InputTarget current_scroll_target = InputTarget::NONE; 204 InputTarget current_scroll_target_ = InputTarget::NONE;
205 InputTarget current_fling_target_ = InputTarget::NONE;
205 int ui_tex_css_width_ = 0; 206 int ui_tex_css_width_ = 0;
206 int ui_tex_css_height_ = 0; 207 int ui_tex_css_height_ = 0;
207 int content_tex_css_width_ = 0; 208 int content_tex_css_width_ = 0;
208 int content_tex_css_height_ = 0; 209 int content_tex_css_height_ = 0;
209 gvr::Sizei content_tex_physical_size_ = {0, 0}; 210 gvr::Sizei content_tex_physical_size_ = {0, 0};
210 gvr::Sizei webvr_surface_size_ = {0, 0}; 211 gvr::Sizei webvr_surface_size_ = {0, 0};
211 gvr::Sizei ui_tex_physical_size_ = {0, 0}; 212 gvr::Sizei ui_tex_physical_size_ = {0, 0};
212 213
213 std::vector<gvr::Mat4f> webvr_head_pose_; 214 std::vector<gvr::Mat4f> webvr_head_pose_;
214 bool web_vr_mode_; 215 bool web_vr_mode_;
(...skipping 25 matching lines...) Expand all
240 gvr::Vec3f controller_start_direction_; 241 gvr::Vec3f controller_start_direction_;
241 242
242 base::WeakPtrFactory<VrShellGl> weak_ptr_factory_; 243 base::WeakPtrFactory<VrShellGl> weak_ptr_factory_;
243 244
244 DISALLOW_COPY_AND_ASSIGN(VrShellGl); 245 DISALLOW_COPY_AND_ASSIGN(VrShellGl);
245 }; 246 };
246 247
247 } // namespace vr_shell 248 } // namespace vr_shell
248 249
249 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ 250 #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') | chrome/browser/android/vr_shell/vr_shell_gl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698