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

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

Issue 659093002: Pass the size to the RenderView on creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@java_enum
Patch Set: Created 6 years, 1 month 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
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 771 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 782
783 if (!params->frame_name.empty()) 783 if (!params->frame_name.empty())
784 webview()->mainFrame()->setName(params->frame_name); 784 webview()->mainFrame()->setName(params->frame_name);
785 785
786 // TODO(davidben): Move this state from Blink into content. 786 // TODO(davidben): Move this state from Blink into content.
787 if (params->window_was_created_with_opener) 787 if (params->window_was_created_with_opener)
788 webview()->setOpenedByDOM(); 788 webview()->setOpenedByDOM();
789 789
790 OnSetRendererPrefs(params->renderer_prefs); 790 OnSetRendererPrefs(params->renderer_prefs);
791 791
792 if (params->initial_size)
793 OnResize(*params->initial_size);
794
792 new MHTMLGenerator(this); 795 new MHTMLGenerator(this);
793 #if defined(OS_MACOSX) 796 #if defined(OS_MACOSX)
794 new TextInputClientObserver(this); 797 new TextInputClientObserver(this);
795 #endif // defined(OS_MACOSX) 798 #endif // defined(OS_MACOSX)
796 799
797 // The next group of objects all implement RenderViewObserver, so are deleted 800 // The next group of objects all implement RenderViewObserver, so are deleted
798 // along with the RenderView automatically. 801 // along with the RenderView automatically.
799 devtools_agent_ = new DevToolsAgent(this); 802 devtools_agent_ = new DevToolsAgent(this);
800 if (RenderWidgetCompositor* rwc = compositor()) { 803 if (RenderWidgetCompositor* rwc = compositor()) {
801 webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId()); 804 webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId());
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
1129 int32 main_frame_routing_id, 1132 int32 main_frame_routing_id,
1130 int32 surface_id, 1133 int32 surface_id,
1131 int64 session_storage_namespace_id, 1134 int64 session_storage_namespace_id,
1132 const base::string16& frame_name, 1135 const base::string16& frame_name,
1133 bool is_renderer_created, 1136 bool is_renderer_created,
1134 bool swapped_out, 1137 bool swapped_out,
1135 int32 proxy_routing_id, 1138 int32 proxy_routing_id,
1136 bool hidden, 1139 bool hidden,
1137 bool never_visible, 1140 bool never_visible,
1138 int32 next_page_id, 1141 int32 next_page_id,
1139 const blink::WebScreenInfo& screen_info) { 1142 const blink::WebScreenInfo& screen_info,
1143 const ViewMsg_Resize_Params* initial_size) {
1140 DCHECK(routing_id != MSG_ROUTING_NONE); 1144 DCHECK(routing_id != MSG_ROUTING_NONE);
1141 RenderViewImplParams params(opener_id, 1145 RenderViewImplParams params(opener_id,
1142 window_was_created_with_opener, 1146 window_was_created_with_opener,
1143 renderer_prefs, 1147 renderer_prefs,
1144 webkit_prefs, 1148 webkit_prefs,
1145 routing_id, 1149 routing_id,
1146 main_frame_routing_id, 1150 main_frame_routing_id,
1147 surface_id, 1151 surface_id,
1148 session_storage_namespace_id, 1152 session_storage_namespace_id,
1149 frame_name, 1153 frame_name,
1150 is_renderer_created, 1154 is_renderer_created,
1151 swapped_out, 1155 swapped_out,
1152 proxy_routing_id, 1156 proxy_routing_id,
1153 hidden, 1157 hidden,
1154 never_visible, 1158 never_visible,
1155 next_page_id, 1159 next_page_id,
1156 screen_info); 1160 screen_info,
1161 initial_size);
1157 RenderViewImpl* render_view = NULL; 1162 RenderViewImpl* render_view = NULL;
1158 if (g_create_render_view_impl) 1163 if (g_create_render_view_impl)
1159 render_view = g_create_render_view_impl(&params); 1164 render_view = g_create_render_view_impl(&params);
1160 else 1165 else
1161 render_view = new RenderViewImpl(&params); 1166 render_view = new RenderViewImpl(&params);
1162 1167
1163 render_view->Initialize(&params); 1168 render_view->Initialize(&params);
1164 return render_view; 1169 return render_view;
1165 } 1170 }
1166 1171
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
1680 main_frame_routing_id, 1685 main_frame_routing_id,
1681 surface_id, 1686 surface_id,
1682 cloned_session_storage_namespace_id, 1687 cloned_session_storage_namespace_id,
1683 base::string16(), // WebCore will take care of setting the correct name. 1688 base::string16(), // WebCore will take care of setting the correct name.
1684 true, // is_renderer_created 1689 true, // is_renderer_created
1685 false, // swapped_out 1690 false, // swapped_out
1686 MSG_ROUTING_NONE, // proxy_routing_id 1691 MSG_ROUTING_NONE, // proxy_routing_id
1687 params.disposition == NEW_BACKGROUND_TAB, // hidden 1692 params.disposition == NEW_BACKGROUND_TAB, // hidden
1688 never_visible, 1693 never_visible,
1689 1, // next_page_id 1694 1, // next_page_id
1690 screen_info_); 1695 screen_info_,
1696 nullptr);
1691 view->opened_by_user_gesture_ = params.user_gesture; 1697 view->opened_by_user_gesture_ = params.user_gesture;
1692 1698
1693 // Record whether the creator frame is trying to suppress the opener field. 1699 // Record whether the creator frame is trying to suppress the opener field.
1694 view->opener_suppressed_ = params.opener_suppressed; 1700 view->opener_suppressed_ = params.opener_suppressed;
1695 1701
1696 return view->webview(); 1702 return view->webview();
1697 } 1703 }
1698 1704
1699 WebWidget* RenderViewImpl::createPopupMenu(blink::WebPopupType popup_type) { 1705 WebWidget* RenderViewImpl::createPopupMenu(blink::WebPopupType popup_type) {
1700 RenderWidget* widget = 1706 RenderWidget* widget =
(...skipping 2512 matching lines...) Expand 10 before | Expand all | Expand 10 after
4213 std::vector<gfx::Size> sizes; 4219 std::vector<gfx::Size> sizes;
4214 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4220 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4215 if (!url.isEmpty()) 4221 if (!url.isEmpty())
4216 urls.push_back( 4222 urls.push_back(
4217 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4223 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4218 } 4224 }
4219 SendUpdateFaviconURL(urls); 4225 SendUpdateFaviconURL(urls);
4220 } 4226 }
4221 4227
4222 } // namespace content 4228 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698