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

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

Issue 592263002: Send initializeChildFrame from RenderFrameProxy instead of WebLocalFrame (part 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits Created 6 years, 2 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/basictypes.h" 8 #include "base/basictypes.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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 int routing_id() { return routing_id_; } 92 int routing_id() { return routing_id_; }
93 RenderViewImpl* render_view() { return render_view_; } 93 RenderViewImpl* render_view() { return render_view_; }
94 blink::WebRemoteFrame* web_frame() { return web_frame_; } 94 blink::WebRemoteFrame* web_frame() { return web_frame_; }
95 95
96 // blink::WebRemoteFrameClient implementation: 96 // blink::WebRemoteFrameClient implementation:
97 virtual void postMessageEvent( 97 virtual void postMessageEvent(
98 blink::WebLocalFrame* sourceFrame, 98 blink::WebLocalFrame* sourceFrame,
99 blink::WebRemoteFrame* targetFrame, 99 blink::WebRemoteFrame* targetFrame,
100 blink::WebSecurityOrigin target, 100 blink::WebSecurityOrigin target,
101 blink::WebDOMMessageEvent event); 101 blink::WebDOMMessageEvent event);
102 virtual void initializeChildFrame(
103 const blink::WebRect& frame_rect,
104 float scale_factor);
102 105
103 private: 106 private:
104 RenderFrameProxy(int routing_id, int frame_routing_id); 107 RenderFrameProxy(int routing_id, int frame_routing_id);
105 108
106 void Init(blink::WebRemoteFrame* frame, RenderViewImpl* render_view); 109 void Init(blink::WebRemoteFrame* frame, RenderViewImpl* render_view);
107 110
108 // IPC::Listener 111 // IPC::Listener
109 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; 112 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
110 113
111 // IPC handlers 114 // IPC handlers
(...skipping 14 matching lines...) Expand all
126 scoped_refptr<ChildFrameCompositingHelper> compositing_helper_; 129 scoped_refptr<ChildFrameCompositingHelper> compositing_helper_;
127 130
128 RenderViewImpl* render_view_; 131 RenderViewImpl* render_view_;
129 132
130 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy); 133 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy);
131 }; 134 };
132 135
133 } // namespace 136 } // namespace
134 137
135 #endif // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ 138 #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