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

Side by Side Diff: ui/compositor/compositor.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/window.cc ('k') | ui/compositor/compositor_observer.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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/threading/thread_restrictions.h" 8 #include "base/threading/thread_restrictions.h"
9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h" 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFloatPoin t.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFloatPoin t.h"
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 DCHECK(swap_posted_); 274 DCHECK(swap_posted_);
275 swap_posted_ = false; 275 swap_posted_ = false;
276 NotifyEnd(); 276 NotifyEnd();
277 } 277 }
278 278
279 void Compositor::OnSwapBuffersAborted() { 279 void Compositor::OnSwapBuffersAborted() {
280 if (swap_posted_) { 280 if (swap_posted_) {
281 swap_posted_ = false; 281 swap_posted_ = false;
282 NotifyEnd(); 282 NotifyEnd();
283 } 283 }
284 FOR_EACH_OBSERVER(CompositorObserver,
285 observer_list_,
286 OnCompositingAborted(this));
287 } 284 }
288 285
289 void Compositor::updateAnimations(double frameBeginTime) { 286 void Compositor::updateAnimations(double frameBeginTime) {
290 } 287 }
291 288
292 void Compositor::layout() { 289 void Compositor::layout() {
293 if (root_layer_) 290 if (root_layer_)
294 root_layer_->SendDamagedRects(); 291 root_layer_->SendDamagedRects();
295 } 292 }
296 293
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 367
371 COMPOSITOR_EXPORT void DisableTestCompositor() { 368 COMPOSITOR_EXPORT void DisableTestCompositor() {
372 test_compositor_enabled = false; 369 test_compositor_enabled = false;
373 } 370 }
374 371
375 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() { 372 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
376 return test_compositor_enabled; 373 return test_compositor_enabled;
377 } 374 }
378 375
379 } // namespace ui 376 } // namespace ui
OLDNEW
« no previous file with comments | « ui/aura/window.cc ('k') | ui/compositor/compositor_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698