OLD | NEW |
1 // Copyright 2013 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/aura/compositor_resize_lock.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/root_window.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(aura::RootWindow* root_window, | 14 CompositorResizeLock::CompositorResizeLock(aura::RootWindow* root_window, |
15 const gfx::Size new_size, | 15 const gfx::Size new_size, |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 | 56 |
57 void CompositorResizeLock::CancelLock() { | 57 void CompositorResizeLock::CancelLock() { |
58 if (cancelled_) | 58 if (cancelled_) |
59 return; | 59 return; |
60 cancelled_ = true; | 60 cancelled_ = true; |
61 UnlockCompositor(); | 61 UnlockCompositor(); |
62 root_window_->ReleasePointerMoves(); | 62 root_window_->ReleasePointerMoves(); |
63 } | 63 } |
64 | 64 |
65 } // namespace content | 65 } // namespace content |
OLD | NEW |