Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 724 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 724 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
| 725 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 725 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
| 726 webview()->settings()->setThreadedScrollingEnabled( | 726 webview()->settings()->setThreadedScrollingEnabled( |
| 727 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); | 727 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); |
| 728 webview()->settings()->setRootLayerScrolls( | 728 webview()->settings()->setRootLayerScrolls( |
| 729 command_line.HasSwitch(switches::kRootLayerScrolls)); | 729 command_line.HasSwitch(switches::kRootLayerScrolls)); |
| 730 | 730 |
| 731 ApplyWebPreferences(webkit_preferences_, webview()); | 731 ApplyWebPreferences(webkit_preferences_, webview()); |
| 732 | 732 |
| 733 RenderFrameProxy* proxy = NULL; | 733 RenderFrameProxy* proxy = NULL; |
| 734 if (params.proxy_routing_id != MSG_ROUTING_NONE) { | 734 // Do not create a proxy here if this is a swapped out RenderView for an |
| 735 // inner WebContents. | |
| 736 // The proxy will be created in RenderFrameImpl::OnSwapOut(). | |
|
nasko
2015/05/22 16:32:28
Is it not possible to just pass MSG_ROUTING_NONE f
lazyboy
2015/05/26 16:32:55
Yes, done.
| |
| 737 if (params.proxy_routing_id != MSG_ROUTING_NONE && | |
| 738 !params.is_inner_web_contents_in_site_per_process) { | |
| 735 CHECK(params.swapped_out); | 739 CHECK(params.swapped_out); |
| 736 proxy = RenderFrameProxy::CreateProxyToReplaceFrame( | 740 proxy = RenderFrameProxy::CreateProxyToReplaceFrame( |
| 737 main_render_frame_, params.proxy_routing_id); | 741 main_render_frame_, params.proxy_routing_id); |
| 738 main_render_frame_->set_render_frame_proxy(proxy); | 742 main_render_frame_->set_render_frame_proxy(proxy); |
| 739 } | 743 } |
| 740 | 744 |
| 741 // In --site-per-process, just use the WebRemoteFrame as the main frame. | 745 // In --site-per-process, just use the WebRemoteFrame as the main frame. |
| 742 if (command_line.HasSwitch(switches::kSitePerProcess) && proxy) { | 746 if (command_line.HasSwitch(switches::kSitePerProcess) && proxy) { |
| 743 webview()->setMainFrame(proxy->web_frame()); | 747 webview()->setMainFrame(proxy->web_frame()); |
| 744 // Initialize the WebRemoteFrame with information replicated from the | 748 // Initialize the WebRemoteFrame with information replicated from the |
| (...skipping 3016 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3761 std::vector<gfx::Size> sizes; | 3765 std::vector<gfx::Size> sizes; |
| 3762 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3766 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 3763 if (!url.isEmpty()) | 3767 if (!url.isEmpty()) |
| 3764 urls.push_back( | 3768 urls.push_back( |
| 3765 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3769 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 3766 } | 3770 } |
| 3767 SendUpdateFaviconURL(urls); | 3771 SendUpdateFaviconURL(urls); |
| 3768 } | 3772 } |
| 3769 | 3773 |
| 3770 } // namespace content | 3774 } // namespace content |
| OLD | NEW |