diff options
Diffstat (limited to 'chromium/ui/compositor/layer_owner.h')
| -rw-r--r-- | chromium/ui/compositor/layer_owner.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/ui/compositor/layer_owner.h b/chromium/ui/compositor/layer_owner.h index 7d4bc47b536..c541ca919c8 100644 --- a/chromium/ui/compositor/layer_owner.h +++ b/chromium/ui/compositor/layer_owner.h @@ -50,7 +50,7 @@ class COMPOSITOR_EXPORT LayerOwner { // |layer|. void Reset(std::unique_ptr<Layer> layer); - // Asks the owner to recreate the layer, returning the old Layer. NULL is + // Asks the owner to recreate the layer, returning the old Layer. nullptr is // returned if there is no existing layer, or recreate is not supported. // // This does not recurse. Existing children of the layer are moved to the new @@ -69,7 +69,7 @@ class COMPOSITOR_EXPORT LayerOwner { private: // The LayerOwner owns its layer unless ownership is relinquished via a call // to AcquireLayer(). After that moment |layer_| will still be valid but - // |layer_owner_| will be NULL. The reason for releasing ownership is that + // |layer_owner_| will be nullptr. The reason for releasing ownership is that // the client may wish to animate the layer beyond the lifetime of the owner, // e.g. fading it out when it is destroyed. std::unique_ptr<Layer> layer_owner_; |