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

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

Issue 1858533002: Introduce WebCachePolicy to merge cache policy enums (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: self review, minor fixes Created 4 years, 8 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 18 matching lines...) Expand all
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/svg/graphics/SVGImage.h" 32 #include "core/svg/graphics/SVGImage.h"
33 #include "platform/Logging.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 "wtf/CurrentTime.h" 40 #include "wtf/CurrentTime.h"
40 #include "wtf/StdLibExtras.h" 41 #include "wtf/StdLibExtras.h"
41 42
42 namespace blink { 43 namespace blink {
43 44
44 using ImageResourceObserverWalker = ResourceClientOrObserverWalker<ImageResource Observer, ImageResourceObserver>; 45 using ImageResourceObserverWalker = ResourceClientOrObserverWalker<ImageResource Observer, ImageResourceObserver>;
45 46
46 RawPtr<ImageResource> ImageResource::fetch(FetchRequest& request, ResourceFetche r* fetcher) 47 RawPtr<ImageResource> ImageResource::fetch(FetchRequest& request, ResourceFetche r* fetcher)
47 { 48 {
48 if (request.resourceRequest().requestContext() == WebURLRequest::RequestCont extUnspecified) 49 if (request.resourceRequest().requestContext() == WebURLRequest::RequestCont extUnspecified)
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 if (m_image->animationPolicy() != newPolicy) { 488 if (m_image->animationPolicy() != newPolicy) {
488 m_image->resetAnimation(); 489 m_image->resetAnimation();
489 m_image->setAnimationPolicy(newPolicy); 490 m_image->setAnimationPolicy(newPolicy);
490 } 491 }
491 } 492 }
492 493
493 void ImageResource::reloadIfLoFi(ResourceFetcher* fetcher) 494 void ImageResource::reloadIfLoFi(ResourceFetcher* fetcher)
494 { 495 {
495 if (!m_response.httpHeaderField("chrome-proxy").contains("q=low")) 496 if (!m_response.httpHeaderField("chrome-proxy").contains("q=low"))
496 return; 497 return;
497 m_resourceRequest.setCachePolicy(ResourceRequestCachePolicy::BypassingCache) ; 498 m_resourceRequest.setCachePolicy(WebCachePolicy::BypassingCache);
498 m_resourceRequest.setLoFiState(WebURLRequest::LoFiOff); 499 m_resourceRequest.setLoFiState(WebURLRequest::LoFiOff);
499 error(Resource::LoadError); 500 error(Resource::LoadError);
500 load(fetcher); 501 load(fetcher);
501 } 502 }
502 503
503 void ImageResource::changedInRect(const blink::Image* image, const IntRect& rect ) 504 void ImageResource::changedInRect(const blink::Image* image, const IntRect& rect )
504 { 505 {
505 if (!image || image != m_image) 506 if (!image || image != m_image)
506 return; 507 return;
507 notifyObservers(false, &rect); 508 notifyObservers(false, &rect);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 if (response().wasFetchedViaServiceWorker()) 544 if (response().wasFetchedViaServiceWorker())
544 return response().serviceWorkerResponseType() != WebServiceWorkerRespons eTypeOpaque; 545 return response().serviceWorkerResponseType() != WebServiceWorkerRespons eTypeOpaque;
545 if (!getImage()->currentFrameHasSingleSecurityOrigin()) 546 if (!getImage()->currentFrameHasSingleSecurityOrigin())
546 return false; 547 return false;
547 if (passesAccessControlCheck(securityOrigin)) 548 if (passesAccessControlCheck(securityOrigin))
548 return true; 549 return true;
549 return !securityOrigin->taintsCanvas(response().url()); 550 return !securityOrigin->taintsCanvas(response().url());
550 } 551 }
551 552
552 } // namespace blink 553 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698