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

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

Issue 1381003004: Better distinguish didFinishLoad and didStopLoading (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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 void stopLoading(); 98 void stopLoading();
99 bool isLoading() const; 99 bool isLoading() const;
100 const ResourceResponse& response() const { return m_response; } 100 const ResourceResponse& response() const { return m_response; }
101 const ResourceError& mainDocumentError() const { return m_mainDocumentError; } 101 const ResourceError& mainDocumentError() const { return m_mainDocumentError; }
102 bool isClientRedirect() const { return m_isClientRedirect; } 102 bool isClientRedirect() const { return m_isClientRedirect; }
103 void setIsClientRedirect(bool isClientRedirect) { m_isClientRedirect = isCli entRedirect; } 103 void setIsClientRedirect(bool isClientRedirect) { m_isClientRedirect = isCli entRedirect; }
104 bool replacesCurrentHistoryItem() const { return m_replacesCurrentHistoryIte m; } 104 bool replacesCurrentHistoryItem() const { return m_replacesCurrentHistoryIte m; }
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
109 void setSentDidFinishLoad() { m_state = SentDidFinishLoad; }
110 bool sentDidFinishLoad() const { return m_state == SentDidFinishLoad; }
111
108 NavigationType navigationType() const { return m_navigationType; } 112 NavigationType navigationType() const { return m_navigationType; }
109 void setNavigationType(NavigationType navigationType) { m_navigationType = n avigationType; } 113 void setNavigationType(NavigationType navigationType) { m_navigationType = n avigationType; }
110 114
111 void setDefersLoading(bool); 115 void setDefersLoading(bool);
112 116
113 void startLoadingMainResource(); 117 void startLoadingMainResource();
114 void cancelMainResourceLoad(const ResourceError&); 118 void cancelMainResourceLoad(const ResourceError&);
115 119
116 void attachThreadedDataReceiver(PassRefPtrWillBeRawPtr<ThreadedDataReceiver> ); 120 void attachThreadedDataReceiver(PassRefPtrWillBeRawPtr<ThreadedDataReceiver> );
117 void acceptDataFromThreadedReceiver(const char* data, int dataLength, int en codedDataLength); 121 void acceptDataFromThreadedReceiver(const char* data, int dataLength, int en codedDataLength);
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 229
226 RefPtrWillBeMember<ContentSecurityPolicy> m_contentSecurityPolicy; 230 RefPtrWillBeMember<ContentSecurityPolicy> m_contentSecurityPolicy;
227 ClientHintsPreferences m_clientHintsPreferences; 231 ClientHintsPreferences m_clientHintsPreferences;
228 InitialScrollState m_initialScrollState; 232 InitialScrollState m_initialScrollState;
229 233
230 enum State { 234 enum State {
231 NotStarted, 235 NotStarted,
232 Provisional, 236 Provisional,
233 Committed, 237 Committed,
234 DataReceived, 238 DataReceived,
235 MainResourceDone 239 MainResourceDone,
240 SentDidFinishLoad
236 }; 241 };
237 State m_state; 242 State m_state;
238 243
239 // Used to protect against reentrancy into dataReceived(). 244 // Used to protect against reentrancy into dataReceived().
240 bool m_inDataReceived; 245 bool m_inDataReceived;
241 RefPtr<SharedBuffer> m_dataBuffer; 246 RefPtr<SharedBuffer> m_dataBuffer;
242 }; 247 };
243 248
244 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); 249 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
245 250
246 } // namespace blink 251 } // namespace blink
247 252
248 #endif // DocumentLoader_h 253 #endif // DocumentLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698