| 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/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include "base/synchronization/lock.h" | 7 #include "base/synchronization/lock.h" |
| 8 #include "cc/animation/timing_function.h" | 8 #include "cc/animation/timing_function.h" |
| 9 #include "cc/layers/content_layer.h" | 9 #include "cc/layers/content_layer.h" |
| 10 #include "cc/layers/content_layer_client.h" | 10 #include "cc/layers/content_layer_client.h" |
| (...skipping 1538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1549 | 1549 |
| 1550 void EvictionTestLayer::Update(ResourceUpdateQueue* queue, const OcclusionTracke
r*, RenderingStats*) | 1550 void EvictionTestLayer::Update(ResourceUpdateQueue* queue, const OcclusionTracke
r*, RenderingStats*) |
| 1551 { | 1551 { |
| 1552 createTextureIfNeeded(); | 1552 createTextureIfNeeded(); |
| 1553 if (!m_texture.get()) | 1553 if (!m_texture.get()) |
| 1554 return; | 1554 return; |
| 1555 | 1555 |
| 1556 gfx::Rect fullRect(0, 0, 10, 10); | 1556 gfx::Rect fullRect(0, 0, 10, 10); |
| 1557 ResourceUpdate upload = ResourceUpdate::Create( | 1557 ResourceUpdate upload = ResourceUpdate::Create( |
| 1558 m_texture.get(), &m_bitmap, fullRect, fullRect, gfx::Vector2d()); | 1558 m_texture.get(), &m_bitmap, fullRect, fullRect, gfx::Vector2d()); |
| 1559 queue->appendFullUpload(upload); | 1559 queue->AppendFullUpload(upload); |
| 1560 } | 1560 } |
| 1561 | 1561 |
| 1562 scoped_ptr<LayerImpl> EvictionTestLayer::CreateLayerImpl(LayerTreeImpl* treeImpl
) | 1562 scoped_ptr<LayerImpl> EvictionTestLayer::CreateLayerImpl(LayerTreeImpl* treeImpl
) |
| 1563 { | 1563 { |
| 1564 return EvictionTestLayerImpl::Create(treeImpl, layer_id_).PassAs<LayerImpl>(
); | 1564 return EvictionTestLayerImpl::Create(treeImpl, layer_id_).PassAs<LayerImpl>(
); |
| 1565 } | 1565 } |
| 1566 | 1566 |
| 1567 void EvictionTestLayer::PushPropertiesTo(LayerImpl* layerImpl) | 1567 void EvictionTestLayer::PushPropertiesTo(LayerImpl* layerImpl) |
| 1568 { | 1568 { |
| 1569 Layer::PushPropertiesTo(layerImpl); | 1569 Layer::PushPropertiesTo(layerImpl); |
| (...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2352 private: | 2352 private: |
| 2353 FakeContentLayerClient m_client; | 2353 FakeContentLayerClient m_client; |
| 2354 scoped_refptr<ContentLayer> m_rootLayer; | 2354 scoped_refptr<ContentLayer> m_rootLayer; |
| 2355 int m_numCommits; | 2355 int m_numCommits; |
| 2356 }; | 2356 }; |
| 2357 | 2357 |
| 2358 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPinchZoomScrollbarNewRootLayer) | 2358 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPinchZoomScrollbarNewRootLayer) |
| 2359 | 2359 |
| 2360 } // namespace | 2360 } // namespace |
| 2361 } // namespace cc | 2361 } // namespace cc |
| OLD | NEW |