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

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

Issue 2068443002: Revert of Move 'frame-src' CSP checks into FrameFetchContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run revert on local machine to resolve conflicts Created 4 years, 6 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) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 void setReplacesCurrentHistoryItem(bool replacesCurrentHistoryItem) { m_repl acesCurrentHistoryItem = replacesCurrentHistoryItem; } 105 void setReplacesCurrentHistoryItem(bool replacesCurrentHistoryItem) { m_repl acesCurrentHistoryItem = replacesCurrentHistoryItem; }
106 106
107 bool isCommittedButEmpty() const { return m_state == Committed; } 107 bool isCommittedButEmpty() const { return m_state == Committed; }
108 108
109 void setSentDidFinishLoad() { m_state = SentDidFinishLoad; } 109 void setSentDidFinishLoad() { m_state = SentDidFinishLoad; }
110 bool sentDidFinishLoad() const { return m_state == SentDidFinishLoad; } 110 bool sentDidFinishLoad() const { return m_state == SentDidFinishLoad; }
111 111
112 NavigationType getNavigationType() const { return m_navigationType; } 112 NavigationType getNavigationType() const { return m_navigationType; }
113 void setNavigationType(NavigationType navigationType) { m_navigationType = n avigationType; } 113 void setNavigationType(NavigationType navigationType) { m_navigationType = n avigationType; }
114 114
115 void startLoadingMainResource(ContentSecurityPolicyDisposition); 115 void startLoadingMainResource();
116 116
117 void acceptDataFromThreadedReceiver(const char* data, int dataLength, int en codedDataLength); 117 void acceptDataFromThreadedReceiver(const char* data, int dataLength, int en codedDataLength);
118 DocumentLoadTiming& timing() { return m_documentLoadTiming; } 118 DocumentLoadTiming& timing() { return m_documentLoadTiming; }
119 const DocumentLoadTiming& timing() const { return m_documentLoadTiming; } 119 const DocumentLoadTiming& timing() const { return m_documentLoadTiming; }
120 120
121 ApplicationCacheHost* applicationCacheHost() const { return m_applicationCac heHost.get(); } 121 ApplicationCacheHost* applicationCacheHost() const { return m_applicationCac heHost.get(); }
122 122
123 void clearRedirectChain(); 123 void clearRedirectChain();
124 void appendRedirect(const KURL&); 124 void appendRedirect(const KURL&);
125 125
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 void finishedLoading(double finishTime); 170 void finishedLoading(double finishTime);
171 void cancelLoadAfterXFrameOptionsOrCSPDenied(const ResourceResponse&); 171 void cancelLoadAfterXFrameOptionsOrCSPDenied(const ResourceResponse&);
172 void redirectReceived(Resource*, ResourceRequest&, const ResourceResponse&) final; 172 void redirectReceived(Resource*, ResourceRequest&, const ResourceResponse&) final;
173 void responseReceived(Resource*, const ResourceResponse&, PassOwnPtr<WebData ConsumerHandle>) final; 173 void responseReceived(Resource*, const ResourceResponse&, PassOwnPtr<WebData ConsumerHandle>) final;
174 void dataReceived(Resource*, const char* data, size_t length) final; 174 void dataReceived(Resource*, const char* data, size_t length) final;
175 void processData(const char* data, size_t length); 175 void processData(const char* data, size_t length);
176 void notifyFinished(Resource*) final; 176 void notifyFinished(Resource*) final;
177 String debugName() const override { return "DocumentLoader"; } 177 String debugName() const override { return "DocumentLoader"; }
178 178
179 bool maybeLoadEmpty(); 179 bool maybeLoadEmpty();
180 void loadUnique();
181 180
182 bool isRedirectAfterPost(const ResourceRequest&, const ResourceResponse&); 181 bool isRedirectAfterPost(const ResourceRequest&, const ResourceResponse&);
183 182
184 bool shouldContinueForResponse() const; 183 bool shouldContinueForResponse() const;
185 184
186 Member<LocalFrame> m_frame; 185 Member<LocalFrame> m_frame;
187 Member<ResourceFetcher> m_fetcher; 186 Member<ResourceFetcher> m_fetcher;
188 OwnPtr<WebDocumentSubresourceFilter> m_subresourceFilter; 187 OwnPtr<WebDocumentSubresourceFilter> m_subresourceFilter;
189 188
190 Member<RawResource> m_mainResource; 189 Member<RawResource> m_mainResource;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 // Used to protect against reentrancy into dataReceived(). 234 // Used to protect against reentrancy into dataReceived().
236 bool m_inDataReceived; 235 bool m_inDataReceived;
237 RefPtr<SharedBuffer> m_dataBuffer; 236 RefPtr<SharedBuffer> m_dataBuffer;
238 }; 237 };
239 238
240 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); 239 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
241 240
242 } // namespace blink 241 } // namespace blink
243 242
244 #endif // DocumentLoader_h 243 #endif // DocumentLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698