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

Side by Side Diff: content/renderer/render_frame_proxy.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
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/renderer/render_frame_proxy.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 float scale_factor, 160 float scale_factor,
161 const cc::SurfaceSequence& sequence); 161 const cc::SurfaceSequence& sequence);
162 void OnUpdateOpener(int opener_routing_id); 162 void OnUpdateOpener(int opener_routing_id);
163 void OnDidStopLoading(); 163 void OnDidStopLoading();
164 void OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags); 164 void OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags);
165 void OnDispatchLoad(); 165 void OnDispatchLoad();
166 void OnDidUpdateName(const std::string& name, const std::string& unique_name); 166 void OnDidUpdateName(const std::string& name, const std::string& unique_name);
167 void OnAddContentSecurityPolicy(const ContentSecurityPolicyHeader& header); 167 void OnAddContentSecurityPolicy(const ContentSecurityPolicyHeader& header);
168 void OnResetContentSecurityPolicy(); 168 void OnResetContentSecurityPolicy();
169 void OnEnforceInsecureRequestPolicy(blink::WebInsecureRequestPolicy policy); 169 void OnEnforceInsecureRequestPolicy(blink::WebInsecureRequestPolicy policy);
170 void OnEnforceInsecureNavigationsSet(const std::vector<uint32_t>& set);
170 void OnSetFrameOwnerProperties(const FrameOwnerProperties& properties); 171 void OnSetFrameOwnerProperties(const FrameOwnerProperties& properties);
171 void OnDidUpdateOrigin(const url::Origin& origin, 172 void OnDidUpdateOrigin(const url::Origin& origin,
172 bool is_potentially_trustworthy_unique_origin); 173 bool is_potentially_trustworthy_unique_origin);
173 void OnSetPageFocus(bool is_focused); 174 void OnSetPageFocus(bool is_focused);
174 void OnSetFocusedFrame(); 175 void OnSetFocusedFrame();
175 void OnWillEnterFullscreen(); 176 void OnWillEnterFullscreen();
176 177
177 // The routing ID by which this RenderFrameProxy is known. 178 // The routing ID by which this RenderFrameProxy is known.
178 const int routing_id_; 179 const int routing_id_;
179 180
180 // The routing ID of the local RenderFrame (if any) which this 181 // The routing ID of the local RenderFrame (if any) which this
181 // RenderFrameProxy is meant to replace in the frame tree. 182 // RenderFrameProxy is meant to replace in the frame tree.
182 const int frame_routing_id_; 183 const int frame_routing_id_;
183 184
184 // Stores the WebRemoteFrame we are associated with. 185 // Stores the WebRemoteFrame we are associated with.
185 blink::WebRemoteFrame* web_frame_; 186 blink::WebRemoteFrame* web_frame_;
186 scoped_refptr<ChildFrameCompositingHelper> compositing_helper_; 187 scoped_refptr<ChildFrameCompositingHelper> compositing_helper_;
187 188
188 RenderViewImpl* render_view_; 189 RenderViewImpl* render_view_;
189 RenderWidget* render_widget_; 190 RenderWidget* render_widget_;
190 191
191 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy); 192 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy);
192 }; 193 };
193 194
194 } // namespace 195 } // namespace
195 196
196 #endif // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ 197 #endif // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/renderer/render_frame_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698