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

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, 2 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 108
109 void setSentDidFinishLoad() { m_state = SentDidFinishLoad; }
110 bool sentDidFinishLoad() const { return m_state == SentDidFinishLoad; }
111
109 bool shouldContinueForNavigationPolicy(const ResourceRequest&, ContentSecuri tyPolicyDisposition shouldCheckMainWorldContentSecurityPolicy, NavigationPolicy = NavigationPolicyCurrentTab); 112 bool shouldContinueForNavigationPolicy(const ResourceRequest&, ContentSecuri tyPolicyDisposition shouldCheckMainWorldContentSecurityPolicy, NavigationPolicy = NavigationPolicyCurrentTab);
110 NavigationType navigationType() const { return m_navigationType; } 113 NavigationType navigationType() const { return m_navigationType; }
111 void setNavigationType(NavigationType navigationType) { m_navigationType = n avigationType; } 114 void setNavigationType(NavigationType navigationType) { m_navigationType = n avigationType; }
112 115
113 void setDefersLoading(bool); 116 void setDefersLoading(bool);
114 117
115 void startLoadingMainResource(); 118 void startLoadingMainResource();
116 void cancelMainResourceLoad(const ResourceError&); 119 void cancelMainResourceLoad(const ResourceError&);
117 120
118 void attachThreadedDataReceiver(PassRefPtrWillBeRawPtr<ThreadedDataReceiver> ); 121 void attachThreadedDataReceiver(PassRefPtrWillBeRawPtr<ThreadedDataReceiver> );
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 230
228 RefPtrWillBeMember<ContentSecurityPolicy> m_contentSecurityPolicy; 231 RefPtrWillBeMember<ContentSecurityPolicy> m_contentSecurityPolicy;
229 ClientHintsPreferences m_clientHintsPreferences; 232 ClientHintsPreferences m_clientHintsPreferences;
230 InitialScrollState m_initialScrollState; 233 InitialScrollState m_initialScrollState;
231 234
232 enum State { 235 enum State {
233 NotStarted, 236 NotStarted,
234 Provisional, 237 Provisional,
235 Committed, 238 Committed,
236 DataReceived, 239 DataReceived,
237 MainResourceDone 240 MainResourceDone,
241 SentDidFinishLoad
238 }; 242 };
239 State m_state; 243 State m_state;
240 244
241 // Used to protect against reentrancy into dataReceived(). 245 // Used to protect against reentrancy into dataReceived().
242 bool m_inDataReceived; 246 bool m_inDataReceived;
243 RefPtr<SharedBuffer> m_dataBuffer; 247 RefPtr<SharedBuffer> m_dataBuffer;
244 }; 248 };
245 249
246 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); 250 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
247 251
248 } // namespace blink 252 } // namespace blink
249 253
250 #endif // DocumentLoader_h 254 #endif // DocumentLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698