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

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: Rebase after a month... Created 4 years, 1 month 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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 // events, abort XHR requests and detach the document. Returns true if the 183 // events, abort XHR requests and detach the document. Returns true if the
184 // frame is ready to receive the next commit, or false otherwise. 184 // frame is ready to receive the next commit, or false otherwise.
185 bool prepareForCommit(); 185 bool prepareForCommit();
186 186
187 void commitProvisionalLoad(); 187 void commitProvisionalLoad();
188 188
189 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; } 189 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; }
190 190
191 void applyUserAgent(ResourceRequest&); 191 void applyUserAgent(ResourceRequest&);
192 192
193 bool shouldInterruptLoadForXFrameOptions(const String&,
194 const KURL&,
195 unsigned long requestIdentifier);
196
197 bool allAncestorsAreComplete() const; // including this 193 bool allAncestorsAreComplete() const; // including this
198 194
199 bool shouldClose(bool isReload = false); 195 bool shouldClose(bool isReload = false);
200 void dispatchUnloadEvent(); 196 void dispatchUnloadEvent();
201 197
202 bool allowPlugins(ReasonForCallingAllowPlugins); 198 bool allowPlugins(ReasonForCallingAllowPlugins);
203 199
204 void updateForSameDocumentNavigation(const KURL&, 200 void updateForSameDocumentNavigation(const KURL&,
205 SameDocumentNavigationSource, 201 SameDocumentNavigationSource,
206 PassRefPtr<SerializedScriptValue>, 202 PassRefPtr<SerializedScriptValue>,
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 SandboxFlags m_forcedSandboxFlags; 322 SandboxFlags m_forcedSandboxFlags;
327 323
328 bool m_dispatchingDidClearWindowObjectInMainWorld; 324 bool m_dispatchingDidClearWindowObjectInMainWorld;
329 bool m_protectProvisionalLoader; 325 bool m_protectProvisionalLoader;
330 bool m_isNavigationHandledByClient; 326 bool m_isNavigationHandledByClient;
331 }; 327 };
332 328
333 } // namespace blink 329 } // namespace blink
334 330
335 #endif // FrameLoader_h 331 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/DocumentLoader.cpp ('k') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698