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

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

Issue 59063003: Don't coerce pointers to compositor layer mappings to booleans. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebaaaase Created 7 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 | Annotate | Revision Log
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 27 matching lines...) Expand all
38 * version of this file under the LGPL, indicate your decision by 38 * version of this file under the LGPL, indicate your decision by
39 * deletingthe provisions above and replace them with the notice and 39 * deletingthe provisions above and replace them with the notice and
40 * other provisions required by the MPL or the GPL, as the case may be. 40 * other provisions required by the MPL or the GPL, as the case may be.
41 * If you do not delete the provisions above, a recipient may use your 41 * If you do not delete the provisions above, a recipient may use your
42 * version of this file under any of the LGPL, the MPL or the GPL. 42 * version of this file under any of the LGPL, the MPL or the GPL.
43 */ 43 */
44 44
45 #ifndef RenderLayer_h 45 #ifndef RenderLayer_h
46 #define RenderLayer_h 46 #define RenderLayer_h
47 47
48 #include "core/rendering/CompositedLayerMappingPtr.h"
48 #include "core/rendering/CompositingReasons.h" 49 #include "core/rendering/CompositingReasons.h"
49 #include "core/rendering/LayerPaintingInfo.h" 50 #include "core/rendering/LayerPaintingInfo.h"
50 #include "core/rendering/PaintInfo.h" 51 #include "core/rendering/PaintInfo.h"
51 #include "core/rendering/RenderBox.h" 52 #include "core/rendering/RenderBox.h"
52 #include "core/rendering/RenderLayerClipper.h" 53 #include "core/rendering/RenderLayerClipper.h"
53 #include "core/rendering/RenderLayerReflectionInfo.h" 54 #include "core/rendering/RenderLayerReflectionInfo.h"
54 #include "core/rendering/RenderLayerRepainter.h" 55 #include "core/rendering/RenderLayerRepainter.h"
55 #include "core/rendering/RenderLayerScrollableArea.h" 56 #include "core/rendering/RenderLayerScrollableArea.h"
56 #include "core/rendering/RenderLayerStackingNode.h" 57 #include "core/rendering/RenderLayerStackingNode.h"
57 58
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 bool paintsWithBlendMode() const { return hasBlendMode() && compositingState () != PaintsIntoOwnBacking; } 341 bool paintsWithBlendMode() const { return hasBlendMode() && compositingState () != PaintsIntoOwnBacking; }
341 342
342 void* operator new(size_t); 343 void* operator new(size_t);
343 // Only safe to call from RenderLayerModelObject::destroyLayer() 344 // Only safe to call from RenderLayerModelObject::destroyLayer()
344 void operator delete(void*); 345 void operator delete(void*);
345 346
346 CompositingState compositingState() const; 347 CompositingState compositingState() const;
347 348
348 // NOTE: If you are accessing the CompositedLayerMapping as a boolean condit ion to determine the state of compositing for this layer, 349 // NOTE: If you are accessing the CompositedLayerMapping as a boolean condit ion to determine the state of compositing for this layer,
349 // then you may have incorrect logic. Use compositingState() instead. 350 // then you may have incorrect logic. Use compositingState() instead.
350 CompositedLayerMapping* compositedLayerMapping() const { return m_composited LayerMapping.get(); } 351 CompositedLayerMappingPtr compositedLayerMapping() const { return m_composit edLayerMapping.get(); }
351 CompositedLayerMapping* ensureCompositedLayerMapping(); 352 CompositedLayerMappingPtr ensureCompositedLayerMapping();
352 void clearCompositedLayerMapping(bool layerBeingDestroyed = false); 353 void clearCompositedLayerMapping(bool layerBeingDestroyed = false);
353 354
354 bool hasCompositedMask() const; 355 bool hasCompositedMask() const;
355 bool hasCompositedClippingMask() const; 356 bool hasCompositedClippingMask() const;
356 bool needsCompositedScrolling() const { return m_scrollableArea && m_scrolla bleArea->needsCompositedScrolling(); } 357 bool needsCompositedScrolling() const { return m_scrollableArea && m_scrolla bleArea->needsCompositedScrolling(); }
357 358
358 RenderLayer* scrollParent() const; 359 RenderLayer* scrollParent() const;
359 RenderLayer* clipParent() const; 360 RenderLayer* clipParent() const;
360 361
361 bool needsCompositingLayersRebuiltForClip(const RenderStyle* oldStyle, const RenderStyle* newStyle) const; 362 bool needsCompositingLayersRebuiltForClip(const RenderStyle* oldStyle, const RenderStyle* newStyle) const;
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 732
732 } // namespace WebCore 733 } // namespace WebCore
733 734
734 #ifndef NDEBUG 735 #ifndef NDEBUG
735 // Outside the WebCore namespace for ease of invocation from gdb. 736 // Outside the WebCore namespace for ease of invocation from gdb.
736 void showLayerTree(const WebCore::RenderLayer*); 737 void showLayerTree(const WebCore::RenderLayer*);
737 void showLayerTree(const WebCore::RenderObject*); 738 void showLayerTree(const WebCore::RenderObject*);
738 #endif 739 #endif
739 740
740 #endif // RenderLayer_h 741 #endif // RenderLayer_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698