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 "base/synchronization/lock.h" | 7 #include "base/synchronization/lock.h" |
8 #include "cc/animation/timing_function.h" | 8 #include "cc/animation/timing_function.h" |
9 #include "cc/layers/content_layer.h" | 9 #include "cc/layers/content_layer.h" |
10 #include "cc/layers/content_layer_client.h" | 10 #include "cc/layers/content_layer_client.h" |
(...skipping 2060 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2071 } | 2071 } |
2072 | 2072 |
2073 virtual void drawLayersOnThread(LayerTreeHostImpl* hostImpl) OVERRIDE | 2073 virtual void drawLayersOnThread(LayerTreeHostImpl* hostImpl) OVERRIDE |
2074 { | 2074 { |
2075 DCHECK(hostImpl->proxy()->HasImplThread()); | 2075 DCHECK(hostImpl->proxy()->HasImplThread()); |
2076 | 2076 |
2077 const ThreadProxy* proxy = static_cast<ThreadProxy*>(hostImpl->proxy()); | 2077 const ThreadProxy* proxy = static_cast<ThreadProxy*>(hostImpl->proxy()); |
2078 if (m_delegatingRenderer) | 2078 if (m_delegatingRenderer) |
2079 EXPECT_EQ(1, proxy->MaxFramesPendingForTesting()); | 2079 EXPECT_EQ(1, proxy->MaxFramesPendingForTesting()); |
2080 else | 2080 else |
2081 EXPECT_EQ(FrameRateController::kDefaultMaxFramesPending, proxy->MaxF
ramesPendingForTesting()); | 2081 EXPECT_EQ(FrameRateController::DEFAULT_MAX_FRAMES_PENDING, proxy->Ma
xFramesPendingForTesting()); |
2082 endTest(); | 2082 endTest(); |
2083 } | 2083 } |
2084 | 2084 |
2085 virtual void afterTest() OVERRIDE | 2085 virtual void afterTest() OVERRIDE |
2086 { | 2086 { |
2087 } | 2087 } |
2088 | 2088 |
2089 protected: | 2089 protected: |
2090 bool m_delegatingRenderer; | 2090 bool m_delegatingRenderer; |
2091 }; | 2091 }; |
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2352 private: | 2352 private: |
2353 FakeContentLayerClient m_client; | 2353 FakeContentLayerClient m_client; |
2354 scoped_refptr<ContentLayer> m_rootLayer; | 2354 scoped_refptr<ContentLayer> m_rootLayer; |
2355 int m_numCommits; | 2355 int m_numCommits; |
2356 }; | 2356 }; |
2357 | 2357 |
2358 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPinchZoomScrollbarNewRootLayer) | 2358 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPinchZoomScrollbarNewRootLayer) |
2359 | 2359 |
2360 } // namespace | 2360 } // namespace |
2361 } // namespace cc | 2361 } // namespace cc |
OLD | NEW |