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

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

Issue 23620020: Don't wait to notify client of spoof attempt if a modal dialog is created. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 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
« no previous file with comments | « no previous file | Source/core/loader/FrameLoader.cpp » ('j') | Source/web/ChromeClientImpl.cpp » ('J')
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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 104
105 // FIXME: These are all functions which stop loads. We have too many. 105 // FIXME: These are all functions which stop loads. We have too many.
106 // Warning: stopAllLoaders can and will detach the Frame out from under you. All callers need to either protect the Frame 106 // Warning: stopAllLoaders can and will detach the Frame out from under you. All callers need to either protect the Frame
107 // or guarantee they won't in any way access the Frame after stopAllLoaders returns. 107 // or guarantee they won't in any way access the Frame after stopAllLoaders returns.
108 void stopAllLoaders(ClearProvisionalItemPolicy = ShouldClearProvisionalItem) ; 108 void stopAllLoaders(ClearProvisionalItemPolicy = ShouldClearProvisionalItem) ;
109 void stopLoading(); 109 void stopLoading();
110 bool closeURL(); 110 bool closeURL();
111 // FIXME: clear() is trying to do too many things. We should break it down i nto smaller functions. 111 // FIXME: clear() is trying to do too many things. We should break it down i nto smaller functions.
112 void clear(ClearOptions); 112 void clear(ClearOptions);
113 113
114 // Sets a timer to notify the client that the initial empty document has
115 // been accessed, and thus it is no longer safe to show a provisional URL
116 // above the document without risking a URL spoof.
114 void didAccessInitialDocument(); 117 void didAccessInitialDocument();
115 void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*); 118 void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*);
darin (slow to review) 2013/09/03 23:21:45 I wonder... should this second method really be pu
Charlie Reis 2013/09/04 00:01:10 Nope. Made it private.
119 // Cancels the timer and immediately notifies the client in cases that
120 // waiting to notify would allow a URL spoof.
121 void forceNotifyForInitialDocumentAccess();
116 122
117 bool isLoading() const; 123 bool isLoading() const;
118 124
119 int numPendingOrLoadingRequests(bool recurse) const; 125 int numPendingOrLoadingRequests(bool recurse) const;
120 String outgoingReferrer() const; 126 String outgoingReferrer() const;
121 String outgoingOrigin() const; 127 String outgoingOrigin() const;
122 128
123 DocumentLoader* activeDocumentLoader() const; 129 DocumentLoader* activeDocumentLoader() const;
124 DocumentLoader* documentLoader() const { return m_documentLoader.get(); } 130 DocumentLoader* documentLoader() const { return m_documentLoader.get(); }
125 DocumentLoader* policyDocumentLoader() const { return m_policyDocumentLoader .get(); } 131 DocumentLoader* policyDocumentLoader() const { return m_policyDocumentLoader .get(); }
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 bool m_startingClientRedirect; 314 bool m_startingClientRedirect;
309 315
310 SandboxFlags m_forcedSandboxFlags; 316 SandboxFlags m_forcedSandboxFlags;
311 317
312 RefPtr<HistoryItem> m_requestedHistoryItem; 318 RefPtr<HistoryItem> m_requestedHistoryItem;
313 }; 319 };
314 320
315 } // namespace WebCore 321 } // namespace WebCore
316 322
317 #endif // FrameLoader_h 323 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/loader/FrameLoader.cpp » ('j') | Source/web/ChromeClientImpl.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698