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

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

Issue 281653003: DRAFT CL: Add FrameNavigationEntry and track subframe session histories. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 5 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | 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 #include "content/renderer/render_frame_proxy.h" 5 #include "content/renderer/render_frame_proxy.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "content/child/webmessageportchannel_impl.h" 10 #include "content/child/webmessageportchannel_impl.h"
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 297
298 void RenderFrameProxy::OnDispatchLoad() { 298 void RenderFrameProxy::OnDispatchLoad() {
299 web_frame_->DispatchLoadEventForFrameOwner(); 299 web_frame_->DispatchLoadEventForFrameOwner();
300 } 300 }
301 301
302 void RenderFrameProxy::OnDidUpdateName(const std::string& name) { 302 void RenderFrameProxy::OnDidUpdateName(const std::string& name) {
303 web_frame_->setReplicatedName(blink::WebString::fromUTF8(name)); 303 web_frame_->setReplicatedName(blink::WebString::fromUTF8(name));
304 } 304 }
305 305
306 void RenderFrameProxy::frameDetached() { 306 void RenderFrameProxy::frameDetached() {
307 if (web_frame_->parent()) 307 // TODO(creis): See http://crbug.com/433012.
308 web_frame_->parent()->removeChild(web_frame_); 308 //if (web_frame_->parent())
309 // web_frame_->parent()->removeChild(web_frame_);
309 310
310 web_frame_->close(); 311 web_frame_->close();
311 delete this; 312 delete this;
312 } 313 }
313 314
314 void RenderFrameProxy::postMessageEvent( 315 void RenderFrameProxy::postMessageEvent(
315 blink::WebLocalFrame* source_frame, 316 blink::WebLocalFrame* source_frame,
316 blink::WebRemoteFrame* target_frame, 317 blink::WebRemoteFrame* target_frame,
317 blink::WebSecurityOrigin target_origin, 318 blink::WebSecurityOrigin target_origin,
318 blink::WebDOMMessageEvent event) { 319 blink::WebDOMMessageEvent event) {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 blink::WebUserGestureIndicator::isProcessingUserGesture(); 363 blink::WebUserGestureIndicator::isProcessingUserGesture();
363 blink::WebUserGestureIndicator::consumeUserGesture(); 364 blink::WebUserGestureIndicator::consumeUserGesture();
364 Send(new FrameHostMsg_OpenURL(routing_id_, params)); 365 Send(new FrameHostMsg_OpenURL(routing_id_, params));
365 } 366 }
366 367
367 void RenderFrameProxy::forwardInputEvent(const blink::WebInputEvent* event) { 368 void RenderFrameProxy::forwardInputEvent(const blink::WebInputEvent* event) {
368 Send(new FrameHostMsg_ForwardInputEvent(routing_id_, event)); 369 Send(new FrameHostMsg_ForwardInputEvent(routing_id_, event));
369 } 370 }
370 371
371 } // namespace 372 } // namespace
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698