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

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

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: Rebase 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 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 864 matching lines...) Expand 10 before | Expand all | Expand 10 after
875 return; 875 return;
876 page()->animator().scheduleVisualUpdate(this); 876 page()->animator().scheduleVisualUpdate(this);
877 } 877 }
878 878
879 void LocalFrame::updateSecurityOrigin(SecurityOrigin* origin) 879 void LocalFrame::updateSecurityOrigin(SecurityOrigin* origin)
880 { 880 {
881 script().updateSecurityOrigin(origin); 881 script().updateSecurityOrigin(origin);
882 frameScheduler()->setFrameOrigin(WebSecurityOrigin(origin)); 882 frameScheduler()->setFrameOrigin(WebSecurityOrigin(origin));
883 } 883 }
884 884
885 void LocalFrame::cancelLoadAfterXFrameOptionsOrCSPDenied()
886 {
887 document()->enforceSandboxFlags(SandboxOrigin);
888
889 // We shouldn't get here for main frames, so owner() should always exist.
890 owner()->dispatchLoad();
891 }
892
885 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); 893 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame);
886 894
887 FrameNavigationDisabler::FrameNavigationDisabler(LocalFrame& frame) 895 FrameNavigationDisabler::FrameNavigationDisabler(LocalFrame& frame)
888 : m_frame(&frame) 896 : m_frame(&frame)
889 { 897 {
890 m_frame->disableNavigation(); 898 m_frame->disableNavigation();
891 } 899 }
892 900
893 FrameNavigationDisabler::~FrameNavigationDisabler() 901 FrameNavigationDisabler::~FrameNavigationDisabler()
894 { 902 {
895 m_frame->enableNavigation(); 903 m_frame->enableNavigation();
896 } 904 }
897 905
898 } // namespace blink 906 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698