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

content/renderer/render_widget.h

Index: content/renderer/render_widget.h
===================================================================
--- content/renderer/render_widget.h	(revision 141081)
+++ content/renderer/render_widget.h	(working copy)
@@ -77,8 +77,7 @@
   // Creates a new RenderWidget.  The opener_id is the routing ID of the
   // RenderView that this widget lives inside.
   static RenderWidget* Create(int32 opener_id,
-                              WebKit::WebPopupType popup_type,
-                              const WebKit::WebScreenInfo& screen_info);
+                              WebKit::WebPopupType popup_type);
 
   // Creates a WebWidget based on the popup type.
   static WebKit::WebWidget* CreateWebWidget(RenderWidget* render_widget);
@@ -167,7 +166,6 @@
   };
 
   RenderWidget(WebKit::WebPopupType popup_type,
-               const WebKit::WebScreenInfo& screen_info,
                bool swapped_out);
   virtual ~RenderWidget();
 
@@ -517,9 +515,6 @@
   // case NULL is added to the queue.
   std::deque<ViewHostMsg_UpdateRect*> updates_pending_swap_;
 
-  // Properties of the screen hosting this RenderWidget instance.
-  WebKit::WebScreenInfo screen_info_;
-
   // Set to true if we should invert all pixels.
   bool invert_;