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

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

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-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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 bool shouldThrottleRendering() const; 170 bool shouldThrottleRendering() const;
171 171
172 // Returns the frame scheduler, creating one if needed. 172 // Returns the frame scheduler, creating one if needed.
173 WebFrameScheduler* frameScheduler(); 173 WebFrameScheduler* frameScheduler();
174 void scheduleVisualUpdateUnlessThrottled(); 174 void scheduleVisualUpdateUnlessThrottled();
175 175
176 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; } 176 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; }
177 177
178 ServiceRegistry* serviceRegistry() { return m_serviceRegistry; } 178 ServiceRegistry* serviceRegistry() { return m_serviceRegistry; }
179 179
180 FrameLoaderClient* client() const;
181
180 private: 182 private:
181 friend class FrameNavigationDisabler; 183 friend class FrameNavigationDisabler;
182 184
183 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*, ServiceRegistry*); 185 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*, ServiceRegistry*);
184 186
185 // Internal Frame helper overrides: 187 // Internal Frame helper overrides:
186 WindowProxyManager* getWindowProxyManager() const override; 188 WindowProxyManager* getWindowProxyManager() const override;
187 189
188 String localLayerTreeAsText(unsigned flags) const; 190 String localLayerTreeAsText(unsigned flags) const;
189 191
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 explicit FrameNavigationDisabler(LocalFrame&); 304 explicit FrameNavigationDisabler(LocalFrame&);
303 ~FrameNavigationDisabler(); 305 ~FrameNavigationDisabler();
304 306
305 private: 307 private:
306 Member<LocalFrame> m_frame; 308 Member<LocalFrame> m_frame;
307 }; 309 };
308 310
309 } // namespace blink 311 } // namespace blink
310 312
311 #endif // LocalFrame_h 313 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/RemoteSecurityContext.cpp ('k') | third_party/WebKit/Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698