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

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

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 | « ui/compositor/compositor.h ('k') | webkit/compositor_bindings/web_layer_tree_view_impl.h » ('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 #include "ui/compositor/compositor.h" 5 #include "ui/compositor/compositor.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <deque> 8 #include <deque>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
15 #include "base/threading/thread_restrictions.h" 15 #include "base/threading/thread_restrictions.h"
16 #include "cc/font_atlas.h"
17 #include "cc/input_handler.h" 16 #include "cc/input_handler.h"
18 #include "cc/layer.h" 17 #include "cc/layer.h"
19 #include "cc/layer_tree_host.h" 18 #include "cc/layer_tree_host.h"
20 #include "cc/output_surface.h" 19 #include "cc/output_surface.h"
21 #include "cc/thread_impl.h" 20 #include "cc/thread_impl.h"
22 #include "third_party/skia/include/core/SkBitmap.h" 21 #include "third_party/skia/include/core/SkBitmap.h"
23 #include "ui/compositor/compositor_observer.h" 22 #include "ui/compositor/compositor_observer.h"
24 #include "ui/compositor/compositor_switches.h" 23 #include "ui/compositor/compositor_switches.h"
25 #include "ui/compositor/dip_util.h" 24 #include "ui/compositor/dip_util.h"
26 #include "ui/compositor/layer.h" 25 #include "ui/compositor/layer.h"
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 void Compositor::didCompleteSwapBuffers() { 543 void Compositor::didCompleteSwapBuffers() {
545 DCHECK(g_compositor_thread); 544 DCHECK(g_compositor_thread);
546 NotifyEnd(); 545 NotifyEnd();
547 } 546 }
548 547
549 void Compositor::scheduleComposite() { 548 void Compositor::scheduleComposite() {
550 if (!disable_schedule_composite_) 549 if (!disable_schedule_composite_)
551 ScheduleDraw(); 550 ScheduleDraw();
552 } 551 }
553 552
554 scoped_ptr<cc::FontAtlas> Compositor::createFontAtlas() {
555 return scoped_ptr<cc::FontAtlas>();
556 }
557
558 scoped_refptr<CompositorLock> Compositor::GetCompositorLock() { 553 scoped_refptr<CompositorLock> Compositor::GetCompositorLock() {
559 if (!compositor_lock_) { 554 if (!compositor_lock_) {
560 compositor_lock_ = new CompositorLock(this); 555 compositor_lock_ = new CompositorLock(this);
561 if (g_compositor_thread) 556 if (g_compositor_thread)
562 host_->setDeferCommits(true); 557 host_->setDeferCommits(true);
563 FOR_EACH_OBSERVER(CompositorObserver, 558 FOR_EACH_OBSERVER(CompositorObserver,
564 observer_list_, 559 observer_list_,
565 OnCompositingLockStateChanged(this)); 560 OnCompositingLockStateChanged(this));
566 } 561 }
567 return compositor_lock_; 562 return compositor_lock_;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 599
605 COMPOSITOR_EXPORT void DisableTestCompositor() { 600 COMPOSITOR_EXPORT void DisableTestCompositor() {
606 g_test_compositor_enabled = false; 601 g_test_compositor_enabled = false;
607 } 602 }
608 603
609 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() { 604 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
610 return g_test_compositor_enabled; 605 return g_test_compositor_enabled;
611 } 606 }
612 607
613 } // namespace ui 608 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/compositor.h ('k') | webkit/compositor_bindings/web_layer_tree_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698