| 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/trace_event/trace_event.h" |
| 8 #include "content/public/browser/browser_thread.h" | 8 #include "content/public/browser/browser_thread.h" |
| 9 #include "ui/aura/window_event_dispatcher.h" | 9 #include "ui/aura/window_event_dispatcher.h" |
| 10 #include "ui/aura/window_tree_host.h" | 10 #include "ui/aura/window_tree_host.h" |
| 11 #include "ui/compositor/compositor.h" | 11 #include "ui/compositor/compositor.h" |
| 12 | 12 |
| 13 namespace content { | 13 namespace content { |
| 14 | 14 |
| 15 CompositorResizeLock::CompositorResizeLock( | 15 CompositorResizeLock::CompositorResizeLock( |
| 16 aura::WindowTreeHost* host, | 16 aura::WindowTreeHost* host, |
| 17 const gfx::Size new_size, | 17 const gfx::Size new_size, |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 | 58 |
| 59 void CompositorResizeLock::CancelLock() { | 59 void CompositorResizeLock::CancelLock() { |
| 60 if (cancelled_) | 60 if (cancelled_) |
| 61 return; | 61 return; |
| 62 cancelled_ = true; | 62 cancelled_ = true; |
| 63 UnlockCompositor(); | 63 UnlockCompositor(); |
| 64 host_->dispatcher()->ReleasePointerMoves(); | 64 host_->dispatcher()->ReleasePointerMoves(); |
| 65 } | 65 } |
| 66 | 66 |
| 67 } // namespace content | 67 } // namespace content |
| OLD | NEW |