Changeset 238600 in webkit
- Timestamp:
- Nov 27, 2018 7:05:16 PM (5 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r238597 r238600 1 2018-11-27 Simon Fraser <simon.fraser@apple.com> 2 3 Fix the mis-spelled "m_clienstWaitingForAsyncDecoding" 4 https://bugs.webkit.org/show_bug.cgi?id=192060 5 6 Reviewed by Wenson Hsieh. 7 8 Fix the mis-spelling of "m_clienstWaitingForAsyncDecoding". 9 10 * loader/cache/CachedImage.cpp: 11 (WebCore::CachedImage::didRemoveClient): 12 (WebCore::CachedImage::isClientWaitingForAsyncDecoding const): 13 (WebCore::CachedImage::addClientWaitingForAsyncDecoding): 14 (WebCore::CachedImage::removeAllClientsWaitingForAsyncDecoding): 15 (WebCore::CachedImage::allClientsRemoved): 16 (WebCore::CachedImage::clear): 17 (WebCore::CachedImage::createImage): 18 (WebCore::CachedImage::imageFrameAvailable): 19 * loader/cache/CachedImage.h: 20 1 21 2018-11-27 Mark Lam <mark.lam@apple.com> 2 22 -
trunk/Source/WebCore/loader/cache/CachedImage.cpp
r237266 r238600 131 131 132 132 m_pendingContainerContextRequests.remove(&static_cast<CachedImageClient&>(client)); 133 m_clien stWaitingForAsyncDecoding.remove(&static_cast<CachedImageClient&>(client));133 m_clientsWaitingForAsyncDecoding.remove(&static_cast<CachedImageClient&>(client)); 134 134 135 135 if (m_svgImageCache) … … 143 143 bool CachedImage::isClientWaitingForAsyncDecoding(CachedImageClient& client) const 144 144 { 145 return m_clien stWaitingForAsyncDecoding.contains(&client);145 return m_clientsWaitingForAsyncDecoding.contains(&client); 146 146 } 147 147 … … 149 149 { 150 150 ASSERT(client.resourceClientType() == CachedImageClient::expectedType()); 151 if (m_clien stWaitingForAsyncDecoding.contains(&client))151 if (m_clientsWaitingForAsyncDecoding.contains(&client)) 152 152 return; 153 153 if (!m_clients.contains(&client)) { … … 155 155 // renderer uses the style of the <body> element, see RenderView::rendererForRootBackground(). 156 156 // In this case, the client we are asked to add is the root box renderer. Since we can't add 157 // a client to m_clien stWaitingForAsyncDecoding unless it is one of the m_clients, we are going157 // a client to m_clientsWaitingForAsyncDecoding unless it is one of the m_clients, we are going 158 158 // to cancel the repaint optimization we do in CachedImage::imageFrameAvailable() by adding 159 // all the m_clients to m_clien stWaitingForAsyncDecoding.159 // all the m_clients to m_clientsWaitingForAsyncDecoding. 160 160 CachedResourceClientWalker<CachedImageClient> walker(m_clients); 161 161 while (auto* client = walker.next()) 162 m_clien stWaitingForAsyncDecoding.add(client);162 m_clientsWaitingForAsyncDecoding.add(client); 163 163 } else 164 m_clien stWaitingForAsyncDecoding.add(&client);164 m_clientsWaitingForAsyncDecoding.add(&client); 165 165 } 166 166 167 167 void CachedImage::removeAllClientsWaitingForAsyncDecoding() 168 168 { 169 if (m_clien stWaitingForAsyncDecoding.isEmpty() || !hasImage() || !is<BitmapImage>(image()))169 if (m_clientsWaitingForAsyncDecoding.isEmpty() || !hasImage() || !is<BitmapImage>(image())) 170 170 return; 171 171 downcast<BitmapImage>(image())->stopAsyncDecodingQueue(); 172 for (auto* client : m_clien stWaitingForAsyncDecoding)172 for (auto* client : m_clientsWaitingForAsyncDecoding) 173 173 client->imageChanged(this); 174 m_clien stWaitingForAsyncDecoding.clear();174 m_clientsWaitingForAsyncDecoding.clear(); 175 175 } 176 176 … … 197 197 { 198 198 m_pendingContainerContextRequests.clear(); 199 m_clien stWaitingForAsyncDecoding.clear();199 m_clientsWaitingForAsyncDecoding.clear(); 200 200 if (m_image && !errorOccurred()) 201 201 m_image->resetAnimation(); … … 339 339 clearImage(); 340 340 m_pendingContainerContextRequests.clear(); 341 m_clien stWaitingForAsyncDecoding.clear();341 m_clientsWaitingForAsyncDecoding.clear(); 342 342 setEncodedSize(0); 343 343 } … … 363 363 } 364 364 m_pendingContainerContextRequests.clear(); 365 m_clien stWaitingForAsyncDecoding.clear();365 m_clientsWaitingForAsyncDecoding.clear(); 366 366 } 367 367 } … … 628 628 while (CachedImageClient* client = clientWalker.next()) { 629 629 // All the clients of animated images have to be notified. The new frame has to be drawn in all of them. 630 if (animatingState == ImageAnimatingState::No && !m_clien stWaitingForAsyncDecoding.contains(client))630 if (animatingState == ImageAnimatingState::No && !m_clientsWaitingForAsyncDecoding.contains(client)) 631 631 continue; 632 632 if (client->imageFrameAvailable(*this, animatingState, changeRect) == VisibleInViewportState::Yes) … … 638 638 639 639 if (decodingStatus != DecodingStatus::Partial) 640 m_clien stWaitingForAsyncDecoding.clear();640 m_clientsWaitingForAsyncDecoding.clear(); 641 641 } 642 642 -
trunk/Source/WebCore/loader/cache/CachedImage.h
r233872 r238600 173 173 ContainerContextRequests m_pendingContainerContextRequests; 174 174 175 HashSet<CachedImageClient*> m_clien stWaitingForAsyncDecoding;175 HashSet<CachedImageClient*> m_clientsWaitingForAsyncDecoding; 176 176 177 177 RefPtr<CachedImageObserver> m_imageObserver;
Note: See TracChangeset
for help on using the changeset viewer.