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

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

Issue 1299493003: Attach mixed content status to resource requests when sent to devtools (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: isMixedContent() -> ContextTypeNotMixedContent, and rename devtools protocol enum Created 5 years, 4 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 memoryCache()->add(resource); 72 memoryCache()->add(resource);
73 fetcher->scheduleDocumentResourcesGC(); 73 fetcher->scheduleDocumentResourcesGC();
74 } 74 }
75 75
76 ResourcePtr<ImageResource> ImageResource::fetch(FetchRequest& request, ResourceF etcher* fetcher) 76 ResourcePtr<ImageResource> ImageResource::fetch(FetchRequest& request, ResourceF etcher* fetcher)
77 { 77 {
78 if (request.resourceRequest().requestContext() == WebURLRequest::RequestCont extUnspecified) 78 if (request.resourceRequest().requestContext() == WebURLRequest::RequestCont extUnspecified)
79 request.mutableResourceRequest().setRequestContext(WebURLRequest::Reques tContextImage); 79 request.mutableResourceRequest().setRequestContext(WebURLRequest::Reques tContextImage);
80 if (fetcher->context().pageDismissalEventBeingDispatched()) { 80 if (fetcher->context().pageDismissalEventBeingDispatched()) {
81 KURL requestURL = request.resourceRequest().url(); 81 KURL requestURL = request.resourceRequest().url();
82 if (requestURL.isValid() && fetcher->context().canRequest(Resource::Imag e, request.resourceRequest(), requestURL, request.options(), request.forPreload( ), request.originRestriction())) 82 if (requestURL.isValid() && fetcher->context().canRequest(Resource::Imag e, request.mutableResourceRequest(), requestURL, request.options(), request.forP reload(), request.originRestriction()))
83 fetcher->context().sendImagePing(requestURL); 83 fetcher->context().sendImagePing(requestURL);
84 return 0; 84 return 0;
85 } 85 }
86 86
87 if (request.resourceRequest().url().protocolIsData()) 87 if (request.resourceRequest().url().protocolIsData())
88 ImageResource::preCacheDataURIImage(request, fetcher); 88 ImageResource::preCacheDataURIImage(request, fetcher);
89 89
90 if (fetcher->clientDefersImage(request.resourceRequest().url())) 90 if (fetcher->clientDefersImage(request.resourceRequest().url()))
91 request.setDefer(FetchRequest::DeferredByClient); 91 request.setDefer(FetchRequest::DeferredByClient);
92 92
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 565
566 return imageForContainer.get(); 566 return imageForContainer.get();
567 } 567 }
568 568
569 bool ImageResource::loadingMultipartContent() const 569 bool ImageResource::loadingMultipartContent() const
570 { 570 {
571 return m_loader && m_loader->loadingMultipartContent(); 571 return m_loader && m_loader->loadingMultipartContent();
572 } 572 }
573 573
574 } // namespace blink 574 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698