| 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 11 matching lines...) Expand all Loading... |
| 22 */ | 22 */ |
| 23 | 23 |
| 24 #include "core/fetch/ImageResource.h" | 24 #include "core/fetch/ImageResource.h" |
| 25 | 25 |
| 26 #include "core/fetch/ImageResourceObserver.h" | 26 #include "core/fetch/ImageResourceObserver.h" |
| 27 #include "core/fetch/MemoryCache.h" | 27 #include "core/fetch/MemoryCache.h" |
| 28 #include "core/fetch/ResourceClient.h" | 28 #include "core/fetch/ResourceClient.h" |
| 29 #include "core/fetch/ResourceClientOrObserverWalker.h" | 29 #include "core/fetch/ResourceClientOrObserverWalker.h" |
| 30 #include "core/fetch/ResourceFetcher.h" | 30 #include "core/fetch/ResourceFetcher.h" |
| 31 #include "core/fetch/ResourceLoader.h" | 31 #include "core/fetch/ResourceLoader.h" |
| 32 #include "core/fetch/ResourceLoadingLog.h" |
| 32 #include "core/svg/graphics/SVGImage.h" | 33 #include "core/svg/graphics/SVGImage.h" |
| 33 #include "platform/Logging.h" | |
| 34 #include "platform/RuntimeEnabledFeatures.h" | 34 #include "platform/RuntimeEnabledFeatures.h" |
| 35 #include "platform/SharedBuffer.h" | 35 #include "platform/SharedBuffer.h" |
| 36 #include "platform/TraceEvent.h" | 36 #include "platform/TraceEvent.h" |
| 37 #include "platform/graphics/BitmapImage.h" | 37 #include "platform/graphics/BitmapImage.h" |
| 38 #include "public/platform/Platform.h" | 38 #include "public/platform/Platform.h" |
| 39 #include "public/platform/WebCachePolicy.h" | 39 #include "public/platform/WebCachePolicy.h" |
| 40 #include "wtf/CurrentTime.h" | 40 #include "wtf/CurrentTime.h" |
| 41 #include "wtf/StdLibExtras.h" | 41 #include "wtf/StdLibExtras.h" |
| 42 #include <memory> | 42 #include <memory> |
| 43 | 43 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 58 | 58 |
| 59 return toImageResource(fetcher->requestResource(request, ImageResourceFactor
y())); | 59 return toImageResource(fetcher->requestResource(request, ImageResourceFactor
y())); |
| 60 } | 60 } |
| 61 | 61 |
| 62 ImageResource::ImageResource(const ResourceRequest& resourceRequest, const Resou
rceLoaderOptions& options) | 62 ImageResource::ImageResource(const ResourceRequest& resourceRequest, const Resou
rceLoaderOptions& options) |
| 63 : Resource(resourceRequest, Image, options) | 63 : Resource(resourceRequest, Image, options) |
| 64 , m_devicePixelRatioHeaderValue(1.0) | 64 , m_devicePixelRatioHeaderValue(1.0) |
| 65 , m_image(nullptr) | 65 , m_image(nullptr) |
| 66 , m_hasDevicePixelRatioHeaderValue(false) | 66 , m_hasDevicePixelRatioHeaderValue(false) |
| 67 { | 67 { |
| 68 WTF_LOG(ResourceLoading, "new ImageResource(ResourceRequest) %p", this); | 68 RESOURCE_LOADING_DVLOG(1) << "new ImageResource(ResourceRequest) " << this; |
| 69 } | 69 } |
| 70 | 70 |
| 71 ImageResource::ImageResource(blink::Image* image, const ResourceLoaderOptions& o
ptions) | 71 ImageResource::ImageResource(blink::Image* image, const ResourceLoaderOptions& o
ptions) |
| 72 : Resource(ResourceRequest(""), Image, options) | 72 : Resource(ResourceRequest(""), Image, options) |
| 73 , m_devicePixelRatioHeaderValue(1.0) | 73 , m_devicePixelRatioHeaderValue(1.0) |
| 74 , m_image(image) | 74 , m_image(image) |
| 75 , m_hasDevicePixelRatioHeaderValue(false) | 75 , m_hasDevicePixelRatioHeaderValue(false) |
| 76 { | 76 { |
| 77 WTF_LOG(ResourceLoading, "new ImageResource(Image) %p", this); | 77 RESOURCE_LOADING_DVLOG(1) << "new ImageResource(Image) " << this; |
| 78 setStatus(Cached); | 78 setStatus(Cached); |
| 79 } | 79 } |
| 80 | 80 |
| 81 ImageResource::~ImageResource() | 81 ImageResource::~ImageResource() |
| 82 { | 82 { |
| 83 WTF_LOG(ResourceLoading, "~ImageResource %p", this); | 83 RESOURCE_LOADING_DVLOG(1) << "~ImageResource " << this; |
| 84 clearImage(); | 84 clearImage(); |
| 85 } | 85 } |
| 86 | 86 |
| 87 DEFINE_TRACE(ImageResource) | 87 DEFINE_TRACE(ImageResource) |
| 88 { | 88 { |
| 89 visitor->trace(m_multipartParser); | 89 visitor->trace(m_multipartParser); |
| 90 Resource::trace(visitor); | 90 Resource::trace(visitor); |
| 91 ImageObserver::trace(visitor); | 91 ImageObserver::trace(visitor); |
| 92 MultipartImageResourceParser::Client::trace(visitor); | 92 MultipartImageResourceParser::Client::trace(visitor); |
| 93 } | 93 } |
| (...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 594 if (response().wasFetchedViaServiceWorker()) | 594 if (response().wasFetchedViaServiceWorker()) |
| 595 return response().serviceWorkerResponseType() != WebServiceWorkerRespons
eTypeOpaque; | 595 return response().serviceWorkerResponseType() != WebServiceWorkerRespons
eTypeOpaque; |
| 596 if (!getImage()->currentFrameHasSingleSecurityOrigin()) | 596 if (!getImage()->currentFrameHasSingleSecurityOrigin()) |
| 597 return false; | 597 return false; |
| 598 if (passesAccessControlCheck(securityOrigin)) | 598 if (passesAccessControlCheck(securityOrigin)) |
| 599 return true; | 599 return true; |
| 600 return !securityOrigin->taintsCanvas(response().url()); | 600 return !securityOrigin->taintsCanvas(response().url()); |
| 601 } | 601 } |
| 602 | 602 |
| 603 } // namespace blink | 603 } // namespace blink |
| OLD | NEW |