| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/browser/renderer_host/compositor_resize_lock_aura.h" | 5 #include "content/browser/renderer_host/compositor_resize_lock_aura.h" |
| 6 | 6 |
| 7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
| 8 #include "content/public/browser/browser_thread.h" | 8 #include "content/public/browser/browser_thread.h" |
| 9 #include "ui/aura/root_window.h" | 9 #include "ui/aura/window_event_dispatcher.h" |
| 10 #include "ui/compositor/compositor.h" | 10 #include "ui/compositor/compositor.h" |
| 11 | 11 |
| 12 namespace content { | 12 namespace content { |
| 13 | 13 |
| 14 CompositorResizeLock::CompositorResizeLock( | 14 CompositorResizeLock::CompositorResizeLock( |
| 15 aura::WindowEventDispatcher* dispatcher, | 15 aura::WindowEventDispatcher* dispatcher, |
| 16 const gfx::Size new_size, | 16 const gfx::Size new_size, |
| 17 bool defer_compositor_lock, | 17 bool defer_compositor_lock, |
| 18 const base::TimeDelta& timeout) | 18 const base::TimeDelta& timeout) |
| 19 : ResizeLock(new_size, defer_compositor_lock), | 19 : ResizeLock(new_size, defer_compositor_lock), |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 | 57 |
| 58 void CompositorResizeLock::CancelLock() { | 58 void CompositorResizeLock::CancelLock() { |
| 59 if (cancelled_) | 59 if (cancelled_) |
| 60 return; | 60 return; |
| 61 cancelled_ = true; | 61 cancelled_ = true; |
| 62 UnlockCompositor(); | 62 UnlockCompositor(); |
| 63 dispatcher_->ReleasePointerMoves(); | 63 dispatcher_->ReleasePointerMoves(); |
| 64 } | 64 } |
| 65 | 65 |
| 66 } // namespace content | 66 } // namespace content |
| OLD | NEW |