OLD | NEW |
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/aura/root_window.h" | 5 #include "ui/aura/root_window.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
553 defer_draw_scheduling_ = true; | 553 defer_draw_scheduling_ = true; |
554 MessageLoop::current()->PostTask( | 554 MessageLoop::current()->PostTask( |
555 FROM_HERE, | 555 FROM_HERE, |
556 base::Bind(&RootWindow::Draw, schedule_paint_factory_.GetWeakPtr())); | 556 base::Bind(&RootWindow::Draw, schedule_paint_factory_.GetWeakPtr())); |
557 } | 557 } |
558 } | 558 } |
559 | 559 |
560 //////////////////////////////////////////////////////////////////////////////// | 560 //////////////////////////////////////////////////////////////////////////////// |
561 // RootWindow, ui::CompositorObserver implementation: | 561 // RootWindow, ui::CompositorObserver implementation: |
562 | 562 |
| 563 void RootWindow::OnCompositingDidCommit(ui::Compositor*) { |
| 564 } |
| 565 |
563 void RootWindow::OnCompositingWillStart(ui::Compositor*) { | 566 void RootWindow::OnCompositingWillStart(ui::Compositor*) { |
564 } | 567 } |
565 | 568 |
566 void RootWindow::OnCompositingStarted(ui::Compositor*) { | 569 void RootWindow::OnCompositingStarted(ui::Compositor*) { |
567 } | 570 } |
568 | 571 |
569 void RootWindow::OnCompositingEnded(ui::Compositor*) { | 572 void RootWindow::OnCompositingEnded(ui::Compositor*) { |
570 TRACE_EVENT_ASYNC_END0("ui", "RootWindow::Draw", | 573 TRACE_EVENT_ASYNC_END0("ui", "RootWindow::Draw", |
571 compositor_->last_ended_frame()); | 574 compositor_->last_ended_frame()); |
572 waiting_on_compositing_end_ = false; | 575 waiting_on_compositing_end_ = false; |
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
980 void RootWindow::UnlockCompositor() { | 983 void RootWindow::UnlockCompositor() { |
981 DCHECK(compositor_lock_); | 984 DCHECK(compositor_lock_); |
982 compositor_lock_ = NULL; | 985 compositor_lock_ = NULL; |
983 if (draw_on_compositor_unlock_) { | 986 if (draw_on_compositor_unlock_) { |
984 draw_on_compositor_unlock_ = false; | 987 draw_on_compositor_unlock_ = false; |
985 ScheduleDraw(); | 988 ScheduleDraw(); |
986 } | 989 } |
987 } | 990 } |
988 | 991 |
989 } // namespace aura | 992 } // namespace aura |
OLD | NEW |