| Index: cc/trees/occlusion_tracker.cc
|
| diff --git a/cc/trees/occlusion_tracker.cc b/cc/trees/occlusion_tracker.cc
|
| index 7d90834b35f6d05030a3b8a2c529bdf8dabd7c0a..727181ebb5e096b5336625f27f4ae652a516a9ba 100644
|
| --- a/cc/trees/occlusion_tracker.cc
|
| +++ b/cc/trees/occlusion_tracker.cc
|
| @@ -21,8 +21,9 @@ template <typename LayerType>
|
| OcclusionTracker<LayerType>::OcclusionTracker(
|
| const gfx::Rect& screen_space_clip_rect)
|
| : screen_space_clip_rect_(screen_space_clip_rect),
|
| - occluding_screen_space_rects_(NULL),
|
| - non_occluding_screen_space_rects_(NULL) {}
|
| + occluding_screen_space_rects_(nullptr),
|
| + non_occluding_screen_space_rects_(nullptr) {
|
| +}
|
|
|
| template <typename LayerType>
|
| OcclusionTracker<LayerType>::~OcclusionTracker() {}
|
| @@ -155,9 +156,9 @@ void OcclusionTracker<LayerType>::EnterRenderTarget(
|
| if (!stack_.empty() && stack_.back().target == new_target)
|
| return;
|
|
|
| - const LayerType* old_target = NULL;
|
| + const LayerType* old_target = nullptr;
|
| const typename LayerType::RenderSurfaceType* old_occlusion_immune_ancestor =
|
| - NULL;
|
| + nullptr;
|
| if (!stack_.empty()) {
|
| old_target = stack_.back().target;
|
| old_occlusion_immune_ancestor =
|
| @@ -188,7 +189,7 @@ void OcclusionTracker<LayerType>::EnterRenderTarget(
|
| &inverse_new_target_screen_space_transform);
|
| }
|
|
|
| - bool entering_root_target = new_target->parent() == NULL;
|
| + bool entering_root_target = new_target->parent() == nullptr;
|
|
|
| bool copy_outside_occlusion_forward =
|
| stack_.size() > 1 &&
|
|
|