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

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

Issue 514603004: Make WebFrame::isLoading() local-only and map it to load event completion (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/loader/FrameLoader.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, 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 // Sets a timer to notify the client that the initial empty document has 107 // Sets a timer to notify the client that the initial empty document has
108 // been accessed, and thus it is no longer safe to show a provisional URL 108 // been accessed, and thus it is no longer safe to show a provisional URL
109 // above the document without risking a URL spoof. 109 // above the document without risking a URL spoof.
110 void didAccessInitialDocument(); 110 void didAccessInitialDocument();
111 111
112 // If the initial empty document is showing and has been accessed, this 112 // If the initial empty document is showing and has been accessed, this
113 // cancels the timer and immediately notifies the client in cases that 113 // cancels the timer and immediately notifies the client in cases that
114 // waiting to notify would allow a URL spoof. 114 // waiting to notify would allow a URL spoof.
115 void notifyIfInitialDocumentAccessed(); 115 void notifyIfInitialDocumentAccessed();
116 116
117 bool isLoading() const;
118
119 DocumentLoader* documentLoader() const { return m_documentLoader.get(); } 117 DocumentLoader* documentLoader() const { return m_documentLoader.get(); }
120 DocumentLoader* policyDocumentLoader() const { return m_policyDocumentLoader .get(); } 118 DocumentLoader* policyDocumentLoader() const { return m_policyDocumentLoader .get(); }
121 DocumentLoader* provisionalDocumentLoader() const { return m_provisionalDocu mentLoader.get(); } 119 DocumentLoader* provisionalDocumentLoader() const { return m_provisionalDocu mentLoader.get(); }
122 FrameState state() const { return m_state; } 120 FrameState state() const { return m_state; }
123 FetchContext& fetchContext() const { return *m_fetchContext; } 121 FetchContext& fetchContext() const { return *m_fetchContext; }
124 122
125 void receivedMainResourceError(const ResourceError&); 123 void receivedMainResourceError(const ResourceError&);
126 124
127 bool isLoadingMainFrame() const; 125 bool isLoadingMainFrame() const;
128 126
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 269
272 bool m_didAccessInitialDocument; 270 bool m_didAccessInitialDocument;
273 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 271 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
274 272
275 SandboxFlags m_forcedSandboxFlags; 273 SandboxFlags m_forcedSandboxFlags;
276 }; 274 };
277 275
278 } // namespace blink 276 } // namespace blink
279 277
280 #endif // FrameLoader_h 278 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698