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

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

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

Powered by Google App Engine
This is Rietveld 408576698