| Index: third_party/WebKit/Source/platform/graphics/CompositingReasons.h
|
| diff --git a/third_party/WebKit/Source/platform/graphics/CompositingReasons.h b/third_party/WebKit/Source/platform/graphics/CompositingReasons.h
|
| index 7ffff180841b108cdb6e35f31efef922b3381937..f79fd84e10e1da01c3ebe3605404718b9e43a965 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/CompositingReasons.h
|
| +++ b/third_party/WebKit/Source/platform/graphics/CompositingReasons.h
|
| @@ -62,34 +62,35 @@ const uint64_t CompositingReasonPerspectiveWith3DDescendants = UINT6
|
| const uint64_t CompositingReasonPreserve3DWith3DDescendants = UINT64_C(1) << 40;
|
| const uint64_t CompositingReasonReflectionOfCompositedParent = UINT64_C(1) << 41;
|
| const uint64_t CompositingReasonIsolateCompositedDescendants = UINT64_C(1) << 42;
|
| +const uint64_t CompositingReasonPositionFixedWithCompositedDescendants = UINT64_C(1) << 43;
|
|
|
| // 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) << 43;
|
| +const uint64_t CompositingReasonRoot = UINT64_C(1) << 44;
|
|
|
| // CompositedLayerMapping internal hierarchy reasons
|
| -const uint64_t CompositingReasonLayerForAncestorClip = UINT64_C(1) << 44;
|
| -const uint64_t CompositingReasonLayerForDescendantClip = UINT64_C(1) << 45;
|
| -const uint64_t CompositingReasonLayerForPerspective = UINT64_C(1) << 46;
|
| -const uint64_t CompositingReasonLayerForHorizontalScrollbar = UINT64_C(1) << 47;
|
| -const uint64_t CompositingReasonLayerForVerticalScrollbar = UINT64_C(1) << 48;
|
| -const uint64_t CompositingReasonLayerForOverflowControlsHost = UINT64_C(1) << 49;
|
| -const uint64_t CompositingReasonLayerForScrollCorner = UINT64_C(1) << 50;
|
| -const uint64_t CompositingReasonLayerForScrollingContents = UINT64_C(1) << 51;
|
| -const uint64_t CompositingReasonLayerForScrollingContainer = UINT64_C(1) << 52;
|
| -const uint64_t CompositingReasonLayerForSquashingContents = UINT64_C(1) << 53;
|
| -const uint64_t CompositingReasonLayerForSquashingContainer = UINT64_C(1) << 54;
|
| -const uint64_t CompositingReasonLayerForForeground = UINT64_C(1) << 55;
|
| -const uint64_t CompositingReasonLayerForBackground = UINT64_C(1) << 56;
|
| -const uint64_t CompositingReasonLayerForMask = UINT64_C(1) << 57;
|
| -const uint64_t CompositingReasonLayerForClippingMask = UINT64_C(1) << 58;
|
| -const uint64_t CompositingReasonLayerForScrollingBlockSelection = UINT64_C(1) << 59;
|
| +const uint64_t CompositingReasonLayerForAncestorClip = UINT64_C(1) << 45;
|
| +const uint64_t CompositingReasonLayerForDescendantClip = UINT64_C(1) << 46;
|
| +const uint64_t CompositingReasonLayerForPerspective = UINT64_C(1) << 47;
|
| +const uint64_t CompositingReasonLayerForHorizontalScrollbar = UINT64_C(1) << 48;
|
| +const uint64_t CompositingReasonLayerForVerticalScrollbar = UINT64_C(1) << 49;
|
| +const uint64_t CompositingReasonLayerForOverflowControlsHost = UINT64_C(1) << 50;
|
| +const uint64_t CompositingReasonLayerForScrollCorner = UINT64_C(1) << 51;
|
| +const uint64_t CompositingReasonLayerForScrollingContents = UINT64_C(1) << 52;
|
| +const uint64_t CompositingReasonLayerForScrollingContainer = UINT64_C(1) << 53;
|
| +const uint64_t CompositingReasonLayerForSquashingContents = UINT64_C(1) << 54;
|
| +const uint64_t CompositingReasonLayerForSquashingContainer = UINT64_C(1) << 55;
|
| +const uint64_t CompositingReasonLayerForForeground = UINT64_C(1) << 56;
|
| +const uint64_t CompositingReasonLayerForBackground = UINT64_C(1) << 57;
|
| +const uint64_t CompositingReasonLayerForMask = UINT64_C(1) << 58;
|
| +const uint64_t CompositingReasonLayerForClippingMask = UINT64_C(1) << 59;
|
| +const uint64_t CompositingReasonLayerForScrollingBlockSelection = UINT64_C(1) << 60;
|
|
|
| // Composited elements with inline transforms trigger assumed overlap so that
|
| // we can update their transforms quickly.
|
| -const uint64_t CompositingReasonInlineTransform = UINT64_C(1) << 60;
|
| +const uint64_t CompositingReasonInlineTransform = UINT64_C(1) << 61;
|
|
|
| -const uint64_t CompositingReasonCompositorProxy = UINT64_C(1) << 61;
|
| +const uint64_t CompositingReasonCompositorProxy = UINT64_C(1) << 62;
|
|
|
| // Various combinations of compositing reasons are defined here also, for more intutive and faster bitwise logic.
|
| const uint64_t CompositingReasonComboAllDirectReasons =
|
| @@ -127,7 +128,8 @@ const uint64_t CompositingReasonComboCompositedDescendants =
|
| | CompositingReasonFilterWithCompositedDescendants
|
| | CompositingReasonBlendingWithCompositedDescendants
|
| | CompositingReasonReflectionWithCompositedDescendants
|
| - | CompositingReasonClipsCompositingDescendants;
|
| + | CompositingReasonClipsCompositingDescendants
|
| + | CompositingReasonPositionFixedWithCompositedDescendants;
|
|
|
| const uint64_t CompositingReasonCombo3DDescendants =
|
| CompositingReasonPreserve3DWith3DDescendants
|
| @@ -165,7 +167,8 @@ const uint64_t CompositingReasonComboReasonsThatRequireOwnBacking =
|
| | CompositingReasonPreserve3DWith3DDescendants // preserve-3d has to create backing store to ensure that 3d-transformed elements intersect.
|
| | CompositingReasonSquashingNearestFixedPositionMismatch
|
| | CompositingReasonScrollChildWithCompositedDescendants
|
| - | CompositingReasonBackdropFilter;
|
| + | CompositingReasonBackdropFilter
|
| + | CompositingReasonPositionFixedWithCompositedDescendants;
|
|
|
| const uint64_t CompositingReasonComboSquashableReasons =
|
| CompositingReasonOverlap
|
|
|