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

Side by Side Diff: Source/core/layout/compositing/GraphicsLayerUpdater.cpp

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 21 matching lines...) Expand all
32 #include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h" 32 #include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h"
33 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" 33 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
34 #include "core/paint/DeprecatedPaintLayer.h" 34 #include "core/paint/DeprecatedPaintLayer.h"
35 #include "platform/TraceEvent.h" 35 #include "platform/TraceEvent.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 class GraphicsLayerUpdater::UpdateContext { 39 class GraphicsLayerUpdater::UpdateContext {
40 public: 40 public:
41 UpdateContext() 41 UpdateContext()
42 : m_compositingStackingContext(0) 42 : m_compositingStackingContext(nullptr)
43 , m_compositingAncestor(0) 43 , m_compositingAncestor(nullptr)
44 { 44 {
45 } 45 }
46 46
47 UpdateContext(const UpdateContext& other, const DeprecatedPaintLayer& layer) 47 UpdateContext(const UpdateContext& other, const DeprecatedPaintLayer& layer)
48 : m_compositingStackingContext(other.m_compositingStackingContext) 48 : m_compositingStackingContext(other.m_compositingStackingContext)
49 , m_compositingAncestor(other.compositingContainer(layer)) 49 , m_compositingAncestor(other.compositingContainer(layer))
50 { 50 {
51 CompositingState compositingState = layer.compositingState(); 51 CompositingState compositingState = layer.compositingState();
52 if (compositingState != NotComposited && compositingState != PaintsIntoG roupedBacking) { 52 if (compositingState != NotComposited && compositingState != PaintsIntoG roupedBacking) {
53 m_compositingAncestor = &layer; 53 m_compositingAncestor = &layer;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 if (layer.hasCompositedDeprecatedPaintLayerMapping()) 121 if (layer.hasCompositedDeprecatedPaintLayerMapping())
122 layer.compositedDeprecatedPaintLayerMapping()->assertNeedsToUpdateGraphi csLayerBitsCleared(); 122 layer.compositedDeprecatedPaintLayerMapping()->assertNeedsToUpdateGraphi csLayerBitsCleared();
123 123
124 for (DeprecatedPaintLayer* child = layer.firstChild(); child; child = child- >nextSibling()) 124 for (DeprecatedPaintLayer* child = layer.firstChild(); child; child = child- >nextSibling())
125 assertNeedsToUpdateGraphicsLayerBitsCleared(*child); 125 assertNeedsToUpdateGraphicsLayerBitsCleared(*child);
126 } 126 }
127 127
128 #endif 128 #endif
129 129
130 } // namespace blink 130 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/compositing/GraphicsLayerTreeBuilder.h ('k') | Source/core/layout/line/AbstractInlineTextBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698