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

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

Issue 1497423002: Revert of Downgrade lock icon for broken-HTTPS subresources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix conflict Created 5 years 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 16 matching lines...) Expand all
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/loader/FrameFetchContext.h" 32 #include "core/loader/FrameFetchContext.h"
33 33
34 #include "bindings/core/v8/ScriptController.h" 34 #include "bindings/core/v8/ScriptController.h"
35 #include "core/dom/Document.h" 35 #include "core/dom/Document.h"
36 #include "core/fetch/ClientHintsPreferences.h" 36 #include "core/fetch/ClientHintsPreferences.h"
37 #include "core/fetch/ResourceLoader.h"
38 #include "core/fetch/UniqueIdentifier.h" 37 #include "core/fetch/UniqueIdentifier.h"
39 #include "core/frame/FrameConsole.h" 38 #include "core/frame/FrameConsole.h"
40 #include "core/frame/FrameHost.h" 39 #include "core/frame/FrameHost.h"
41 #include "core/frame/FrameView.h" 40 #include "core/frame/FrameView.h"
42 #include "core/frame/LocalFrame.h" 41 #include "core/frame/LocalFrame.h"
43 #include "core/frame/Settings.h" 42 #include "core/frame/Settings.h"
44 #include "core/html/HTMLFrameOwnerElement.h" 43 #include "core/html/HTMLFrameOwnerElement.h"
45 #include "core/html/imports/HTMLImportsController.h" 44 #include "core/html/imports/HTMLImportsController.h"
46 #include "core/inspector/ConsoleMessage.h" 45 #include "core/inspector/ConsoleMessage.h"
47 #include "core/inspector/InspectorInstrumentation.h" 46 #include "core/inspector/InspectorInstrumentation.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 { 232 {
234 MixedContentChecker::checkMixedPrivatePublic(frame(), response.remoteIPAddre ss()); 233 MixedContentChecker::checkMixedPrivatePublic(frame(), response.remoteIPAddre ss());
235 LinkLoader::loadLinkFromHeader(response.httpHeaderField("Link"), frame()->do cument(), NetworkHintsInterfaceImpl()); 234 LinkLoader::loadLinkFromHeader(response.httpHeaderField("Link"), frame()->do cument(), NetworkHintsInterfaceImpl());
236 if (m_documentLoader == frame()->loader().provisionalDocumentLoader()) { 235 if (m_documentLoader == frame()->loader().provisionalDocumentLoader()) {
237 ResourceFetcher* fetcher = nullptr; 236 ResourceFetcher* fetcher = nullptr;
238 if (frame()->document()) 237 if (frame()->document())
239 fetcher = frame()->document()->fetcher(); 238 fetcher = frame()->document()->fetcher();
240 m_documentLoader->clientHintsPreferences().updateFromAcceptClientHintsHe ader(response.httpHeaderField("accept-ch"), fetcher); 239 m_documentLoader->clientHintsPreferences().updateFromAcceptClientHintsHe ader(response.httpHeaderField("accept-ch"), fetcher);
241 } 240 }
242 241
243 if (response.hasMajorCertificateErrors() && resourceLoader)
244 MixedContentChecker::handleCertificateError(frame(), resourceLoader->ori ginalRequest(), response);
245
246 frame()->loader().progress().incrementProgress(identifier, response); 242 frame()->loader().progress().incrementProgress(identifier, response);
247 frame()->loader().client()->dispatchDidReceiveResponse(m_documentLoader, ide ntifier, response); 243 frame()->loader().client()->dispatchDidReceiveResponse(m_documentLoader, ide ntifier, response);
248 TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceReceiveResponse", TRACE_E VENT_SCOPE_THREAD, "data", InspectorReceiveResponseEvent::data(identifier, frame (), response)); 244 TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceReceiveResponse", TRACE_E VENT_SCOPE_THREAD, "data", InspectorReceiveResponseEvent::data(identifier, frame (), response));
249 DocumentLoader* documentLoader = ensureLoaderForNotifications(); 245 DocumentLoader* documentLoader = ensureLoaderForNotifications();
250 InspectorInstrumentation::didReceiveResourceResponse(frame(), identifier, do cumentLoader, response, resourceLoader); 246 InspectorInstrumentation::didReceiveResourceResponse(frame(), identifier, do cumentLoader, response, resourceLoader);
251 // It is essential that inspector gets resource response BEFORE console. 247 // It is essential that inspector gets resource response BEFORE console.
252 frame()->console().reportResourceResponseReceived(documentLoader, identifier , response); 248 frame()->console().reportResourceResponseReceived(documentLoader, identifier , response);
253 } 249 }
254 250
255 void FrameFetchContext::dispatchDidReceiveData(unsigned long identifier, const c har* data, int dataLength, int encodedDataLength) 251 void FrameFetchContext::dispatchDidReceiveData(unsigned long identifier, const c har* data, int dataLength, int encodedDataLength)
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 } 750 }
755 751
756 DEFINE_TRACE(FrameFetchContext) 752 DEFINE_TRACE(FrameFetchContext)
757 { 753 {
758 visitor->trace(m_document); 754 visitor->trace(m_document);
759 visitor->trace(m_documentLoader); 755 visitor->trace(m_documentLoader);
760 FetchContext::trace(visitor); 756 FetchContext::trace(visitor);
761 } 757 }
762 758
763 } // namespace blink 759 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/EmptyClients.h ('k') | third_party/WebKit/Source/core/loader/FrameLoaderClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698