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

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

Issue 12499009: Merge 146940 "Non-paintsContent fixed position layer should not ..." (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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) 2003, 2009, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 bool isInTopLayerSubtree() const; 765 bool isInTopLayerSubtree() const;
766 #endif 766 #endif
767 767
768 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE; 768 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
769 769
770 #if USE(ACCELERATED_COMPOSITING) 770 #if USE(ACCELERATED_COMPOSITING)
771 enum ViewportConstrainedNotCompositedReason { 771 enum ViewportConstrainedNotCompositedReason {
772 NoNotCompositedReason, 772 NoNotCompositedReason,
773 NotCompositedForBoundsOutOfView, 773 NotCompositedForBoundsOutOfView,
774 NotCompositedForNonViewContainer, 774 NotCompositedForNonViewContainer,
775 NotCompositedForNoVisibleContent,
775 }; 776 };
776 777
777 void setViewportConstrainedNotCompositedReason(ViewportConstrainedNotComposi tedReason reason) { m_viewportConstrainedNotCompositedReason = reason; } 778 void setViewportConstrainedNotCompositedReason(ViewportConstrainedNotComposi tedReason reason) { m_viewportConstrainedNotCompositedReason = reason; }
778 ViewportConstrainedNotCompositedReason viewportConstrainedNotCompositedReaso n() const { return static_cast<ViewportConstrainedNotCompositedReason>(m_viewpor tConstrainedNotCompositedReason); } 779 ViewportConstrainedNotCompositedReason viewportConstrainedNotCompositedReaso n() const { return static_cast<ViewportConstrainedNotCompositedReason>(m_viewpor tConstrainedNotCompositedReason); }
779 #endif 780 #endif
780 781
781 private: 782 private:
782 enum CollectLayersBehavior { StopAtStackingContexts, StopAtStackingContainer s }; 783 enum CollectLayersBehavior { StopAtStackingContexts, StopAtStackingContainer s };
783 784
784 void updateZOrderLists(); 785 void updateZOrderLists();
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
1227 1228
1228 } // namespace WebCore 1229 } // namespace WebCore
1229 1230
1230 #ifndef NDEBUG 1231 #ifndef NDEBUG
1231 // Outside the WebCore namespace for ease of invocation from gdb. 1232 // Outside the WebCore namespace for ease of invocation from gdb.
1232 void showLayerTree(const WebCore::RenderLayer*); 1233 void showLayerTree(const WebCore::RenderLayer*);
1233 void showLayerTree(const WebCore::RenderObject*); 1234 void showLayerTree(const WebCore::RenderObject*);
1234 #endif 1235 #endif
1235 1236
1236 #endif // RenderLayer_h 1237 #endif // RenderLayer_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698