diff options
| author | kulkarni.a <kulkarni.a@samsung.com> | 2014-10-10 06:50:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-10 13:50:28 +0000 |
| commit | 4015690f15e47949bf0dc40c7adea721dda94ef9 (patch) | |
| tree | db1a2e97d4026d8186af98ab85860d3f5b48af99 /cc/layers/render_surface_impl.cc | |
| parent | c30aa408450d0fd3713ec6d7775b9c801731ed7e (diff) | |
| download | chromium_src-4015690f15e47949bf0dc40c7adea721dda94ef9.zip chromium_src-4015690f15e47949bf0dc40c7adea721dda94ef9.tar.gz chromium_src-4015690f15e47949bf0dc40c7adea721dda94ef9.tar.bz2 | |
[C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/cc [part-2]
BUG =
Review URL: https://codereview.chromium.org/643583003
Cr-Commit-Position: refs/heads/master@{#299106}
Diffstat (limited to 'cc/layers/render_surface_impl.cc')
| -rw-r--r-- | cc/layers/render_surface_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/layers/render_surface_impl.cc b/cc/layers/render_surface_impl.cc index c0e4a82..18d50c5 100644 --- a/cc/layers/render_surface_impl.cc +++ b/cc/layers/render_surface_impl.cc @@ -34,7 +34,7 @@ RenderSurfaceImpl::RenderSurfaceImpl(LayerImpl* owning_layer) is_clipped_(false), contributes_to_drawn_surface_(false), draw_opacity_(1), - nearest_occlusion_immune_ancestor_(NULL), + nearest_occlusion_immune_ancestor_(nullptr), target_render_surface_layer_index_history_(0), current_layer_index_history_(0) { damage_tracker_ = DamageTracker::Create(); @@ -184,13 +184,13 @@ void RenderSurfaceImpl::AppendQuads( LayerImpl* mask_layer = owning_layer_->mask_layer(); if (mask_layer && (!mask_layer->DrawsContent() || mask_layer->bounds().IsEmpty())) - mask_layer = NULL; + mask_layer = nullptr; if (!mask_layer && for_replica) { mask_layer = owning_layer_->replica_layer()->mask_layer(); if (mask_layer && (!mask_layer->DrawsContent() || mask_layer->bounds().IsEmpty())) - mask_layer = NULL; + mask_layer = nullptr; } gfx::RectF mask_uv_rect(0.f, 0.f, 1.f, 1.f); |