Index: cc/trees/layer_tree_host_unittest_occlusion.cc |
diff --git a/cc/trees/layer_tree_host_unittest_occlusion.cc b/cc/trees/layer_tree_host_unittest_occlusion.cc |
index 943299dd229be8b6e6a1f57a3f8f9dbbb8825441..12768499e7ff69ec6d86b9c9c2c15fc1778095db 100644 |
--- a/cc/trees/layer_tree_host_unittest_occlusion.cc |
+++ b/cc/trees/layer_tree_host_unittest_occlusion.cc |
@@ -120,7 +120,7 @@ class LayerTreeHostOcclusionTestOcclusionSurfaceClipping |
// The child layer is a surface and the grand_child is opaque, but clipped |
// to the child and root |
SetLayerPropertiesForTesting( |
- root_.get(), NULL, identity_matrix_, |
+ root_.get(), nullptr, identity_matrix_, |
gfx::PointF(0.f, 0.f), gfx::Size(200, 200), true); |
SetLayerPropertiesForTesting( |
child_.get(), root_.get(), identity_matrix_, |
@@ -150,7 +150,7 @@ class LayerTreeHostOcclusionTestOcclusionSurfaceClippingOpaque |
// If the child layer is opaque, then it adds to the occlusion seen by the |
// root_. |
SetLayerPropertiesForTesting( |
- root_.get(), NULL, identity_matrix_, |
+ root_.get(), nullptr, identity_matrix_, |
gfx::PointF(0.f, 0.f), gfx::Size(200, 200), true); |
SetLayerPropertiesForTesting( |
child_.get(), root_.get(), identity_matrix_, |
@@ -179,7 +179,7 @@ class LayerTreeHostOcclusionTestOcclusionTwoChildren |
virtual void SetupTree() override { |
// Add a second child to the root layer and the regions should merge |
SetLayerPropertiesForTesting( |
- root_.get(), NULL, identity_matrix_, |
+ root_.get(), nullptr, identity_matrix_, |
gfx::PointF(0.f, 0.f), gfx::Size(200, 200), true); |
SetLayerPropertiesForTesting( |
child_.get(), root_.get(), identity_matrix_, |
@@ -213,7 +213,7 @@ class LayerTreeHostOcclusionTestOcclusionMask |
// If the child layer has a mask on it, then it shouldn't contribute to |
// occlusion on stuff below it. |
SetLayerPropertiesForTesting( |
- root_.get(), NULL, identity_matrix_, |
+ root_.get(), nullptr, identity_matrix_, |
gfx::PointF(0.f, 0.f), gfx::Size(200, 200), true); |
SetLayerPropertiesForTesting( |
child2_.get(), root_.get(), identity_matrix_, |
@@ -247,7 +247,7 @@ class LayerTreeHostOcclusionTestOcclusionMaskBelowOcclusion |
// contribute to occlusion on everything, and child shouldn't contribute |
// to the root_. |
SetLayerPropertiesForTesting( |
- root_.get(), NULL, identity_matrix_, |
+ root_.get(), nullptr, identity_matrix_, |
gfx::PointF(0.f, 0.f), gfx::Size(200, 200), true); |
SetLayerPropertiesForTesting( |
child_.get(), root_.get(), identity_matrix_, |
@@ -282,7 +282,7 @@ class LayerTreeHostOcclusionTestOcclusionOpacity |
// If the child layer has a non-opaque opacity, then it shouldn't |
// contribute to occlusion on stuff below it |
SetLayerPropertiesForTesting( |
- root_.get(), NULL, identity_matrix_, |
+ root_.get(), nullptr, identity_matrix_, |
gfx::PointF(0.f, 0.f), gfx::Size(200, 200), true); |
SetLayerPropertiesForTesting( |
child2_.get(), root_.get(), identity_matrix_, |
@@ -316,7 +316,7 @@ class LayerTreeHostOcclusionTestOcclusionOpacityBelowOcclusion |
// child2 should contribute to occlusion on everything, and child shouldn't |
// contribute to the root_. |
SetLayerPropertiesForTesting( |
- root_.get(), NULL, identity_matrix_, |
+ root_.get(), nullptr, identity_matrix_, |
gfx::PointF(0.f, 0.f), gfx::Size(200, 200), true); |
SetLayerPropertiesForTesting( |
child_.get(), root_.get(), identity_matrix_, |
@@ -351,7 +351,7 @@ class LayerTreeHostOcclusionTestOcclusionBlending |
// If the child layer has a blend mode, then it shouldn't |
// contribute to occlusion on stuff below it |
SetLayerPropertiesForTesting( |
- root_.get(), NULL, identity_matrix_, |
+ root_.get(), nullptr, identity_matrix_, |
gfx::PointF(0.f, 0.f), gfx::Size(200, 200), true); |
SetLayerPropertiesForTesting( |
child2_.get(), root_.get(), identity_matrix_, |
@@ -385,7 +385,7 @@ class LayerTreeHostOcclusionTestOcclusionBlendingBelowOcclusion |
// child2 should contribute to occlusion on everything, and child shouldn't |
// contribute to the root_. |
SetLayerPropertiesForTesting( |
- root_.get(), NULL, identity_matrix_, |
+ root_.get(), nullptr, identity_matrix_, |
gfx::PointF(0.f, 0.f), gfx::Size(200, 200), true); |
SetLayerPropertiesForTesting( |
child_.get(), root_.get(), identity_matrix_, |
@@ -423,7 +423,7 @@ class LayerTreeHostOcclusionTestOcclusionOpacityFilter |
// child2, then child2 should contribute to occlusion on everything, |
// and child shouldn't contribute to the root |
SetLayerPropertiesForTesting( |
- root_.get(), NULL, identity_matrix_, |
+ root_.get(), nullptr, identity_matrix_, |
gfx::PointF(0.f, 0.f), gfx::Size(200, 200), true); |
SetLayerPropertiesForTesting(child_.get(), |
root_.get(), |
@@ -480,7 +480,7 @@ class LayerTreeHostOcclusionTestOcclusionBlurFilter |
// below child2, then child should not inherit occlusion from outside its |
// subtree, and should not contribute to the root |
SetLayerPropertiesForTesting( |
- root_.get(), NULL, identity_matrix_, |
+ root_.get(), nullptr, identity_matrix_, |
gfx::PointF(0.f, 0.f), gfx::Size(200, 200), true); |
SetLayerPropertiesForTesting( |
child_.get(), root_.get(), child_transform, |
@@ -517,7 +517,7 @@ class LayerTreeHostOcclusionTestOcclusionCopyRequest |
// The child layer will still receive occlusion from inside, and |
// the root layer will recive occlusion from child. |
SetLayerPropertiesForTesting( |
- root_.get(), NULL, identity_matrix_, |
+ root_.get(), nullptr, identity_matrix_, |
gfx::PointF(), gfx::Size(100, 100), true); |
SetLayerPropertiesForTesting( |
child_.get(), root_.get(), identity_matrix_, |
@@ -552,7 +552,7 @@ class LayerTreeHostOcclusionTestOcclusionReplica |
// The child layer will still receive occlusion from inside, and |
// the root layer will recive occlusion from child. |
SetLayerPropertiesForTesting( |
- root_.get(), NULL, identity_matrix_, |
+ root_.get(), nullptr, identity_matrix_, |
gfx::PointF(), gfx::Size(100, 100), true); |
SetLayerPropertiesForTesting( |
child_.get(), root_.get(), identity_matrix_, |
@@ -593,7 +593,7 @@ class LayerTreeHostOcclusionTestManySurfaces |
layers.push_back(TestLayer::Create()); |
if (i == 0) { |
SetLayerPropertiesForTesting( |
- layers.back().get(), NULL, identity_matrix_, |
+ layers.back().get(), nullptr, identity_matrix_, |
gfx::PointF(0.f, 0.f), |
gfx::Size(root_width, root_height), true); |
} else { |