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

Side by Side Diff: content/common/gpu/media/rendering_helper.h

Issue 972153004: Make ui::DisplayConfigurator a singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make a Singleton Created 5 years, 9 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 | « ash/shell.cc ('k') | content/common/gpu/media/rendering_helper.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CONTENT_COMMON_GPU_MEDIA_RENDERING_HELPER_H_ 5 #ifndef CONTENT_COMMON_GPU_MEDIA_RENDERING_HELPER_H_
6 #define CONTENT_COMMON_GPU_MEDIA_RENDERING_HELPER_H_ 6 #define CONTENT_COMMON_GPU_MEDIA_RENDERING_HELPER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <queue> 9 #include <queue>
10 #include <vector> 10 #include <vector>
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 base::MessageLoop* message_loop_; 186 base::MessageLoop* message_loop_;
187 187
188 scoped_refptr<gfx::GLContext> gl_context_; 188 scoped_refptr<gfx::GLContext> gl_context_;
189 scoped_refptr<gfx::GLSurface> gl_surface_; 189 scoped_refptr<gfx::GLSurface> gl_surface_;
190 190
191 #if defined(USE_OZONE) 191 #if defined(USE_OZONE)
192 class StubOzoneDelegate; 192 class StubOzoneDelegate;
193 scoped_ptr<StubOzoneDelegate> platform_window_delegate_; 193 scoped_ptr<StubOzoneDelegate> platform_window_delegate_;
194 194
195 #if defined(OS_CHROMEOS) 195 #if defined(OS_CHROMEOS)
196 scoped_ptr<ui::DisplayConfigurator> display_configurator_; 196 ui::DisplayConfigurator* display_configurator_;
197 #endif 197 #endif
198 #endif 198 #endif
199 199
200 gfx::AcceleratedWidget window_; 200 gfx::AcceleratedWidget window_;
201 201
202 gfx::Size screen_size_; 202 gfx::Size screen_size_;
203 203
204 std::vector<RenderedVideo> videos_; 204 std::vector<RenderedVideo> videos_;
205 205
206 bool render_as_thumbnails_; 206 bool render_as_thumbnails_;
207 int frame_count_; 207 int frame_count_;
208 GLuint thumbnails_fbo_id_; 208 GLuint thumbnails_fbo_id_;
209 GLuint thumbnails_texture_id_; 209 GLuint thumbnails_texture_id_;
210 gfx::Size thumbnails_fbo_size_; 210 gfx::Size thumbnails_fbo_size_;
211 gfx::Size thumbnail_size_; 211 gfx::Size thumbnail_size_;
212 GLuint program_; 212 GLuint program_;
213 base::TimeDelta frame_duration_; 213 base::TimeDelta frame_duration_;
214 base::TimeTicks scheduled_render_time_; 214 base::TimeTicks scheduled_render_time_;
215 base::CancelableClosure render_task_; 215 base::CancelableClosure render_task_;
216 base::TimeTicks vsync_timebase_; 216 base::TimeTicks vsync_timebase_;
217 base::TimeDelta vsync_interval_; 217 base::TimeDelta vsync_interval_;
218 218
219 DISALLOW_COPY_AND_ASSIGN(RenderingHelper); 219 DISALLOW_COPY_AND_ASSIGN(RenderingHelper);
220 }; 220 };
221 221
222 } // namespace content 222 } // namespace content
223 223
224 #endif // CONTENT_COMMON_GPU_MEDIA_RENDERING_HELPER_H_ 224 #endif // CONTENT_COMMON_GPU_MEDIA_RENDERING_HELPER_H_
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | content/common/gpu/media/rendering_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698