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

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

Issue 1364863002: DocumentLoader::isCommittedButEmpty is timing-dependent. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back to the original test fix Created 4 years, 5 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 void didChangePerformanceTiming(); 99 void didChangePerformanceTiming();
100 void didObserveLoadingBehavior(WebLoadingBehaviorFlag); 100 void didObserveLoadingBehavior(WebLoadingBehaviorFlag);
101 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce); 101 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce);
102 const ResourceResponse& response() const { return m_response; } 102 const ResourceResponse& response() const { return m_response; }
103 bool isClientRedirect() const { return m_isClientRedirect; } 103 bool isClientRedirect() const { return m_isClientRedirect; }
104 void setIsClientRedirect(bool isClientRedirect) { m_isClientRedirect = isCli entRedirect; } 104 void setIsClientRedirect(bool isClientRedirect) { m_isClientRedirect = isCli entRedirect; }
105 bool replacesCurrentHistoryItem() const { return m_replacesCurrentHistoryIte m; } 105 bool replacesCurrentHistoryItem() const { return m_replacesCurrentHistoryIte m; }
106 void setReplacesCurrentHistoryItem(bool replacesCurrentHistoryItem) { m_repl acesCurrentHistoryItem = replacesCurrentHistoryItem; } 106 void setReplacesCurrentHistoryItem(bool replacesCurrentHistoryItem) { m_repl acesCurrentHistoryItem = replacesCurrentHistoryItem; }
107 107
108 bool isCommittedButEmpty() const { return m_state == Committed; } 108 bool isCommittedButEmpty() const { return m_state >= Committed && !m_dataRec eived; }
109 109
110 void setSentDidFinishLoad() { m_state = SentDidFinishLoad; } 110 void setSentDidFinishLoad() { m_state = SentDidFinishLoad; }
111 bool sentDidFinishLoad() const { return m_state == SentDidFinishLoad; } 111 bool sentDidFinishLoad() const { return m_state == SentDidFinishLoad; }
112 112
113 NavigationType getNavigationType() const { return m_navigationType; } 113 NavigationType getNavigationType() const { return m_navigationType; }
114 void setNavigationType(NavigationType navigationType) { m_navigationType = n avigationType; } 114 void setNavigationType(NavigationType navigationType) { m_navigationType = n avigationType; }
115 115
116 void upgradeInsecureRequest(); 116 void upgradeInsecureRequest();
117 117
118 void startLoadingMainResource(); 118 void startLoadingMainResource();
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 202
203 // The 'working' request. It may be mutated 203 // The 'working' request. It may be mutated
204 // several times from the original request to include additional 204 // several times from the original request to include additional
205 // headers, cookie information, canonicalization and redirects. 205 // headers, cookie information, canonicalization and redirects.
206 ResourceRequest m_request; 206 ResourceRequest m_request;
207 207
208 ResourceResponse m_response; 208 ResourceResponse m_response;
209 209
210 bool m_isClientRedirect; 210 bool m_isClientRedirect;
211 bool m_replacesCurrentHistoryItem; 211 bool m_replacesCurrentHistoryItem;
212 bool m_dataReceived;
212 213
213 NavigationType m_navigationType; 214 NavigationType m_navigationType;
214 215
215 DocumentLoadTiming m_documentLoadTiming; 216 DocumentLoadTiming m_documentLoadTiming;
216 217
217 double m_timeOfLastDataReceived; 218 double m_timeOfLastDataReceived;
218 219
219 Member<ApplicationCacheHost> m_applicationCacheHost; 220 Member<ApplicationCacheHost> m_applicationCacheHost;
220 221
221 Member<ContentSecurityPolicy> m_contentSecurityPolicy; 222 Member<ContentSecurityPolicy> m_contentSecurityPolicy;
222 ClientHintsPreferences m_clientHintsPreferences; 223 ClientHintsPreferences m_clientHintsPreferences;
223 InitialScrollState m_initialScrollState; 224 InitialScrollState m_initialScrollState;
224 225
225 bool m_wasBlockedAfterXFrameOptionsOrCSP; 226 bool m_wasBlockedAfterXFrameOptionsOrCSP;
226 227
227 enum State { 228 enum State {
228 NotStarted, 229 NotStarted,
229 Provisional, 230 Provisional,
230 Committed, 231 Committed,
231 DataReceived,
232 MainResourceDone, 232 MainResourceDone,
233 SentDidFinishLoad 233 SentDidFinishLoad
234 }; 234 };
235 State m_state; 235 State m_state;
236 236
237 // Used to protect against reentrancy into dataReceived(). 237 // Used to protect against reentrancy into dataReceived().
238 bool m_inDataReceived; 238 bool m_inDataReceived;
239 RefPtr<SharedBuffer> m_dataBuffer; 239 RefPtr<SharedBuffer> m_dataBuffer;
240 }; 240 };
241 241
242 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); 242 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
243 243
244 } // namespace blink 244 } // namespace blink
245 245
246 #endif // DocumentLoader_h 246 #endif // DocumentLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698