| 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 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 501 clearImage(); | 501 clearImage(); |
| 502 } | 502 } |
| 503 } | 503 } |
| 504 | 504 |
| 505 if (!m_image || m_image->isNull()) { | 505 if (!m_image || m_image->isNull()) { |
| 506 size_t size = encodedSize(); | 506 size_t size = encodedSize(); |
| 507 clear(); | 507 clear(); |
| 508 if (!errorOccurred()) | 508 if (!errorOccurred()) |
| 509 setStatus(DecodeError); | 509 setStatus(DecodeError); |
| 510 if (!allDataReceived && loader()) { | 510 if (!allDataReceived && loader()) { |
| 511 loader()->didFinishLoading(nullptr, monotonicallyIncreasingTime(), size, | 511 loader()->didFinishLoading(monotonicallyIncreasingTime(), size, size); |
| 512 size); | |
| 513 } | 512 } |
| 514 memoryCache()->remove(this); | 513 memoryCache()->remove(this); |
| 515 } | 514 } |
| 516 | 515 |
| 517 // It would be nice to only redraw the decoded band of the image, but with the | 516 // It would be nice to only redraw the decoded band of the image, but with the |
| 518 // current design (decoding delayed until painting) that seems hard. | 517 // current design (decoding delayed until painting) that seems hard. |
| 519 notifyObservers(); | 518 notifyObservers(); |
| 520 } | 519 } |
| 521 | 520 |
| 522 void ImageResource::updateImageAndClearBuffer() { | 521 void ImageResource::updateImageAndClearBuffer() { |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 720 WebServiceWorkerResponseTypeOpaque; | 719 WebServiceWorkerResponseTypeOpaque; |
| 721 } | 720 } |
| 722 if (!getImage()->currentFrameHasSingleSecurityOrigin()) | 721 if (!getImage()->currentFrameHasSingleSecurityOrigin()) |
| 723 return false; | 722 return false; |
| 724 if (passesAccessControlCheck(securityOrigin)) | 723 if (passesAccessControlCheck(securityOrigin)) |
| 725 return true; | 724 return true; |
| 726 return !securityOrigin->taintsCanvas(response().url()); | 725 return !securityOrigin->taintsCanvas(response().url()); |
| 727 } | 726 } |
| 728 | 727 |
| 729 } // namespace blink | 728 } // namespace blink |
| OLD | NEW |