Remove the next_paint_is_restore flag stuff from RenderWidget.

Neither the browser nor RenderWidget do anything with these anymore.

R=jbauman, piman
BUG=362164

Review URL: https://codereview.chromium.org/261643004

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

4 files changed, 3 insertions, 37 deletions

diff --git a/content/common/view_message_enums.h b/content/common/view_message_enums.h
index 1175568..37179e8 100644
--- a/content/common/view_message_enums.h
+++ b/content/common/view_message_enums.h
@@ -12,15 +12,11 @@
 struct ViewHostMsg_UpdateRect_Flags {
   enum {
     IS_RESIZE_ACK = 1 << 0,
-    IS_RESTORE_ACK = 1 << 1,
     IS_REPAINT_ACK = 1 << 2,
   };
   static bool is_resize_ack(int flags) {
     return (flags & IS_RESIZE_ACK) != 0;
   }
-  static bool is_restore_ack(int flags) {
-    return (flags & IS_RESTORE_ACK) != 0;
-  }
   static bool is_repaint_ack(int flags) {
     return (flags & IS_REPAINT_ACK) != 0;
   }
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index 3a27d79..43b345b 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -419,9 +419,6 @@ IPC_STRUCT_BEGIN(ViewHostMsg_UpdateRect_Params)
   //   ViewHostMsg_UpdateRect_Flags::IS_RESIZE_ACK
   //     Indicates that this is a response to a ViewMsg_Resize message.
   //
-  //   ViewHostMsg_UpdateRect_Flags::IS_RESTORE_ACK
-  //     Indicates that this is a response to a ViewMsg_WasShown message.
-  //
   //   ViewHostMsg_UpdateRect_Flags::IS_REPAINT_ACK
   //     Indicates that this is a response to a ViewMsg_Repaint message.
   //
@@ -611,9 +608,8 @@ IPC_MESSAGE_ROUTED0(ViewMsg_WasHidden)
 
 // Tells the render view that it is no longer hidden (see WasHidden), and the
 // render view is expected to respond with a full repaint if needs_repainting
-// is true.  In that case, the generated ViewHostMsg_UpdateRect message will
-// have the IS_RESTORE_ACK flag set.  If needs_repainting is false, then this
-// message does not trigger a message in response.
+// is true. If needs_repainting is false, then this message does not trigger a
+// message in response.
 IPC_MESSAGE_ROUTED1(ViewMsg_WasShown,
                     bool /* needs_repainting */)
 
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index ba5fd34..92c1254 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -370,7 +370,6 @@ RenderWidget::RenderWidget(blink::WebPopupType popup_type,
       is_hidden_(hidden),
       never_visible_(never_visible),
       is_fullscreen_(false),
-      needs_repainting_on_restore_(false),
       has_focus_(false),
       handling_input_event_(false),
       handling_ime_event_(false),
@@ -667,9 +666,6 @@ void RenderWidget::Resize(const gfx::Size& new_size,
   is_fullscreen_ = is_fullscreen;
 
   if (size_ != new_size) {
-    // TODO(darin): We should not need to reset this here.
-    needs_repainting_on_restore_ = false;
-
     size_ = new_size;
 
     has_frame_pending_ = false;
@@ -800,13 +796,8 @@ void RenderWidget::OnWasShown(bool needs_repainting) {
   // See OnWasHidden
   SetHidden(false);
 
-  if (!needs_repainting && !needs_repainting_on_restore_)
+  if (!needs_repainting)
     return;
-  needs_repainting_on_restore_ = false;
-
-  // Tag the next paint as a restore ack, which is picked up by
-  // DoDeferredUpdate when it sends out the next PaintRect message.
-  set_next_paint_is_restore_ack();
 
   // Generate a full repaint.
   if (!is_accelerated_compositing_active_) {
@@ -1857,18 +1848,10 @@ bool RenderWidget::next_paint_is_resize_ack() const {
   return ViewHostMsg_UpdateRect_Flags::is_resize_ack(next_paint_flags_);
 }
 
-bool RenderWidget::next_paint_is_restore_ack() const {
-  return ViewHostMsg_UpdateRect_Flags::is_restore_ack(next_paint_flags_);
-}
-
 void RenderWidget::set_next_paint_is_resize_ack() {
   next_paint_flags_ |= ViewHostMsg_UpdateRect_Flags::IS_RESIZE_ACK;
 }
 
-void RenderWidget::set_next_paint_is_restore_ack() {
-  next_paint_flags_ |= ViewHostMsg_UpdateRect_Flags::IS_RESTORE_ACK;
-}
-
 void RenderWidget::set_next_paint_is_repaint_ack() {
   next_paint_flags_ |= ViewHostMsg_UpdateRect_Flags::IS_REPAINT_ACK;
 }
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index 27005820..cc61ffb 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -416,9 +416,7 @@ class CONTENT_EXPORT RenderWidget
   void DidToggleFullscreen();
 
   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();
 
   // Override point to obtain that the current input method state and caret
@@ -581,13 +579,6 @@ class CONTENT_EXPORT RenderWidget
   // Indicates that we are in fullscreen mode.
   bool is_fullscreen_;
 
-  // Indicates that we should be repainted when restored.  This flag is set to
-  // true if we receive an invalidation / scroll event from webkit while our
-  // is_hidden_ flag is set to true.  This is used to force a repaint once we
-  // restore to account for the fact that our host would not know about the
-  // invalidation / scroll event(s) from webkit while we are hidden.
-  bool needs_repainting_on_restore_;
-
   // Indicates whether we have been focused/unfocused by the browser.
   bool has_focus_;