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

Side by Side Diff: Source/core/layout/compositing/CompositingLayerAssigner.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 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2014 Google Inc. All rights reserved. 3 * Copyright (C) 2014 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 bool layersChanged() const { return m_layersChanged; } 46 bool layersChanged() const { return m_layersChanged; }
47 47
48 // FIXME: This function should be private. We should remove the one caller 48 // FIXME: This function should be private. We should remove the one caller
49 // once we've fixed the compositing chicken/egg issues. 49 // once we've fixed the compositing chicken/egg issues.
50 CompositingStateTransitionType computeCompositedLayerUpdate(DeprecatedPaintL ayer*); 50 CompositingStateTransitionType computeCompositedLayerUpdate(DeprecatedPaintL ayer*);
51 51
52 private: 52 private:
53 struct SquashingState { 53 struct SquashingState {
54 SquashingState() 54 SquashingState()
55 : mostRecentMapping(0) 55 : mostRecentMapping(nullptr)
56 , hasMostRecentMapping(false) 56 , hasMostRecentMapping(false)
57 , haveAssignedBackingsToEntireSquashingLayerSubtree(false) 57 , haveAssignedBackingsToEntireSquashingLayerSubtree(false)
58 , nextSquashedLayerIndex(0) 58 , nextSquashedLayerIndex(0)
59 , totalAreaOfSquashedRects(0) { } 59 , totalAreaOfSquashedRects(0) { }
60 60
61 void updateSquashingStateForNewMapping(CompositedDeprecatedPaintLayerMap ping*, bool hasNewCompositedDeprecatedPaintLayerMapping); 61 void updateSquashingStateForNewMapping(CompositedDeprecatedPaintLayerMap ping*, bool hasNewCompositedDeprecatedPaintLayerMapping);
62 62
63 // The most recent composited backing that the layer should squash onto if needed. 63 // The most recent composited backing that the layer should squash onto if needed.
64 CompositedDeprecatedPaintLayerMapping* mostRecentMapping; 64 CompositedDeprecatedPaintLayerMapping* mostRecentMapping;
65 bool hasMostRecentMapping; 65 bool hasMostRecentMapping;
(...skipping 21 matching lines...) Expand all
87 void updateSquashingAssignment(DeprecatedPaintLayer*, SquashingState&, Compo sitingStateTransitionType, Vector<DeprecatedPaintLayer*>& layersNeedingPaintInva lidation); 87 void updateSquashingAssignment(DeprecatedPaintLayer*, SquashingState&, Compo sitingStateTransitionType, Vector<DeprecatedPaintLayer*>& layersNeedingPaintInva lidation);
88 bool needsOwnBacking(const DeprecatedPaintLayer*) const; 88 bool needsOwnBacking(const DeprecatedPaintLayer*) const;
89 89
90 DeprecatedPaintLayerCompositor* m_compositor; 90 DeprecatedPaintLayerCompositor* m_compositor;
91 bool m_layersChanged; 91 bool m_layersChanged;
92 }; 92 };
93 93
94 } // namespace blink 94 } // namespace blink
95 95
96 #endif // CompositingLayerAssigner_h 96 #endif // CompositingLayerAssigner_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698