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

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

Issue 2786673002: Separate ContentSettingsClient out from LocalFrameClient (Closed)
Patch Set: fix Created 3 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
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 26 matching lines...) Expand all
37 #include "platform/heap/Handle.h" 37 #include "platform/heap/Handle.h"
38 #include "platform/loader/fetch/FetchContext.h" 38 #include "platform/loader/fetch/FetchContext.h"
39 #include "platform/loader/fetch/FetchRequest.h" 39 #include "platform/loader/fetch/FetchRequest.h"
40 #include "platform/loader/fetch/ResourceFetcher.h" 40 #include "platform/loader/fetch/ResourceFetcher.h"
41 #include "platform/loader/fetch/ResourceRequest.h" 41 #include "platform/loader/fetch/ResourceRequest.h"
42 #include "wtf/Forward.h" 42 #include "wtf/Forward.h"
43 43
44 namespace blink { 44 namespace blink {
45 45
46 class ClientHintsPreferences; 46 class ClientHintsPreferences;
47 class ContentSettingsClient;
47 class Document; 48 class Document;
48 class DocumentLoader; 49 class DocumentLoader;
50 class LocalFrame;
49 class LocalFrameClient; 51 class LocalFrameClient;
50 class LocalFrame;
51 class ResourceError; 52 class ResourceError;
52 class ResourceResponse; 53 class ResourceResponse;
53 54
54 class CORE_EXPORT FrameFetchContext final : public FetchContext { 55 class CORE_EXPORT FrameFetchContext final : public FetchContext {
55 public: 56 public:
56 static ResourceFetcher* createFetcherFromDocumentLoader( 57 static ResourceFetcher* createFetcherFromDocumentLoader(
57 DocumentLoader* loader) { 58 DocumentLoader* loader) {
58 return ResourceFetcher::create(new FrameFetchContext(loader, nullptr)); 59 return ResourceFetcher::create(new FrameFetchContext(loader, nullptr));
59 } 60 }
60 static ResourceFetcher* createFetcherFromDocument(Document* document) { 61 static ResourceFetcher* createFetcherFromDocument(Document* document) {
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 176
176 // m_documentLoader is null when loading resources from an HTML import 177 // m_documentLoader is null when loading resources from an HTML import
177 // and in such cases we use the document loader of the importing frame. 178 // and in such cases we use the document loader of the importing frame.
178 // Convenient accessors below can be used to transparently access the 179 // Convenient accessors below can be used to transparently access the
179 // relevant document loader or frame in either cases without null-checks. 180 // relevant document loader or frame in either cases without null-checks.
180 // TODO(kinuko): Remove constness, these return non-const members. 181 // TODO(kinuko): Remove constness, these return non-const members.
181 DocumentLoader* masterDocumentLoader() const; 182 DocumentLoader* masterDocumentLoader() const;
182 LocalFrame* frame() const; 183 LocalFrame* frame() const;
183 LocalFrameClient* localFrameClient() const; 184 LocalFrameClient* localFrameClient() const;
184 185
186 ContentSettingsClient* contentSettingsClient() const;
187
185 LocalFrame* frameOfImportsController() const; 188 LocalFrame* frameOfImportsController() const;
186 189
187 void printAccessDeniedMessage(const KURL&) const; 190 void printAccessDeniedMessage(const KURL&) const;
188 ResourceRequestBlockedReason canRequestInternal( 191 ResourceRequestBlockedReason canRequestInternal(
189 Resource::Type, 192 Resource::Type,
190 const ResourceRequest&, 193 const ResourceRequest&,
191 const KURL&, 194 const KURL&,
192 const ResourceLoaderOptions&, 195 const ResourceLoaderOptions&,
193 SecurityViolationReportingPolicy, 196 SecurityViolationReportingPolicy,
194 FetchRequest::OriginRestriction, 197 FetchRequest::OriginRestriction,
(...skipping 11 matching lines...) Expand all
206 // FIXME: Oilpan: Ideally this should just be a traced Member but that will 209 // FIXME: Oilpan: Ideally this should just be a traced Member but that will
207 // currently leak because ComputedStyle and its data are not on the heap. 210 // currently leak because ComputedStyle and its data are not on the heap.
208 // See crbug.com/383860 for details. 211 // See crbug.com/383860 for details.
209 WeakMember<Document> m_document; 212 WeakMember<Document> m_document;
210 Member<DocumentLoader> m_documentLoader; 213 Member<DocumentLoader> m_documentLoader;
211 }; 214 };
212 215
213 } // namespace blink 216 } // namespace blink
214 217
215 #endif 218 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698