Merge 140030 - Revert 124453 - WebWidgetClient::screenInfo() no longer does a synchronous IPC.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
===================================================================
--- content/renderer/render_view_impl.cc	(revision 141081)
+++ content/renderer/render_view_impl.cc	(working copy)
@@ -440,10 +440,9 @@
     bool is_renderer_created,
     bool swapped_out,
     int32 next_page_id,
-    const WebKit::WebScreenInfo& screen_info,
     bool guest,
     AccessibilityMode accessibility_mode)
-    : RenderWidget(WebKit::WebPopupTypeNone, screen_info, swapped_out),
+    : RenderWidget(WebKit::WebPopupTypeNone, swapped_out),
       webkit_preferences_(webkit_prefs),
       send_content_state_immediately_(false),
       enabled_bindings_(0),
@@ -657,7 +656,6 @@
     bool is_renderer_created,
     bool swapped_out,
     int32 next_page_id,
-    const WebKit::WebScreenInfo& screen_info,
     bool guest,
     AccessibilityMode accessibility_mode) {
   DCHECK(routing_id != MSG_ROUTING_NONE);
@@ -674,7 +672,6 @@
       is_renderer_created,
       swapped_out,
       next_page_id,
-      screen_info,
       guest,
       accessibility_mode);
 }
@@ -1541,7 +1538,6 @@
       true,
       false,
       1,
-      screen_info_,
       guest_,
       accessibility_mode_);
   view->opened_by_user_gesture_ = params.user_gesture;
@@ -1564,7 +1560,7 @@
 
 WebWidget* RenderViewImpl::createPopupMenu(WebKit::WebPopupType popup_type) {
   RenderWidget* widget =
-      RenderWidget::Create(routing_id_, popup_type, screen_info_);
+      RenderWidget::Create(routing_id_, popup_type);
   return widget->webwidget();
 }