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

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

Issue 2557063002: Upgrade Insecure Requests: bugfixes, tests, and support for OOPIF.
Patch Set: Addressed comments (@nasko #2). Created 4 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 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
9 * reserved. 9 * reserved.
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 void setIsLoading(bool isLoading) { m_isLoading = isLoading; } 140 void setIsLoading(bool isLoading) { m_isLoading = isLoading; }
141 bool isLoading() const { return m_isLoading; } 141 bool isLoading() const { return m_isLoading; }
142 142
143 virtual WindowProxyManager* getWindowProxyManager() const = 0; 143 virtual WindowProxyManager* getWindowProxyManager() const = 0;
144 144
145 virtual void didChangeVisibilityState(); 145 virtual void didChangeVisibilityState();
146 146
147 bool isDetaching() const { return m_isDetaching; } 147 bool isDetaching() const { return m_isDetaching; }
148 148
149 protected: 149 protected:
150 static void upgradeInsecureRequest(KURL&, Document& originDocument);
151
150 Frame(FrameClient*, FrameHost*, FrameOwner*); 152 Frame(FrameClient*, FrameHost*, FrameOwner*);
151 153
152 mutable FrameTree m_treeNode; 154 mutable FrameTree m_treeNode;
153 155
154 Member<FrameHost> m_host; 156 Member<FrameHost> m_host;
155 Member<FrameOwner> m_owner; 157 Member<FrameOwner> m_owner;
156 158
157 bool m_isDetaching = false; 159 bool m_isDetaching = false;
158 160
159 private: 161 private:
(...skipping 15 matching lines...) Expand all
175 return m_treeNode; 177 return m_treeNode;
176 } 178 }
177 179
178 // Allow equality comparisons of Frames by reference or pointer, 180 // Allow equality comparisons of Frames by reference or pointer,
179 // interchangeably. 181 // interchangeably.
180 DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES(Frame) 182 DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES(Frame)
181 183
182 } // namespace blink 184 } // namespace blink
183 185
184 #endif // Frame_h 186 #endif // Frame_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/SecurityContext.cpp ('k') | third_party/WebKit/Source/core/frame/Frame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698