| 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/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 Loading... |
| 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)); |
| 284 } | 287 } |
| 285 | 288 |
| 286 void Compositor::updateAnimations(double frameBeginTime) { | 289 void Compositor::updateAnimations(double frameBeginTime) { |
| 287 } | 290 } |
| 288 | 291 |
| 289 void Compositor::layout() { | 292 void Compositor::layout() { |
| 290 if (root_layer_) | 293 if (root_layer_) |
| 291 root_layer_->SendDamagedRects(); | 294 root_layer_->SendDamagedRects(); |
| 292 } | 295 } |
| 293 | 296 |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 | 370 |
| 368 COMPOSITOR_EXPORT void DisableTestCompositor() { | 371 COMPOSITOR_EXPORT void DisableTestCompositor() { |
| 369 test_compositor_enabled = false; | 372 test_compositor_enabled = false; |
| 370 } | 373 } |
| 371 | 374 |
| 372 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() { | 375 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() { |
| 373 return test_compositor_enabled; | 376 return test_compositor_enabled; |
| 374 } | 377 } |
| 375 | 378 |
| 376 } // namespace ui | 379 } // namespace ui |
| OLD | NEW |