diff options
| author | danakj <danakj@chromium.org> | 2014-10-15 15:52:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-15 22:52:36 +0000 |
| commit | 968153f336dfc187cdea3267c68caf07e8be6e6f (patch) | |
| tree | bc4288d1acdbdb010a3a39742db631606b44304f /cc/trees/damage_tracker_unittest.cc | |
| parent | c762fb764c6812cc662b125ae69d3421064b1c45 (diff) | |
| download | chromium_src-968153f336dfc187cdea3267c68caf07e8be6e6f.zip chromium_src-968153f336dfc187cdea3267c68caf07e8be6e6f.tar.gz chromium_src-968153f336dfc187cdea3267c68caf07e8be6e6f.tar.bz2 | |
cc: Change scoped_ptr<T>() to nullptr.
R=enne
Review URL: https://codereview.chromium.org/657103003
Cr-Commit-Position: refs/heads/master@{#299782}
Diffstat (limited to 'cc/trees/damage_tracker_unittest.cc')
| -rw-r--r-- | cc/trees/damage_tracker_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/trees/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc index dffe90a..90b5b8a 100644 --- a/cc/trees/damage_tracker_unittest.cc +++ b/cc/trees/damage_tracker_unittest.cc @@ -1105,7 +1105,7 @@ TEST_F(DamageTrackerTest, VerifyDamageForReplica) { // CASE 3: removing the reflection should cause the entire region including // reflection to damage the target surface. ClearDamageForAllSurfaces(root.get()); - grand_child1->SetReplicaLayer(scoped_ptr<LayerImpl>()); + grand_child1->SetReplicaLayer(nullptr); EmulateDrawingOneFrame(root.get()); ASSERT_EQ(old_content_rect.width(), child1->render_surface()->content_rect().width()); @@ -1202,7 +1202,7 @@ TEST_F(DamageTrackerTest, VerifyDamageForMask) { // Then test mask removal. ClearDamageForAllSurfaces(root.get()); - child->SetMaskLayer(scoped_ptr<LayerImpl>()); + child->SetMaskLayer(nullptr); ASSERT_TRUE(child->LayerPropertyChanged()); EmulateDrawingOneFrame(root.get()); @@ -1270,7 +1270,7 @@ TEST_F(DamageTrackerTest, VerifyDamageForReplicaMask) { // target surface. // ClearDamageForAllSurfaces(root.get()); - grand_child1_replica->SetMaskLayer(scoped_ptr<LayerImpl>()); + grand_child1_replica->SetMaskLayer(nullptr); EmulateDrawingOneFrame(root.get()); grand_child_damage_rect = |