| 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 "core/loader/resource/ImageResourceContent.h" | 5 #include "core/loader/resource/ImageResourceContent.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "core/loader/resource/ImageResource.h" | 9 #include "core/loader/resource/ImageResource.h" |
| 10 #include "core/loader/resource/ImageResourceInfo.h" | 10 #include "core/loader/resource/ImageResourceInfo.h" |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 } | 95 } |
| 96 | 96 |
| 97 void ImageResourceContent::markObserverFinished( | 97 void ImageResourceContent::markObserverFinished( |
| 98 ImageResourceObserver* observer) { | 98 ImageResourceObserver* observer) { |
| 99 ProhibitAddRemoveObserverInScope prohibitAddRemoveObserverInScope(this); | 99 ProhibitAddRemoveObserverInScope prohibitAddRemoveObserverInScope(this); |
| 100 | 100 |
| 101 auto it = m_observers.find(observer); | 101 auto it = m_observers.find(observer); |
| 102 if (it == m_observers.end()) | 102 if (it == m_observers.end()) |
| 103 return; | 103 return; |
| 104 m_observers.remove(it); | 104 m_observers.remove(it); |
| 105 m_finishedObservers.add(observer); | 105 m_finishedObservers.insert(observer); |
| 106 } | 106 } |
| 107 | 107 |
| 108 void ImageResourceContent::addObserver(ImageResourceObserver* observer) { | 108 void ImageResourceContent::addObserver(ImageResourceObserver* observer) { |
| 109 CHECK(!m_isAddRemoveObserverProhibited); | 109 CHECK(!m_isAddRemoveObserverProhibited); |
| 110 | 110 |
| 111 m_info->willAddClientOrObserver(); | 111 m_info->willAddClientOrObserver(); |
| 112 | 112 |
| 113 { | 113 { |
| 114 ProhibitAddRemoveObserverInScope prohibitAddRemoveObserverInScope(this); | 114 ProhibitAddRemoveObserverInScope prohibitAddRemoveObserverInScope(this); |
| 115 m_observers.add(observer); | 115 m_observers.insert(observer); |
| 116 } | 116 } |
| 117 | 117 |
| 118 if (m_info->isCacheValidator()) | 118 if (m_info->isCacheValidator()) |
| 119 return; | 119 return; |
| 120 | 120 |
| 121 if (m_image && !m_image->isNull()) { | 121 if (m_image && !m_image->isNull()) { |
| 122 observer->imageChanged(this); | 122 observer->imageChanged(this); |
| 123 } | 123 } |
| 124 | 124 |
| 125 if (isLoaded() && m_observers.contains(observer) && | 125 if (isLoaded() && m_observers.contains(observer) && |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 508 | 508 |
| 509 const ResourceResponse& ImageResourceContent::response() const { | 509 const ResourceResponse& ImageResourceContent::response() const { |
| 510 return m_info->response(); | 510 return m_info->response(); |
| 511 } | 511 } |
| 512 | 512 |
| 513 const ResourceError& ImageResourceContent::resourceError() const { | 513 const ResourceError& ImageResourceContent::resourceError() const { |
| 514 return m_info->resourceError(); | 514 return m_info->resourceError(); |
| 515 } | 515 } |
| 516 | 516 |
| 517 } // namespace blink | 517 } // namespace blink |
| OLD | NEW |