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

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

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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 (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 MEDIA_GPU_RENDERING_HELPER_H_ 5 #ifndef MEDIA_GPU_RENDERING_HELPER_H_
6 #define MEDIA_GPU_RENDERING_HELPER_H_ 6 #define MEDIA_GPU_RENDERING_HELPER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 11 matching lines...) Expand all
22 #include "ui/gfx/geometry/rect.h" 22 #include "ui/gfx/geometry/rect.h"
23 #include "ui/gfx/geometry/size.h" 23 #include "ui/gfx/geometry/size.h"
24 #include "ui/gl/gl_bindings.h" 24 #include "ui/gl/gl_bindings.h"
25 #include "ui/gl/gl_context.h" 25 #include "ui/gl/gl_context.h"
26 #include "ui/gl/gl_surface.h" 26 #include "ui/gl/gl_surface.h"
27 27
28 namespace base { 28 namespace base {
29 class WaitableEvent; 29 class WaitableEvent;
30 } 30 }
31 31
32 namespace ui { 32 namespace display {
33 class DisplayConfigurator; 33 class DisplayConfigurator;
34 } 34 }
35 35
36 namespace media { 36 namespace media {
37 37
38 class VideoFrameTexture : public base::RefCounted<VideoFrameTexture> { 38 class VideoFrameTexture : public base::RefCounted<VideoFrameTexture> {
39 public: 39 public:
40 uint32_t texture_id() const { return texture_id_; } 40 uint32_t texture_id() const { return texture_id_; }
41 uint32_t texture_target() const { return texture_target_; } 41 uint32_t texture_target() const { return texture_target_; }
42 42
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 190 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
191 191
192 scoped_refptr<gl::GLContext> gl_context_; 192 scoped_refptr<gl::GLContext> gl_context_;
193 scoped_refptr<gl::GLSurface> gl_surface_; 193 scoped_refptr<gl::GLSurface> gl_surface_;
194 194
195 #if defined(USE_OZONE) 195 #if defined(USE_OZONE)
196 class StubOzoneDelegate; 196 class StubOzoneDelegate;
197 std::unique_ptr<StubOzoneDelegate> platform_window_delegate_; 197 std::unique_ptr<StubOzoneDelegate> platform_window_delegate_;
198 198
199 #if defined(OS_CHROMEOS) 199 #if defined(OS_CHROMEOS)
200 std::unique_ptr<ui::DisplayConfigurator> display_configurator_; 200 std::unique_ptr<display::DisplayConfigurator> display_configurator_;
201 #endif 201 #endif
202 #endif 202 #endif
203 203
204 bool ignore_vsync_; 204 bool ignore_vsync_;
205 205
206 gfx::AcceleratedWidget window_; 206 gfx::AcceleratedWidget window_;
207 207
208 gfx::Size screen_size_; 208 gfx::Size screen_size_;
209 209
210 std::vector<RenderedVideo> videos_; 210 std::vector<RenderedVideo> videos_;
(...skipping 10 matching lines...) Expand all
221 base::CancelableClosure render_task_; 221 base::CancelableClosure render_task_;
222 base::TimeTicks vsync_timebase_; 222 base::TimeTicks vsync_timebase_;
223 base::TimeDelta vsync_interval_; 223 base::TimeDelta vsync_interval_;
224 224
225 DISALLOW_COPY_AND_ASSIGN(RenderingHelper); 225 DISALLOW_COPY_AND_ASSIGN(RenderingHelper);
226 }; 226 };
227 227
228 } // namespace media 228 } // namespace media
229 229
230 #endif // MEDIA_GPU_RENDERING_HELPER_H_ 230 #endif // MEDIA_GPU_RENDERING_HELPER_H_
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_desktop_controller_aura.cc ('k') | media/gpu/rendering_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698