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

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

Issue 1957783002: Replicate Content-Security-Policy into remote frame proxies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed CR feedback from dcheng@. Created 4 years, 7 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 782 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 return m_frameScheduler.get(); 793 return m_frameScheduler.get();
794 } 794 }
795 795
796 void LocalFrame::scheduleVisualUpdateUnlessThrottled() 796 void LocalFrame::scheduleVisualUpdateUnlessThrottled()
797 { 797 {
798 if (shouldThrottleRendering()) 798 if (shouldThrottleRendering())
799 return; 799 return;
800 page()->animator().scheduleVisualUpdate(this); 800 page()->animator().scheduleVisualUpdate(this);
801 } 801 }
802 802
803 FrameLoaderClient* LocalFrame::client() const
804 {
805 return static_cast<FrameLoaderClient*>(Frame::client());
806 }
807
803 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); 808 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame);
804 809
805 FrameNavigationDisabler::FrameNavigationDisabler(LocalFrame& frame) 810 FrameNavigationDisabler::FrameNavigationDisabler(LocalFrame& frame)
806 : m_frame(&frame) 811 : m_frame(&frame)
807 { 812 {
808 m_frame->disableNavigation(); 813 m_frame->disableNavigation();
809 } 814 }
810 815
811 FrameNavigationDisabler::~FrameNavigationDisabler() 816 FrameNavigationDisabler::~FrameNavigationDisabler()
812 { 817 {
813 m_frame->enableNavigation(); 818 m_frame->enableNavigation();
814 } 819 }
815 820
816 } // namespace blink 821 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.h ('k') | third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698