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

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

Issue 2702503002: Block renderer-initiated main frame navigations to data URLs (Closed)
Patch Set: Cleanup Created 3 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. 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
4 * (http://www.torchmobile.com/) 4 * (http://www.torchmobile.com/)
5 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
6 * Copyright (C) 2011 Google Inc. All rights reserved. 6 * Copyright (C) 2011 Google Inc. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 // For history navigations or reloads, an appropriate FrameLoadType should be 93 // For history navigations or reloads, an appropriate FrameLoadType should be
94 // given. Otherwise, FrameLoadTypeStandard should be used (and the final 94 // given. Otherwise, FrameLoadTypeStandard should be used (and the final
95 // FrameLoadType will be computed). For history navigations, a history item 95 // FrameLoadType will be computed). For history navigations, a history item
96 // and a HistoryLoadType should also be provided. 96 // and a HistoryLoadType should also be provided.
97 void load(const FrameLoadRequest&, 97 void load(const FrameLoadRequest&,
98 FrameLoadType = FrameLoadTypeStandard, 98 FrameLoadType = FrameLoadTypeStandard,
99 HistoryItem* = nullptr, 99 HistoryItem* = nullptr,
100 HistoryLoadType = HistoryDifferentDocumentLoad); 100 HistoryLoadType = HistoryDifferentDocumentLoad);
101 101
102 static void reportLocalLoadFailed(LocalFrame*, const String& url); 102 static void reportLocalLoadFailed(LocalFrame*, const String& url);
103 static void reportTopLevelNavigationFailed(LocalFrame*, const String& url);
103 104
104 // Warning: stopAllLoaders can and will detach the LocalFrame out from under 105 // Warning: stopAllLoaders can and will detach the LocalFrame out from under
105 // you. All callers need to either protect the LocalFrame or guarantee they 106 // you. All callers need to either protect the LocalFrame or guarantee they
106 // won't in any way access the LocalFrame after stopAllLoaders returns. 107 // won't in any way access the LocalFrame after stopAllLoaders returns.
107 void stopAllLoaders(); 108 void stopAllLoaders();
108 109
109 // FIXME: clear() is trying to do too many things. We should break it down 110 // FIXME: clear() is trying to do too many things. We should break it down
110 // into smaller functions. 111 // into smaller functions.
111 void clear(); 112 void clear();
112 113
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 330
330 SandboxFlags m_forcedSandboxFlags; 331 SandboxFlags m_forcedSandboxFlags;
331 332
332 bool m_dispatchingDidClearWindowObjectInMainWorld; 333 bool m_dispatchingDidClearWindowObjectInMainWorld;
333 bool m_protectProvisionalLoader; 334 bool m_protectProvisionalLoader;
334 }; 335 };
335 336
336 } // namespace blink 337 } // namespace blink
337 338
338 #endif // FrameLoader_h 339 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698