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

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

Issue 11413123: cc: switch to new WebLayerTreeViewClient API for requesting font atlas (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixing aura, added show check Created 8 years 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 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/font_atlas.h"
12 #include "cc/layer_tree_host_client.h" 13 #include "cc/layer_tree_host_client.h"
13 #include "ui/compositor/compositor_export.h" 14 #include "ui/compositor/compositor_export.h"
14 #include "ui/gfx/native_widget_types.h" 15 #include "ui/gfx/native_widget_types.h"
15 #include "ui/gfx/size.h" 16 #include "ui/gfx/size.h"
16 #include "ui/gfx/transform.h" 17 #include "ui/gfx/transform.h"
17 #include "ui/gl/gl_share_group.h" 18 #include "ui/gl/gl_share_group.h"
18 19
19 class SkBitmap; 20 class SkBitmap;
20 21
21 namespace cc { 22 namespace cc {
23 class FontAtlas;
22 class Layer; 24 class Layer;
23 class LayerTreeHost; 25 class LayerTreeHost;
24 } 26 }
25 27
26 namespace gfx { 28 namespace gfx {
27 class GLContext; 29 class GLContext;
28 class GLSurface; 30 class GLSurface;
29 class GLShareGroup; 31 class GLShareGroup;
30 class Point; 32 class Point;
31 class Rect; 33 class Rect;
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 float pageScale) OVERRIDE; 253 float pageScale) OVERRIDE;
252 virtual scoped_ptr<WebKit::WebCompositorOutputSurface> 254 virtual scoped_ptr<WebKit::WebCompositorOutputSurface>
253 createOutputSurface() OVERRIDE; 255 createOutputSurface() OVERRIDE;
254 virtual void didRecreateOutputSurface(bool success) OVERRIDE; 256 virtual void didRecreateOutputSurface(bool success) OVERRIDE;
255 virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE; 257 virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE;
256 virtual void willCommit() OVERRIDE; 258 virtual void willCommit() OVERRIDE;
257 virtual void didCommit() OVERRIDE; 259 virtual void didCommit() OVERRIDE;
258 virtual void didCommitAndDrawFrame() OVERRIDE; 260 virtual void didCommitAndDrawFrame() OVERRIDE;
259 virtual void didCompleteSwapBuffers() OVERRIDE; 261 virtual void didCompleteSwapBuffers() OVERRIDE;
260 virtual void scheduleComposite() OVERRIDE; 262 virtual void scheduleComposite() OVERRIDE;
263 virtual scoped_ptr<cc::FontAtlas> createFontAtlas() OVERRIDE;
261 264
262 265
263 int last_started_frame() { return last_started_frame_; } 266 int last_started_frame() { return last_started_frame_; }
264 int last_ended_frame() { return last_ended_frame_; } 267 int last_ended_frame() { return last_ended_frame_; }
265 268
266 bool IsLocked() { return compositor_lock_ != NULL; } 269 bool IsLocked() { return compositor_lock_ != NULL; }
267 270
268 private: 271 private:
269 friend class base::RefCounted<Compositor>; 272 friend class base::RefCounted<Compositor>;
270 friend class CompositorLock; 273 friend class CompositorLock;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 bool disable_schedule_composite_; 306 bool disable_schedule_composite_;
304 307
305 CompositorLock* compositor_lock_; 308 CompositorLock* compositor_lock_;
306 309
307 DISALLOW_COPY_AND_ASSIGN(Compositor); 310 DISALLOW_COPY_AND_ASSIGN(Compositor);
308 }; 311 };
309 312
310 } // namespace ui 313 } // namespace ui
311 314
312 #endif // UI_COMPOSITOR_COMPOSITOR_H_ 315 #endif // UI_COMPOSITOR_COMPOSITOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698