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

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

Issue 1476953004: Consolidate functions for updating state after a security origin change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 882 matching lines...) Expand 10 before | Expand all | Expand 10 after
893 893
894 WebFrameScheduler* LocalFrame::frameScheduler() 894 WebFrameScheduler* LocalFrame::frameScheduler()
895 { 895 {
896 if (!m_frameScheduler.get()) 896 if (!m_frameScheduler.get())
897 m_frameScheduler = page()->chromeClient().createFrameScheduler(); 897 m_frameScheduler = page()->chromeClient().createFrameScheduler();
898 898
899 ASSERT(m_frameScheduler.get()); 899 ASSERT(m_frameScheduler.get());
900 return m_frameScheduler.get(); 900 return m_frameScheduler.get();
901 } 901 }
902 902
903 void LocalFrame::updateFrameSecurityOrigin() 903 void LocalFrame::updateSecurityOrigin(SecurityOrigin* origin)
904 { 904 {
905 SecurityContext* context = securityContext(); 905 script().updateSecurityOrigin(origin);
906 if (!context) 906 frameScheduler()->setFrameOrigin(WebSecurityOrigin(origin));
907 return;
908
909 WebSecurityOrigin securityOrigin(context->securityOrigin());
910 frameScheduler()->setFrameOrigin(&securityOrigin);
911 } 907 }
912 908
913 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); 909 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame);
914 910
915 FrameNavigationDisabler::FrameNavigationDisabler(LocalFrame& frame) 911 FrameNavigationDisabler::FrameNavigationDisabler(LocalFrame& frame)
916 : m_frame(&frame) 912 : m_frame(&frame)
917 { 913 {
918 m_frame->disableNavigation(); 914 m_frame->disableNavigation();
919 } 915 }
920 916
921 FrameNavigationDisabler::~FrameNavigationDisabler() 917 FrameNavigationDisabler::~FrameNavigationDisabler()
922 { 918 {
923 m_frame->enableNavigation(); 919 m_frame->enableNavigation();
924 } 920 }
925 921
926 } // namespace blink 922 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698