| OLD | NEW |
| 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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 m_image->resetAnimation(); | 210 m_image->resetAnimation(); |
| 211 } | 211 } |
| 212 | 212 |
| 213 void ImageResource::allClientsAndObserversRemoved() | 213 void ImageResource::allClientsAndObserversRemoved() |
| 214 { | 214 { |
| 215 if (m_image && !errorOccurred()) { | 215 if (m_image && !errorOccurred()) { |
| 216 // If possible, delay the resetting until back at the event loop. | 216 // If possible, delay the resetting until back at the event loop. |
| 217 // Doing so after a conservative GC prevents resetAnimation() from | 217 // Doing so after a conservative GC prevents resetAnimation() from |
| 218 // upsetting ongoing animation updates (crbug.com/613709) | 218 // upsetting ongoing animation updates (crbug.com/613709) |
| 219 if (!ThreadHeap::willObjectBeLazilySwept(this)) | 219 if (!ThreadHeap::willObjectBeLazilySwept(this)) |
| 220 Platform::current()->currentThread()->getWebTaskRunner()->postTask(B
LINK_FROM_HERE, bind(&ImageResource::doResetAnimation, wrapWeakPersistent(this))
); | 220 Platform::current()->currentThread()->getWebTaskRunner()->postTask(B
LINK_FROM_HERE, WTF::bind(&ImageResource::doResetAnimation, wrapWeakPersistent(t
his))); |
| 221 else | 221 else |
| 222 m_image->resetAnimation(); | 222 m_image->resetAnimation(); |
| 223 } | 223 } |
| 224 if (m_multipartParser) | 224 if (m_multipartParser) |
| 225 m_multipartParser->cancel(); | 225 m_multipartParser->cancel(); |
| 226 Resource::allClientsAndObserversRemoved(); | 226 Resource::allClientsAndObserversRemoved(); |
| 227 } | 227 } |
| 228 | 228 |
| 229 void ImageResource::appendData(const char* data, size_t length) | 229 void ImageResource::appendData(const char* data, size_t length) |
| 230 { | 230 { |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 if (response().wasFetchedViaServiceWorker()) | 564 if (response().wasFetchedViaServiceWorker()) |
| 565 return response().serviceWorkerResponseType() != WebServiceWorkerRespons
eTypeOpaque; | 565 return response().serviceWorkerResponseType() != WebServiceWorkerRespons
eTypeOpaque; |
| 566 if (!getImage()->currentFrameHasSingleSecurityOrigin()) | 566 if (!getImage()->currentFrameHasSingleSecurityOrigin()) |
| 567 return false; | 567 return false; |
| 568 if (passesAccessControlCheck(securityOrigin)) | 568 if (passesAccessControlCheck(securityOrigin)) |
| 569 return true; | 569 return true; |
| 570 return !securityOrigin->taintsCanvas(response().url()); | 570 return !securityOrigin->taintsCanvas(response().url()); |
| 571 } | 571 } |
| 572 | 572 |
| 573 } // namespace blink | 573 } // namespace blink |
| OLD | NEW |