| 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 ImageObserver::trace(visitor); | 94 ImageObserver::trace(visitor); |
| 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.erase(it); |
| 105 m_finishedObservers.insert(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); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 129 } | 129 } |
| 130 } | 130 } |
| 131 | 131 |
| 132 void ImageResourceContent::removeObserver(ImageResourceObserver* observer) { | 132 void ImageResourceContent::removeObserver(ImageResourceObserver* observer) { |
| 133 DCHECK(observer); | 133 DCHECK(observer); |
| 134 CHECK(!m_isAddRemoveObserverProhibited); | 134 CHECK(!m_isAddRemoveObserverProhibited); |
| 135 ProhibitAddRemoveObserverInScope prohibitAddRemoveObserverInScope(this); | 135 ProhibitAddRemoveObserverInScope prohibitAddRemoveObserverInScope(this); |
| 136 | 136 |
| 137 auto it = m_observers.find(observer); | 137 auto it = m_observers.find(observer); |
| 138 if (it != m_observers.end()) { | 138 if (it != m_observers.end()) { |
| 139 m_observers.remove(it); | 139 m_observers.erase(it); |
| 140 } else { | 140 } else { |
| 141 it = m_finishedObservers.find(observer); | 141 it = m_finishedObservers.find(observer); |
| 142 DCHECK(it != m_finishedObservers.end()); | 142 DCHECK(it != m_finishedObservers.end()); |
| 143 m_finishedObservers.remove(it); | 143 m_finishedObservers.erase(it); |
| 144 } | 144 } |
| 145 m_info->didRemoveClientOrObserver(); | 145 m_info->didRemoveClientOrObserver(); |
| 146 } | 146 } |
| 147 | 147 |
| 148 static void priorityFromObserver(const ImageResourceObserver* observer, | 148 static void priorityFromObserver(const ImageResourceObserver* observer, |
| 149 ResourcePriority& priority) { | 149 ResourcePriority& priority) { |
| 150 ResourcePriority nextPriority = observer->computeResourcePriority(); | 150 ResourcePriority nextPriority = observer->computeResourcePriority(); |
| 151 if (nextPriority.visibility == ResourcePriority::NotVisible) | 151 if (nextPriority.visibility == ResourcePriority::NotVisible) |
| 152 return; | 152 return; |
| 153 priority.visibility = ResourcePriority::Visible; | 153 priority.visibility = ResourcePriority::Visible; |
| (...skipping 354 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 |