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

Side by Side Diff: ui/aura/root_window.cc

Issue 10454107: Revert 139494 - ash: Improved window maximize/restore animations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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/aura/root_window.h ('k') | ui/aura/window.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/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 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 if (draw_on_compositing_end_) { 595 if (draw_on_compositing_end_) {
596 draw_on_compositing_end_ = false; 596 draw_on_compositing_end_ = false;
597 597
598 // Call ScheduleDraw() instead of Draw() in order to allow other 598 // Call ScheduleDraw() instead of Draw() in order to allow other
599 // ui::CompositorObservers to be notified before starting another 599 // ui::CompositorObservers to be notified before starting another
600 // draw cycle. 600 // draw cycle.
601 ScheduleDraw(); 601 ScheduleDraw();
602 } 602 }
603 } 603 }
604 604
605 void RootWindow::OnCompositingAborted(ui::Compositor*) {
606 }
607
608 //////////////////////////////////////////////////////////////////////////////// 605 ////////////////////////////////////////////////////////////////////////////////
609 // RootWindow, ui::LayerDelegate implementation: 606 // RootWindow, ui::LayerDelegate implementation:
610 607
611 void RootWindow::OnDeviceScaleFactorChanged( 608 void RootWindow::OnDeviceScaleFactorChanged(
612 float device_scale_factor) { 609 float device_scale_factor) {
613 if (cursor_shown_) 610 if (cursor_shown_)
614 ShowCursor(false); 611 ShowCursor(false);
615 host_->OnDeviceScaleFactorChanged(device_scale_factor); 612 host_->OnDeviceScaleFactorChanged(device_scale_factor);
616 Window::OnDeviceScaleFactorChanged(device_scale_factor); 613 Window::OnDeviceScaleFactorChanged(device_scale_factor);
617 if (cursor_shown_) 614 if (cursor_shown_)
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
1029 void RootWindow::UnlockCompositor() { 1026 void RootWindow::UnlockCompositor() {
1030 DCHECK(compositor_lock_); 1027 DCHECK(compositor_lock_);
1031 compositor_lock_ = NULL; 1028 compositor_lock_ = NULL;
1032 if (draw_on_compositor_unlock_) { 1029 if (draw_on_compositor_unlock_) {
1033 draw_on_compositor_unlock_ = false; 1030 draw_on_compositor_unlock_ = false;
1034 ScheduleDraw(); 1031 ScheduleDraw();
1035 } 1032 }
1036 } 1033 }
1037 1034
1038 } // namespace aura 1035 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/root_window.h ('k') | ui/aura/window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698