Fix false positive/negative resize_ack_pending_ in RenderWidgetHostImpl.

content/browser/renderer_host/render_widget_host_impl.cc

 // 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.
 
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 137 matching lines @@
       routing_id_(routing_id),
       surface_id_(0),
       is_loading_(false),
       is_hidden_(false),
       is_fullscreen_(false),
       is_accelerated_compositing_active_(false),
       repaint_ack_pending_(false),
       resize_ack_pending_(false),
       screen_info_out_of_date_(false),
       overdraw_bottom_height_(0.f),
+      in_flight_size_(-1, -1),
       should_auto_resize_(false),
       waiting_for_screen_rects_ack_(false),
       mouse_move_pending_(false),
       mouse_wheel_pending_(false),
       accessibility_mode_(AccessibilityModeOff),
       select_range_pending_(false),
       move_caret_pending_(false),
       needs_repainting_on_restore_(false),
       is_unresponsive_(false),
       in_flight_event_count_(0),
@@ skipping 186 matching lines @@
   process_->SurfaceUpdated(surface_id_);
 }
 
 void RenderWidgetHostImpl::ResetSizeAndRepaintPendingFlags() {
   resize_ack_pending_ = false;
   if (repaint_ack_pending_) {
     TRACE_EVENT_ASYNC_END0(
         "renderer_host", "RenderWidgetHostImpl::repaint_ack_pending_", this);
   }
   repaint_ack_pending_ = false;
-  in_flight_size_.SetSize(0, 0);
+  in_flight_size_.SetSize(-1, -1);
 }
 
 void RenderWidgetHostImpl::SendScreenRects() {
   if (!renderer_initialized_ || waiting_for_screen_rects_ack_)
     return;
 
   if (is_hidden_) {
     // On GTK, this comes in for backgrounded tabs. Ignore, to match what
     // happens on Win & Mac, and when the view is shown it'll call this again.
     return;
@@ skipping 209 matching lines @@
   gfx::Rect view_bounds = view_->GetViewBounds();
   gfx::Size new_size(view_bounds.size());
 
   gfx::Size old_physical_backing_size = physical_backing_size_;
   physical_backing_size_ = view_->GetPhysicalBackingSize();
   bool was_fullscreen = is_fullscreen_;
   is_fullscreen_ = IsFullscreen();
   float old_overdraw_bottom_height = overdraw_bottom_height_;
   overdraw_bottom_height_ = view_->GetOverdrawBottomHeight();
 
-  bool size_changed = new_size != current_size_;

[aelias_OOO_until_Jul13, 2013/07/10 23:20:46]

Leave this line as it was.

[Kibeom Kim (inactive), 2013/07/11 00:23:51]

Done.

+  bool size_changed = new_size != in_flight_size_;
   bool side_payload_changed =
       screen_info_out_of_date_ ||
       old_physical_backing_size != physical_backing_size_ ||
       was_fullscreen != is_fullscreen_ ||
       old_overdraw_bottom_height != overdraw_bottom_height_;
 
   if (!size_changed && !side_payload_changed)
     return;
 
-  if (in_flight_size_ != gfx::Size() && new_size == in_flight_size_ &&

[aelias_OOO_until_Jul13, 2013/07/10 23:20:46]

Bring this back but just remove "in_flight_size_ != gfx::Size()"

[Kibeom Kim (inactive), 2013/07/11 00:23:51]

Done.

-      !side_payload_changed)
-    return;
-
   if (!screen_info_) {
     screen_info_.reset(new WebKit::WebScreenInfo);
     GetWebScreenInfo(screen_info_.get());
   }
 
   // We don't expect to receive an ACK when the requested size or the physical
   // backing size is empty, or when the main viewport size didn't change.
   if (!new_size.IsEmpty() && !physical_backing_size_.IsEmpty() && size_changed)
     resize_ack_pending_ = g_check_for_pending_resize_ack;
 
@@ skipping 1222 matching lines @@
   last_scroll_offset_ = params.scroll_offset;
 
   bool is_resize_ack =
       ViewHostMsg_UpdateRect_Flags::is_resize_ack(params.flags);
 
   // resize_ack_pending_ needs to be cleared before we call DidPaintRect, since
   // that will end up reaching GetBackingStore.
   if (is_resize_ack) {
     DCHECK(!g_check_for_pending_resize_ack || resize_ack_pending_);
     resize_ack_pending_ = false;
-    in_flight_size_.SetSize(0, 0);

[aelias_OOO_until_Jul13, 2013/07/10 23:20:46]

Bring this back as "in_flight_size_.SetSize(-1, -1);"

[Kibeom Kim (inactive), 2013/07/11 00:23:51]

Done.

   }
 
   bool is_repaint_ack =
       ViewHostMsg_UpdateRect_Flags::is_repaint_ack(params.flags);
   if (is_repaint_ack) {
     DCHECK(repaint_ack_pending_);
     TRACE_EVENT_ASYNC_END0(
         "renderer_host", "RenderWidgetHostImpl::repaint_ack_pending_", this);
     repaint_ack_pending_ = false;
     TimeDelta delta = TimeTicks::Now() - repaint_start_time_;
@@ skipping 831 matching lines @@
     int process_id = (b->first.second >> 32) & 0xffffffff;
     RenderWidgetHost* rwh =
         RenderWidgetHost::FromID(process_id, routing_id);
     if (!rwh)
       continue;
     RenderWidgetHostImpl::From(rwh)->FrameSwapped(latency_info);
   }
 }
 
 }  // namespace content