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

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

Issue 2714943004: Move unique name generation and tracking into //content. (Closed)
Patch Set: . Created 3 years, 9 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"
11 #include "content/renderer/unique_name_helper.h"
11 #include "ipc/ipc_listener.h" 12 #include "ipc/ipc_listener.h"
12 #include "ipc/ipc_sender.h" 13 #include "ipc/ipc_sender.h"
13 #include "third_party/WebKit/public/platform/WebFocusType.h" 14 #include "third_party/WebKit/public/platform/WebFocusType.h"
14 #include "third_party/WebKit/public/platform/WebInsecureRequestPolicy.h" 15 #include "third_party/WebKit/public/platform/WebInsecureRequestPolicy.h"
15 #include "third_party/WebKit/public/web/WebRemoteFrame.h" 16 #include "third_party/WebKit/public/web/WebRemoteFrame.h"
16 #include "third_party/WebKit/public/web/WebRemoteFrameClient.h" 17 #include "third_party/WebKit/public/web/WebRemoteFrameClient.h"
17 #include "url/origin.h" 18 #include "url/origin.h"
18 19
19 namespace blink { 20 namespace blink {
20 class WebInputEvent; 21 class WebInputEvent;
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 // when a compositor frame has committed. 111 // when a compositor frame has committed.
111 void DidCommitCompositorFrame(); 112 void DidCommitCompositorFrame();
112 113
113 // Pass replicated information, such as security origin, to this 114 // Pass replicated information, such as security origin, to this
114 // RenderFrameProxy's WebRemoteFrame. 115 // RenderFrameProxy's WebRemoteFrame.
115 void SetReplicatedState(const FrameReplicationState& state); 116 void SetReplicatedState(const FrameReplicationState& state);
116 117
117 int routing_id() { return routing_id_; } 118 int routing_id() { return routing_id_; }
118 RenderViewImpl* render_view() { return render_view_; } 119 RenderViewImpl* render_view() { return render_view_; }
119 blink::WebRemoteFrame* web_frame() { return web_frame_; } 120 blink::WebRemoteFrame* web_frame() { return web_frame_; }
121 const std::string& unique_name() const { return unique_name_; }
120 122
121 void set_provisional_frame_routing_id(int routing_id) { 123 void set_provisional_frame_routing_id(int routing_id) {
122 provisional_frame_routing_id_ = routing_id; 124 provisional_frame_routing_id_ = routing_id;
123 } 125 }
124 126
125 int provisional_frame_routing_id() { return provisional_frame_routing_id_; } 127 int provisional_frame_routing_id() { return provisional_frame_routing_id_; }
126 128
127 // Returns the widget used for the local frame root. 129 // Returns the widget used for the local frame root.
128 RenderWidget* render_widget() { return render_widget_; } 130 RenderWidget* render_widget() { return render_widget_; }
129 131
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 184
183 // The routing ID by which this RenderFrameProxy is known. 185 // The routing ID by which this RenderFrameProxy is known.
184 const int routing_id_; 186 const int routing_id_;
185 187
186 // The routing ID of the provisional RenderFrame (if any) that is meant to 188 // The routing ID of the provisional RenderFrame (if any) that is meant to
187 // replace this RenderFrameProxy in the frame tree. 189 // replace this RenderFrameProxy in the frame tree.
188 int provisional_frame_routing_id_; 190 int provisional_frame_routing_id_;
189 191
190 // Stores the WebRemoteFrame we are associated with. 192 // Stores the WebRemoteFrame we are associated with.
191 blink::WebRemoteFrame* web_frame_; 193 blink::WebRemoteFrame* web_frame_;
194 std::string unique_name_;
192 scoped_refptr<ChildFrameCompositingHelper> compositing_helper_; 195 scoped_refptr<ChildFrameCompositingHelper> compositing_helper_;
193 196
194 RenderViewImpl* render_view_; 197 RenderViewImpl* render_view_;
195 RenderWidget* render_widget_; 198 RenderWidget* render_widget_;
196 199
197 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy); 200 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy);
198 }; 201 };
199 202
200 } // namespace 203 } // namespace
201 204
202 #endif // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ 205 #endif // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698