OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "platform/graphics/OffscreenCanvasPlaceholder.h" | 5 #include "platform/graphics/OffscreenCanvasPlaceholder.h" |
6 | 6 |
7 #include "platform/CrossThreadFunctional.h" | 7 #include "platform/CrossThreadFunctional.h" |
8 #include "platform/WebTaskRunner.h" | 8 #include "platform/WebTaskRunner.h" |
9 #include "platform/graphics/Image.h" | 9 #include "platform/graphics/Image.h" |
10 #include "platform/graphics/OffscreenCanvasFrameDispatcher.h" | 10 #include "platform/graphics/OffscreenCanvasFrameDispatcher.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 placeholderRegistry().remove(m_placeholderId); | 60 placeholderRegistry().remove(m_placeholderId); |
61 m_placeholderId = kNoPlaceholderId; | 61 m_placeholderId = kNoPlaceholderId; |
62 } | 62 } |
63 | 63 |
64 void OffscreenCanvasPlaceholder::setPlaceholderFrame( | 64 void OffscreenCanvasPlaceholder::setPlaceholderFrame( |
65 RefPtr<Image> newFrame, | 65 RefPtr<Image> newFrame, |
66 WeakPtr<OffscreenCanvasFrameDispatcher> dispatcher, | 66 WeakPtr<OffscreenCanvasFrameDispatcher> dispatcher, |
67 std::unique_ptr<WebTaskRunner> taskRunner, | 67 std::unique_ptr<WebTaskRunner> taskRunner, |
68 unsigned resourceId) { | 68 unsigned resourceId) { |
69 DCHECK(isPlaceholderRegistered()); | 69 DCHECK(isPlaceholderRegistered()); |
| 70 DCHECK(newFrame); |
70 releasePlaceholderFrame(); | 71 releasePlaceholderFrame(); |
71 m_placeholderFrame = std::move(newFrame); | 72 m_placeholderFrame = std::move(newFrame); |
72 m_frameDispatcher = std::move(dispatcher); | 73 m_frameDispatcher = std::move(dispatcher); |
73 m_frameDispatcherTaskRunner = std::move(taskRunner); | 74 m_frameDispatcherTaskRunner = std::move(taskRunner); |
74 m_placeholderFrameResourceId = resourceId; | 75 m_placeholderFrameResourceId = resourceId; |
| 76 setSize(m_placeholderFrame->size()); |
75 } | 77 } |
76 | 78 |
77 void OffscreenCanvasPlaceholder::releasePlaceholderFrame() { | 79 void OffscreenCanvasPlaceholder::releasePlaceholderFrame() { |
78 DCHECK(isPlaceholderRegistered()); | 80 DCHECK(isPlaceholderRegistered()); |
79 if (m_placeholderFrame) { | 81 if (m_placeholderFrame) { |
80 m_placeholderFrame->transfer(); | 82 m_placeholderFrame->transfer(); |
81 m_frameDispatcherTaskRunner->postTask( | 83 m_frameDispatcherTaskRunner->postTask( |
82 BLINK_FROM_HERE, | 84 BLINK_FROM_HERE, |
83 crossThreadBind(releaseFrameToDispatcher, std::move(m_frameDispatcher), | 85 crossThreadBind(releaseFrameToDispatcher, std::move(m_frameDispatcher), |
84 std::move(m_placeholderFrame), | 86 std::move(m_placeholderFrame), |
85 m_placeholderFrameResourceId)); | 87 m_placeholderFrameResourceId)); |
86 } | 88 } |
87 } | 89 } |
88 | 90 |
89 } // blink | 91 } // blink |
OLD | NEW |