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

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

Issue 2692853016: Change PaintLayer::m_layoutObject to a reference. (Closed)
Patch Set: restore inadvertantly removed null check Created 3 years, 10 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 m_compositingAncestor = &layer; 50 m_compositingAncestor = &layer;
51 if (layer.stackingNode()->isStackingContext()) 51 if (layer.stackingNode()->isStackingContext())
52 m_compositingStackingContext = &layer; 52 m_compositingStackingContext = &layer;
53 } 53 }
54 } 54 }
55 55
56 const PaintLayer* compositingContainer(const PaintLayer& layer) const { 56 const PaintLayer* compositingContainer(const PaintLayer& layer) const {
57 if (layer.stackingNode()->isStacked()) 57 if (layer.stackingNode()->isStacked())
58 return m_compositingStackingContext; 58 return m_compositingStackingContext;
59 59
60 if (layer.layoutObject()->isFloatingWithNonContainingBlockParent()) 60 if (layer.layoutObject().isFloatingWithNonContainingBlockParent())
61 return layer.enclosingLayerWithCompositedLayerMapping(ExcludeSelf); 61 return layer.enclosingLayerWithCompositedLayerMapping(ExcludeSelf);
62 62
63 return m_compositingAncestor; 63 return m_compositingAncestor;
64 } 64 }
65 65
66 const PaintLayer* compositingStackingContext() const { 66 const PaintLayer* compositingStackingContext() const {
67 return m_compositingStackingContext; 67 return m_compositingStackingContext;
68 } 68 }
69 69
70 private: 70 private:
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 ->assertNeedsToUpdateGraphicsLayerBitsCleared(); 128 ->assertNeedsToUpdateGraphicsLayerBitsCleared();
129 129
130 for (PaintLayer* child = layer.firstChild(); child; 130 for (PaintLayer* child = layer.firstChild(); child;
131 child = child->nextSibling()) 131 child = child->nextSibling())
132 assertNeedsToUpdateGraphicsLayerBitsCleared(*child); 132 assertNeedsToUpdateGraphicsLayerBitsCleared(*child);
133 } 133 }
134 134
135 #endif 135 #endif
136 136
137 } // namespace blink 137 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698