Revert my change to get the tree green. Not sure why the tests became flaky. I'll try to check them in again but in smaller chunks tomorrow.

TBR=mpcomplete

Review URL: http://codereview.chromium.org/21039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9132 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 20 insertions, 6 deletions

diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index 8e37b83..df193bd 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -12,8 +12,8 @@
 #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"
@@ -144,11 +144,25 @@ class RenderWidget : public IPC::Channel::Listener,
     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.