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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 { | 89 { |
90 return m_layerImpl; | 90 return m_layerImpl; |
91 } | 91 } |
92 private: | 92 private: |
93 FakeCCTiledLayerImpl* m_layerImpl; | 93 FakeCCTiledLayerImpl* m_layerImpl; |
94 }; | 94 }; |
95 void textureManagerClearAllMemory(CCPrioritizedTextureManager* textureManage
r, CCResourceProvider* resourceProvider) | 95 void textureManagerClearAllMemory(CCPrioritizedTextureManager* textureManage
r, CCResourceProvider* resourceProvider) |
96 { | 96 { |
97 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked; | 97 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked; |
98 textureManager->clearAllMemory(resourceProvider); | 98 textureManager->clearAllMemory(resourceProvider); |
| 99 textureManager->reduceMemory(resourceProvider); |
99 } | 100 } |
100 void updateTextures() | 101 void updateTextures() |
101 { | 102 { |
102 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked; | 103 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked; |
103 ASSERT(m_queue); | 104 ASSERT(m_queue); |
104 OwnPtr<CCTextureUpdateController> updateController = | 105 OwnPtr<CCTextureUpdateController> updateController = |
105 CCTextureUpdateController::create( | 106 CCTextureUpdateController::create( |
106 NULL, | 107 NULL, |
107 CCProxy::implThread(), | 108 CCProxy::implThread(), |
108 m_queue.release(), | 109 m_queue.release(), |
(...skipping 1440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1549 updateTextures(); | 1550 updateTextures(); |
1550 | 1551 |
1551 // Invalidate the entire layer in layer space. When painting, the rect given
to webkit should match the layer's bounds. | 1552 // Invalidate the entire layer in layer space. When painting, the rect given
to webkit should match the layer's bounds. |
1552 layer->setNeedsDisplayRect(layerRect); | 1553 layer->setNeedsDisplayRect(layerRect); |
1553 layer->update(*m_queue.get(), 0, m_stats); | 1554 layer->update(*m_queue.get(), 0, m_stats); |
1554 | 1555 |
1555 EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect()); | 1556 EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect()); |
1556 } | 1557 } |
1557 | 1558 |
1558 } // namespace | 1559 } // namespace |
OLD | NEW |