Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_impl.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc |
| index fd68f9e24b97f0addcc1536bcb402ce538fd8582..b7326cdea9f1ffd777c9b2abc6ff2ac84ad70b67 100644 |
| --- a/content/browser/renderer_host/render_widget_host_impl.cc |
| +++ b/content/browser/renderer_host/render_widget_host_impl.cc |
| @@ -155,6 +155,7 @@ RenderWidgetHostImpl::RenderWidgetHostImpl(RenderWidgetHostDelegate* delegate, |
| 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), |
| @@ -361,7 +362,7 @@ void RenderWidgetHostImpl::ResetSizeAndRepaintPendingFlags() { |
| "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() { |
| @@ -591,7 +592,7 @@ void RenderWidgetHostImpl::WasResized() { |
| 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_ || |
| @@ -601,10 +602,6 @@ void RenderWidgetHostImpl::WasResized() { |
| 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_ !
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()); |
| @@ -1847,7 +1844,6 @@ void RenderWidgetHostImpl::OnUpdateRect( |
| 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 = |