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

Side by Side Diff: Source/core/rendering/RenderLayer.h

Issue 729523006: Make ensureCompositedMappingLayer() to be a void function. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « no previous file | Source/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2013 Intel Corporation. All rights reserved. 3 * Copyright (C) 2013 Intel Corporation. All rights reserved.
4 * 4 *
5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
6 * 6 *
7 * Other contributors: 7 * Other contributors:
8 * Robert O'Callahan <roc+@cs.cmu.edu> 8 * Robert O'Callahan <roc+@cs.cmu.edu>
9 * David Baron <dbaron@fas.harvard.edu> 9 * David Baron <dbaron@fas.harvard.edu>
10 * Christian Biesinger <cbiesinger@web.de> 10 * Christian Biesinger <cbiesinger@web.de>
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 void operator delete(void*); 276 void operator delete(void*);
277 277
278 CompositingState compositingState() const; 278 CompositingState compositingState() const;
279 279
280 // This returns true if our document is in a phase of its lifestyle during w hich 280 // This returns true if our document is in a phase of its lifestyle during w hich
281 // compositing state may legally be read. 281 // compositing state may legally be read.
282 bool isAllowedToQueryCompositingState() const; 282 bool isAllowedToQueryCompositingState() const;
283 283
284 // Don't null check this. 284 // Don't null check this.
285 CompositedLayerMapping* compositedLayerMapping() const; 285 CompositedLayerMapping* compositedLayerMapping() const;
286 // FIXME: This should return a reference.
287 CompositedLayerMapping* ensureCompositedLayerMapping();
288 GraphicsLayer* graphicsLayerBacking() const; 286 GraphicsLayer* graphicsLayerBacking() const;
289 GraphicsLayer* graphicsLayerBackingForScrolling() const; 287 GraphicsLayer* graphicsLayerBackingForScrolling() const;
290 // NOTE: If you are using hasCompositedLayerMapping to determine the state o f compositing for this layer, 288 // NOTE: If you are using hasCompositedLayerMapping to determine the state o f compositing for this layer,
291 // (and not just to do bookkeeping related to the mapping like, say, allocat ing or deallocating a mapping), 289 // (and not just to do bookkeeping related to the mapping like, say, allocat ing or deallocating a mapping),
292 // then you may have incorrect logic. Use compositingState() instead. 290 // then you may have incorrect logic. Use compositingState() instead.
293 // FIXME: This is identical to null checking compositedLayerMapping(), why n ot just call that? 291 // FIXME: This is identical to null checking compositedLayerMapping(), why n ot just call that?
294 bool hasCompositedLayerMapping() const { return m_compositedLayerMapping.get (); } 292 bool hasCompositedLayerMapping() const { return m_compositedLayerMapping.get (); }
293 void ensureCompositedLayerMapping();
295 void clearCompositedLayerMapping(bool layerBeingDestroyed = false); 294 void clearCompositedLayerMapping(bool layerBeingDestroyed = false);
296 CompositedLayerMapping* groupedMapping() const { return m_groupedMapping; } 295 CompositedLayerMapping* groupedMapping() const { return m_groupedMapping; }
297 void setGroupedMapping(CompositedLayerMapping* groupedMapping, bool layerBei ngDestroyed = false); 296 void setGroupedMapping(CompositedLayerMapping* groupedMapping, bool layerBei ngDestroyed = false);
298 297
299 bool hasCompositedMask() const; 298 bool hasCompositedMask() const;
300 bool hasCompositedClippingMask() const; 299 bool hasCompositedClippingMask() const;
301 bool needsCompositedScrolling() const { return m_scrollableArea && m_scrolla bleArea->needsCompositedScrolling(); } 300 bool needsCompositedScrolling() const { return m_scrollableArea && m_scrolla bleArea->needsCompositedScrolling(); }
302 301
303 // Computes the position of the given render object in the space of |paintIn validationContainer|. 302 // Computes the position of the given render object in the space of |paintIn validationContainer|.
304 // FIXME: invert the logic to have paint invalidation containers take care o f painting objects into them, rather than the reverse. 303 // FIXME: invert the logic to have paint invalidation containers take care o f painting objects into them, rather than the reverse.
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 681
683 } // namespace blink 682 } // namespace blink
684 683
685 #ifndef NDEBUG 684 #ifndef NDEBUG
686 // Outside the WebCore namespace for ease of invocation from gdb. 685 // Outside the WebCore namespace for ease of invocation from gdb.
687 void showLayerTree(const blink::RenderLayer*); 686 void showLayerTree(const blink::RenderLayer*);
688 void showLayerTree(const blink::RenderObject*); 687 void showLayerTree(const blink::RenderObject*);
689 #endif 688 #endif
690 689
691 #endif // RenderLayer_h 690 #endif // RenderLayer_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698