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

content/renderer/render_widget.cc

Index: content/renderer/render_widget.cc
===================================================================
--- content/renderer/render_widget.cc	(revision 141081)
+++ content/renderer/render_widget.cc	(working copy)
@@ -93,7 +93,6 @@
 }  // namespace
 
 RenderWidget::RenderWidget(WebKit::WebPopupType popup_type,
-                           const WebKit::WebScreenInfo& screen_info,
                            bool swapped_out)
     : routing_id_(MSG_ROUTING_NONE),
       surface_id_(0),
@@ -125,7 +124,6 @@
       is_accelerated_compositing_active_(false),
       animation_update_pending_(false),
       invalidation_task_posted_(false),
-      screen_info_(screen_info),
       invert_(false) {
   if (!swapped_out)
     RenderProcess::current()->AddRefProcess();
@@ -148,11 +146,10 @@
 
 // static
 RenderWidget* RenderWidget::Create(int32 opener_id,
-                                   WebKit::WebPopupType popup_type,
-                                   const WebKit::WebScreenInfo& screen_info) {
+                                   WebKit::WebPopupType popup_type) {
   DCHECK(opener_id != MSG_ROUTING_NONE);
   scoped_refptr<RenderWidget> widget(
-      new RenderWidget(popup_type, screen_info, false));
+      new RenderWidget(popup_type, false));
   widget->Init(opener_id);  // adds reference
   return widget;
 }
@@ -1682,7 +1679,19 @@
 }
 
 WebScreenInfo RenderWidget::screenInfo() {
-  return screen_info_;
+  WebScreenInfo results;
+  if (host_window_set_)
+    Send(new ViewHostMsg_GetScreenInfo(routing_id_, host_window_, &results));
+  else {
+    DLOG(WARNING) << "Unable to retrieve screen information, no host window";
+#if defined(USE_AURA)
+    // TODO(backer): Remove this a temporary workaround for crbug.com/111929
+    // once we get a proper fix.
+    results.availableRect.width = 1000;
+    results.availableRect.height = 1000;
+#endif
+  }
+  return results;
 }
 
 void RenderWidget::resetInputMethod() {