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 "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "cc/layer_tree_host.h" | 7 #include "cc/layer_tree_host.h" |
8 | 8 |
9 #include "base/synchronization/lock.h" | 9 #include "base/synchronization/lock.h" |
10 #include "cc/content_layer.h" | 10 #include "cc/content_layer.h" |
(...skipping 2619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2630 bool haveBackingTexture() const { return m_texture.get() ? m_texture->haveBa
ckingTexture() : false; } | 2630 bool haveBackingTexture() const { return m_texture.get() ? m_texture->haveBa
ckingTexture() : false; } |
2631 | 2631 |
2632 private: | 2632 private: |
2633 EvictionTestLayer() : Layer() { } | 2633 EvictionTestLayer() : Layer() { } |
2634 virtual ~EvictionTestLayer() { } | 2634 virtual ~EvictionTestLayer() { } |
2635 | 2635 |
2636 void createTextureIfNeeded() | 2636 void createTextureIfNeeded() |
2637 { | 2637 { |
2638 if (m_texture.get()) | 2638 if (m_texture.get()) |
2639 return; | 2639 return; |
2640 m_texture = PrioritizedTexture::create(layerTreeHost()->contentsTextureM
anager()); | 2640 m_texture = PrioritizedResource::create(layerTreeHost()->contentsTexture
Manager()); |
2641 m_texture->setDimensions(gfx::Size(10, 10), GL_RGBA); | 2641 m_texture->setDimensions(gfx::Size(10, 10), GL_RGBA); |
2642 m_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10); | 2642 m_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10); |
2643 } | 2643 } |
2644 | 2644 |
2645 scoped_ptr<PrioritizedTexture> m_texture; | 2645 scoped_ptr<PrioritizedResource> m_texture; |
2646 SkBitmap m_bitmap; | 2646 SkBitmap m_bitmap; |
2647 }; | 2647 }; |
2648 | 2648 |
2649 class EvictionTestLayerImpl : public LayerImpl { | 2649 class EvictionTestLayerImpl : public LayerImpl { |
2650 public: | 2650 public: |
2651 static scoped_ptr<EvictionTestLayerImpl> create(int id) | 2651 static scoped_ptr<EvictionTestLayerImpl> create(int id) |
2652 { | 2652 { |
2653 return make_scoped_ptr(new EvictionTestLayerImpl(id)); | 2653 return make_scoped_ptr(new EvictionTestLayerImpl(id)); |
2654 } | 2654 } |
2655 virtual ~EvictionTestLayerImpl() { } | 2655 virtual ~EvictionTestLayerImpl() { } |
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3265 int m_numCommitsDeferred; | 3265 int m_numCommitsDeferred; |
3266 int m_numCompleteCommits; | 3266 int m_numCompleteCommits; |
3267 }; | 3267 }; |
3268 | 3268 |
3269 TEST_F(LayerTreeHostTestDeferCommits, runMultiThread) | 3269 TEST_F(LayerTreeHostTestDeferCommits, runMultiThread) |
3270 { | 3270 { |
3271 runTest(true); | 3271 runTest(true); |
3272 } | 3272 } |
3273 | 3273 |
3274 } // anonymous namespace | 3274 } // anonymous namespace |
OLD | NEW |