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

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

Issue 132383005: Set correct viewport size for an out of process iframe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed obsolete test Created 6 years, 10 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.h ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 is_swapped_out_ = true; 707 is_swapped_out_ = true;
708 708
709 // Now that we're swapped out and filtering IPC messages, stop loading to 709 // Now that we're swapped out and filtering IPC messages, stop loading to
710 // ensure that no other in-progress navigation continues. We do this here 710 // ensure that no other in-progress navigation continues. We do this here
711 // to avoid sending a DidStopLoading message to the browser process. 711 // to avoid sending a DidStopLoading message to the browser process.
712 // TODO(creis): Should we be stopping all frames here and using 712 // TODO(creis): Should we be stopping all frames here and using
713 // StopAltErrorPageFetcher with RenderView::OnStop, or just stopping this 713 // StopAltErrorPageFetcher with RenderView::OnStop, or just stopping this
714 // frame? 714 // frame?
715 frame_->stopLoading(); 715 frame_->stopLoading();
716 716
717 frame_->setIsRemote(true);
718
717 // Replace the page with a blank dummy URL. The unload handler will not be 719 // Replace the page with a blank dummy URL. The unload handler will not be
718 // run a second time, thanks to a check in FrameLoader::stopLoading. 720 // run a second time, thanks to a check in FrameLoader::stopLoading.
719 // TODO(creis): Need to add a better way to do this that avoids running the 721 // TODO(creis): Need to add a better way to do this that avoids running the
720 // beforeunload handler. For now, we just run it a second time silently. 722 // beforeunload handler. For now, we just run it a second time silently.
721 render_view_->NavigateToSwappedOutURL(frame_); 723 render_view_->NavigateToSwappedOutURL(frame_);
722 724
723 render_view_->RegisterSwappedOutChildFrame(this); 725 render_view_->RegisterSwappedOutChildFrame(this);
724 } 726 }
725 727
726 Send(new FrameHostMsg_SwapOut_ACK(routing_id_)); 728 Send(new FrameHostMsg_SwapOut_ACK(routing_id_));
(...skipping 1282 matching lines...) Expand 10 before | Expand all | Expand 10 after
2009 params.selection_end = gfx::Point(end_rect.right(), end_rect.bottom()); 2011 params.selection_end = gfx::Point(end_rect.right(), end_rect.bottom());
2010 #endif 2012 #endif
2011 2013
2012 Send(new FrameHostMsg_ContextMenu(routing_id_, params)); 2014 Send(new FrameHostMsg_ContextMenu(routing_id_, params));
2013 } 2015 }
2014 2016
2015 void RenderFrameImpl::forwardInputEvent(const blink::WebInputEvent* event) { 2017 void RenderFrameImpl::forwardInputEvent(const blink::WebInputEvent* event) {
2016 Send(new FrameHostMsg_ForwardInputEvent(routing_id_, event)); 2018 Send(new FrameHostMsg_ForwardInputEvent(routing_id_, event));
2017 } 2019 }
2018 2020
2021 void RenderFrameImpl::initializeChildFrame(const blink::WebRect& frame_rect,
2022 float scale_factor) {
2023 Send(new FrameHostMsg_InitializeChildFrame(
2024 routing_id_, frame_rect, scale_factor));
2025 }
2026
2019 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { 2027 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) {
2020 observers_.AddObserver(observer); 2028 observers_.AddObserver(observer);
2021 } 2029 }
2022 2030
2023 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { 2031 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) {
2024 observer->RenderFrameGone(); 2032 observer->RenderFrameGone();
2025 observers_.RemoveObserver(observer); 2033 observers_.RemoveObserver(observer);
2026 } 2034 }
2027 2035
2028 void RenderFrameImpl::OnStop() { 2036 void RenderFrameImpl::OnStop() {
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
2204 2212
2205 void RenderFrameImpl::didStartLoading() { 2213 void RenderFrameImpl::didStartLoading() {
2206 Send(new FrameHostMsg_DidStartLoading(routing_id_)); 2214 Send(new FrameHostMsg_DidStartLoading(routing_id_));
2207 } 2215 }
2208 2216
2209 void RenderFrameImpl::didStopLoading() { 2217 void RenderFrameImpl::didStopLoading() {
2210 Send(new FrameHostMsg_DidStopLoading(routing_id_)); 2218 Send(new FrameHostMsg_DidStopLoading(routing_id_));
2211 } 2219 }
2212 2220
2213 } // namespace content 2221 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698