| 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 19a11f90fff9639c5c30ebdc4e8d70755c028d4e..481984279b1122edf91857ef2acb7a2f05753a46 100644
|
| --- a/cc/trees/layer_tree_host_impl_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_impl_unittest.cc
|
| @@ -96,7 +96,7 @@ class LayerTreeHostImplTest : public testing::Test,
|
| settings.texture_id_allocation_chunk_size = 1;
|
|
|
| host_impl_ = LayerTreeHostImpl::Create(
|
| - settings, this, &proxy_, &stats_instrumentation_, NULL);
|
| + settings, this, &proxy_, &stats_instrumentation_, NULL, 0);
|
| host_impl_->InitializeRenderer(CreateOutputSurface());
|
| host_impl_->SetViewportSize(gfx::Size(10, 10));
|
| }
|
| @@ -159,7 +159,7 @@ class LayerTreeHostImplTest : public testing::Test,
|
| settings.partial_swap_enabled = partial_swap;
|
|
|
| host_impl_ = LayerTreeHostImpl::Create(
|
| - settings, this, &proxy_, &stats_instrumentation_, NULL);
|
| + settings, this, &proxy_, &stats_instrumentation_, NULL, 0);
|
|
|
| host_impl_->InitializeRenderer(output_surface.Pass());
|
| host_impl_->SetViewportSize(gfx::Size(10, 10));
|
| @@ -388,7 +388,7 @@ TEST_F(LayerTreeHostImplTest, CanDrawIncompleteFrames) {
|
| LayerTreeSettings settings;
|
| settings.impl_side_painting = true;
|
| host_impl_ = LayerTreeHostImpl::Create(
|
| - settings, this, &proxy_, &stats_instrumentation_, NULL);
|
| + settings, this, &proxy_, &stats_instrumentation_, NULL, 0);
|
|
|
| scoped_ptr<FakeOutputSurface> output_surface(
|
| FakeOutputSurface::CreateAlwaysDrawAndSwap3d());
|
| @@ -492,7 +492,7 @@ TEST_F(LayerTreeHostImplTest, ScrollWithoutRootLayer) {
|
| TEST_F(LayerTreeHostImplTest, ScrollWithoutRenderer) {
|
| LayerTreeSettings settings;
|
| host_impl_ = LayerTreeHostImpl::Create(
|
| - settings, this, &proxy_, &stats_instrumentation_, NULL);
|
| + settings, this, &proxy_, &stats_instrumentation_, NULL, 0);
|
| scoped_ptr<TestWebGraphicsContext3D> context_owned =
|
| TestWebGraphicsContext3D::Create();
|
| context_owned->set_times_make_current_succeeds(0);
|
| @@ -1148,7 +1148,8 @@ class LayerTreeHostImplOverridePhysicalTime : public LayerTreeHostImpl {
|
| client,
|
| proxy,
|
| rendering_stats_instrumentation,
|
| - NULL) {}
|
| + NULL,
|
| + 0) {}
|
|
|
| virtual base::TimeTicks CurrentPhysicalTimeTicks() const OVERRIDE {
|
| return fake_current_physical_time_;
|
| @@ -1281,7 +1282,7 @@ void LayerTreeHostImplTest::SetupMouseMoveAtWithDeviceScale(
|
| gfx::Size content_size(1000, 1000);
|
|
|
| host_impl_ = LayerTreeHostImpl::Create(
|
| - settings, this, &proxy_, &stats_instrumentation_, NULL);
|
| + settings, this, &proxy_, &stats_instrumentation_, NULL, 0);
|
| host_impl_->InitializeRenderer(CreateOutputSurface());
|
| host_impl_->SetDeviceScaleFactor(device_scale_factor);
|
| host_impl_->SetViewportSize(device_viewport_size);
|
| @@ -1787,7 +1788,7 @@ TEST_F(LayerTreeHostImplTest, ScrollNonScrollableRootWithTopControls) {
|
| settings.top_controls_height = 50;
|
|
|
| host_impl_ = LayerTreeHostImpl::Create(
|
| - settings, this, &proxy_, &stats_instrumentation_, NULL);
|
| + settings, this, &proxy_, &stats_instrumentation_, NULL, 0);
|
| host_impl_->InitializeRenderer(CreateOutputSurface());
|
| host_impl_->SetViewportSize(gfx::Size(10, 10));
|
|
|
| @@ -2749,7 +2750,7 @@ TEST_F(LayerTreeHostImplTest, OverscrollAlways) {
|
| LayerTreeSettings settings;
|
| settings.always_overscroll = true;
|
| host_impl_ = LayerTreeHostImpl::Create(
|
| - settings, this, &proxy_, &stats_instrumentation_, NULL);
|
| + settings, this, &proxy_, &stats_instrumentation_, NULL, 0);
|
|
|
| SetupScrollAndContentsLayers(gfx::Size(50, 50));
|
| host_impl_->SetViewportSize(gfx::Size(50, 50));
|
| @@ -3082,7 +3083,7 @@ class LayerTreeHostImplViewportCoveredTest : public LayerTreeHostImplTest {
|
| settings.minimum_occlusion_tracking_size = gfx::Size();
|
| settings.impl_side_painting = true;
|
| host_impl_ = LayerTreeHostImpl::Create(
|
| - settings, this, &proxy_, &stats_instrumentation_, NULL);
|
| + settings, this, &proxy_, &stats_instrumentation_, NULL, 0);
|
|
|
| scoped_ptr<FakeOutputSurface> output_surface;
|
| if (always_draw)
|
| @@ -3439,7 +3440,7 @@ TEST_F(LayerTreeHostImplTest, PartialSwapReceivesDamageRect) {
|
| settings.partial_swap_enabled = true;
|
| scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl =
|
| LayerTreeHostImpl::Create(
|
| - settings, this, &proxy_, &stats_instrumentation_, NULL);
|
| + settings, this, &proxy_, &stats_instrumentation_, NULL, 0);
|
| layer_tree_host_impl->InitializeRenderer(output_surface.Pass());
|
| layer_tree_host_impl->SetViewportSize(gfx::Size(500, 500));
|
|
|
| @@ -3739,7 +3740,7 @@ static scoped_ptr<LayerTreeHostImpl> SetupLayersForOpacity(
|
| LayerTreeSettings settings;
|
| settings.partial_swap_enabled = partial_swap;
|
| scoped_ptr<LayerTreeHostImpl> my_host_impl = LayerTreeHostImpl::Create(
|
| - settings, client, proxy, stats_instrumentation, NULL);
|
| + settings, client, proxy, stats_instrumentation, NULL, 0);
|
| my_host_impl->InitializeRenderer(output_surface.Pass());
|
| my_host_impl->SetViewportSize(gfx::Size(100, 100));
|
|
|
| @@ -4083,7 +4084,7 @@ TEST_F(LayerTreeHostImplTest, MaskLayerWithScaling) {
|
| LayerTreeSettings settings;
|
| settings.layer_transforms_should_scale_layer_contents = true;
|
| host_impl_ = LayerTreeHostImpl::Create(
|
| - settings, this, &proxy_, &stats_instrumentation_, NULL);
|
| + settings, this, &proxy_, &stats_instrumentation_, NULL, 0);
|
| host_impl_->InitializeRenderer(CreateOutputSurface());
|
| host_impl_->SetViewportSize(gfx::Size(10, 10));
|
|
|
| @@ -5072,7 +5073,7 @@ TEST_F(LayerTreeHostImplTestDeferredInitialize, Fails_OffscreenContext) {
|
| TEST_F(LayerTreeHostImplTest, DefaultMemoryAllocation) {
|
| LayerTreeSettings settings;
|
| host_impl_ = LayerTreeHostImpl::Create(
|
| - settings, this, &proxy_, &stats_instrumentation_, NULL);
|
| + settings, this, &proxy_, &stats_instrumentation_, NULL, 0);
|
|
|
| scoped_ptr<OutputSurface> output_surface(
|
| FakeOutputSurface::Create3d(TestWebGraphicsContext3D::Create()));
|
| @@ -5203,7 +5204,7 @@ TEST_F(LayerTreeHostImplTest, ShutdownReleasesContext) {
|
| TestContextProvider::Create();
|
|
|
| host_impl_ = LayerTreeHostImpl::Create(
|
| - LayerTreeSettings(), this, &proxy_, &stats_instrumentation_, NULL);
|
| + LayerTreeSettings(), this, &proxy_, &stats_instrumentation_, NULL, 0);
|
| host_impl_->InitializeRenderer(FakeOutputSurface::Create3d(context_provider)
|
| .PassAs<OutputSurface>());
|
| host_impl_->SetViewportSize(gfx::Size(10, 10));
|
|
|