Index: Source/platform/graphics/CompositingReasons.h |
diff --git a/Source/platform/graphics/CompositingReasons.h b/Source/platform/graphics/CompositingReasons.h |
index 72f738136e4d5cb88eee6c8298a492e27d80e5ef..580d6ca89b6f83af5f88c9cfdb046d952f10a6a1 100644 |
--- a/Source/platform/graphics/CompositingReasons.h |
+++ b/Source/platform/graphics/CompositingReasons.h |
@@ -29,62 +29,63 @@ const uint64_t CompositingReasonOverflowScrollingParent = UINT6 |
const uint64_t CompositingReasonOutOfFlowClipping = UINT64_C(1) << 11; |
const uint64_t CompositingReasonVideoOverlay = UINT64_C(1) << 12; |
const uint64_t CompositingReasonWillChangeCompositingHint = UINT64_C(1) << 13; |
+const uint64_t CompositingReasonScrollBlocksOn = UINT64_C(1) << 14; |
// Overlap reasons that require knowing what's behind you in paint-order before knowing the answer |
-const uint64_t CompositingReasonAssumedOverlap = UINT64_C(1) << 14; |
-const uint64_t CompositingReasonOverlap = UINT64_C(1) << 15; |
-const uint64_t CompositingReasonNegativeZIndexChildren = UINT64_C(1) << 16; |
-const uint64_t CompositingReasonScrollsWithRespectToSquashingLayer = UINT64_C(1) << 17; |
-const uint64_t CompositingReasonSquashingSparsityExceeded = UINT64_C(1) << 18; |
-const uint64_t CompositingReasonSquashingClippingContainerMismatch = UINT64_C(1) << 19; |
-const uint64_t CompositingReasonSquashingOpacityAncestorMismatch = UINT64_C(1) << 20; |
-const uint64_t CompositingReasonSquashingTransformAncestorMismatch = UINT64_C(1) << 21; |
-const uint64_t CompositingReasonSquashingFilterMismatch = UINT64_C(1) << 22; |
-const uint64_t CompositingReasonSquashingWouldBreakPaintOrder = UINT64_C(1) << 23; |
-const uint64_t CompositingReasonSquashingVideoIsDisallowed = UINT64_C(1) << 24; |
-const uint64_t CompositingReasonSquashedLayerClipsCompositingDescendants = UINT64_C(1) << 25; |
-const uint64_t CompositingReasonSquashingRenderPartIsDisallowed = UINT64_C(1) << 26; |
-const uint64_t CompositingReasonSquashingReflectionIsDisallowed = UINT64_C(1) << 27; |
-const uint64_t CompositingReasonSquashingBlendingIsDisallowed = UINT64_C(1) << 28; |
+const uint64_t CompositingReasonAssumedOverlap = UINT64_C(1) << 15; |
+const uint64_t CompositingReasonOverlap = UINT64_C(1) << 16; |
+const uint64_t CompositingReasonNegativeZIndexChildren = UINT64_C(1) << 17; |
+const uint64_t CompositingReasonScrollsWithRespectToSquashingLayer = UINT64_C(1) << 18; |
+const uint64_t CompositingReasonSquashingSparsityExceeded = UINT64_C(1) << 19; |
+const uint64_t CompositingReasonSquashingClippingContainerMismatch = UINT64_C(1) << 20; |
+const uint64_t CompositingReasonSquashingOpacityAncestorMismatch = UINT64_C(1) << 21; |
+const uint64_t CompositingReasonSquashingTransformAncestorMismatch = UINT64_C(1) << 22; |
+const uint64_t CompositingReasonSquashingFilterMismatch = UINT64_C(1) << 23; |
+const uint64_t CompositingReasonSquashingWouldBreakPaintOrder = UINT64_C(1) << 24; |
+const uint64_t CompositingReasonSquashingVideoIsDisallowed = UINT64_C(1) << 25; |
+const uint64_t CompositingReasonSquashedLayerClipsCompositingDescendants = UINT64_C(1) << 26; |
+const uint64_t CompositingReasonSquashingRenderPartIsDisallowed = UINT64_C(1) << 27; |
+const uint64_t CompositingReasonSquashingReflectionIsDisallowed = UINT64_C(1) << 28; |
+const uint64_t CompositingReasonSquashingBlendingIsDisallowed = UINT64_C(1) << 29; |
// Subtree reasons that require knowing what the status of your subtree is before knowing the answer |
-const uint64_t CompositingReasonTransformWithCompositedDescendants = UINT64_C(1) << 29; |
-const uint64_t CompositingReasonOpacityWithCompositedDescendants = UINT64_C(1) << 30; |
-const uint64_t CompositingReasonMaskWithCompositedDescendants = UINT64_C(1) << 31; |
-const uint64_t CompositingReasonReflectionWithCompositedDescendants = UINT64_C(1) << 32; |
-const uint64_t CompositingReasonFilterWithCompositedDescendants = UINT64_C(1) << 33; |
-const uint64_t CompositingReasonBlendingWithCompositedDescendants = UINT64_C(1) << 34; |
-const uint64_t CompositingReasonClipsCompositingDescendants = UINT64_C(1) << 35; |
-const uint64_t CompositingReasonPerspectiveWith3DDescendants = UINT64_C(1) << 36; |
-const uint64_t CompositingReasonPreserve3DWith3DDescendants = UINT64_C(1) << 37; |
-const uint64_t CompositingReasonReflectionOfCompositedParent = UINT64_C(1) << 38; |
-const uint64_t CompositingReasonIsolateCompositedDescendants = UINT64_C(1) << 39; |
+const uint64_t CompositingReasonTransformWithCompositedDescendants = UINT64_C(1) << 30; |
+const uint64_t CompositingReasonOpacityWithCompositedDescendants = UINT64_C(1) << 31; |
+const uint64_t CompositingReasonMaskWithCompositedDescendants = UINT64_C(1) << 32; |
+const uint64_t CompositingReasonReflectionWithCompositedDescendants = UINT64_C(1) << 33; |
+const uint64_t CompositingReasonFilterWithCompositedDescendants = UINT64_C(1) << 34; |
+const uint64_t CompositingReasonBlendingWithCompositedDescendants = UINT64_C(1) << 35; |
+const uint64_t CompositingReasonClipsCompositingDescendants = UINT64_C(1) << 36; |
+const uint64_t CompositingReasonPerspectiveWith3DDescendants = UINT64_C(1) << 37; |
+const uint64_t CompositingReasonPreserve3DWith3DDescendants = UINT64_C(1) << 38; |
+const uint64_t CompositingReasonReflectionOfCompositedParent = UINT64_C(1) << 39; |
+const uint64_t CompositingReasonIsolateCompositedDescendants = UINT64_C(1) << 40; |
// The root layer is a special case that may be forced to be a layer, but also it needs to be |
// a layer if anything else in the subtree is composited. |
-const uint64_t CompositingReasonRoot = UINT64_C(1) << 40; |
+const uint64_t CompositingReasonRoot = UINT64_C(1) << 41; |
// CompositedLayerMapping internal hierarchy reasons |
-const uint64_t CompositingReasonLayerForAncestorClip = UINT64_C(1) << 41; |
-const uint64_t CompositingReasonLayerForDescendantClip = UINT64_C(1) << 42; |
-const uint64_t CompositingReasonLayerForPerspective = UINT64_C(1) << 43; |
-const uint64_t CompositingReasonLayerForHorizontalScrollbar = UINT64_C(1) << 44; |
-const uint64_t CompositingReasonLayerForVerticalScrollbar = UINT64_C(1) << 45; |
-const uint64_t CompositingReasonLayerForOverflowControlsHost = UINT64_C(1) << 46; |
-const uint64_t CompositingReasonLayerForScrollCorner = UINT64_C(1) << 47; |
-const uint64_t CompositingReasonLayerForScrollingContents = UINT64_C(1) << 48; |
-const uint64_t CompositingReasonLayerForScrollingContainer = UINT64_C(1) << 49; |
-const uint64_t CompositingReasonLayerForSquashingContents = UINT64_C(1) << 50; |
-const uint64_t CompositingReasonLayerForSquashingContainer = UINT64_C(1) << 51; |
-const uint64_t CompositingReasonLayerForForeground = UINT64_C(1) << 52; |
-const uint64_t CompositingReasonLayerForBackground = UINT64_C(1) << 53; |
-const uint64_t CompositingReasonLayerForMask = UINT64_C(1) << 54; |
-const uint64_t CompositingReasonLayerForClippingMask = UINT64_C(1) << 55; |
-const uint64_t CompositingReasonLayerForScrollingBlockSelection = UINT64_C(1) << 56; |
+const uint64_t CompositingReasonLayerForAncestorClip = UINT64_C(1) << 42; |
+const uint64_t CompositingReasonLayerForDescendantClip = UINT64_C(1) << 43; |
+const uint64_t CompositingReasonLayerForPerspective = UINT64_C(1) << 44; |
+const uint64_t CompositingReasonLayerForHorizontalScrollbar = UINT64_C(1) << 45; |
+const uint64_t CompositingReasonLayerForVerticalScrollbar = UINT64_C(1) << 46; |
+const uint64_t CompositingReasonLayerForOverflowControlsHost = UINT64_C(1) << 47; |
+const uint64_t CompositingReasonLayerForScrollCorner = UINT64_C(1) << 48; |
+const uint64_t CompositingReasonLayerForScrollingContents = UINT64_C(1) << 49; |
+const uint64_t CompositingReasonLayerForScrollingContainer = UINT64_C(1) << 50; |
+const uint64_t CompositingReasonLayerForSquashingContents = UINT64_C(1) << 51; |
+const uint64_t CompositingReasonLayerForSquashingContainer = UINT64_C(1) << 52; |
+const uint64_t CompositingReasonLayerForForeground = UINT64_C(1) << 53; |
+const uint64_t CompositingReasonLayerForBackground = UINT64_C(1) << 54; |
+const uint64_t CompositingReasonLayerForMask = UINT64_C(1) << 55; |
+const uint64_t CompositingReasonLayerForClippingMask = UINT64_C(1) << 56; |
+const uint64_t CompositingReasonLayerForScrollingBlockSelection = UINT64_C(1) << 57; |
// Composited elements with inline transforms trigger assumed overlap so that |
// we can update their transforms quickly. |
-const uint64_t CompositingReasonInlineTransform = UINT64_C(1) << 57; |
+const uint64_t CompositingReasonInlineTransform = UINT64_C(1) << 58; |
// Various combinations of compositing reasons are defined here also, for more intutive and faster bitwise logic. |
const uint64_t CompositingReasonComboAllDirectReasons = |
@@ -101,14 +102,16 @@ const uint64_t CompositingReasonComboAllDirectReasons = |
| CompositingReasonOverflowScrollingParent |
| CompositingReasonOutOfFlowClipping |
| CompositingReasonVideoOverlay |
- | CompositingReasonWillChangeCompositingHint; |
+ | CompositingReasonWillChangeCompositingHint |
+ | CompositingReasonScrollBlocksOn; |
const uint64_t CompositingReasonComboAllDirectStyleDeterminedReasons = |
CompositingReason3DTransform |
| CompositingReasonBackfaceVisibilityHidden |
| CompositingReasonActiveAnimation |
| CompositingReasonTransitionProperty |
- | CompositingReasonWillChangeCompositingHint; |
+ | CompositingReasonWillChangeCompositingHint |
+ | CompositingReasonScrollBlocksOn; |
const uint64_t CompositingReasonComboCompositedDescendants = |
CompositingReasonTransformWithCompositedDescendants |