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

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

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