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

Side by Side Diff: ash/wm/window_animations.cc

Issue 161413002: Revert of Read compositor VSync information from platform, when possible (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ash/display/resolution_notification_controller_unittest.cc ('k') | cc/output/output_surface.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 "ash/wm/window_animations.h" 5 #include "ash/wm/window_animations.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <vector> 10 #include <vector>
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 } 279 }
280 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE { 280 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE {
281 } 281 }
282 virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE { 282 virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE {
283 // Triggers OnImplicitAnimationsCompleted() to be called and deletes us. 283 // Triggers OnImplicitAnimationsCompleted() to be called and deletes us.
284 layer_->GetAnimator()->StopAnimating(); 284 layer_->GetAnimator()->StopAnimating();
285 } 285 }
286 virtual void OnCompositingLockStateChanged( 286 virtual void OnCompositingLockStateChanged(
287 ui::Compositor* compositor) OVERRIDE { 287 ui::Compositor* compositor) OVERRIDE {
288 } 288 }
289 virtual void OnUpdateVSyncParameters(ui::Compositor* compositor,
290 base::TimeTicks timebase,
291 base::TimeDelta interval) OVERRIDE {
292 }
289 293
290 // aura::WindowObserver overrides: 294 // aura::WindowObserver overrides:
291 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { 295 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {
292 // Triggers OnImplicitAnimationsCompleted() to be called and deletes us. 296 // Triggers OnImplicitAnimationsCompleted() to be called and deletes us.
293 layer_->GetAnimator()->StopAnimating(); 297 layer_->GetAnimator()->StopAnimating();
294 } 298 }
295 virtual void OnWindowRemovingFromRootWindow(aura::Window* window) OVERRIDE { 299 virtual void OnWindowRemovingFromRootWindow(aura::Window* window) OVERRIDE {
296 layer_->GetAnimator()->StopAnimating(); 300 layer_->GetAnimator()->StopAnimating();
297 } 301 }
298 302
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 } 541 }
538 542
539 // Assume the shelf is overflowed, zoom off to the bottom right of the 543 // Assume the shelf is overflowed, zoom off to the bottom right of the
540 // work area. 544 // work area.
541 gfx::Rect work_area = 545 gfx::Rect work_area =
542 Shell::GetScreen()->GetDisplayNearestWindow(window).work_area(); 546 Shell::GetScreen()->GetDisplayNearestWindow(window).work_area();
543 return gfx::Rect(work_area.right(), work_area.bottom(), 0, 0); 547 return gfx::Rect(work_area.right(), work_area.bottom(), 0, 0);
544 } 548 }
545 549
546 } // namespace ash 550 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/resolution_notification_controller_unittest.cc ('k') | cc/output/output_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698