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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 }; | 93 }; |
94 void textureManagerClearAllMemory(CCPrioritizedTextureManager* textureManage
r, CCResourceProvider* resourceProvider) | 94 void textureManagerClearAllMemory(CCPrioritizedTextureManager* textureManage
r, CCResourceProvider* resourceProvider) |
95 { | 95 { |
96 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked; | 96 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked; |
97 textureManager->clearAllMemory(resourceProvider); | 97 textureManager->clearAllMemory(resourceProvider); |
98 textureManager->reduceMemory(resourceProvider); | 98 textureManager->reduceMemory(resourceProvider); |
99 } | 99 } |
100 void updateTextures() | 100 void updateTextures() |
101 { | 101 { |
102 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked; | 102 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked; |
103 ASSERT(m_queue); | 103 DCHECK(m_queue); |
104 scoped_ptr<CCTextureUpdateController> updateController = | 104 scoped_ptr<CCTextureUpdateController> updateController = |
105 CCTextureUpdateController::create( | 105 CCTextureUpdateController::create( |
106 NULL, | 106 NULL, |
107 CCProxy::implThread(), | 107 CCProxy::implThread(), |
108 m_queue.Pass(), | 108 m_queue.Pass(), |
109 m_resourceProvider.get(), | 109 m_resourceProvider.get(), |
110 &m_uploader); | 110 &m_uploader); |
111 updateController->finalize(); | 111 updateController->finalize(); |
112 m_queue = make_scoped_ptr(new CCTextureUpdateQueue); | 112 m_queue = make_scoped_ptr(new CCTextureUpdateQueue); |
113 } | 113 } |
(...skipping 1435 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 |