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

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

Issue 1487343002: Set credentials mode "same-origin" when crossOrigin=anonymous is set. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 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 visitor->trace(m_document); 49 visitor->trace(m_document);
50 } 50 }
51 51
52 static void preconnectHost(PreloadRequest* request, const NetworkHintsInterface& networkHintsInterface) 52 static void preconnectHost(PreloadRequest* request, const NetworkHintsInterface& networkHintsInterface)
53 { 53 {
54 ASSERT(request); 54 ASSERT(request);
55 ASSERT(request->isPreconnect()); 55 ASSERT(request->isPreconnect());
56 KURL host(request->baseURL(), request->resourceURL()); 56 KURL host(request->baseURL(), request->resourceURL());
57 if (!host.isValid() || !host.protocolIsInHTTPFamily()) 57 if (!host.isValid() || !host.protocolIsInHTTPFamily())
58 return; 58 return;
59 CrossOriginAttributeValue crossOrigin = CrossOriginAttributeNotSet; 59 networkHintsInterface.preconnectHost(host, request->crossOrigin());
60 if (request->isCORS()) {
61 if (request->isAllowCredentials())
62 crossOrigin = CrossOriginAttributeUseCredentials;
63 else
64 crossOrigin = CrossOriginAttributeAnonymous;
65 }
66 networkHintsInterface.preconnectHost(host, crossOrigin);
67 } 60 }
68 61
69 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload, const Ne tworkHintsInterface& networkHintsInterface) 62 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload, const Ne tworkHintsInterface& networkHintsInterface)
70 { 63 {
71 if (preload->isPreconnect()) { 64 if (preload->isPreconnect()) {
72 preconnectHost(preload.get(), networkHintsInterface); 65 preconnectHost(preload.get(), networkHintsInterface);
73 return; 66 return;
74 } 67 }
75 // TODO(yoichio): Should preload if document is imported. 68 // TODO(yoichio): Should preload if document is imported.
76 if (!m_document->loader()) 69 if (!m_document->loader())
77 return; 70 return;
78 FetchRequest request = preload->resourceRequest(m_document); 71 FetchRequest request = preload->resourceRequest(m_document);
79 // TODO(dgozman): This check should go to HTMLPreloadScanner, but this requi res 72 // TODO(dgozman): This check should go to HTMLPreloadScanner, but this requi res
80 // making Document::completeURLWithOverride logic to be statically accessibl e. 73 // making Document::completeURLWithOverride logic to be statically accessibl e.
81 if (request.url().protocolIsData()) 74 if (request.url().protocolIsData())
82 return; 75 return;
83 if (preload->resourceType() == Resource::Script || preload->resourceType() = = Resource::CSSStyleSheet || preload->resourceType() == Resource::ImportResource ) 76 if (preload->resourceType() == Resource::Script || preload->resourceType() = = Resource::CSSStyleSheet || preload->resourceType() == Resource::ImportResource )
84 request.setCharset(preload->charset().isEmpty() ? m_document->characterS et().string() : preload->charset()); 77 request.setCharset(preload->charset().isEmpty() ? m_document->characterS et().string() : preload->charset());
85 request.setForPreload(true); 78 request.setForPreload(true);
86 Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_ cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime())), 0, 2000, 20); 79 Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_ cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime())), 0, 2000, 20);
87 m_document->loader()->startPreload(preload->resourceType(), request); 80 m_document->loader()->startPreload(preload->resourceType(), request);
88 } 81 }
89 82
90 } // namespace blink 83 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698