| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/test/fake_picture_layer.h" | 5 #include "cc/test/fake_picture_layer.h" |
| 6 | 6 |
| 7 #include "cc/test/fake_picture_layer_impl.h" | 7 #include "cc/test/fake_picture_layer_impl.h" |
| 8 | 8 |
| 9 namespace cc { | 9 namespace cc { |
| 10 | 10 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 | 26 |
| 27 bool FakePictureLayer::Update(ResourceUpdateQueue* queue, | 27 bool FakePictureLayer::Update(ResourceUpdateQueue* queue, |
| 28 const OcclusionTracker<Layer>* occlusion) { | 28 const OcclusionTracker<Layer>* occlusion) { |
| 29 bool updated = PictureLayer::Update(queue, occlusion); | 29 bool updated = PictureLayer::Update(queue, occlusion); |
| 30 update_count_++; | 30 update_count_++; |
| 31 return updated || always_update_resources_; | 31 return updated || always_update_resources_; |
| 32 } | 32 } |
| 33 | 33 |
| 34 void FakePictureLayer::PushPropertiesTo(LayerImpl* layer) { | 34 void FakePictureLayer::PushPropertiesTo(LayerImpl* layer) { |
| 35 PictureLayer::PushPropertiesTo(layer); | 35 PictureLayer::PushPropertiesTo(layer); |
| 36 PictureLayerImpl* layer_impl = static_cast<PictureLayerImpl*>(layer); |
| 37 // the tests expect a non-solid layer |
| 38 layer_impl->SetSolidColorState(false, SK_ColorBLACK); |
| 36 push_properties_count_++; | 39 push_properties_count_++; |
| 37 } | 40 } |
| 38 | 41 |
| 39 | 42 |
| 40 } // namespace cc | 43 } // namespace cc |
| OLD | NEW |