| 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 } | 158 } |
| 159 | 159 |
| 160 public: | 160 public: |
| 161 WebKitTests::WebCompositorInitializer m_compositorInitializer; | 161 WebKitTests::WebCompositorInitializer m_compositorInitializer; |
| 162 scoped_ptr<CCGraphicsContext> m_context; | 162 scoped_ptr<CCGraphicsContext> m_context; |
| 163 OwnPtr<CCResourceProvider> m_resourceProvider; | 163 OwnPtr<CCResourceProvider> m_resourceProvider; |
| 164 OwnPtr<CCTextureUpdateQueue> m_queue; | 164 OwnPtr<CCTextureUpdateQueue> m_queue; |
| 165 CCRenderingStats m_stats; | 165 CCRenderingStats m_stats; |
| 166 FakeTextureUploader m_uploader; | 166 FakeTextureUploader m_uploader; |
| 167 CCPriorityCalculator m_priorityCalculator; | 167 CCPriorityCalculator m_priorityCalculator; |
| 168 OwnPtr<CCPrioritizedTextureManager> m_textureManager; | 168 scoped_ptr<CCPrioritizedTextureManager> m_textureManager; |
| 169 TestCCOcclusionTracker* m_occlusion; | 169 TestCCOcclusionTracker* m_occlusion; |
| 170 }; | 170 }; |
| 171 | 171 |
| 172 TEST_F(TiledLayerChromiumTest, pushDirtyTiles) | 172 TEST_F(TiledLayerChromiumTest, pushDirtyTiles) |
| 173 { | 173 { |
| 174 scoped_refptr<FakeTiledLayerChromium> layer = make_scoped_refptr(new FakeTil
edLayerChromium(m_textureManager.get())); | 174 scoped_refptr<FakeTiledLayerChromium> layer = make_scoped_refptr(new FakeTil
edLayerChromium(m_textureManager.get())); |
| 175 ScopedFakeCCTiledLayerImpl layerImpl(1); | 175 ScopedFakeCCTiledLayerImpl layerImpl(1); |
| 176 | 176 |
| 177 // The tile size is 100x100, so this invalidates and then paints two tiles. | 177 // The tile size is 100x100, so this invalidates and then paints two tiles. |
| 178 layer->setBounds(IntSize(100, 200)); | 178 layer->setBounds(IntSize(100, 200)); |
| (...skipping 1370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1549 updateTextures(); | 1549 updateTextures(); |
| 1550 | 1550 |
| 1551 // Invalidate the entire layer in layer space. When painting, the rect given
to webkit should match the layer's bounds. | 1551 // Invalidate the entire layer in layer space. When painting, the rect given
to webkit should match the layer's bounds. |
| 1552 layer->setNeedsDisplayRect(layerRect); | 1552 layer->setNeedsDisplayRect(layerRect); |
| 1553 layer->update(*m_queue.get(), 0, m_stats); | 1553 layer->update(*m_queue.get(), 0, m_stats); |
| 1554 | 1554 |
| 1555 EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect()); | 1555 EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect()); |
| 1556 } | 1556 } |
| 1557 | 1557 |
| 1558 } // namespace | 1558 } // namespace |
| OLD | NEW |