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.h" | 5 #include "content/browser/renderer_host/compositor_resize_lock.h" |
6 | 6 |
7 #include "base/trace_event/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/compositor/compositor.h" | 9 #include "ui/compositor/compositor.h" |
10 | 10 |
(...skipping 23 matching lines...) Expand all Loading... |
34 compositor_lock_ = client_->GetCompositorLock(this); | 34 compositor_lock_ = client_->GetCompositorLock(this); |
35 return true; | 35 return true; |
36 } | 36 } |
37 | 37 |
38 void CompositorResizeLock::UnlockCompositor() { | 38 void CompositorResizeLock::UnlockCompositor() { |
39 unlocked_ = true; | 39 unlocked_ = true; |
40 compositor_lock_ = nullptr; | 40 compositor_lock_ = nullptr; |
41 } | 41 } |
42 | 42 |
43 void CompositorResizeLock::CompositorLockTimedOut() { | 43 void CompositorResizeLock::CompositorLockTimedOut() { |
| 44 timed_out_ = true; |
44 UnlockCompositor(); | 45 UnlockCompositor(); |
45 if (client_) { | 46 if (client_) { |
46 client_->CompositorResizeLockEnded(); | 47 client_->CompositorResizeLockEnded(); |
47 client_ = nullptr; | 48 client_ = nullptr; |
48 } | 49 } |
49 } | 50 } |
50 | 51 |
51 } // namespace content | 52 } // namespace content |
OLD | NEW |