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

Unified Diff: cc/trees/layer_tree_host_impl_unittest.cc

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 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
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_host_pixeltest_masks.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl_unittest.cc
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index b5e3a813449eae773c77e5fe65a5f7aaed08053e..7ffa6831a92d75042bbcd3437802578bf00ed521 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -2473,7 +2473,6 @@ class LayerTreeHostImplTopControlsTest : public LayerTreeHostImplTest {
: layer_size_(10, 10),
clip_size_(layer_size_),
top_controls_height_(50) {
- settings_.calculate_top_controls_position = true;
settings_.use_pinch_virtual_viewport = true;
viewport_size_ = gfx::Size(clip_size_.width(),
@@ -2484,7 +2483,7 @@ class LayerTreeHostImplTopControlsTest : public LayerTreeHostImplTest {
scoped_ptr<OutputSurface> output_surface) override {
bool init =
LayerTreeHostImplTest::CreateHostImpl(settings, output_surface.Pass());
- if (init && settings.calculate_top_controls_position) {
+ if (init) {
host_impl_->active_tree()->set_top_controls_height(top_controls_height_);
host_impl_->active_tree()->SetCurrentTopControlsShownRatio(1.f);
}
@@ -7426,7 +7425,6 @@ class LayerTreeHostImplWithTopControlsTest : public LayerTreeHostImplTest {
public:
void SetUp() override {
LayerTreeSettings settings = DefaultSettings();
- settings.calculate_top_controls_position = true;
CreateHostImpl(settings, CreateOutputSurface());
host_impl_->active_tree()->set_top_controls_height(top_controls_height_);
host_impl_->sync_tree()->set_top_controls_height(top_controls_height_);
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_host_pixeltest_masks.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698