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

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

Issue 1290683003: Remove WeakPtrs from DocumentTiming/DocumentLoadTiming (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: WeakPtrWillBeRawPtr<Document>(nullptr) => nullptr Created 5 years, 4 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
« no previous file with comments | « Source/core/loader/DocumentLoadTiming.cpp ('k') | Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 void dataReceived(Resource*, const char* data, unsigned length) final; 181 void dataReceived(Resource*, const char* data, unsigned length) final;
182 void processData(const char* data, unsigned length); 182 void processData(const char* data, unsigned length);
183 void notifyFinished(Resource*) final; 183 void notifyFinished(Resource*) final;
184 184
185 bool maybeLoadEmpty(); 185 bool maybeLoadEmpty();
186 186
187 bool isRedirectAfterPost(const ResourceRequest&, const ResourceResponse&); 187 bool isRedirectAfterPost(const ResourceRequest&, const ResourceResponse&);
188 188
189 bool shouldContinueForResponse() const; 189 bool shouldContinueForResponse() const;
190 190
191 WeakPtrWillBeRawPtr<DocumentLoader> weakReference();
192
193 RawPtrWillBeMember<LocalFrame> m_frame; 191 RawPtrWillBeMember<LocalFrame> m_frame;
194 PersistentWillBeMember<ResourceFetcher> m_fetcher; 192 PersistentWillBeMember<ResourceFetcher> m_fetcher;
195 193
196 ResourcePtr<RawResource> m_mainResource; 194 ResourcePtr<RawResource> m_mainResource;
197 195
198 RefPtrWillBeMember<DocumentWriter> m_writer; 196 RefPtrWillBeMember<DocumentWriter> m_writer;
199 197
200 // A reference to actual request used to create the data source. 198 // A reference to actual request used to create the data source.
201 // The only part of this request that should change is the url, and 199 // The only part of this request that should change is the url, and
202 // that only in the case of a same-document navigation. 200 // that only in the case of a same-document navigation.
(...skipping 10 matching lines...) Expand all
213 211
214 ResourceError m_mainDocumentError; 212 ResourceError m_mainDocumentError;
215 213
216 bool m_isClientRedirect; 214 bool m_isClientRedirect;
217 bool m_replacesCurrentHistoryItem; 215 bool m_replacesCurrentHistoryItem;
218 216
219 NavigationType m_navigationType; 217 NavigationType m_navigationType;
220 218
221 RefPtrWillBeMember<MHTMLArchive> m_archive; 219 RefPtrWillBeMember<MHTMLArchive> m_archive;
222 220
223 #if !ENABLE(OILPAN)
224 WeakPtrFactory<DocumentLoader> m_weakFactory;
225 #endif
226 DocumentLoadTiming m_documentLoadTiming; 221 DocumentLoadTiming m_documentLoadTiming;
227 222
228 double m_timeOfLastDataReceived; 223 double m_timeOfLastDataReceived;
229 224
230 PersistentWillBeMember<ApplicationCacheHost> m_applicationCacheHost; 225 PersistentWillBeMember<ApplicationCacheHost> m_applicationCacheHost;
231 226
232 RefPtrWillBeMember<ContentSecurityPolicy> m_contentSecurityPolicy; 227 RefPtrWillBeMember<ContentSecurityPolicy> m_contentSecurityPolicy;
233 ClientHintsPreferences m_clientHintsPreferences; 228 ClientHintsPreferences m_clientHintsPreferences;
234 InitialScrollState m_initialScrollState; 229 InitialScrollState m_initialScrollState;
235 230
236 enum State { 231 enum State {
237 NotStarted, 232 NotStarted,
238 Provisional, 233 Provisional,
239 Committed, 234 Committed,
240 DataReceived, 235 DataReceived,
241 MainResourceDone 236 MainResourceDone
242 }; 237 };
243 State m_state; 238 State m_state;
244 239
245 // Used to protect against reentrancy into dataReceived(). 240 // Used to protect against reentrancy into dataReceived().
246 bool m_inDataReceived; 241 bool m_inDataReceived;
247 RefPtr<SharedBuffer> m_dataBuffer; 242 RefPtr<SharedBuffer> m_dataBuffer;
248 }; 243 };
249 244
250 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); 245 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
251 246
252 } // namespace blink 247 } // namespace blink
253 248
254 #endif // DocumentLoader_h 249 #endif // DocumentLoader_h
OLDNEW
« no previous file with comments | « Source/core/loader/DocumentLoadTiming.cpp ('k') | Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698