Revert 204014 "Don't track whether a resize ack is pending durin..."

trunk/src/content/renderer/render_widget.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_RENDER_WIDGET_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_H_
 
 #include <deque>
 #include <map>
 
@@ skipping 516 matching lines @@
 
   bool init_complete_;
 
   // We store the current cursor object so we can avoid spamming SetCursor
   // messages.
   WebCursor current_cursor_;
 
   // The size of the RenderWidget.
   gfx::Size size_;
 
+  // When short-circuiting size updates, the browser might not know about the
+  // current size of the RenderWidget. To be able to correctly predict when the
+  // browser expects a resize ack, keep track of the size the browser thinks
+  // this RenderWidget should have.
+  gfx::Size size_browser_expects_;
+
   // The TransportDIB that is being used to transfer an image to the browser.
   TransportDIB* current_paint_buf_;
 
   PaintAggregator paint_aggregator_;
 
   // The size of the view's backing surface in non-DPI-adjusted pixels.
   gfx::Size physical_backing_size_;
 
   // The height of the physical backing surface that is overdrawn opaquely in
   // the browser, for example by an on-screen-keyboard (in DPI-adjusted pixels).
@@ skipping 164 matching lines @@
   BrowserRenderingStats browser_rendering_stats_;
 
   base::WeakPtrFactory<RenderWidget> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_