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 "TiledLayerChromium.h" | 7 #include "TiledLayerChromium.h" |
8 | 8 |
9 #include "BitmapCanvasLayerTextureUpdater.h" | 9 #include "BitmapCanvasLayerTextureUpdater.h" |
10 #include "CCAnimationTestCommon.h" | 10 #include "CCAnimationTestCommon.h" |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 class TiledLayerChromiumTest : public testing::Test { | 50 class TiledLayerChromiumTest : public testing::Test { |
51 public: | 51 public: |
52 TiledLayerChromiumTest() | 52 TiledLayerChromiumTest() |
53 : m_compositorInitializer(0) | 53 : m_compositorInitializer(0) |
54 , m_context(WebKit::createFakeCCGraphicsContext()) | 54 , m_context(WebKit::createFakeCCGraphicsContext()) |
55 , m_queue(adoptPtr(new CCTextureUpdateQueue)) | 55 , m_queue(adoptPtr(new CCTextureUpdateQueue)) |
56 , m_textureManager(CCPrioritizedTextureManager::create(60*1024*1024, 102
4, CCRenderer::ContentPool)) | 56 , m_textureManager(CCPrioritizedTextureManager::create(60*1024*1024, 102
4, CCRenderer::ContentPool)) |
57 , m_occlusion(0) | 57 , m_occlusion(0) |
58 { | 58 { |
59 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked; | 59 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked; |
60 m_resourceProvider = CCResourceProvider::create(m_context.get(), Unthrot
tledUploader); | 60 m_resourceProvider = CCResourceProvider::create(m_context.get()); |
61 } | 61 } |
62 | 62 |
63 virtual ~TiledLayerChromiumTest() | 63 virtual ~TiledLayerChromiumTest() |
64 { | 64 { |
65 textureManagerClearAllMemory(m_textureManager.get(), m_resourceProvider.
get()); | 65 textureManagerClearAllMemory(m_textureManager.get(), m_resourceProvider.
get()); |
66 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked; | 66 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked; |
67 m_resourceProvider.clear(); | 67 m_resourceProvider.clear(); |
68 } | 68 } |
69 | 69 |
70 // Helper classes and functions that set the current thread to be the impl t
hread | 70 // Helper classes and functions that set the current thread to be the impl t
hread |
(...skipping 1481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1552 updateTextures(); | 1552 updateTextures(); |
1553 | 1553 |
1554 // Invalidate the entire layer in layer space. When painting, the rect given
to webkit should match the layer's bounds. | 1554 // Invalidate the entire layer in layer space. When painting, the rect given
to webkit should match the layer's bounds. |
1555 layer->setNeedsDisplayRect(layerRect); | 1555 layer->setNeedsDisplayRect(layerRect); |
1556 layer->update(*m_queue.get(), 0, m_stats); | 1556 layer->update(*m_queue.get(), 0, m_stats); |
1557 | 1557 |
1558 EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect()); | 1558 EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect()); |
1559 } | 1559 } |
1560 | 1560 |
1561 } // namespace | 1561 } // namespace |
OLD | NEW |