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

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: Re-block data to data navigations, rebase, address nasko comments Created 3 years, 8 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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 // For history navigations or reloads, an appropriate FrameLoadType should be 91 // For history navigations or reloads, an appropriate FrameLoadType should be
92 // given. Otherwise, FrameLoadTypeStandard should be used (and the final 92 // given. Otherwise, FrameLoadTypeStandard should be used (and the final
93 // FrameLoadType will be computed). For history navigations, a history item 93 // FrameLoadType will be computed). For history navigations, a history item
94 // and a HistoryLoadType should also be provided. 94 // and a HistoryLoadType should also be provided.
95 void load(const FrameLoadRequest&, 95 void load(const FrameLoadRequest&,
96 FrameLoadType = FrameLoadTypeStandard, 96 FrameLoadType = FrameLoadTypeStandard,
97 HistoryItem* = nullptr, 97 HistoryItem* = nullptr,
98 HistoryLoadType = HistoryDifferentDocumentLoad); 98 HistoryLoadType = HistoryDifferentDocumentLoad);
99 99
100 static void reportLocalLoadFailed(LocalFrame*, const String& url); 100 static void reportLocalLoadFailed(LocalFrame*, const String& url);
101 static void reportTopLevelNavigationFailed(LocalFrame*, const String& url);
101 102
102 // Warning: stopAllLoaders can and will detach the LocalFrame out from under 103 // Warning: stopAllLoaders can and will detach the LocalFrame out from under
103 // you. All callers need to either protect the LocalFrame or guarantee they 104 // you. All callers need to either protect the LocalFrame or guarantee they
104 // won't in any way access the LocalFrame after stopAllLoaders returns. 105 // won't in any way access the LocalFrame after stopAllLoaders returns.
105 void stopAllLoaders(); 106 void stopAllLoaders();
106 107
107 // FIXME: clear() is trying to do too many things. We should break it down 108 // FIXME: clear() is trying to do too many things. We should break it down
108 // into smaller functions. 109 // into smaller functions.
109 void clear(); 110 void clear();
110 111
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 SandboxFlags m_forcedSandboxFlags; 315 SandboxFlags m_forcedSandboxFlags;
315 316
316 bool m_dispatchingDidClearWindowObjectInMainWorld; 317 bool m_dispatchingDidClearWindowObjectInMainWorld;
317 bool m_protectProvisionalLoader; 318 bool m_protectProvisionalLoader;
318 bool m_detached; 319 bool m_detached;
319 }; 320 };
320 321
321 } // namespace blink 322 } // namespace blink
322 323
323 #endif // FrameLoader_h 324 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698