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

Side by Side Diff: content/renderer/render_frame_proxy.h

Issue 2625773002: Reenable framebusting (Closed)
Patch Set: Fix unit tests Created 3 years, 11 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 // 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 void frameDetached(DetachType type) override; 125 void frameDetached(DetachType type) override;
126 void forwardPostMessage(blink::WebLocalFrame* sourceFrame, 126 void forwardPostMessage(blink::WebLocalFrame* sourceFrame,
127 blink::WebRemoteFrame* targetFrame, 127 blink::WebRemoteFrame* targetFrame,
128 blink::WebSecurityOrigin target, 128 blink::WebSecurityOrigin target,
129 blink::WebDOMMessageEvent event) override; 129 blink::WebDOMMessageEvent event) override;
130 void navigate(const blink::WebURLRequest& request, 130 void navigate(const blink::WebURLRequest& request,
131 bool should_replace_current_entry) override; 131 bool should_replace_current_entry) override;
132 void forwardInputEvent(const blink::WebInputEvent* event) override; 132 void forwardInputEvent(const blink::WebInputEvent* event) override;
133 void frameRectsChanged(const blink::WebRect& frame_rect) override; 133 void frameRectsChanged(const blink::WebRect& frame_rect) override;
134 void visibilityChanged(bool visible) override; 134 void visibilityChanged(bool visible) override;
135 void setHasReceivedUserGesture() override;
136 void didChangeOpener(blink::WebFrame* opener) override; 135 void didChangeOpener(blink::WebFrame* opener) override;
137 void advanceFocus(blink::WebFocusType type, 136 void advanceFocus(blink::WebFocusType type,
138 blink::WebLocalFrame* source) override; 137 blink::WebLocalFrame* source) override;
139 void frameFocused() override; 138 void frameFocused() override;
140 139
141 // IPC handlers 140 // IPC handlers
142 void OnDidStartLoading(); 141 void OnDidStartLoading();
143 142
144 private: 143 private:
145 RenderFrameProxy(int routing_id, int frame_routing_id); 144 RenderFrameProxy(int routing_id, int frame_routing_id);
(...skipping 20 matching lines...) Expand all
166 void OnDidUpdateName(const std::string& name, const std::string& unique_name); 165 void OnDidUpdateName(const std::string& name, const std::string& unique_name);
167 void OnAddContentSecurityPolicy(const ContentSecurityPolicyHeader& header); 166 void OnAddContentSecurityPolicy(const ContentSecurityPolicyHeader& header);
168 void OnResetContentSecurityPolicy(); 167 void OnResetContentSecurityPolicy();
169 void OnEnforceInsecureRequestPolicy(blink::WebInsecureRequestPolicy policy); 168 void OnEnforceInsecureRequestPolicy(blink::WebInsecureRequestPolicy policy);
170 void OnSetFrameOwnerProperties(const FrameOwnerProperties& properties); 169 void OnSetFrameOwnerProperties(const FrameOwnerProperties& properties);
171 void OnDidUpdateOrigin(const url::Origin& origin, 170 void OnDidUpdateOrigin(const url::Origin& origin,
172 bool is_potentially_trustworthy_unique_origin); 171 bool is_potentially_trustworthy_unique_origin);
173 void OnSetPageFocus(bool is_focused); 172 void OnSetPageFocus(bool is_focused);
174 void OnSetFocusedFrame(); 173 void OnSetFocusedFrame();
175 void OnWillEnterFullscreen(); 174 void OnWillEnterFullscreen();
175 void OnSetHasReceivedUserGesture();
176 176
177 // The routing ID by which this RenderFrameProxy is known. 177 // The routing ID by which this RenderFrameProxy is known.
178 const int routing_id_; 178 const int routing_id_;
179 179
180 // The routing ID of the local RenderFrame (if any) which this 180 // The routing ID of the local RenderFrame (if any) which this
181 // RenderFrameProxy is meant to replace in the frame tree. 181 // RenderFrameProxy is meant to replace in the frame tree.
182 const int frame_routing_id_; 182 const int frame_routing_id_;
183 183
184 // Stores the WebRemoteFrame we are associated with. 184 // Stores the WebRemoteFrame we are associated with.
185 blink::WebRemoteFrame* web_frame_; 185 blink::WebRemoteFrame* web_frame_;
186 scoped_refptr<ChildFrameCompositingHelper> compositing_helper_; 186 scoped_refptr<ChildFrameCompositingHelper> compositing_helper_;
187 187
188 RenderViewImpl* render_view_; 188 RenderViewImpl* render_view_;
189 RenderWidget* render_widget_; 189 RenderWidget* render_widget_;
190 190
191 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy); 191 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy);
192 }; 192 };
193 193
194 } // namespace 194 } // namespace
195 195
196 #endif // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ 196 #endif // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698