Revert my change to get the tree green. Not sure why the tests became flaky....

chrome/renderer/render_widget.h

 // Copyright (c) 2006-2008 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 CHROME_RENDERER_RENDER_WIDGET_H__
 #define CHROME_RENDERER_RENDER_WIDGET_H__
 
 #include <vector>
 #include "base/basictypes.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/gfx/point.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "base/ref_counted.h"
-#include "base/shared_memory.h"
 #include "chrome/common/ipc_channel.h"
+#include "chrome/common/render_messages.h"
 #include "skia/ext/platform_canvas.h"
 
 #include "webkit/glue/webwidget_delegate.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webplugin.h"
 
 class RenderThreadBase;
 
 // RenderWidget provides a communication bridge between a WebWidget and
 // a RenderWidgetHost, the latter of which lives in a different process.
@@ skipping 110 matching lines @@
   // True if a PaintRect_ACK message is pending.
   bool paint_reply_pending() const {
     return paint_reply_pending_;
   }
 
   // True if a ScrollRect_ACK message is pending.
   bool scroll_reply_pending() const {
     return current_scroll_buf_ != NULL;
   }
 
-  bool next_paint_is_resize_ack() const;
-  bool next_paint_is_restore_ack() const;
-  void set_next_paint_is_resize_ack();
-  void set_next_paint_is_restore_ack();
-  void set_next_paint_is_repaint_ack();
+  bool next_paint_is_resize_ack() const {
+    return ViewHostMsg_PaintRect_Flags::is_resize_ack(next_paint_flags_);
+  }
+
+  bool next_paint_is_restore_ack() const {
+    return ViewHostMsg_PaintRect_Flags::is_restore_ack(next_paint_flags_);
+  }
+
+  void set_next_paint_is_resize_ack() {
+    next_paint_flags_ |= ViewHostMsg_PaintRect_Flags::IS_RESIZE_ACK;
+  }
+
+  void set_next_paint_is_restore_ack() {
+    next_paint_flags_ |= ViewHostMsg_PaintRect_Flags::IS_RESTORE_ACK;
+  }
+
+  void set_next_paint_is_repaint_ack() {
+    next_paint_flags_ |= ViewHostMsg_PaintRect_Flags::IS_REPAINT_ACK;
+  }
 
   // Called when a renderer process moves an input focus or updates the
   // position of its caret.
   // This function compares them with the previous values, and send them to
   // the browser process only if they are updated.
   // The browser process moves IME windows and context.
   void UpdateIME();
 
   // Tells the renderer it does not have focus. Used to prevent us from getting
   // the focus on our own when the browser did not focus us.
@@ skipping 94 matching lines @@
   // Whether the window for this RenderWidget can be activated.
   bool activatable_;
 
   // Holds all the needed plugin window moves for a scroll.
   std::vector<WebPluginGeometry> plugin_window_moves_;
 
   DISALLOW_EVIL_CONSTRUCTORS(RenderWidget);
 };
 
 #endif // CHROME_RENDERER_RENDER_WIDGET_H__