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

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

Issue 167953003: cc: Remove the --enable-partial-swap flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: enablepartialswap: build 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_view_impl.h ('k') | content/renderer/render_view_impl_params.h » ('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 (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 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 focused_plugin_id_(-1), 743 focused_plugin_id_(-1),
744 #endif 744 #endif
745 #if defined(ENABLE_PLUGINS) 745 #if defined(ENABLE_PLUGINS)
746 focused_pepper_plugin_(NULL), 746 focused_pepper_plugin_(NULL),
747 pepper_last_mouse_event_target_(NULL), 747 pepper_last_mouse_event_target_(NULL),
748 #endif 748 #endif
749 enumeration_completion_id_(0), 749 enumeration_completion_id_(0),
750 load_progress_tracker_(new LoadProgressTracker(this)), 750 load_progress_tracker_(new LoadProgressTracker(this)),
751 session_storage_namespace_id_(params->session_storage_namespace_id), 751 session_storage_namespace_id_(params->session_storage_namespace_id),
752 handling_select_range_(false), 752 handling_select_range_(false),
753 next_snapshot_id_(0), 753 next_snapshot_id_(0) {
754 allow_partial_swap_(params->allow_partial_swap) {
755 } 754 }
756 755
757 void RenderViewImpl::Initialize(RenderViewImplParams* params) { 756 void RenderViewImpl::Initialize(RenderViewImplParams* params) {
758 routing_id_ = params->routing_id; 757 routing_id_ = params->routing_id;
759 surface_id_ = params->surface_id; 758 surface_id_ = params->surface_id;
760 if (params->opener_id != MSG_ROUTING_NONE && params->is_renderer_created) 759 if (params->opener_id != MSG_ROUTING_NONE && params->is_renderer_created)
761 opener_id_ = params->opener_id; 760 opener_id_ = params->opener_id;
762 761
763 // Ensure we start with a valid next_page_id_ from the browser. 762 // Ensure we start with a valid next_page_id_ from the browser.
764 DCHECK_GE(next_page_id_, 0); 763 DCHECK_GE(next_page_id_, 0);
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 int32 routing_id, 974 int32 routing_id,
976 int32 main_frame_routing_id, 975 int32 main_frame_routing_id,
977 int32 surface_id, 976 int32 surface_id,
978 int64 session_storage_namespace_id, 977 int64 session_storage_namespace_id,
979 const base::string16& frame_name, 978 const base::string16& frame_name,
980 bool is_renderer_created, 979 bool is_renderer_created,
981 bool swapped_out, 980 bool swapped_out,
982 bool hidden, 981 bool hidden,
983 int32 next_page_id, 982 int32 next_page_id,
984 const blink::WebScreenInfo& screen_info, 983 const blink::WebScreenInfo& screen_info,
985 unsigned int accessibility_mode, 984 unsigned int accessibility_mode) {
986 bool allow_partial_swap) {
987 DCHECK(routing_id != MSG_ROUTING_NONE); 985 DCHECK(routing_id != MSG_ROUTING_NONE);
988 RenderViewImplParams params( 986 RenderViewImplParams params(opener_id,
989 opener_id, 987 renderer_prefs,
990 renderer_prefs, 988 webkit_prefs,
991 webkit_prefs, 989 routing_id,
992 routing_id, 990 main_frame_routing_id,
993 main_frame_routing_id, 991 surface_id,
994 surface_id, 992 session_storage_namespace_id,
995 session_storage_namespace_id, 993 frame_name,
996 frame_name, 994 is_renderer_created,
997 is_renderer_created, 995 swapped_out,
998 swapped_out, 996 hidden,
999 hidden, 997 next_page_id,
1000 next_page_id, 998 screen_info,
1001 screen_info, 999 accessibility_mode);
1002 accessibility_mode,
1003 allow_partial_swap);
1004 RenderViewImpl* render_view = NULL; 1000 RenderViewImpl* render_view = NULL;
1005 if (g_create_render_view_impl) 1001 if (g_create_render_view_impl)
1006 render_view = g_create_render_view_impl(&params); 1002 render_view = g_create_render_view_impl(&params);
1007 else 1003 else
1008 render_view = new RenderViewImpl(&params); 1004 render_view = new RenderViewImpl(&params);
1009 render_view->Initialize(&params); 1005 render_view->Initialize(&params);
1010 return render_view; 1006 return render_view;
1011 } 1007 }
1012 1008
1013 // static 1009 // static
(...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
1832 // disagrees. 1828 // disagrees.
1833 RenderViewImpl* view = RenderViewImpl::Create( 1829 RenderViewImpl* view = RenderViewImpl::Create(
1834 routing_id_, 1830 routing_id_,
1835 renderer_preferences_, 1831 renderer_preferences_,
1836 transferred_preferences, 1832 transferred_preferences,
1837 routing_id, 1833 routing_id,
1838 main_frame_routing_id, 1834 main_frame_routing_id,
1839 surface_id, 1835 surface_id,
1840 cloned_session_storage_namespace_id, 1836 cloned_session_storage_namespace_id,
1841 base::string16(), // WebCore will take care of setting the correct name. 1837 base::string16(), // WebCore will take care of setting the correct name.
1842 true, // is_renderer_created 1838 true, // is_renderer_created
1843 false, // swapped_out 1839 false, // swapped_out
1844 params.disposition == NEW_BACKGROUND_TAB, // hidden 1840 params.disposition == NEW_BACKGROUND_TAB, // hidden
1845 1, // next_page_id 1841 1, // next_page_id
1846 screen_info_, 1842 screen_info_,
1847 accessibility_mode_, 1843 accessibility_mode_);
1848 allow_partial_swap_);
1849 view->opened_by_user_gesture_ = params.user_gesture; 1844 view->opened_by_user_gesture_ = params.user_gesture;
1850 1845
1851 // Record whether the creator frame is trying to suppress the opener field. 1846 // Record whether the creator frame is trying to suppress the opener field.
1852 view->opener_suppressed_ = params.opener_suppressed; 1847 view->opener_suppressed_ = params.opener_suppressed;
1853 1848
1854 return view->webview(); 1849 return view->webview();
1855 } 1850 }
1856 1851
1857 WebWidget* RenderViewImpl::createPopupMenu(blink::WebPopupType popup_type) { 1852 WebWidget* RenderViewImpl::createPopupMenu(blink::WebPopupType popup_type) {
1858 RenderWidget* widget = 1853 RenderWidget* widget =
(...skipping 3188 matching lines...) Expand 10 before | Expand all | Expand 10 after
5047 } 5042 }
5048 5043
5049 void RenderViewImpl::InstrumentWillComposite() { 5044 void RenderViewImpl::InstrumentWillComposite() {
5050 if (!webview()) 5045 if (!webview())
5051 return; 5046 return;
5052 if (!webview()->devToolsAgent()) 5047 if (!webview()->devToolsAgent())
5053 return; 5048 return;
5054 webview()->devToolsAgent()->willComposite(); 5049 webview()->devToolsAgent()->willComposite();
5055 } 5050 }
5056 5051
5057 bool RenderViewImpl::AllowPartialSwap() const {
5058 return allow_partial_swap_;
5059 }
5060
5061 void RenderViewImpl::SetScreenMetricsEmulationParameters( 5052 void RenderViewImpl::SetScreenMetricsEmulationParameters(
5062 float device_scale_factor, 5053 float device_scale_factor,
5063 const gfx::Point& root_layer_offset, 5054 const gfx::Point& root_layer_offset,
5064 float root_layer_scale) { 5055 float root_layer_scale) {
5065 if (webview()) { 5056 if (webview()) {
5066 webview()->setCompositorDeviceScaleFactorOverride(device_scale_factor); 5057 webview()->setCompositorDeviceScaleFactorOverride(device_scale_factor);
5067 webview()->setRootLayerTransform( 5058 webview()->setRootLayerTransform(
5068 blink::WebSize(root_layer_offset.x(), root_layer_offset.y()), 5059 blink::WebSize(root_layer_offset.x(), root_layer_offset.y()),
5069 root_layer_scale); 5060 root_layer_scale);
5070 } 5061 }
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
5550 for (size_t i = 0; i < icon_urls.size(); i++) { 5541 for (size_t i = 0; i < icon_urls.size(); i++) {
5551 WebURL url = icon_urls[i].iconURL(); 5542 WebURL url = icon_urls[i].iconURL();
5552 if (!url.isEmpty()) 5543 if (!url.isEmpty())
5553 urls.push_back(FaviconURL(url, 5544 urls.push_back(FaviconURL(url,
5554 ToFaviconType(icon_urls[i].iconType()))); 5545 ToFaviconType(icon_urls[i].iconType())));
5555 } 5546 }
5556 SendUpdateFaviconURL(urls); 5547 SendUpdateFaviconURL(urls);
5557 } 5548 }
5558 5549
5559 } // namespace content 5550 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_view_impl_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698