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

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalFrame.h

Issue 1710283003: OOPIF: Handle cross-site frames being blocked by X-Frame-Options or CSP. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split off the relaxed DCHECK in OnCrossSiteResponse into separate CL Created 4 years, 9 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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999-2001 Lars Knoll <knoll@kde.org> 3 * 1999-2001 Lars Knoll <knoll@kde.org>
4 * 1999-2001 Antti Koivisto <koivisto@kde.org> 4 * 1999-2001 Antti Koivisto <koivisto@kde.org>
5 * 2000-2001 Simon Hausmann <hausmann@kde.org> 5 * 2000-2001 Simon Hausmann <hausmann@kde.org>
6 * 2000-2001 Dirk Mueller <mueller@kde.org> 6 * 2000-2001 Dirk Mueller <mueller@kde.org>
7 * 2000 Stefan Schimanski <1Stein@gmx.de> 7 * 2000 Stefan Schimanski <1Stein@gmx.de>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 bool shouldThrottleRendering() const; 182 bool shouldThrottleRendering() const;
183 183
184 // Returns the frame scheduler, creating one if needed. 184 // Returns the frame scheduler, creating one if needed.
185 WebFrameScheduler* frameScheduler(); 185 WebFrameScheduler* frameScheduler();
186 void scheduleVisualUpdateUnlessThrottled(); 186 void scheduleVisualUpdateUnlessThrottled();
187 187
188 void updateSecurityOrigin(SecurityOrigin*); 188 void updateSecurityOrigin(SecurityOrigin*);
189 189
190 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; } 190 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; }
191 191
192 void updateForBlockedLoad();
193
192 private: 194 private:
193 friend class FrameNavigationDisabler; 195 friend class FrameNavigationDisabler;
194 196
195 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*); 197 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*);
196 198
197 // Internal Frame helper overrides: 199 // Internal Frame helper overrides:
198 WindowProxyManager* windowProxyManager() const override; 200 WindowProxyManager* windowProxyManager() const override;
199 201
200 String localLayerTreeAsText(unsigned flags) const; 202 String localLayerTreeAsText(unsigned flags) const;
201 203
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 explicit FrameNavigationDisabler(LocalFrame&); 319 explicit FrameNavigationDisabler(LocalFrame&);
318 ~FrameNavigationDisabler(); 320 ~FrameNavigationDisabler();
319 321
320 private: 322 private:
321 RawPtrWillBeMember<LocalFrame> m_frame; 323 RawPtrWillBeMember<LocalFrame> m_frame;
322 }; 324 };
323 325
324 } // namespace blink 326 } // namespace blink
325 327
326 #endif // LocalFrame_h 328 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/FlagExpectations/site-per-process ('k') | third_party/WebKit/Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698