| Index: cc/damage_tracker_unittest.cc
|
| diff --git a/cc/damage_tracker_unittest.cc b/cc/damage_tracker_unittest.cc
|
| index 42eaaafc729aaa1dc6ee4e9fbce5ffd3af2c116b..232a037dd23cd66f584d06efe12b2b790a054849 100644
|
| --- a/cc/damage_tracker_unittest.cc
|
| +++ b/cc/damage_tracker_unittest.cc
|
| @@ -58,7 +58,7 @@ void emulateDrawingOneFrame(LayerImpl* root)
|
| // Iterate back-to-front, so that damage correctly propagates from descendant surfaces to ancestors.
|
| for (int i = renderSurfaceLayerList.size() - 1; i >= 0; --i) {
|
| RenderSurfaceImpl* targetSurface = renderSurfaceLayerList[i]->renderSurface();
|
| - targetSurface->damageTracker()->updateDamageTrackingState(targetSurface->layerList(), targetSurface->owningLayerId(), targetSurface->surfacePropertyChangedOnlyFromDescendant(), targetSurface->contentRect(), renderSurfaceLayerList[i]->maskLayer(), renderSurfaceLayerList[i]->filters(), renderSurfaceLayerList[i]->filter());
|
| + targetSurface->damageTracker()->updateDamageTrackingState(targetSurface->layerList(), targetSurface->owningLayerId(), targetSurface->surfacePropertyChangedOnlyFromDescendant(), targetSurface->contentRect(), renderSurfaceLayerList[i]->maskLayer(), renderSurfaceLayerList[i]->filters(), renderSurfaceLayerList[i]->filter().get());
|
| }
|
|
|
| root->resetAllChangeTrackingForSubtree();
|
| @@ -396,8 +396,7 @@ TEST_F(DamageTrackerTest, verifyDamageForImageFilter)
|
| // Allow us to set damage on child too.
|
| child->setDrawsContent(true);
|
|
|
| - SkAutoTUnref<SkImageFilter> filter(new SkBlurImageFilter(SkIntToScalar(2),
|
| - SkIntToScalar(2)));
|
| + SkiaRefPtr<SkImageFilter> filter = SkiaRefPtr<SkImageFilter>::Adopt(new SkBlurImageFilter(SkIntToScalar(2), SkIntToScalar(2)));
|
| // Setting the filter will damage the whole surface.
|
| clearDamageForAllSurfaces(root.get());
|
| child->setFilter(filter);
|
|
|