Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

Unified Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 18413004: Fix false positive/negative resize_ack_pending_ in RenderWidgetHostImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 f9d5ab458710114f5029312559ddb31add80175a..17670ec229a768e694323f23c73ae62248afe63d 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -361,7 +361,7 @@ void RenderWidgetHostImpl::ResetSizeAndRepaintPendingFlags() {
"renderer_host", "RenderWidgetHostImpl::repaint_ack_pending_", this);
}
repaint_ack_pending_ = false;
- in_flight_size_.SetSize(0, 0);
+ last_requested_size_.SetSize(0, 0);
}
void RenderWidgetHostImpl::SendScreenRects() {
@@ -591,7 +591,7 @@ void RenderWidgetHostImpl::WasResized() {
float old_overdraw_bottom_height = overdraw_bottom_height_;
overdraw_bottom_height_ = view_->GetOverdrawBottomHeight();
- bool size_changed = new_size != current_size_;
+ bool size_changed = new_size != last_requested_size_;
bool side_payload_changed =
screen_info_out_of_date_ ||
old_physical_backing_size != physical_backing_size_ ||
@@ -601,10 +601,6 @@ void RenderWidgetHostImpl::WasResized() {
if (!size_changed && !side_payload_changed)
return;
- if (in_flight_size_ != gfx::Size() && new_size == in_flight_size_ &&
- !side_payload_changed)
- return;
-
if (!screen_info_) {
screen_info_.reset(new WebKit::WebScreenInfo);
GetWebScreenInfo(screen_info_.get());
@@ -625,7 +621,7 @@ void RenderWidgetHostImpl::WasResized() {
if (!Send(new ViewMsg_Resize(routing_id_, params))) {
resize_ack_pending_ = false;
} else {
- in_flight_size_ = new_size;
+ last_requested_size_ = new_size;
}
}
@@ -1847,7 +1843,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);
}
bool is_repaint_ack =
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.h ('k') | content/browser/renderer_host/render_widget_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698