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

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

Issue 13844021: Move compositor thread input handling logic into content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « ui/compositor/compositor.h ('k') | webkit/renderer/compositor_bindings/compositor_bindings.gyp » ('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"
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 if (root_layer_) 708 if (root_layer_)
709 root_layer_->SendDamagedRects(); 709 root_layer_->SendDamagedRects();
710 disable_schedule_composite_ = false; 710 disable_schedule_composite_ = false;
711 } 711 }
712 712
713 scoped_ptr<cc::OutputSurface> Compositor::CreateOutputSurface() { 713 scoped_ptr<cc::OutputSurface> Compositor::CreateOutputSurface() {
714 return make_scoped_ptr( 714 return make_scoped_ptr(
715 ContextFactory::GetInstance()->CreateOutputSurface(this)); 715 ContextFactory::GetInstance()->CreateOutputSurface(this));
716 } 716 }
717 717
718 scoped_ptr<cc::InputHandlerClient> Compositor::CreateInputHandlerClient() {
719 return scoped_ptr<cc::InputHandlerClient>();
720 }
721
722 void Compositor::DidCommit() { 718 void Compositor::DidCommit() {
723 DCHECK(!IsLocked()); 719 DCHECK(!IsLocked());
724 FOR_EACH_OBSERVER(CompositorObserver, 720 FOR_EACH_OBSERVER(CompositorObserver,
725 observer_list_, 721 observer_list_,
726 OnCompositingDidCommit(this)); 722 OnCompositingDidCommit(this));
727 } 723 }
728 724
729 void Compositor::DidCommitAndDrawFrame() { 725 void Compositor::DidCommitAndDrawFrame() {
730 base::TimeTicks start_time = base::TimeTicks::Now(); 726 base::TimeTicks start_time = base::TimeTicks::Now();
731 FOR_EACH_OBSERVER(CompositorObserver, 727 FOR_EACH_OBSERVER(CompositorObserver,
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
819 COMPOSITOR_EXPORT void DisableTestCompositor() { 815 COMPOSITOR_EXPORT void DisableTestCompositor() {
820 ResetImplicitFactory(); 816 ResetImplicitFactory();
821 g_test_compositor_enabled = false; 817 g_test_compositor_enabled = false;
822 } 818 }
823 819
824 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() { 820 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
825 return g_test_compositor_enabled; 821 return g_test_compositor_enabled;
826 } 822 }
827 823
828 } // namespace ui 824 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/compositor.h ('k') | webkit/renderer/compositor_bindings/compositor_bindings.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698