summaryrefslogtreecommitdiff
path: root/chromium/ui/compositor/layer_owner.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/compositor/layer_owner.h
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/compositor/layer_owner.h')
-rw-r--r--chromium/ui/compositor/layer_owner.h4
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_;