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

Side by Side Diff: cc/trees/layer_tree_host_impl_unittest.cc

Issue 1236643003: [Android] Suppress overscroll for unscrollable axes in the browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 "cc/trees/layer_tree_host_impl.h" 5 #include "cc/trees/layer_tree_host_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 did_request_prepare_tiles_(false), 94 did_request_prepare_tiles_(false),
95 did_complete_page_scale_animation_(false), 95 did_complete_page_scale_animation_(false),
96 reduce_memory_result_(true) { 96 reduce_memory_result_(true) {
97 media::InitializeMediaLibrary(); 97 media::InitializeMediaLibrary();
98 } 98 }
99 99
100 LayerTreeSettings DefaultSettings() { 100 LayerTreeSettings DefaultSettings() {
101 LayerTreeSettings settings; 101 LayerTreeSettings settings;
102 settings.minimum_occlusion_tracking_size = gfx::Size(); 102 settings.minimum_occlusion_tracking_size = gfx::Size();
103 settings.renderer_settings.texture_id_allocation_chunk_size = 1; 103 settings.renderer_settings.texture_id_allocation_chunk_size = 1;
104 settings.report_overscroll_only_for_scrollable_axes = true;
105 settings.gpu_rasterization_enabled = true; 104 settings.gpu_rasterization_enabled = true;
106 return settings; 105 return settings;
107 } 106 }
108 107
109 void SetUp() override { 108 void SetUp() override {
110 CreateHostImpl(DefaultSettings(), CreateOutputSurface()); 109 CreateHostImpl(DefaultSettings(), CreateOutputSurface());
111 } 110 }
112 111
113 void TearDown() override {} 112 void TearDown() override {}
114 113
(...skipping 8026 matching lines...) Expand 10 before | Expand all | Expand 10 after
8141 // Hold an unowned pointer to the output surface to use for mock expectations. 8140 // Hold an unowned pointer to the output surface to use for mock expectations.
8142 MockReclaimResourcesOutputSurface* mock_output_surface = output_surface.get(); 8141 MockReclaimResourcesOutputSurface* mock_output_surface = output_surface.get();
8143 8142
8144 CreateHostImpl(DefaultSettings(), output_surface.Pass()); 8143 CreateHostImpl(DefaultSettings(), output_surface.Pass());
8145 EXPECT_CALL(*mock_output_surface, ForceReclaimResources()).Times(1); 8144 EXPECT_CALL(*mock_output_surface, ForceReclaimResources()).Times(1);
8146 host_impl_->BeginCommit(); 8145 host_impl_->BeginCommit();
8147 } 8146 }
8148 8147
8149 } // namespace 8148 } // namespace
8150 } // namespace cc 8149 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698