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

Side by Side Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 330113002: Fixing flaky overscroll and touch exploration mode browser tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup Created 6 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_impl.h" 5 #include "content/browser/renderer_host/render_widget_host_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 if (is_hidden()) 724 if (is_hidden())
725 return false; 725 return false;
726 726
727 // Do not pause if there is not a paint or resize already coming. 727 // Do not pause if there is not a paint or resize already coming.
728 if (!repaint_ack_pending_ && !resize_ack_pending_) 728 if (!repaint_ack_pending_ && !resize_ack_pending_)
729 return false; 729 return false;
730 730
731 return true; 731 return true;
732 } 732 }
733 733
734 bool RenderWidgetHostImpl::IsResizeAckPendingForTesting() {
735 return resize_ack_pending_;
736 }
737
734 void RenderWidgetHostImpl::WaitForSurface() { 738 void RenderWidgetHostImpl::WaitForSurface() {
735 TRACE_EVENT0("browser", "RenderWidgetHostImpl::WaitForSurface"); 739 TRACE_EVENT0("browser", "RenderWidgetHostImpl::WaitForSurface");
736 740
737 if (!view_) 741 if (!view_)
738 return; 742 return;
739 743
740 // The view_size will be current_size_ for auto-sized views and otherwise the 744 // The view_size will be current_size_ for auto-sized views and otherwise the
741 // size of the view_. (For auto-sized views, current_size_ is updated during 745 // size of the view_. (For auto-sized views, current_size_ is updated during
742 // UpdateRect messages.) 746 // UpdateRect messages.)
743 gfx::Size view_size = current_size_; 747 gfx::Size view_size = current_size_;
(...skipping 1560 matching lines...) Expand 10 before | Expand all | Expand 10 after
2304 } 2308 }
2305 } 2309 }
2306 2310
2307 SkBitmap::Config RenderWidgetHostImpl::PreferredReadbackFormat() { 2311 SkBitmap::Config RenderWidgetHostImpl::PreferredReadbackFormat() {
2308 if (view_) 2312 if (view_)
2309 return view_->PreferredReadbackFormat(); 2313 return view_->PreferredReadbackFormat();
2310 return SkBitmap::kARGB_8888_Config; 2314 return SkBitmap::kARGB_8888_Config;
2311 } 2315 }
2312 2316
2313 } // namespace content 2317 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698