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

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

Issue 243793006: HTML Imports: Teach preloader about HTML Imports. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/parser/HTMLPreloadScanner.cpp ('k') | Source/core/testing/Internals.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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 58
59 if (m_resourceType == Resource::ImportResource) {
60 bool sameOrigin = document->contextDocument()->securityOrigin()->canRequ est(request.url());
61 request.setCrossOriginAccessControl(document->contextDocument()->securit yOrigin(),
62 sameOrigin ? AllowStoredCredentials : DoNotAllowStoredCredentials,
63 ClientDidNotRequestCredentials);
64 }
65
59 if (m_isCORSEnabled) 66 if (m_isCORSEnabled)
60 request.setCrossOriginAccessControl(document->securityOrigin(), m_allowC redentials); 67 request.setCrossOriginAccessControl(document->securityOrigin(), m_allowC redentials);
61 return request; 68 return request;
62 } 69 }
63 70
64 void HTMLResourcePreloader::takeAndPreload(PreloadRequestStream& r) 71 void HTMLResourcePreloader::takeAndPreload(PreloadRequestStream& r)
65 { 72 {
66 PreloadRequestStream requests; 73 PreloadRequestStream requests;
67 requests.swap(r); 74 requests.swap(r);
68 75
69 for (PreloadRequestStream::iterator it = requests.begin(); it != requests.en d(); ++it) 76 for (PreloadRequestStream::iterator it = requests.begin(); it != requests.en d(); ++it)
70 preload(it->release()); 77 preload(it->release());
71 } 78 }
72 79
73 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload) 80 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload)
74 { 81 {
75 FetchRequest request = preload->resourceRequest(m_document); 82 FetchRequest request = preload->resourceRequest(m_document);
76 blink::Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime( ))), 0, 2000, 20); 83 blink::Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime( ))), 0, 2000, 20);
77 m_document->fetcher()->preload(preload->resourceType(), request, preload->ch arset()); 84 m_document->fetcher()->preload(preload->resourceType(), request, preload->ch arset());
78 } 85 }
79 86
80 } 87 }
OLDNEW
« no previous file with comments | « Source/core/html/parser/HTMLPreloadScanner.cpp ('k') | Source/core/testing/Internals.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698