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

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

Issue 2655143002: Drop replacesCurrentHistoryItem, NavigationType (Closed)
Patch Set: More compile fixes Created 3 years, 10 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 115
116 void didChangePerformanceTiming(); 116 void didChangePerformanceTiming();
117 void didObserveLoadingBehavior(WebLoadingBehaviorFlag); 117 void didObserveLoadingBehavior(WebLoadingBehaviorFlag);
118 void updateForSameDocumentNavigation(const KURL&, 118 void updateForSameDocumentNavigation(const KURL&,
119 SameDocumentNavigationSource); 119 SameDocumentNavigationSource);
120 const ResourceResponse& response() const { return m_response; } 120 const ResourceResponse& response() const { return m_response; }
121 bool isClientRedirect() const { return m_isClientRedirect; } 121 bool isClientRedirect() const { return m_isClientRedirect; }
122 void setIsClientRedirect(bool isClientRedirect) { 122 void setIsClientRedirect(bool isClientRedirect) {
123 m_isClientRedirect = isClientRedirect; 123 m_isClientRedirect = isClientRedirect;
124 } 124 }
125 bool replacesCurrentHistoryItem() const {
126 return m_replacesCurrentHistoryItem;
127 }
128 void setReplacesCurrentHistoryItem(bool replacesCurrentHistoryItem) {
129 m_replacesCurrentHistoryItem = replacesCurrentHistoryItem;
130 }
131 125
132 bool isCommittedButEmpty() const { 126 bool isCommittedButEmpty() const {
133 return m_state >= Committed && !m_dataReceived; 127 return m_state >= Committed && !m_dataReceived;
134 } 128 }
135 129
136 void setSentDidFinishLoad() { m_state = SentDidFinishLoad; } 130 void setSentDidFinishLoad() { m_state = SentDidFinishLoad; }
137 bool sentDidFinishLoad() const { return m_state == SentDidFinishLoad; } 131 bool sentDidFinishLoad() const { return m_state == SentDidFinishLoad; }
138 132
139 FrameLoadType loadType() const { return m_loadType; } 133 FrameLoadType loadType() const { return m_loadType; }
140 void setLoadType(FrameLoadType loadType) { m_loadType = loadType; } 134 void setLoadType(FrameLoadType loadType) { m_loadType = loadType; }
141 135
142 NavigationType getNavigationType() const { return m_navigationType; }
143 void setNavigationType(NavigationType navigationType) {
144 m_navigationType = navigationType;
145 }
146
147 void startLoadingMainResource(); 136 void startLoadingMainResource();
148 137
149 DocumentLoadTiming& timing() { return m_documentLoadTiming; } 138 DocumentLoadTiming& timing() { return m_documentLoadTiming; }
150 const DocumentLoadTiming& timing() const { return m_documentLoadTiming; } 139 const DocumentLoadTiming& timing() const { return m_documentLoadTiming; }
151 140
152 ApplicationCacheHost* applicationCacheHost() const { 141 ApplicationCacheHost* applicationCacheHost() const {
153 return m_applicationCacheHost.get(); 142 return m_applicationCacheHost.get();
154 } 143 }
155 144
156 void clearRedirectChain(); 145 void clearRedirectChain();
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 // The 'working' request. It may be mutated 248 // The 'working' request. It may be mutated
260 // several times from the original request to include additional 249 // several times from the original request to include additional
261 // headers, cookie information, canonicalization and redirects. 250 // headers, cookie information, canonicalization and redirects.
262 ResourceRequest m_request; 251 ResourceRequest m_request;
263 252
264 ResourceResponse m_response; 253 ResourceResponse m_response;
265 254
266 FrameLoadType m_loadType; 255 FrameLoadType m_loadType;
267 256
268 bool m_isClientRedirect; 257 bool m_isClientRedirect;
269 bool m_replacesCurrentHistoryItem;
270 bool m_dataReceived; 258 bool m_dataReceived;
271 259
272 NavigationType m_navigationType;
273
274 DocumentLoadTiming m_documentLoadTiming; 260 DocumentLoadTiming m_documentLoadTiming;
275 261
276 double m_timeOfLastDataReceived; 262 double m_timeOfLastDataReceived;
277 263
278 Member<ApplicationCacheHost> m_applicationCacheHost; 264 Member<ApplicationCacheHost> m_applicationCacheHost;
279 265
280 Member<ContentSecurityPolicy> m_contentSecurityPolicy; 266 Member<ContentSecurityPolicy> m_contentSecurityPolicy;
281 ClientHintsPreferences m_clientHintsPreferences; 267 ClientHintsPreferences m_clientHintsPreferences;
282 InitialScrollState m_initialScrollState; 268 InitialScrollState m_initialScrollState;
283 269
(...skipping 10 matching lines...) Expand all
294 // Used to protect against reentrancy into dataReceived(). 280 // Used to protect against reentrancy into dataReceived().
295 bool m_inDataReceived; 281 bool m_inDataReceived;
296 RefPtr<SharedBuffer> m_dataBuffer; 282 RefPtr<SharedBuffer> m_dataBuffer;
297 }; 283 };
298 284
299 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); 285 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
300 286
301 } // namespace blink 287 } // namespace blink
302 288
303 #endif // DocumentLoader_h 289 #endif // DocumentLoader_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLAnchorElement.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