| OLD | NEW |
| 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.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/synchronization/lock.h" | 10 #include "base/synchronization/lock.h" |
| (...skipping 1962 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1973 settings.single_thread_proxy_scheduler = false; | 1973 settings.single_thread_proxy_scheduler = false; |
| 1974 | 1974 |
| 1975 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 1975 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
| 1976 new TestSharedBitmapManager()); | 1976 new TestSharedBitmapManager()); |
| 1977 scoped_ptr<LayerTreeHost> host = | 1977 scoped_ptr<LayerTreeHost> host = |
| 1978 LayerTreeHost::CreateSingleThreaded(&client, | 1978 LayerTreeHost::CreateSingleThreaded(&client, |
| 1979 &client, | 1979 &client, |
| 1980 shared_bitmap_manager.get(), | 1980 shared_bitmap_manager.get(), |
| 1981 NULL, | 1981 NULL, |
| 1982 settings, | 1982 settings, |
| 1983 base::MessageLoopProxy::current()); | 1983 base::MessageLoopProxy::current(), |
| 1984 nullptr); |
| 1984 client.SetLayerTreeHost(host.get()); | 1985 client.SetLayerTreeHost(host.get()); |
| 1985 host->Composite(base::TimeTicks::Now()); | 1986 host->Composite(base::TimeTicks::Now()); |
| 1986 | 1987 |
| 1987 EXPECT_EQ(4u, host->settings().max_partial_texture_updates); | 1988 EXPECT_EQ(4u, host->settings().max_partial_texture_updates); |
| 1988 } | 1989 } |
| 1989 | 1990 |
| 1990 TEST(LayerTreeHostTest, PartialUpdatesWithSoftwareRenderer) { | 1991 TEST(LayerTreeHostTest, PartialUpdatesWithSoftwareRenderer) { |
| 1991 FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_SOFTWARE); | 1992 FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_SOFTWARE); |
| 1992 | 1993 |
| 1993 LayerTreeSettings settings; | 1994 LayerTreeSettings settings; |
| 1994 settings.max_partial_texture_updates = 4; | 1995 settings.max_partial_texture_updates = 4; |
| 1995 settings.single_thread_proxy_scheduler = false; | 1996 settings.single_thread_proxy_scheduler = false; |
| 1996 | 1997 |
| 1997 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 1998 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
| 1998 new TestSharedBitmapManager()); | 1999 new TestSharedBitmapManager()); |
| 1999 scoped_ptr<LayerTreeHost> host = | 2000 scoped_ptr<LayerTreeHost> host = |
| 2000 LayerTreeHost::CreateSingleThreaded(&client, | 2001 LayerTreeHost::CreateSingleThreaded(&client, |
| 2001 &client, | 2002 &client, |
| 2002 shared_bitmap_manager.get(), | 2003 shared_bitmap_manager.get(), |
| 2003 NULL, | 2004 NULL, |
| 2004 settings, | 2005 settings, |
| 2005 base::MessageLoopProxy::current()); | 2006 base::MessageLoopProxy::current(), |
| 2007 nullptr); |
| 2006 client.SetLayerTreeHost(host.get()); | 2008 client.SetLayerTreeHost(host.get()); |
| 2007 host->Composite(base::TimeTicks::Now()); | 2009 host->Composite(base::TimeTicks::Now()); |
| 2008 | 2010 |
| 2009 EXPECT_EQ(4u, host->settings().max_partial_texture_updates); | 2011 EXPECT_EQ(4u, host->settings().max_partial_texture_updates); |
| 2010 } | 2012 } |
| 2011 | 2013 |
| 2012 TEST(LayerTreeHostTest, PartialUpdatesWithDelegatingRendererAndGLContent) { | 2014 TEST(LayerTreeHostTest, PartialUpdatesWithDelegatingRendererAndGLContent) { |
| 2013 FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DELEGATED_3D); | 2015 FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DELEGATED_3D); |
| 2014 | 2016 |
| 2015 LayerTreeSettings settings; | 2017 LayerTreeSettings settings; |
| 2016 settings.max_partial_texture_updates = 4; | 2018 settings.max_partial_texture_updates = 4; |
| 2017 settings.single_thread_proxy_scheduler = false; | 2019 settings.single_thread_proxy_scheduler = false; |
| 2018 | 2020 |
| 2019 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 2021 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
| 2020 new TestSharedBitmapManager()); | 2022 new TestSharedBitmapManager()); |
| 2021 scoped_ptr<LayerTreeHost> host = | 2023 scoped_ptr<LayerTreeHost> host = |
| 2022 LayerTreeHost::CreateSingleThreaded(&client, | 2024 LayerTreeHost::CreateSingleThreaded(&client, |
| 2023 &client, | 2025 &client, |
| 2024 shared_bitmap_manager.get(), | 2026 shared_bitmap_manager.get(), |
| 2025 NULL, | 2027 NULL, |
| 2026 settings, | 2028 settings, |
| 2027 base::MessageLoopProxy::current()); | 2029 base::MessageLoopProxy::current(), |
| 2030 nullptr); |
| 2028 client.SetLayerTreeHost(host.get()); | 2031 client.SetLayerTreeHost(host.get()); |
| 2029 host->Composite(base::TimeTicks::Now()); | 2032 host->Composite(base::TimeTicks::Now()); |
| 2030 | 2033 |
| 2031 EXPECT_EQ(0u, host->MaxPartialTextureUpdates()); | 2034 EXPECT_EQ(0u, host->MaxPartialTextureUpdates()); |
| 2032 } | 2035 } |
| 2033 | 2036 |
| 2034 TEST(LayerTreeHostTest, | 2037 TEST(LayerTreeHostTest, |
| 2035 PartialUpdatesWithDelegatingRendererAndSoftwareContent) { | 2038 PartialUpdatesWithDelegatingRendererAndSoftwareContent) { |
| 2036 FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DELEGATED_SOFTWARE); | 2039 FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DELEGATED_SOFTWARE); |
| 2037 | 2040 |
| 2038 LayerTreeSettings settings; | 2041 LayerTreeSettings settings; |
| 2039 settings.max_partial_texture_updates = 4; | 2042 settings.max_partial_texture_updates = 4; |
| 2040 settings.single_thread_proxy_scheduler = false; | 2043 settings.single_thread_proxy_scheduler = false; |
| 2041 | 2044 |
| 2042 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 2045 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
| 2043 new TestSharedBitmapManager()); | 2046 new TestSharedBitmapManager()); |
| 2044 scoped_ptr<LayerTreeHost> host = | 2047 scoped_ptr<LayerTreeHost> host = |
| 2045 LayerTreeHost::CreateSingleThreaded(&client, | 2048 LayerTreeHost::CreateSingleThreaded(&client, |
| 2046 &client, | 2049 &client, |
| 2047 shared_bitmap_manager.get(), | 2050 shared_bitmap_manager.get(), |
| 2048 NULL, | 2051 NULL, |
| 2049 settings, | 2052 settings, |
| 2050 base::MessageLoopProxy::current()); | 2053 base::MessageLoopProxy::current(), |
| 2054 nullptr); |
| 2051 client.SetLayerTreeHost(host.get()); | 2055 client.SetLayerTreeHost(host.get()); |
| 2052 host->Composite(base::TimeTicks::Now()); | 2056 host->Composite(base::TimeTicks::Now()); |
| 2053 | 2057 |
| 2054 EXPECT_EQ(0u, host->MaxPartialTextureUpdates()); | 2058 EXPECT_EQ(0u, host->MaxPartialTextureUpdates()); |
| 2055 } | 2059 } |
| 2056 | 2060 |
| 2057 class LayerTreeHostTestShutdownWithOnlySomeResourcesEvicted | 2061 class LayerTreeHostTestShutdownWithOnlySomeResourcesEvicted |
| 2058 : public LayerTreeHostTest { | 2062 : public LayerTreeHostTest { |
| 2059 public: | 2063 public: |
| 2060 LayerTreeHostTestShutdownWithOnlySomeResourcesEvicted() | 2064 LayerTreeHostTestShutdownWithOnlySomeResourcesEvicted() |
| (...skipping 3103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5164 } | 5168 } |
| 5165 | 5169 |
| 5166 int commit_count_; | 5170 int commit_count_; |
| 5167 TestSwapPromiseResult swap_promise_result_[3]; | 5171 TestSwapPromiseResult swap_promise_result_[3]; |
| 5168 }; | 5172 }; |
| 5169 | 5173 |
| 5170 // Impl-side painting is not supported for synchronous compositing. | 5174 // Impl-side painting is not supported for synchronous compositing. |
| 5171 SINGLE_THREAD_NOIMPL_TEST_F(LayerTreeHostTestSynchronousCompositeSwapPromise); | 5175 SINGLE_THREAD_NOIMPL_TEST_F(LayerTreeHostTestSynchronousCompositeSwapPromise); |
| 5172 | 5176 |
| 5173 } // namespace cc | 5177 } // namespace cc |
| OLD | NEW |