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

Side by Side 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 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 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 719
720 Node* enclosingElement() const; 720 Node* enclosingElement() const;
721 721
722 #if ENABLE(DIALOG_ELEMENT) 722 #if ENABLE(DIALOG_ELEMENT)
723 bool isInTopLayer() const; 723 bool isInTopLayer() const;
724 bool isInTopLayerSubtree() const; 724 bool isInTopLayerSubtree() const;
725 #endif 725 #endif
726 726
727 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE; 727 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
728 728
729 #if USE(ACCELERATED_COMPOSITING)
730 enum ViewportConstrainedNotCompositedReason {
731 NoNotCompositedReason,
732 NotCompositedForBoundsOutOfView,
733 NotCompositedForNonViewContainer,
734 };
735
736 void setViewportConstrainedNotCompositedReason(ViewportConstrainedNotComposi tedReason reason) { m_viewportConstrainedNotCompositedReason = reason; }
737 ViewportConstrainedNotCompositedReason viewportConstrainedNotCompositedReaso n() const { return static_cast<ViewportConstrainedNotCompositedReason>(m_viewpor tConstrainedNotCompositedReason); }
738 #endif
739
729 private: 740 private:
730 void updateZOrderLists(); 741 void updateZOrderLists();
731 void rebuildZOrderLists(); 742 void rebuildZOrderLists();
732 void clearZOrderLists(); 743 void clearZOrderLists();
733 744
734 void updateNormalFlowList(); 745 void updateNormalFlowList();
735 746
736 bool isStackingContext(const RenderStyle* style) const { return !style->hasA utoZIndex() || isRootLayer(); } 747 bool isStackingContext(const RenderStyle* style) const { return !style->hasA utoZIndex() || isRootLayer(); }
737 bool isDirtyStackingContext() const { return m_zOrderListsDirty && isStackin gContext(); } 748 bool isDirtyStackingContext() const { return m_zOrderListsDirty && isStackin gContext(); }
738 749
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
1028 bool m_hasVisibleDescendant : 1; 1039 bool m_hasVisibleDescendant : 1;
1029 1040
1030 bool m_isPaginated : 1; // If we think this layer is split by a multi-column ancestor, then this bit will be set. 1041 bool m_isPaginated : 1; // If we think this layer is split by a multi-column ancestor, then this bit will be set.
1031 1042
1032 bool m_3DTransformedDescendantStatusDirty : 1; 1043 bool m_3DTransformedDescendantStatusDirty : 1;
1033 bool m_has3DTransformedDescendant : 1; // Set on a stacking context layer t hat has 3D descendants anywhere 1044 bool m_has3DTransformedDescendant : 1; // Set on a stacking context layer t hat has 3D descendants anywhere
1034 // in a preserves3D hierarchy. Hint to do 3D-aware hit testing. 1045 // in a preserves3D hierarchy. Hint to do 3D-aware hit testing.
1035 #if USE(ACCELERATED_COMPOSITING) 1046 #if USE(ACCELERATED_COMPOSITING)
1036 bool m_hasCompositingDescendant : 1; // In the z-order tree. 1047 bool m_hasCompositingDescendant : 1; // In the z-order tree.
1037 unsigned m_indirectCompositingReason : 3; 1048 unsigned m_indirectCompositingReason : 3;
1049 unsigned m_viewportConstrainedNotCompositedReason : 2;
1038 #endif 1050 #endif
1039 1051
1040 bool m_containsDirtyOverlayScrollbars : 1; 1052 bool m_containsDirtyOverlayScrollbars : 1;
1041 bool m_updatingMarqueePosition : 1; 1053 bool m_updatingMarqueePosition : 1;
1042 1054
1043 #if !ASSERT_DISABLED 1055 #if !ASSERT_DISABLED
1044 bool m_layerListMutationAllowed : 1; 1056 bool m_layerListMutationAllowed : 1;
1045 #endif 1057 #endif
1046 // This is an optimization added for <table>. 1058 // This is an optimization added for <table>.
1047 // Currently cells do not need to update their repaint rectangles when scrol ling. This also 1059 // Currently cells do not need to update their repaint rectangles when scrol ling. This also
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
1170 1182
1171 } // namespace WebCore 1183 } // namespace WebCore
1172 1184
1173 #ifndef NDEBUG 1185 #ifndef NDEBUG
1174 // Outside the WebCore namespace for ease of invocation from gdb. 1186 // Outside the WebCore namespace for ease of invocation from gdb.
1175 void showLayerTree(const WebCore::RenderLayer*); 1187 void showLayerTree(const WebCore::RenderLayer*);
1176 void showLayerTree(const WebCore::RenderObject*); 1188 void showLayerTree(const WebCore::RenderObject*);
1177 #endif 1189 #endif
1178 1190
1179 #endif // RenderLayer_h 1191 #endif // RenderLayer_h
OLDNEW
« 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