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

Unified Diff: Source/WebCore/rendering/RenderLayer.h

Issue 11970041: Merge 139461 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/rendering/RenderLayer.h
===================================================================
--- Source/WebCore/rendering/RenderLayer.h (revision 139983)
+++ Source/WebCore/rendering/RenderLayer.h (working copy)
@@ -726,6 +726,17 @@
virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
+#if USE(ACCELERATED_COMPOSITING)
+ enum ViewportConstrainedNotCompositedReason {
+ NoNotCompositedReason,
+ NotCompositedForBoundsOutOfView,
+ NotCompositedForNonViewContainer,
+ };
+
+ void setViewportConstrainedNotCompositedReason(ViewportConstrainedNotCompositedReason reason) { m_viewportConstrainedNotCompositedReason = reason; }
+ ViewportConstrainedNotCompositedReason viewportConstrainedNotCompositedReason() const { return static_cast<ViewportConstrainedNotCompositedReason>(m_viewportConstrainedNotCompositedReason); }
+#endif
+
private:
void updateZOrderLists();
void rebuildZOrderLists();
@@ -1035,6 +1046,7 @@
#if USE(ACCELERATED_COMPOSITING)
bool m_hasCompositingDescendant : 1; // In the z-order tree.
unsigned m_indirectCompositingReason : 3;
+ unsigned m_viewportConstrainedNotCompositedReason : 2;
#endif
bool m_containsDirtyOverlayScrollbars : 1;
« no previous file with comments | « Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm ('k') | Source/WebCore/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698