Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Side by Side Diff: third_party/WebKit/Source/core/fetch/ImageResource.cpp

Issue 1965323002: Do the things in ImageResource::allClientsAndObserversRemoved() asynchronously Base URL: https://chromium.googlesource.com/chromium/src.git@Loader_asyncCancelInAllClientsAndObRemoved_hoge
Patch Set: Rebase. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 6 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 void ImageResource::destroyDecodedDataIfPossible() 199 void ImageResource::destroyDecodedDataIfPossible()
200 { 200 {
201 if (!hasClientsOrObservers() && !isLoading() && (!m_image || (m_image->hasOn eRef() && m_image->isBitmapImage()))) { 201 if (!hasClientsOrObservers() && !isLoading() && (!m_image || (m_image->hasOn eRef() && m_image->isBitmapImage()))) {
202 m_image = nullptr; 202 m_image = nullptr;
203 setDecodedSize(0); 203 setDecodedSize(0);
204 } else if (m_image && !errorOccurred()) { 204 } else if (m_image && !errorOccurred()) {
205 m_image->destroyDecodedData(true); 205 m_image->destroyDecodedData(true);
206 } 206 }
207 } 207 }
208 208
209 void ImageResource::allClientsAndObserversRemoved() 209 void ImageResource::cancelTimerFired(Timer<Resource>* timer)
210 { 210 {
211 if (m_image && !errorOccurred()) 211 if (m_image && !errorOccurred())
212 m_image->resetAnimation(); 212 m_image->resetAnimation();
213 if (m_multipartParser) 213 if (m_multipartParser)
214 m_multipartParser->cancel(); 214 m_multipartParser->cancel();
215 Resource::allClientsAndObserversRemoved(); 215 Resource::cancelTimerFired(timer);
216 } 216 }
217 217
218 void ImageResource::appendData(const char* data, size_t length) 218 void ImageResource::appendData(const char* data, size_t length)
219 { 219 {
220 if (m_multipartParser) { 220 if (m_multipartParser) {
221 m_multipartParser->appendData(data, length); 221 m_multipartParser->appendData(data, length);
222 } else { 222 } else {
223 Resource::appendData(data, length); 223 Resource::appendData(data, length);
224 updateImage(false); 224 updateImage(false);
225 } 225 }
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 if (response().wasFetchedViaServiceWorker()) 553 if (response().wasFetchedViaServiceWorker())
554 return response().serviceWorkerResponseType() != WebServiceWorkerRespons eTypeOpaque; 554 return response().serviceWorkerResponseType() != WebServiceWorkerRespons eTypeOpaque;
555 if (!getImage()->currentFrameHasSingleSecurityOrigin()) 555 if (!getImage()->currentFrameHasSingleSecurityOrigin())
556 return false; 556 return false;
557 if (passesAccessControlCheck(securityOrigin)) 557 if (passesAccessControlCheck(securityOrigin))
558 return true; 558 return true;
559 return !securityOrigin->taintsCanvas(response().url()); 559 return !securityOrigin->taintsCanvas(response().url());
560 } 560 }
561 561
562 } // namespace blink 562 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ImageResource.h ('k') | third_party/WebKit/Source/core/fetch/Resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698