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

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

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-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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 void unregisterPluginElement(HTMLPlugInElement*); 179 void unregisterPluginElement(HTMLPlugInElement*);
180 void clearWeakMembers(Visitor*); 180 void clearWeakMembers(Visitor*);
181 #endif 181 #endif
182 DisplayItemClient displayItemClient() const { return toDisplayItemClient(thi s); } 182 DisplayItemClient displayItemClient() const { return toDisplayItemClient(thi s); }
183 String debugName() const { return "LocalFrame"; } 183 String debugName() const { return "LocalFrame"; }
184 184
185 bool shouldThrottleRendering() const; 185 bool shouldThrottleRendering() const;
186 186
187 // Returns the frame scheduler, creating one if needed. 187 // Returns the frame scheduler, creating one if needed.
188 WebFrameScheduler* frameScheduler(); 188 WebFrameScheduler* frameScheduler();
189 void updateFrameSecurityOrigin(); 189
190 void updateSecurityOrigin(SecurityOrigin*);
190 191
191 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; } 192 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; }
192 193
193 private: 194 private:
194 friend class FrameNavigationDisabler; 195 friend class FrameNavigationDisabler;
195 196
196 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*); 197 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*);
197 198
198 // Internal Frame helper overrides: 199 // Internal Frame helper overrides:
199 WindowProxyManager* windowProxyManager() const override; 200 WindowProxyManager* windowProxyManager() const override;
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 explicit FrameNavigationDisabler(LocalFrame&); 341 explicit FrameNavigationDisabler(LocalFrame&);
341 ~FrameNavigationDisabler(); 342 ~FrameNavigationDisabler();
342 343
343 private: 344 private:
344 RawPtrWillBeMember<LocalFrame> m_frame; 345 RawPtrWillBeMember<LocalFrame> m_frame;
345 }; 346 };
346 347
347 } // namespace blink 348 } // namespace blink
348 349
349 #endif // LocalFrame_h 350 #endif // LocalFrame_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698