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

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

Issue 1617043002: Introduce AncestorThrottle, which will process 'X-Frame-Options' headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@block-response
Patch Set: DCHECK. Created 4 years, 7 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 // unload events, abort XHR requests and detach the document. Returns true 164 // unload events, abort XHR requests and detach the document. Returns true
165 // if the frame is ready to receive the next commit, or false otherwise. 165 // if the frame is ready to receive the next commit, or false otherwise.
166 bool prepareForCommit(); 166 bool prepareForCommit();
167 167
168 void commitProvisionalLoad(); 168 void commitProvisionalLoad();
169 169
170 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; } 170 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; }
171 171
172 void applyUserAgent(ResourceRequest&); 172 void applyUserAgent(ResourceRequest&);
173 173
174 bool shouldInterruptLoadForXFrameOptions(const String&, const KURL&, unsigne d long requestIdentifier);
175
176 bool allAncestorsAreComplete() const; // including this 174 bool allAncestorsAreComplete() const; // including this
177 175
178 bool shouldClose(bool isReload = false); 176 bool shouldClose(bool isReload = false);
179 void dispatchUnloadEvent(); 177 void dispatchUnloadEvent();
180 178
181 bool allowPlugins(ReasonForCallingAllowPlugins); 179 bool allowPlugins(ReasonForCallingAllowPlugins);
182 180
183 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, HistoryScrollRestorationType, FrameLoadTy pe); 181 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, HistoryScrollRestorationType, FrameLoadTy pe);
184 182
185 HistoryItem* currentItem() const { return m_currentItem.get(); } 183 HistoryItem* currentItem() const { return m_currentItem.get(); }
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 278
281 SandboxFlags m_forcedSandboxFlags; 279 SandboxFlags m_forcedSandboxFlags;
282 280
283 bool m_dispatchingDidClearWindowObjectInMainWorld; 281 bool m_dispatchingDidClearWindowObjectInMainWorld;
284 bool m_protectProvisionalLoader; 282 bool m_protectProvisionalLoader;
285 }; 283 };
286 284
287 } // namespace blink 285 } // namespace blink
288 286
289 #endif // FrameLoader_h 287 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698