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

Side by Side Diff: Source/core/fetch/ResourceFetcher.cpp

Issue 439223005: Resources restored from CSS cache should be able to trigger InsecureContent messages (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Avoid unnecessary notifications/checks Created 6 years, 3 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
« no previous file with comments | « Source/core/fetch/ResourceFetcher.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
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 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 { 670 {
671 if (FetchRequest::DeferredByClient == request.defer()) 671 if (FetchRequest::DeferredByClient == request.defer())
672 return false; 672 return false;
673 if (policy != Use) 673 if (policy != Use)
674 return true; 674 return true;
675 if (resource->stillNeedsLoad()) 675 if (resource->stillNeedsLoad())
676 return true; 676 return true;
677 return request.options().synchronousPolicy == RequestSynchronously && resour ce->isLoading(); 677 return request.options().synchronousPolicy == RequestSynchronously && resour ce->isLoading();
678 } 678 }
679 679
680 void ResourceFetcher::maybeNotifyInsecureContent(const Resource* resource) const
681 {
682 // As a side effect browser will be notified.
683 checkInsecureContent(resource->type(), resource->lastResourceRequest().url() , resource->options().mixedContentBlockingTreatment);
Mike West 2014/09/12 18:54:28 Sorry! I changed this in a patch that landed just
684 }
685
680 void ResourceFetcher::requestLoadStarted(Resource* resource, const FetchRequest& request, ResourceLoadStartType type) 686 void ResourceFetcher::requestLoadStarted(Resource* resource, const FetchRequest& request, ResourceLoadStartType type)
681 { 687 {
682 if (type == ResourceLoadingFromCache) 688 if (type == ResourceLoadingFromCache)
683 notifyLoadedFromMemoryCache(resource); 689 notifyLoadedFromMemoryCache(resource);
684 690
685 if (request.resourceRequest().url().protocolIsData() || (m_documentLoader && m_documentLoader->substituteData().isValid())) 691 if (request.resourceRequest().url().protocolIsData() || (m_documentLoader && m_documentLoader->substituteData().isValid()))
686 return; 692 return;
687 693
688 if (type == ResourceLoadingFromCache && !resource->stillNeedsLoad() && !m_va lidatedURLs.contains(request.resourceRequest().url())) { 694 if (type == ResourceLoadingFromCache && !resource->stillNeedsLoad() && !m_va lidatedURLs.contains(request.resourceRequest().url())) {
689 // Resources loaded from memory cache should be reported the first time they're used. 695 // Resources loaded from memory cache should be reported the first time they're used.
(...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after
1553 1559
1554 void ResourceFetcher::trace(Visitor* visitor) 1560 void ResourceFetcher::trace(Visitor* visitor)
1555 { 1561 {
1556 visitor->trace(m_document); 1562 visitor->trace(m_document);
1557 visitor->trace(m_loaders); 1563 visitor->trace(m_loaders);
1558 visitor->trace(m_multipartLoaders); 1564 visitor->trace(m_multipartLoaders);
1559 ResourceLoaderHost::trace(visitor); 1565 ResourceLoaderHost::trace(visitor);
1560 } 1566 }
1561 1567
1562 } 1568 }
OLDNEW
« no previous file with comments | « Source/core/fetch/ResourceFetcher.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698