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

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 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 UScriptCode code = static_cast<UScriptCode>(script); 637 UScriptCode code = static_cast<UScriptCode>(script);
638 (*setter)(settings, it->second, GetScriptForWebSettings(code)); 638 (*setter)(settings, it->second, GetScriptForWebSettings(code));
639 } 639 }
640 } 640 }
641 } 641 }
642 642
643 } // namespace 643 } // namespace
644 644
645 RenderViewImpl::RenderViewImpl(RenderViewImplParams* params) 645 RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
646 : RenderWidget(blink::WebPopupTypeNone, 646 : RenderWidget(blink::WebPopupTypeNone,
647 params->screen_info, 647 params->initial_size.screen_info,
648 params->swapped_out, 648 params->swapped_out,
649 params->hidden, 649 params->hidden,
650 params->never_visible), 650 params->never_visible),
651 webkit_preferences_(params->webkit_prefs), 651 webkit_preferences_(params->webkit_prefs),
652 send_content_state_immediately_(false), 652 send_content_state_immediately_(false),
653 enabled_bindings_(0), 653 enabled_bindings_(0),
654 send_preferred_size_changes_(false), 654 send_preferred_size_changes_(false),
655 navigation_gesture_(NavigationGestureUnknown), 655 navigation_gesture_(NavigationGestureUnknown),
656 opened_by_user_gesture_(true), 656 opened_by_user_gesture_(true),
657 opener_suppressed_(false), 657 opener_suppressed_(false),
(...skipping 124 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 OnResize(params->initial_size);
793
792 new MHTMLGenerator(this); 794 new MHTMLGenerator(this);
793 #if defined(OS_MACOSX) 795 #if defined(OS_MACOSX)
794 new TextInputClientObserver(this); 796 new TextInputClientObserver(this);
795 #endif // defined(OS_MACOSX) 797 #endif // defined(OS_MACOSX)
796 798
797 // The next group of objects all implement RenderViewObserver, so are deleted 799 // The next group of objects all implement RenderViewObserver, so are deleted
798 // along with the RenderView automatically. 800 // along with the RenderView automatically.
799 devtools_agent_ = new DevToolsAgent(this); 801 devtools_agent_ = new DevToolsAgent(this);
800 if (RenderWidgetCompositor* rwc = compositor()) { 802 if (RenderWidgetCompositor* rwc = compositor()) {
801 webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId()); 803 webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId());
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 int32 main_frame_routing_id, 1134 int32 main_frame_routing_id,
1133 int32 surface_id, 1135 int32 surface_id,
1134 int64 session_storage_namespace_id, 1136 int64 session_storage_namespace_id,
1135 const base::string16& frame_name, 1137 const base::string16& frame_name,
1136 bool is_renderer_created, 1138 bool is_renderer_created,
1137 bool swapped_out, 1139 bool swapped_out,
1138 int32 proxy_routing_id, 1140 int32 proxy_routing_id,
1139 bool hidden, 1141 bool hidden,
1140 bool never_visible, 1142 bool never_visible,
1141 int32 next_page_id, 1143 int32 next_page_id,
1142 const blink::WebScreenInfo& screen_info) { 1144 const ViewMsg_Resize_Params& initial_size) {
1143 DCHECK(routing_id != MSG_ROUTING_NONE); 1145 DCHECK(routing_id != MSG_ROUTING_NONE);
1144 RenderViewImplParams params(opener_id, 1146 RenderViewImplParams params(opener_id,
1145 window_was_created_with_opener, 1147 window_was_created_with_opener,
1146 renderer_prefs, 1148 renderer_prefs,
1147 webkit_prefs, 1149 webkit_prefs,
1148 routing_id, 1150 routing_id,
1149 main_frame_routing_id, 1151 main_frame_routing_id,
1150 surface_id, 1152 surface_id,
1151 session_storage_namespace_id, 1153 session_storage_namespace_id,
1152 frame_name, 1154 frame_name,
1153 is_renderer_created, 1155 is_renderer_created,
1154 swapped_out, 1156 swapped_out,
1155 proxy_routing_id, 1157 proxy_routing_id,
1156 hidden, 1158 hidden,
1157 never_visible, 1159 never_visible,
1158 next_page_id, 1160 next_page_id,
1159 screen_info); 1161 initial_size);
1160 RenderViewImpl* render_view = NULL; 1162 RenderViewImpl* render_view = NULL;
1161 if (g_create_render_view_impl) 1163 if (g_create_render_view_impl)
1162 render_view = g_create_render_view_impl(&params); 1164 render_view = g_create_render_view_impl(&params);
1163 else 1165 else
1164 render_view = new RenderViewImpl(&params); 1166 render_view = new RenderViewImpl(&params);
1165 1167
1166 render_view->Initialize(&params); 1168 render_view->Initialize(&params);
1167 return render_view; 1169 return render_view;
1168 } 1170 }
1169 1171
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
1662 return NULL; 1664 return NULL;
1663 1665
1664 WebUserGestureIndicator::consumeUserGesture(); 1666 WebUserGestureIndicator::consumeUserGesture();
1665 1667
1666 // While this view may be a background extension page, it can spawn a visible 1668 // While this view may be a background extension page, it can spawn a visible
1667 // render view. So we just assume that the new one is not another background 1669 // render view. So we just assume that the new one is not another background
1668 // page instead of passing on our own value. 1670 // page instead of passing on our own value.
1669 // TODO(vangelis): Can we tell if the new view will be a background page? 1671 // TODO(vangelis): Can we tell if the new view will be a background page?
1670 bool never_visible = false; 1672 bool never_visible = false;
1671 1673
1674 ViewMsg_Resize_Params initial_size = ViewMsg_Resize_Params();
1675 initial_size.screen_info = screen_info_;
1676
1672 // The initial hidden state for the RenderViewImpl here has to match what the 1677 // The initial hidden state for the RenderViewImpl here has to match what the
1673 // browser will eventually decide for the given disposition. Since we have to 1678 // browser will eventually decide for the given disposition. Since we have to
1674 // return from this call synchronously, we just have to make our best guess 1679 // return from this call synchronously, we just have to make our best guess
1675 // and rely on the browser sending a WasHidden / WasShown message if it 1680 // and rely on the browser sending a WasHidden / WasShown message if it
1676 // disagrees. 1681 // disagrees.
1677 RenderViewImpl* view = RenderViewImpl::Create( 1682 RenderViewImpl* view = RenderViewImpl::Create(
1678 routing_id_, 1683 routing_id_,
1679 true, // window_was_created_with_opener 1684 true, // window_was_created_with_opener
1680 renderer_preferences_, 1685 renderer_preferences_,
1681 webkit_preferences_, 1686 webkit_preferences_,
1682 routing_id, 1687 routing_id,
1683 main_frame_routing_id, 1688 main_frame_routing_id,
1684 surface_id, 1689 surface_id,
1685 cloned_session_storage_namespace_id, 1690 cloned_session_storage_namespace_id,
1686 base::string16(), // WebCore will take care of setting the correct name. 1691 base::string16(), // WebCore will take care of setting the correct name.
1687 true, // is_renderer_created 1692 true, // is_renderer_created
1688 false, // swapped_out 1693 false, // swapped_out
1689 MSG_ROUTING_NONE, // proxy_routing_id 1694 MSG_ROUTING_NONE, // proxy_routing_id
1690 params.disposition == NEW_BACKGROUND_TAB, // hidden 1695 params.disposition == NEW_BACKGROUND_TAB, // hidden
1691 never_visible, 1696 never_visible,
1692 1, // next_page_id 1697 1, // next_page_id
1693 screen_info_); 1698 initial_size);
1694 view->opened_by_user_gesture_ = params.user_gesture; 1699 view->opened_by_user_gesture_ = params.user_gesture;
1695 1700
1696 // Record whether the creator frame is trying to suppress the opener field. 1701 // Record whether the creator frame is trying to suppress the opener field.
1697 view->opener_suppressed_ = params.opener_suppressed; 1702 view->opener_suppressed_ = params.opener_suppressed;
1698 1703
1699 return view->webview(); 1704 return view->webview();
1700 } 1705 }
1701 1706
1702 WebWidget* RenderViewImpl::createPopupMenu(blink::WebPopupType popup_type) { 1707 WebWidget* RenderViewImpl::createPopupMenu(blink::WebPopupType popup_type) {
1703 RenderWidget* widget = 1708 RenderWidget* widget =
(...skipping 2513 matching lines...) Expand 10 before | Expand all | Expand 10 after
4217 std::vector<gfx::Size> sizes; 4222 std::vector<gfx::Size> sizes;
4218 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4223 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4219 if (!url.isEmpty()) 4224 if (!url.isEmpty())
4220 urls.push_back( 4225 urls.push_back(
4221 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4226 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4222 } 4227 }
4223 SendUpdateFaviconURL(urls); 4228 SendUpdateFaviconURL(urls);
4224 } 4229 }
4225 4230
4226 } // namespace content 4231 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698