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

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

Issue 2240053002: Replace WTF_LOG() with NETWORK_DVLOG() or RESOURCE_LOADING_DVLOG(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sstream, EXPECT_STREQ Created 4 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) 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 "core/loader/FrameFetchContext.h" 31 #include "core/loader/FrameFetchContext.h"
32 32
33 #include "bindings/core/v8/ScriptController.h" 33 #include "bindings/core/v8/ScriptController.h"
34 #include "core/dom/Document.h" 34 #include "core/dom/Document.h"
35 #include "core/fetch/ClientHintsPreferences.h" 35 #include "core/fetch/ClientHintsPreferences.h"
36 #include "core/fetch/ResourceLoader.h" 36 #include "core/fetch/ResourceLoader.h"
37 #include "core/fetch/ResourceLoadingLog.h"
37 #include "core/fetch/UniqueIdentifier.h" 38 #include "core/fetch/UniqueIdentifier.h"
38 #include "core/frame/FrameConsole.h" 39 #include "core/frame/FrameConsole.h"
39 #include "core/frame/FrameHost.h" 40 #include "core/frame/FrameHost.h"
40 #include "core/frame/FrameView.h" 41 #include "core/frame/FrameView.h"
41 #include "core/frame/LocalDOMWindow.h" 42 #include "core/frame/LocalDOMWindow.h"
42 #include "core/frame/LocalFrame.h" 43 #include "core/frame/LocalFrame.h"
43 #include "core/frame/Settings.h" 44 #include "core/frame/Settings.h"
44 #include "core/html/HTMLFrameOwnerElement.h" 45 #include "core/html/HTMLFrameOwnerElement.h"
45 #include "core/html/imports/HTMLImportsController.h" 46 #include "core/html/imports/HTMLImportsController.h"
46 #include "core/inspector/ConsoleMessage.h" 47 #include "core/inspector/ConsoleMessage.h"
47 #include "core/inspector/IdentifiersFactory.h" 48 #include "core/inspector/IdentifiersFactory.h"
48 #include "core/inspector/InspectorInstrumentation.h" 49 #include "core/inspector/InspectorInstrumentation.h"
49 #include "core/inspector/InspectorNetworkAgent.h" 50 #include "core/inspector/InspectorNetworkAgent.h"
50 #include "core/inspector/InspectorTraceEvents.h" 51 #include "core/inspector/InspectorTraceEvents.h"
51 #include "core/loader/DocumentLoader.h" 52 #include "core/loader/DocumentLoader.h"
52 #include "core/loader/FrameLoader.h" 53 #include "core/loader/FrameLoader.h"
53 #include "core/loader/FrameLoaderClient.h" 54 #include "core/loader/FrameLoaderClient.h"
54 #include "core/loader/MixedContentChecker.h" 55 #include "core/loader/MixedContentChecker.h"
55 #include "core/loader/NetworkHintsInterface.h" 56 #include "core/loader/NetworkHintsInterface.h"
56 #include "core/loader/PingLoader.h" 57 #include "core/loader/PingLoader.h"
57 #include "core/loader/ProgressTracker.h" 58 #include "core/loader/ProgressTracker.h"
58 #include "core/loader/appcache/ApplicationCacheHost.h" 59 #include "core/loader/appcache/ApplicationCacheHost.h"
59 #include "core/page/NetworkStateNotifier.h" 60 #include "core/page/NetworkStateNotifier.h"
60 #include "core/page/Page.h" 61 #include "core/page/Page.h"
61 #include "core/svg/graphics/SVGImageChromeClient.h" 62 #include "core/svg/graphics/SVGImageChromeClient.h"
62 #include "core/timing/DOMWindowPerformance.h" 63 #include "core/timing/DOMWindowPerformance.h"
63 #include "core/timing/Performance.h" 64 #include "core/timing/Performance.h"
64 #include "platform/Logging.h"
65 #include "platform/TracedValue.h" 65 #include "platform/TracedValue.h"
66 #include "platform/mhtml/MHTMLArchive.h" 66 #include "platform/mhtml/MHTMLArchive.h"
67 #include "platform/network/NetworkUtils.h" 67 #include "platform/network/NetworkUtils.h"
68 #include "platform/network/ResourceLoadPriority.h" 68 #include "platform/network/ResourceLoadPriority.h"
69 #include "platform/network/ResourceTimingInfo.h" 69 #include "platform/network/ResourceTimingInfo.h"
70 #include "platform/weborigin/SchemeRegistry.h" 70 #include "platform/weborigin/SchemeRegistry.h"
71 #include "platform/weborigin/SecurityPolicy.h" 71 #include "platform/weborigin/SecurityPolicy.h"
72 #include "public/platform/WebCachePolicy.h" 72 #include "public/platform/WebCachePolicy.h"
73 #include "public/platform/WebDocumentSubresourceFilter.h" 73 #include "public/platform/WebDocumentSubresourceFilter.h"
74 #include "public/platform/WebFrameScheduler.h" 74 #include "public/platform/WebFrameScheduler.h"
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 if (InspectorInstrumentation::shouldBlockRequest(frame(), resourceRequest)) 492 if (InspectorInstrumentation::shouldBlockRequest(frame(), resourceRequest))
493 return ResourceRequestBlockedReasonInspector; 493 return ResourceRequestBlockedReasonInspector;
494 494
495 SecurityOrigin* securityOrigin = options.securityOrigin.get(); 495 SecurityOrigin* securityOrigin = options.securityOrigin.get();
496 if (!securityOrigin && m_document) 496 if (!securityOrigin && m_document)
497 securityOrigin = m_document->getSecurityOrigin(); 497 securityOrigin = m_document->getSecurityOrigin();
498 498
499 if (originRestriction != FetchRequest::NoOriginRestriction && securityOrigin && !securityOrigin->canDisplay(url)) { 499 if (originRestriction != FetchRequest::NoOriginRestriction && securityOrigin && !securityOrigin->canDisplay(url)) {
500 if (!forPreload) 500 if (!forPreload)
501 FrameLoader::reportLocalLoadFailed(frame(), url.elidedString()); 501 FrameLoader::reportLocalLoadFailed(frame(), url.elidedString());
502 WTF_LOG(ResourceLoading, "ResourceFetcher::requestResource URL was not a llowed by SecurityOrigin::canDisplay"); 502 RESOURCE_LOADING_DVLOG(1) << "ResourceFetcher::requestResource URL was n ot allowed by SecurityOrigin::canDisplay";
503 return ResourceRequestBlockedReasonOther; 503 return ResourceRequestBlockedReasonOther;
504 } 504 }
505 505
506 // Some types of resources can be loaded only from the same origin. Other 506 // Some types of resources can be loaded only from the same origin. Other
507 // types of resources, like Images, Scripts, and CSS, can be loaded from 507 // types of resources, like Images, Scripts, and CSS, can be loaded from
508 // any URL. 508 // any URL.
509 switch (type) { 509 switch (type) {
510 case Resource::MainResource: 510 case Resource::MainResource:
511 case Resource::Image: 511 case Resource::Image:
512 case Resource::CSSStyleSheet: 512 case Resource::CSSStyleSheet:
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 } 833 }
834 834
835 DEFINE_TRACE(FrameFetchContext) 835 DEFINE_TRACE(FrameFetchContext)
836 { 836 {
837 visitor->trace(m_document); 837 visitor->trace(m_document);
838 visitor->trace(m_documentLoader); 838 visitor->trace(m_documentLoader);
839 FetchContext::trace(visitor); 839 FetchContext::trace(visitor);
840 } 840 }
841 841
842 } // namespace blink 842 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698