| 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/tiled_layer.h" | 7 #include "cc/tiled_layer.h" |
| 8 | 8 |
| 9 #include "CCOverdrawMetrics.h" | 9 #include "CCOverdrawMetrics.h" |
| 10 #include "CCRenderingStats.h" | 10 #include "CCRenderingStats.h" |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 textureManager->reduceMemory(resourceProvider); |
| 100 } | 100 } |
| 101 void updateTextures() | 101 void updateTextures() |
| 102 { | 102 { |
| 103 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked; | 103 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked; |
| 104 DCHECK(m_queue); | 104 ASSERT(m_queue); |
| 105 scoped_ptr<CCTextureUpdateController> updateController = | 105 scoped_ptr<CCTextureUpdateController> updateController = |
| 106 CCTextureUpdateController::create( | 106 CCTextureUpdateController::create( |
| 107 NULL, | 107 NULL, |
| 108 CCProxy::implThread(), | 108 CCProxy::implThread(), |
| 109 m_queue.Pass(), | 109 m_queue.Pass(), |
| 110 m_resourceProvider.get(), | 110 m_resourceProvider.get(), |
| 111 &m_uploader); | 111 &m_uploader); |
| 112 updateController->finalize(); | 112 updateController->finalize(); |
| 113 m_queue = make_scoped_ptr(new CCTextureUpdateQueue); | 113 m_queue = make_scoped_ptr(new CCTextureUpdateQueue); |
| 114 } | 114 } |
| (...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1550 updateTextures(); | 1550 updateTextures(); |
| 1551 | 1551 |
| 1552 // 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. |
| 1553 layer->setNeedsDisplayRect(layerRect); | 1553 layer->setNeedsDisplayRect(layerRect); |
| 1554 layer->update(*m_queue.get(), 0, m_stats); | 1554 layer->update(*m_queue.get(), 0, m_stats); |
| 1555 | 1555 |
| 1556 EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect()); | 1556 EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect()); |
| 1557 } | 1557 } |
| 1558 | 1558 |
| 1559 } // namespace | 1559 } // namespace |
| OLD | NEW |