| 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" | |
| 10 #include "platform/graphics/OffscreenCanvasFrameDispatcher.h" | 9 #include "platform/graphics/OffscreenCanvasFrameDispatcher.h" |
| 10 #include "platform/graphics/StaticBitmapImage.h" |
| 11 #include "wtf/HashMap.h" | 11 #include "wtf/HashMap.h" |
| 12 | 12 |
| 13 namespace { | 13 namespace { |
| 14 | 14 |
| 15 typedef HashMap<int, blink::OffscreenCanvasPlaceholder*> PlaceholderIdMap; | 15 typedef HashMap<int, blink::OffscreenCanvasPlaceholder*> PlaceholderIdMap; |
| 16 | 16 |
| 17 PlaceholderIdMap& placeholderRegistry() { | 17 PlaceholderIdMap& placeholderRegistry() { |
| 18 DCHECK(isMainThread()); | 18 DCHECK(isMainThread()); |
| 19 DEFINE_STATIC_LOCAL(PlaceholderIdMap, s_placeholderRegistry, ()); | 19 DEFINE_STATIC_LOCAL(PlaceholderIdMap, s_placeholderRegistry, ()); |
| 20 return s_placeholderRegistry; | 20 return s_placeholderRegistry; |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 | 55 |
| 56 void OffscreenCanvasPlaceholder::unregisterPlaceholder() { | 56 void OffscreenCanvasPlaceholder::unregisterPlaceholder() { |
| 57 if (!isPlaceholderRegistered()) | 57 if (!isPlaceholderRegistered()) |
| 58 return; | 58 return; |
| 59 DCHECK(placeholderRegistry().find(m_placeholderId)->value == this); | 59 DCHECK(placeholderRegistry().find(m_placeholderId)->value == this); |
| 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<StaticBitmapImage> 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 DCHECK(newFrame); |
| 71 releasePlaceholderFrame(); | 71 releasePlaceholderFrame(); |
| 72 m_placeholderFrame = std::move(newFrame); | 72 m_placeholderFrame = std::move(newFrame); |
| 73 m_frameDispatcher = std::move(dispatcher); | 73 m_frameDispatcher = std::move(dispatcher); |
| 74 m_frameDispatcherTaskRunner = std::move(taskRunner); | 74 m_frameDispatcherTaskRunner = std::move(taskRunner); |
| 75 m_placeholderFrameResourceId = resourceId; | 75 m_placeholderFrameResourceId = resourceId; |
| 76 } | 76 } |
| 77 | 77 |
| 78 void OffscreenCanvasPlaceholder::releasePlaceholderFrame() { | 78 void OffscreenCanvasPlaceholder::releasePlaceholderFrame() { |
| 79 DCHECK(isPlaceholderRegistered()); | 79 DCHECK(isPlaceholderRegistered()); |
| 80 if (m_placeholderFrame) { | 80 if (m_placeholderFrame) { |
| 81 m_placeholderFrame->transfer(); | 81 m_placeholderFrame->transfer(); |
| 82 m_frameDispatcherTaskRunner->postTask( | 82 m_frameDispatcherTaskRunner->postTask( |
| 83 BLINK_FROM_HERE, | 83 BLINK_FROM_HERE, |
| 84 crossThreadBind(releaseFrameToDispatcher, std::move(m_frameDispatcher), | 84 crossThreadBind(releaseFrameToDispatcher, std::move(m_frameDispatcher), |
| 85 std::move(m_placeholderFrame), | 85 std::move(m_placeholderFrame), |
| 86 m_placeholderFrameResourceId)); | 86 m_placeholderFrameResourceId)); |
| 87 } | 87 } |
| 88 } | 88 } |
| 89 | 89 |
| 90 } // blink | 90 } // blink |
| OLD | NEW |