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

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

Issue 357043006: Prepare RenderFrameProxy for mirroring the frame tree (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add comment. Created 6 years, 5 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_proxy.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 759
760 main_render_frame_.reset(RenderFrameImpl::Create( 760 main_render_frame_.reset(RenderFrameImpl::Create(
761 this, params->main_frame_routing_id)); 761 this, params->main_frame_routing_id));
762 // The main frame WebLocalFrame object is closed by 762 // The main frame WebLocalFrame object is closed by
763 // RenderFrameImpl::frameDetached(). 763 // RenderFrameImpl::frameDetached().
764 WebLocalFrame* web_frame = WebLocalFrame::create(main_render_frame_.get()); 764 WebLocalFrame* web_frame = WebLocalFrame::create(main_render_frame_.get());
765 main_render_frame_->SetWebFrame(web_frame); 765 main_render_frame_->SetWebFrame(web_frame);
766 766
767 if (params->proxy_routing_id != MSG_ROUTING_NONE) { 767 if (params->proxy_routing_id != MSG_ROUTING_NONE) {
768 CHECK(params->swapped_out); 768 CHECK(params->swapped_out);
769 RenderFrameProxy* proxy = 769 RenderFrameProxy* proxy = RenderFrameProxy::CreateProxyToReplaceFrame(
770 RenderFrameProxy::CreateFrameProxy(params->proxy_routing_id, 770 main_render_frame_.get(), params->proxy_routing_id);
771 params->main_frame_routing_id);
772 main_render_frame_->set_render_frame_proxy(proxy); 771 main_render_frame_->set_render_frame_proxy(proxy);
773 } 772 }
774 773
775 webwidget_ = WebView::create(this); 774 webwidget_ = WebView::create(this);
776 webwidget_mouse_lock_target_.reset(new WebWidgetLockTarget(webwidget_)); 775 webwidget_mouse_lock_target_.reset(new WebWidgetLockTarget(webwidget_));
777 776
778 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 777 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
779 778
780 if (command_line.HasSwitch(switches::kStatsCollectionController)) 779 if (command_line.HasSwitch(switches::kStatsCollectionController))
781 stats_collection_observer_.reset(new StatsCollectionObserver(this)); 780 stats_collection_observer_.reset(new StatsCollectionObserver(this));
(...skipping 3515 matching lines...) Expand 10 before | Expand all | Expand 10 after
4297 std::vector<gfx::Size> sizes; 4296 std::vector<gfx::Size> sizes;
4298 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4297 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4299 if (!url.isEmpty()) 4298 if (!url.isEmpty())
4300 urls.push_back( 4299 urls.push_back(
4301 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4300 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4302 } 4301 }
4303 SendUpdateFaviconURL(urls); 4302 SendUpdateFaviconURL(urls);
4304 } 4303 }
4305 4304
4306 } // namespace content 4305 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_proxy.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698