| 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 } | 150 } |
| 151 | 151 |
| 152 if (isLoaded()) { | 152 if (isLoaded()) { |
| 153 markObserverFinished(observer); | 153 markObserverFinished(observer); |
| 154 observer->imageNotifyFinished(this); | 154 observer->imageNotifyFinished(this); |
| 155 } | 155 } |
| 156 } | 156 } |
| 157 | 157 |
| 158 void ImageResource::removeObserver(ImageResourceObserver* observer) | 158 void ImageResource::removeObserver(ImageResourceObserver* observer) |
| 159 { | 159 { |
| 160 ASSERT(observer); | 160 DCHECK(observer); |
| 161 | 161 |
| 162 if (m_observers.contains(observer)) | 162 if (m_observers.contains(observer)) |
| 163 m_observers.remove(observer); | 163 m_observers.remove(observer); |
| 164 else if (m_finishedObservers.contains(observer)) | 164 else if (m_finishedObservers.contains(observer)) |
| 165 m_finishedObservers.remove(observer); | 165 m_finishedObservers.remove(observer); |
| 166 else | 166 else |
| 167 ASSERT_NOT_REACHED(); | 167 NOTREACHED(); |
| 168 | 168 |
| 169 didRemoveClientOrObserver(); | 169 didRemoveClientOrObserver(); |
| 170 } | 170 } |
| 171 | 171 |
| 172 static void priorityFromObserver(const ImageResourceObserver* observer, Resource
Priority& priority) | 172 static void priorityFromObserver(const ImageResourceObserver* observer, Resource
Priority& priority) |
| 173 { | 173 { |
| 174 ResourcePriority nextPriority = observer->computeResourcePriority(); | 174 ResourcePriority nextPriority = observer->computeResourcePriority(); |
| 175 if (nextPriority.visibility == ResourcePriority::NotVisible) | 175 if (nextPriority.visibility == ResourcePriority::NotVisible) |
| 176 return; | 176 return; |
| 177 priority.visibility = ResourcePriority::Visible; | 177 priority.visibility = ResourcePriority::Visible; |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 { | 436 { |
| 437 if (m_multipartParser) | 437 if (m_multipartParser) |
| 438 m_multipartParser->cancel(); | 438 m_multipartParser->cancel(); |
| 439 clear(); | 439 clear(); |
| 440 Resource::error(error); | 440 Resource::error(error); |
| 441 notifyObservers(); | 441 notifyObservers(); |
| 442 } | 442 } |
| 443 | 443 |
| 444 void ImageResource::responseReceived(const ResourceResponse& response, std::uniq
ue_ptr<WebDataConsumerHandle> handle) | 444 void ImageResource::responseReceived(const ResourceResponse& response, std::uniq
ue_ptr<WebDataConsumerHandle> handle) |
| 445 { | 445 { |
| 446 ASSERT(!handle); | 446 DCHECK(!handle); |
| 447 ASSERT(!m_multipartParser); | 447 DCHECK(!m_multipartParser); |
| 448 // If there's no boundary, just handle the request normally. | 448 // If there's no boundary, just handle the request normally. |
| 449 if (response.isMultipart() && !response.multipartBoundary().isEmpty()) | 449 if (response.isMultipart() && !response.multipartBoundary().isEmpty()) |
| 450 m_multipartParser = new MultipartImageResourceParser(response, response.
multipartBoundary(), this); | 450 m_multipartParser = new MultipartImageResourceParser(response, response.
multipartBoundary(), this); |
| 451 Resource::responseReceived(response, std::move(handle)); | 451 Resource::responseReceived(response, std::move(handle)); |
| 452 if (RuntimeEnabledFeatures::clientHintsEnabled()) { | 452 if (RuntimeEnabledFeatures::clientHintsEnabled()) { |
| 453 m_devicePixelRatioHeaderValue = this->response().httpHeaderField(HTTPNam
es::Content_DPR).toFloat(&m_hasDevicePixelRatioHeaderValue); | 453 m_devicePixelRatioHeaderValue = this->response().httpHeaderField(HTTPNam
es::Content_DPR).toFloat(&m_hasDevicePixelRatioHeaderValue); |
| 454 if (!m_hasDevicePixelRatioHeaderValue || m_devicePixelRatioHeaderValue <
= 0.0) { | 454 if (!m_hasDevicePixelRatioHeaderValue || m_devicePixelRatioHeaderValue <
= 0.0) { |
| 455 m_devicePixelRatioHeaderValue = 1.0; | 455 m_devicePixelRatioHeaderValue = 1.0; |
| 456 m_hasDevicePixelRatioHeaderValue = false; | 456 m_hasDevicePixelRatioHeaderValue = false; |
| 457 } | 457 } |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 543 | 543 |
| 544 void ImageResource::changedInRect(const blink::Image* image, const IntRect& rect
) | 544 void ImageResource::changedInRect(const blink::Image* image, const IntRect& rect
) |
| 545 { | 545 { |
| 546 if (!image || image != m_image) | 546 if (!image || image != m_image) |
| 547 return; | 547 return; |
| 548 notifyObservers(&rect); | 548 notifyObservers(&rect); |
| 549 } | 549 } |
| 550 | 550 |
| 551 void ImageResource::onePartInMultipartReceived(const ResourceResponse& response) | 551 void ImageResource::onePartInMultipartReceived(const ResourceResponse& response) |
| 552 { | 552 { |
| 553 ASSERT(m_multipartParser); | 553 DCHECK(m_multipartParser); |
| 554 | 554 |
| 555 setResponse(response); | 555 setResponse(response); |
| 556 if (m_multipartParsingState == MultipartParsingState::WaitingForFirstPart) { | 556 if (m_multipartParsingState == MultipartParsingState::WaitingForFirstPart) { |
| 557 // We have nothing to do because we don't have any data. | 557 // We have nothing to do because we don't have any data. |
| 558 m_multipartParsingState = MultipartParsingState::ParsingFirstPart; | 558 m_multipartParsingState = MultipartParsingState::ParsingFirstPart; |
| 559 return; | 559 return; |
| 560 } | 560 } |
| 561 updateImageAndClearBuffer(); | 561 updateImageAndClearBuffer(); |
| 562 | 562 |
| 563 if (m_multipartParsingState == MultipartParsingState::ParsingFirstPart) { | 563 if (m_multipartParsingState == MultipartParsingState::ParsingFirstPart) { |
| 564 m_multipartParsingState = MultipartParsingState::FinishedParsingFirstPar
t; | 564 m_multipartParsingState = MultipartParsingState::FinishedParsingFirstPar
t; |
| 565 // Notify finished when the first part ends. | 565 // Notify finished when the first part ends. |
| 566 if (!errorOccurred()) | 566 if (!errorOccurred()) |
| 567 setStatus(Cached); | 567 setStatus(Cached); |
| 568 // We will also notify clients/observers of the finish in | 568 // We will also notify clients/observers of the finish in |
| 569 // Resource::finish()/error() so we don't mark them finished here. | 569 // Resource::finish()/error() so we don't mark them finished here. |
| 570 notifyObserversInternal(MarkFinishedOption::DoNotMarkFinished); | 570 notifyObserversInternal(MarkFinishedOption::DoNotMarkFinished); |
| 571 notifyClientsInternal(MarkFinishedOption::DoNotMarkFinished); | 571 notifyClientsInternal(MarkFinishedOption::DoNotMarkFinished); |
| 572 if (loader()) | 572 if (loader()) |
| 573 loader()->didFinishLoadingFirstPartInMultipart(); | 573 loader()->didFinishLoadingFirstPartInMultipart(); |
| 574 } | 574 } |
| 575 } | 575 } |
| 576 | 576 |
| 577 void ImageResource::multipartDataReceived(const char* bytes, size_t size) | 577 void ImageResource::multipartDataReceived(const char* bytes, size_t size) |
| 578 { | 578 { |
| 579 ASSERT(m_multipartParser); | 579 DCHECK(m_multipartParser); |
| 580 Resource::appendData(bytes, size); | 580 Resource::appendData(bytes, size); |
| 581 } | 581 } |
| 582 | 582 |
| 583 bool ImageResource::isAccessAllowed(SecurityOrigin* securityOrigin) | 583 bool ImageResource::isAccessAllowed(SecurityOrigin* securityOrigin) |
| 584 { | 584 { |
| 585 if (response().wasFetchedViaServiceWorker()) | 585 if (response().wasFetchedViaServiceWorker()) |
| 586 return response().serviceWorkerResponseType() != WebServiceWorkerRespons
eTypeOpaque; | 586 return response().serviceWorkerResponseType() != WebServiceWorkerRespons
eTypeOpaque; |
| 587 if (!getImage()->currentFrameHasSingleSecurityOrigin()) | 587 if (!getImage()->currentFrameHasSingleSecurityOrigin()) |
| 588 return false; | 588 return false; |
| 589 if (passesAccessControlCheck(securityOrigin)) | 589 if (passesAccessControlCheck(securityOrigin)) |
| 590 return true; | 590 return true; |
| 591 return !securityOrigin->taintsCanvas(response().url()); | 591 return !securityOrigin->taintsCanvas(response().url()); |
| 592 } | 592 } |
| 593 | 593 |
| 594 } // namespace blink | 594 } // namespace blink |
| OLD | NEW |