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

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

Issue 181493007: Don't stop the documentLoader on navigations. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: use onReceivedResponse Created 6 years, 9 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, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
4 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
5 * Copyright (C) 2011 Google Inc. All rights reserved. 5 * Copyright (C) 2011 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 void applyUserAgent(ResourceRequest&); 177 void applyUserAgent(ResourceRequest&);
178 178
179 bool shouldInterruptLoadForXFrameOptions(const String&, const KURL&, unsigne d long requestIdentifier); 179 bool shouldInterruptLoadForXFrameOptions(const String&, const KURL&, unsigne d long requestIdentifier);
180 180
181 bool allAncestorsAreComplete() const; // including this 181 bool allAncestorsAreComplete() const; // including this
182 182
183 bool shouldClose(); 183 bool shouldClose();
184 184
185 void started(); 185 void started();
186 186
187 void onResponseReceived();
Nate Chapin 2014/03/10 16:12:44 Nit: responseReceived(), to match the name on Docu
188
187 bool allowPlugins(ReasonForCallingAllowPlugins); 189 bool allowPlugins(ReasonForCallingAllowPlugins);
188 190
189 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, UpdateBackForwardListPolicy); 191 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, UpdateBackForwardListPolicy);
190 192
191 HistoryItem* currentItem() const { return m_currentItem.get(); } 193 HistoryItem* currentItem() const { return m_currentItem.get(); }
192 void saveDocumentAndScrollState(); 194 void saveDocumentAndScrollState();
193 void clearScrollPositionAndViewState(); 195 void clearScrollPositionAndViewState();
194 196
195 enum RestorePolicy { 197 enum RestorePolicy {
196 StandardRestore, 198 StandardRestore,
(...skipping 29 matching lines...) Expand all
226 void detachChildren(); 228 void detachChildren();
227 void closeAndRemoveChild(LocalFrame*); 229 void closeAndRemoveChild(LocalFrame*);
228 void detachClient(); 230 void detachClient();
229 231
230 void setHistoryItemStateForCommit(HistoryCommitType, bool isPushOrReplaceSta te = false, PassRefPtr<SerializedScriptValue> = nullptr); 232 void setHistoryItemStateForCommit(HistoryCommitType, bool isPushOrReplaceSta te = false, PassRefPtr<SerializedScriptValue> = nullptr);
231 233
232 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, UpdateBackForwardListPolicy, ClientRedirectPolicy); 234 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, UpdateBackForwardListPolicy, ClientRedirectPolicy);
233 235
234 void scheduleCheckCompleted(); 236 void scheduleCheckCompleted();
235 void startCheckCompleteTimer(); 237 void startCheckCompleteTimer();
238 void checkCurrentDocumentLoaderNeedsStop();
236 239
237 LocalFrame* m_frame; 240 LocalFrame* m_frame;
238 FrameLoaderClient* m_client; 241 FrameLoaderClient* m_client;
239 242
240 // FIXME: These should be OwnPtr<T> to reduce build times and simplify 243 // FIXME: These should be OwnPtr<T> to reduce build times and simplify
241 // header dependencies unless performance testing proves otherwise. 244 // header dependencies unless performance testing proves otherwise.
242 // Some of these could be lazily created for memory savings on devices. 245 // Some of these could be lazily created for memory savings on devices.
243 mutable FrameLoaderStateMachine m_stateMachine; 246 mutable FrameLoaderStateMachine m_stateMachine;
244 mutable MixedContentChecker m_mixedContentChecker; 247 mutable MixedContentChecker m_mixedContentChecker;
245 248
(...skipping 12 matching lines...) Expand all
258 RefPtr<DocumentLoader> m_policyDocumentLoader; 261 RefPtr<DocumentLoader> m_policyDocumentLoader;
259 OwnPtr<FetchContext> m_fetchContext; 262 OwnPtr<FetchContext> m_fetchContext;
260 263
261 RefPtr<HistoryItem> m_currentItem; 264 RefPtr<HistoryItem> m_currentItem;
262 RefPtr<HistoryItem> m_provisionalItem; 265 RefPtr<HistoryItem> m_provisionalItem;
263 266
264 bool m_inStopAllLoaders; 267 bool m_inStopAllLoaders;
265 268
266 // FIXME: This is only used in checkCompleted(). Figure out a way to disenta ngle it. 269 // FIXME: This is only used in checkCompleted(). Figure out a way to disenta ngle it.
267 bool m_isComplete; 270 bool m_isComplete;
271 bool m_currentLoaderNeedsStop;
Nate Chapin 2014/03/10 16:12:44 currentLoader isn't a particularly clear name to m
268 272
269 Timer<FrameLoader> m_checkTimer; 273 Timer<FrameLoader> m_checkTimer;
270 bool m_shouldCallCheckCompleted; 274 bool m_shouldCallCheckCompleted;
271 275
272 bool m_didAccessInitialDocument; 276 bool m_didAccessInitialDocument;
273 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 277 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
274 278
275 SandboxFlags m_forcedSandboxFlags; 279 SandboxFlags m_forcedSandboxFlags;
276 }; 280 };
277 281
278 } // namespace WebCore 282 } // namespace WebCore
279 283
280 #endif // FrameLoader_h 284 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698