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

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

Issue 2688813004: Enable scrolling of UI elements. (Closed)
Patch Set: Moved switch, uses MakeUnique Created 3 years, 10 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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 gvr::Sizei render_size_headlocked_; 159 gvr::Sizei render_size_headlocked_;
160 160
161 std::unique_ptr<VrShellRenderer> vr_shell_renderer_; 161 std::unique_ptr<VrShellRenderer> vr_shell_renderer_;
162 162
163 bool touch_pending_ = false; 163 bool touch_pending_ = false;
164 gvr::Quatf controller_quat_; 164 gvr::Quatf controller_quat_;
165 165
166 gvr::Vec3f target_point_; 166 gvr::Vec3f target_point_;
167 const ContentRectangle* target_element_ = nullptr; 167 const ContentRectangle* target_element_ = nullptr;
168 InputTarget current_input_target_ = InputTarget::NONE; 168 InputTarget current_input_target_ = InputTarget::NONE;
169 InputTarget current_scroll_target = InputTarget::NONE;
169 int ui_tex_css_width_ = 0; 170 int ui_tex_css_width_ = 0;
170 int ui_tex_css_height_ = 0; 171 int ui_tex_css_height_ = 0;
171 int content_tex_css_width_ = 0; 172 int content_tex_css_width_ = 0;
172 int content_tex_css_height_ = 0; 173 int content_tex_css_height_ = 0;
173 gvr::Sizei content_tex_physical_size_ = {0, 0}; 174 gvr::Sizei content_tex_physical_size_ = {0, 0};
174 gvr::Sizei ui_tex_physical_size_ = {0, 0}; 175 gvr::Sizei ui_tex_physical_size_ = {0, 0};
175 176
176 std::vector<gvr::Mat4f> webvr_head_pose_; 177 std::vector<gvr::Mat4f> webvr_head_pose_;
177 int webvr_texture_id_ = 0; 178 int webvr_texture_id_ = 0;
178 bool web_vr_mode_; 179 bool web_vr_mode_;
(...skipping 22 matching lines...) Expand all
201 uint16_t last_frame_index_ = -1; 202 uint16_t last_frame_index_ = -1;
202 203
203 base::WeakPtrFactory<VrShellGl> weak_ptr_factory_; 204 base::WeakPtrFactory<VrShellGl> weak_ptr_factory_;
204 205
205 DISALLOW_COPY_AND_ASSIGN(VrShellGl); 206 DISALLOW_COPY_AND_ASSIGN(VrShellGl);
206 }; 207 };
207 208
208 } // namespace vr_shell 209 } // namespace vr_shell
209 210
210 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ 211 #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