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

Side by Side Diff: Source/core/html/parser/HTMLResourcePreloader.cpp

Issue 623683002: Mixed Content: Extract frame processing from ::shouldBlockFetch. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixing preloader. Created 6 years, 2 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.cpp ('k') | Source/core/loader/MixedContentChecker.h » ('j') | 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) 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 return document->completeURLWithOverride(m_resourceURL, m_baseURL.isEmpty() ? document->url() : m_baseURL); 48 return document->completeURLWithOverride(m_resourceURL, m_baseURL.isEmpty() ? document->url() : m_baseURL);
49 } 49 }
50 50
51 FetchRequest PreloadRequest::resourceRequest(Document* document) 51 FetchRequest PreloadRequest::resourceRequest(Document* document)
52 { 52 {
53 ASSERT(isMainThread()); 53 ASSERT(isMainThread());
54 FetchInitiatorInfo initiatorInfo; 54 FetchInitiatorInfo initiatorInfo;
55 initiatorInfo.name = AtomicString(m_initiatorName); 55 initiatorInfo.name = AtomicString(m_initiatorName);
56 initiatorInfo.position = m_initiatorPosition; 56 initiatorInfo.position = m_initiatorPosition;
57 FetchRequest request(ResourceRequest(completeURL(document)), initiatorInfo); 57 FetchRequest request(ResourceRequest(completeURL(document)), initiatorInfo);
58 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textPrefetch);
58 59
59 if (m_isCORSEnabled) 60 if (m_isCORSEnabled)
60 request.setCrossOriginAccessControl(document->securityOrigin(), m_allowC redentials); 61 request.setCrossOriginAccessControl(document->securityOrigin(), m_allowC redentials);
61 return request; 62 return request;
62 } 63 }
63 64
64 inline HTMLResourcePreloader::HTMLResourcePreloader(Document& document) 65 inline HTMLResourcePreloader::HTMLResourcePreloader(Document& document)
65 : m_document(document) 66 : m_document(document)
66 { 67 {
67 } 68 }
(...skipping 19 matching lines...) Expand all
87 88
88 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload) 89 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload)
89 { 90 {
90 FetchRequest request = preload->resourceRequest(m_document); 91 FetchRequest request = preload->resourceRequest(m_document);
91 request.setDefer(preload->defer()); 92 request.setDefer(preload->defer());
92 blink::Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime( ))), 0, 2000, 20); 93 blink::Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime( ))), 0, 2000, 20);
93 m_document->fetcher()->preload(preload->resourceType(), request, preload->ch arset()); 94 m_document->fetcher()->preload(preload->resourceType(), request, preload->ch arset());
94 } 95 }
95 96
96 } 97 }
OLDNEW
« no previous file with comments | « Source/core/fetch/ResourceFetcher.cpp ('k') | Source/core/loader/MixedContentChecker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698