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

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

Issue 2488743003: (Re-)introduce AncestorThrottle to handle 'X-Frame-Options'. (Closed)
Patch Set: Addressed comments (@alexmos #2) Created 3 years, 12 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 // events, abort XHR requests and detach the document. Returns true if the 178 // events, abort XHR requests and detach the document. Returns true if the
179 // frame is ready to receive the next commit, or false otherwise. 179 // frame is ready to receive the next commit, or false otherwise.
180 bool prepareForCommit(); 180 bool prepareForCommit();
181 181
182 void commitProvisionalLoad(); 182 void commitProvisionalLoad();
183 183
184 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; } 184 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; }
185 185
186 void applyUserAgent(ResourceRequest&); 186 void applyUserAgent(ResourceRequest&);
187 187
188 bool shouldInterruptLoadForXFrameOptions(const String&,
189 const KURL&,
190 unsigned long requestIdentifier);
191
192 bool allAncestorsAreComplete() const; // including this 188 bool allAncestorsAreComplete() const; // including this
193 189
194 bool shouldClose(bool isReload = false); 190 bool shouldClose(bool isReload = false);
195 void dispatchUnloadEvent(); 191 void dispatchUnloadEvent();
196 192
197 bool allowPlugins(ReasonForCallingAllowPlugins); 193 bool allowPlugins(ReasonForCallingAllowPlugins);
198 194
199 void updateForSameDocumentNavigation(const KURL&, 195 void updateForSameDocumentNavigation(const KURL&,
200 SameDocumentNavigationSource, 196 SameDocumentNavigationSource,
201 PassRefPtr<SerializedScriptValue>, 197 PassRefPtr<SerializedScriptValue>,
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 SandboxFlags m_forcedSandboxFlags; 316 SandboxFlags m_forcedSandboxFlags;
321 317
322 bool m_dispatchingDidClearWindowObjectInMainWorld; 318 bool m_dispatchingDidClearWindowObjectInMainWorld;
323 bool m_protectProvisionalLoader; 319 bool m_protectProvisionalLoader;
324 bool m_isNavigationHandledByClient; 320 bool m_isNavigationHandledByClient;
325 }; 321 };
326 322
327 } // namespace blink 323 } // namespace blink
328 324
329 #endif // FrameLoader_h 325 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698