| 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 "cc/tiled_layer.h" | 5 #include "cc/tiled_layer.h" |
| 6 | 6 |
| 7 #include "cc/bitmap_content_layer_updater.h" | 7 #include "cc/bitmap_content_layer_updater.h" |
| 8 #include "cc/layer_painter.h" | 8 #include "cc/layer_painter.h" |
| 9 #include "cc/overdraw_metrics.h" | 9 #include "cc/overdraw_metrics.h" |
| 10 #include "cc/rendering_stats.h" | 10 #include "cc/rendering_stats.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 , m_outputSurface(createFakeOutputSurface()) | 52 , m_outputSurface(createFakeOutputSurface()) |
| 53 , m_queue(make_scoped_ptr(new ResourceUpdateQueue)) | 53 , m_queue(make_scoped_ptr(new ResourceUpdateQueue)) |
| 54 , m_occlusion(0) | 54 , m_occlusion(0) |
| 55 { | 55 { |
| 56 } | 56 } |
| 57 | 57 |
| 58 virtual void SetUp() | 58 virtual void SetUp() |
| 59 { | 59 { |
| 60 m_layerTreeHost = LayerTreeHost::create(&m_fakeLayerImplTreeHostClient,
m_settings, scoped_ptr<Thread>(NULL)); | 60 m_layerTreeHost = LayerTreeHost::create(&m_fakeLayerImplTreeHostClient,
m_settings, scoped_ptr<Thread>(NULL)); |
| 61 m_proxy = m_layerTreeHost->proxy(); | 61 m_proxy = m_layerTreeHost->proxy(); |
| 62 m_resourceManager = PrioritizedResourceManager::create(Renderer::Content
Pool, m_proxy); | 62 m_resourceManager = PrioritizedResourceManager::create(m_proxy); |
| 63 m_layerTreeHost->initializeRendererIfNeeded(); | 63 m_layerTreeHost->initializeRendererIfNeeded(); |
| 64 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked(m_proxy); | 64 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked(m_proxy); |
| 65 m_resourceProvider = ResourceProvider::create(m_outputSurface.get()); | 65 m_resourceProvider = ResourceProvider::create(m_outputSurface.get()); |
| 66 m_hostImpl = make_scoped_ptr(new FakeLayerTreeHostImpl(m_proxy)); | 66 m_hostImpl = make_scoped_ptr(new FakeLayerTreeHostImpl(m_proxy)); |
| 67 } | 67 } |
| 68 | 68 |
| 69 virtual ~TiledLayerTest() | 69 virtual ~TiledLayerTest() |
| 70 { | 70 { |
| 71 resourceManagerClearAllMemory(m_resourceManager.get(), m_resourceProvide
r.get()); | 71 resourceManagerClearAllMemory(m_resourceManager.get(), m_resourceProvide
r.get()); |
| 72 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked(m_proxy); | 72 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc
ked(m_proxy); |
| (...skipping 1553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1626 | 1626 |
| 1627 // Invalidate the entire layer in layer space. When painting, the rect given
to webkit should match the layer's bounds. | 1627 // Invalidate the entire layer in layer space. When painting, the rect given
to webkit should match the layer's bounds. |
| 1628 layer->setNeedsDisplayRect(layerRect); | 1628 layer->setNeedsDisplayRect(layerRect); |
| 1629 layer->update(*m_queue.get(), 0, m_stats); | 1629 layer->update(*m_queue.get(), 0, m_stats); |
| 1630 | 1630 |
| 1631 EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect()); | 1631 EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect()); |
| 1632 } | 1632 } |
| 1633 | 1633 |
| 1634 } // namespace | 1634 } // namespace |
| 1635 } // namespace cc | 1635 } // namespace cc |
| OLD | NEW |