Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Side by Side Diff: Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h

Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add one more file. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 LayoutRect compositedBounds; 44 LayoutRect compositedBounds;
45 45
46 // The clip rect to apply, in the local coordinate space of the squashed lay er, when painting it. 46 // The clip rect to apply, in the local coordinate space of the squashed lay er, when painting it.
47 IntRect localClipRectForSquashedLayer; 47 IntRect localClipRectForSquashedLayer;
48 48
49 // Offset describing where this squashed Layer paints into the shared Graphi csLayer backing. 49 // Offset describing where this squashed Layer paints into the shared Graphi csLayer backing.
50 IntSize offsetFromLayoutObject; 50 IntSize offsetFromLayoutObject;
51 bool offsetFromLayoutObjectSet; 51 bool offsetFromLayoutObjectSet;
52 52
53 GraphicsLayerPaintInfo() : paintLayer(0), offsetFromLayoutObjectSet(false) { } 53 GraphicsLayerPaintInfo() : paintLayer(nullptr), offsetFromLayoutObjectSet(fa lse) { }
54 }; 54 };
55 55
56 enum GraphicsLayerUpdateScope { 56 enum GraphicsLayerUpdateScope {
57 GraphicsLayerUpdateNone, 57 GraphicsLayerUpdateNone,
58 GraphicsLayerUpdateLocal, 58 GraphicsLayerUpdateLocal,
59 GraphicsLayerUpdateSubtree, 59 GraphicsLayerUpdateSubtree,
60 }; 60 };
61 61
62 // CompositedDeprecatedPaintLayerMapping keeps track of how Layers of the layout tree correspond to 62 // CompositedDeprecatedPaintLayerMapping keeps track of how Layers of the layout tree correspond to
63 // GraphicsLayers of the composited layer tree. Each instance of CompositedDepre catedPaintLayerMapping 63 // GraphicsLayers of the composited layer tree. Each instance of CompositedDepre catedPaintLayerMapping
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 182
183 virtual String debugName(const GraphicsLayer*) override; 183 virtual String debugName(const GraphicsLayer*) override;
184 184
185 LayoutSize contentOffsetInCompositingLayer() const; 185 LayoutSize contentOffsetInCompositingLayer() const;
186 186
187 LayoutPoint squashingOffsetFromTransformedAncestor() 187 LayoutPoint squashingOffsetFromTransformedAncestor()
188 { 188 {
189 return m_squashingLayerOffsetFromTransformedAncestor; 189 return m_squashingLayerOffsetFromTransformedAncestor;
190 } 190 }
191 191
192 // If there is a squashed layer painting into this CLM that is an ancestor o f the given LayoutObject, return it. Otherwise return 0. 192 // If there is a squashed layer painting into this CLM that is an ancestor o f the given LayoutObject, return it. Otherwise return nullptr.
193 const GraphicsLayerPaintInfo* containingSquashedLayer(const LayoutObject*, u nsigned maxSquashedLayerIndex); 193 const GraphicsLayerPaintInfo* containingSquashedLayer(const LayoutObject*, u nsigned maxSquashedLayerIndex);
194 194
195 void updateScrollingBlockSelection(); 195 void updateScrollingBlockSelection();
196 196
197 DisplayItemClient displayItemClient() const { return toDisplayItemClient(thi s); } 197 DisplayItemClient displayItemClient() const { return toDisplayItemClient(thi s); }
198 String debugName() const { return "CompositedLayerMapping for " + owningLaye r().debugName(); } 198 String debugName() const { return "CompositedLayerMapping for " + owningLaye r().debugName(); }
199 199
200 private: 200 private:
201 static const GraphicsLayerPaintInfo* containingSquashedLayer(const LayoutObj ect*, const Vector<GraphicsLayerPaintInfo>& layers, unsigned maxSquashedLayerIn dex); 201 static const GraphicsLayerPaintInfo* containingSquashedLayer(const LayoutObj ect*, const Vector<GraphicsLayerPaintInfo>& layers, unsigned maxSquashedLayerIn dex);
202 202
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 unsigned m_pendingUpdateScope : 2; 416 unsigned m_pendingUpdateScope : 2;
417 unsigned m_isMainFrameLayoutViewLayer : 1; 417 unsigned m_isMainFrameLayoutViewLayer : 1;
418 418
419 unsigned m_backgroundLayerPaintsFixedRootBackground : 1; 419 unsigned m_backgroundLayerPaintsFixedRootBackground : 1;
420 unsigned m_scrollingContentsAreEmpty : 1; 420 unsigned m_scrollingContentsAreEmpty : 1;
421 }; 421 };
422 422
423 } // namespace blink 423 } // namespace blink
424 424
425 #endif // CompositedDeprecatedPaintLayerMapping_h 425 #endif // CompositedDeprecatedPaintLayerMapping_h
OLDNEW
« no previous file with comments | « Source/core/layout/TextRunConstructor.cpp ('k') | Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698