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

Side by Side Diff: ui/compositor/compositor.h

Issue 12212099: cc: remove FontAtlas (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase to 182043 Created 7 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
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | ui/compositor/compositor.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 UI_COMPOSITOR_COMPOSITOR_H_ 5 #ifndef UI_COMPOSITOR_COMPOSITOR_H_
6 #define UI_COMPOSITOR_COMPOSITOR_H_ 6 #define UI_COMPOSITOR_COMPOSITOR_H_
7 7
8 #include "base/hash_tables.h" 8 #include "base/hash_tables.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/observer_list.h" 11 #include "base/observer_list.h"
12 #include "cc/layer_tree_host_client.h" 12 #include "cc/layer_tree_host_client.h"
13 #include "ui/compositor/compositor_export.h" 13 #include "ui/compositor/compositor_export.h"
14 #include "ui/gfx/native_widget_types.h" 14 #include "ui/gfx/native_widget_types.h"
15 #include "ui/gfx/size.h" 15 #include "ui/gfx/size.h"
16 #include "ui/gfx/transform.h" 16 #include "ui/gfx/transform.h"
17 #include "ui/gl/gl_share_group.h" 17 #include "ui/gl/gl_share_group.h"
18 18
19 class SkBitmap; 19 class SkBitmap;
20 20
21 namespace cc { 21 namespace cc {
22 class FontAtlas;
23 class Layer; 22 class Layer;
24 class LayerTreeHost; 23 class LayerTreeHost;
25 } 24 }
26 25
27 namespace gfx { 26 namespace gfx {
28 class GLContext; 27 class GLContext;
29 class GLSurface; 28 class GLSurface;
30 class GLShareGroup; 29 class GLShareGroup;
31 class Point; 30 class Point;
32 class Rect; 31 class Rect;
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 float pageScale) OVERRIDE; 259 float pageScale) OVERRIDE;
261 virtual scoped_ptr<cc::OutputSurface> 260 virtual scoped_ptr<cc::OutputSurface>
262 createOutputSurface() OVERRIDE; 261 createOutputSurface() OVERRIDE;
263 virtual void didRecreateOutputSurface(bool success) OVERRIDE; 262 virtual void didRecreateOutputSurface(bool success) OVERRIDE;
264 virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE; 263 virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE;
265 virtual void willCommit() OVERRIDE; 264 virtual void willCommit() OVERRIDE;
266 virtual void didCommit() OVERRIDE; 265 virtual void didCommit() OVERRIDE;
267 virtual void didCommitAndDrawFrame() OVERRIDE; 266 virtual void didCommitAndDrawFrame() OVERRIDE;
268 virtual void didCompleteSwapBuffers() OVERRIDE; 267 virtual void didCompleteSwapBuffers() OVERRIDE;
269 virtual void scheduleComposite() OVERRIDE; 268 virtual void scheduleComposite() OVERRIDE;
270 virtual scoped_ptr<cc::FontAtlas> createFontAtlas() OVERRIDE;
271 269
272 270
273 int last_started_frame() { return last_started_frame_; } 271 int last_started_frame() { return last_started_frame_; }
274 int last_ended_frame() { return last_ended_frame_; } 272 int last_ended_frame() { return last_ended_frame_; }
275 273
276 bool IsLocked() { return compositor_lock_ != NULL; } 274 bool IsLocked() { return compositor_lock_ != NULL; }
277 275
278 private: 276 private:
279 friend class base::RefCounted<Compositor>; 277 friend class base::RefCounted<Compositor>;
280 friend class CompositorLock; 278 friend class CompositorLock;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 bool disable_schedule_composite_; 311 bool disable_schedule_composite_;
314 312
315 CompositorLock* compositor_lock_; 313 CompositorLock* compositor_lock_;
316 314
317 DISALLOW_COPY_AND_ASSIGN(Compositor); 315 DISALLOW_COPY_AND_ASSIGN(Compositor);
318 }; 316 };
319 317
320 } // namespace ui 318 } // namespace ui
321 319
322 #endif // UI_COMPOSITOR_COMPOSITOR_H_ 320 #endif // UI_COMPOSITOR_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698