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

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

Issue 2103733004: Set navigationStart correctly for all load types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 5 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 // FIXME: clear() is trying to do too many things. We should break it down i nto smaller functions. 98 // FIXME: clear() is trying to do too many things. We should break it down i nto smaller functions.
99 void clear(); 99 void clear();
100 100
101 void replaceDocumentWhileExecutingJavaScriptURL(const String& source, Docume nt* ownerDocument); 101 void replaceDocumentWhileExecutingJavaScriptURL(const String& source, Docume nt* ownerDocument);
102 102
103 // Sets a timer to notify the client that the initial empty document has 103 // Sets a timer to notify the client that the initial empty document has
104 // been accessed, and thus it is no longer safe to show a provisional URL 104 // been accessed, and thus it is no longer safe to show a provisional URL
105 // above the document without risking a URL spoof. 105 // above the document without risking a URL spoof.
106 void didAccessInitialDocument(); 106 void didAccessInitialDocument();
107 107
108 // Returns true if |didAccessInitialDocument| was called.
109 bool hasAccessedInitialDocument() const { return m_hasAccessedInitialDocumen t; }
110
108 // If the initial empty document is showing and has been accessed, this 111 // If the initial empty document is showing and has been accessed, this
109 // cancels the timer and immediately notifies the client in cases that 112 // cancels the timer and immediately notifies the client in cases that
110 // waiting to notify would allow a URL spoof. 113 // waiting to notify would allow a URL spoof.
111 void notifyIfInitialDocumentAccessed(); 114 void notifyIfInitialDocumentAccessed();
112 115
113 DocumentLoader* documentLoader() const { return m_documentLoader.get(); } 116 DocumentLoader* documentLoader() const { return m_documentLoader.get(); }
114 DocumentLoader* provisionalDocumentLoader() const { return m_provisionalDocu mentLoader.get(); } 117 DocumentLoader* provisionalDocumentLoader() const { return m_provisionalDocu mentLoader.get(); }
115 118
116 void loadFailed(DocumentLoader*, const ResourceError&); 119 void loadFailed(DocumentLoader*, const ResourceError&);
117 120
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 FrameLoadType m_loadType; 276 FrameLoadType m_loadType;
274 HistoryLoadType m_historyLoadType; 277 HistoryLoadType m_historyLoadType;
275 }; 278 };
276 279
277 Member<DeferredHistoryLoad> m_deferredHistoryLoad; 280 Member<DeferredHistoryLoad> m_deferredHistoryLoad;
278 281
279 bool m_inStopAllLoaders; 282 bool m_inStopAllLoaders;
280 283
281 Timer<FrameLoader> m_checkTimer; 284 Timer<FrameLoader> m_checkTimer;
282 285
283 bool m_didAccessInitialDocument; 286 bool m_hasAccessedInitialDocument;
284 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 287 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
285 288
286 SandboxFlags m_forcedSandboxFlags; 289 SandboxFlags m_forcedSandboxFlags;
287 290
288 bool m_dispatchingDidClearWindowObjectInMainWorld; 291 bool m_dispatchingDidClearWindowObjectInMainWorld;
289 bool m_protectProvisionalLoader; 292 bool m_protectProvisionalLoader;
290 }; 293 };
291 294
292 } // namespace blink 295 } // namespace blink
293 296
294 #endif // FrameLoader_h 297 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698