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

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

Issue 1444413002: Revert of Simplify starting a navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 167
168 void commitIfReady(); 168 void commitIfReady();
169 void commitData(const char* bytes, size_t length); 169 void commitData(const char* bytes, size_t length);
170 ResourceLoader* mainResourceLoader() const; 170 ResourceLoader* mainResourceLoader() const;
171 void clearMainResourceHandle(); 171 void clearMainResourceHandle();
172 172
173 bool maybeCreateArchive(); 173 bool maybeCreateArchive();
174 174
175 void prepareSubframeArchiveLoadIfNeeded(); 175 void prepareSubframeArchiveLoadIfNeeded();
176 176
177 void willSendRequest(ResourceRequest&, const ResourceResponse&);
177 void finishedLoading(double finishTime); 178 void finishedLoading(double finishTime);
178 void mainReceivedError(const ResourceError&); 179 void mainReceivedError(const ResourceError&);
179 void cancelLoadAfterXFrameOptionsOrCSPDenied(const ResourceResponse&); 180 void cancelLoadAfterXFrameOptionsOrCSPDenied(const ResourceResponse&);
180 void redirectReceived(Resource*, ResourceRequest&, const ResourceResponse&) final; 181 void redirectReceived(Resource*, ResourceRequest&, const ResourceResponse&) final;
182 void updateRequest(Resource*, const ResourceRequest&) final;
181 void responseReceived(Resource*, const ResourceResponse&, PassOwnPtr<WebData ConsumerHandle>) final; 183 void responseReceived(Resource*, const ResourceResponse&, PassOwnPtr<WebData ConsumerHandle>) final;
182 void dataReceived(Resource*, const char* data, unsigned length) final; 184 void dataReceived(Resource*, const char* data, unsigned length) final;
183 void processData(const char* data, unsigned length); 185 void processData(const char* data, unsigned length);
184 void notifyFinished(Resource*) final; 186 void notifyFinished(Resource*) final;
185 187
186 bool maybeLoadEmpty(); 188 bool maybeLoadEmpty();
187 189
188 bool isRedirectAfterPost(const ResourceRequest&, const ResourceResponse&); 190 bool isRedirectAfterPost(const ResourceRequest&, const ResourceResponse&);
189 191
190 bool shouldContinueForResponse() const; 192 bool shouldContinueForResponse() const;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 225
224 double m_timeOfLastDataReceived; 226 double m_timeOfLastDataReceived;
225 227
226 PersistentWillBeMember<ApplicationCacheHost> m_applicationCacheHost; 228 PersistentWillBeMember<ApplicationCacheHost> m_applicationCacheHost;
227 229
228 RefPtrWillBeMember<ContentSecurityPolicy> m_contentSecurityPolicy; 230 RefPtrWillBeMember<ContentSecurityPolicy> m_contentSecurityPolicy;
229 ClientHintsPreferences m_clientHintsPreferences; 231 ClientHintsPreferences m_clientHintsPreferences;
230 InitialScrollState m_initialScrollState; 232 InitialScrollState m_initialScrollState;
231 233
232 enum State { 234 enum State {
235 NotStarted,
233 Provisional, 236 Provisional,
234 Committed, 237 Committed,
235 DataReceived, 238 DataReceived,
236 MainResourceDone, 239 MainResourceDone,
237 SentDidFinishLoad 240 SentDidFinishLoad
238 }; 241 };
239 State m_state; 242 State m_state;
240 243
241 // Used to protect against reentrancy into dataReceived(). 244 // Used to protect against reentrancy into dataReceived().
242 bool m_inDataReceived; 245 bool m_inDataReceived;
243 RefPtr<SharedBuffer> m_dataBuffer; 246 RefPtr<SharedBuffer> m_dataBuffer;
244 }; 247 };
245 248
246 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); 249 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
247 250
248 } // namespace blink 251 } // namespace blink
249 252
250 #endif // DocumentLoader_h 253 #endif // DocumentLoader_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceLoader.cpp ('k') | third_party/WebKit/Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698