third_party/WebKit/Source/platform/graphics/CompositingReasons.h - Issue 1730653002: Move squash preventing reasons out of compositing reasons

Unified Diff: third_party/WebKit/Source/platform/graphics/CompositingReasons.h

Issue 1730653002: Move squash preventing reasons out of compositing reasons (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Bug and test fixes. Created 4 years, 10 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

« no previous file with comments | « third_party/WebKit/Source/platform/blink_platform.gypi ('k') | third_party/WebKit/Source/platform/graphics/CompositingReasons.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 542694a0ad8e0d5f8f8db63456428f4ec61f8372..82cccab9f2a0f4504705fa90c29542357511f05b 100644

--- a/third_party/WebKit/Source/platform/graphics/CompositingReasons.h

+++ b/third_party/WebKit/Source/platform/graphics/CompositingReasons.h

@@ -36,63 +36,49 @@ const uint64_t CompositingReasonBackdropFilter = UINT6

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 CompositingReasonSquashingLayoutPartIsDisallowed = UINT64_C(1) << 27;

-const uint64_t CompositingReasonSquashingReflectionIsDisallowed = UINT64_C(1) << 28;

-const uint64_t CompositingReasonSquashingBlendingIsDisallowed = UINT64_C(1) << 29;

-const uint64_t CompositingReasonSquashingNearestFixedPositionMismatch = UINT64_C(1) << 30;

-const uint64_t CompositingReasonScrollChildWithCompositedDescendants = UINT64_C(1) << 31;

-const uint64_t CompositingReasonSquashingLayerIsAnimating = UINT64_C(1) << 32;

+const uint64_t CompositingReasonSquashingDisallowed = UINT64_C(1) << 18;

// Subtree reasons that require knowing what the status of your subtree is before knowing the answer

-const uint64_t CompositingReasonTransformWithCompositedDescendants = UINT64_C(1) << 33;

-const uint64_t CompositingReasonOpacityWithCompositedDescendants = UINT64_C(1) << 34;

-const uint64_t CompositingReasonMaskWithCompositedDescendants = UINT64_C(1) << 35;

-const uint64_t CompositingReasonReflectionWithCompositedDescendants = UINT64_C(1) << 36;

-const uint64_t CompositingReasonFilterWithCompositedDescendants = UINT64_C(1) << 37;

-const uint64_t CompositingReasonBlendingWithCompositedDescendants = UINT64_C(1) << 38;

-const uint64_t CompositingReasonClipsCompositingDescendants = UINT64_C(1) << 39;

-const uint64_t CompositingReasonPerspectiveWith3DDescendants = UINT64_C(1) << 40;

-const uint64_t CompositingReasonPreserve3DWith3DDescendants = UINT64_C(1) << 41;

-const uint64_t CompositingReasonReflectionOfCompositedParent = UINT64_C(1) << 42;

-const uint64_t CompositingReasonIsolateCompositedDescendants = UINT64_C(1) << 43;

-const uint64_t CompositingReasonPositionFixedWithCompositedDescendants = UINT64_C(1) << 44;

+const uint64_t CompositingReasonTransformWithCompositedDescendants = UINT64_C(1) << 19;

+const uint64_t CompositingReasonOpacityWithCompositedDescendants = UINT64_C(1) << 20;

+const uint64_t CompositingReasonMaskWithCompositedDescendants = UINT64_C(1) << 21;

+const uint64_t CompositingReasonReflectionWithCompositedDescendants = UINT64_C(1) << 22;

+const uint64_t CompositingReasonFilterWithCompositedDescendants = UINT64_C(1) << 23;

+const uint64_t CompositingReasonBlendingWithCompositedDescendants = UINT64_C(1) << 24;

+const uint64_t CompositingReasonClipsCompositingDescendants = UINT64_C(1) << 25;

+const uint64_t CompositingReasonPerspectiveWith3DDescendants = UINT64_C(1) << 26;

+const uint64_t CompositingReasonPreserve3DWith3DDescendants = UINT64_C(1) << 27;

+const uint64_t CompositingReasonReflectionOfCompositedParent = UINT64_C(1) << 28;

+const uint64_t CompositingReasonIsolateCompositedDescendants = UINT64_C(1) << 29;

+const uint64_t CompositingReasonPositionFixedWithCompositedDescendants = UINT64_C(1) << 30;

// 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) << 45;

+const uint64_t CompositingReasonRoot = UINT64_C(1) << 31;

// CompositedLayerMapping internal hierarchy reasons

-const uint64_t CompositingReasonLayerForAncestorClip = UINT64_C(1) << 46;

-const uint64_t CompositingReasonLayerForDescendantClip = UINT64_C(1) << 47;

-const uint64_t CompositingReasonLayerForPerspective = UINT64_C(1) << 48;

-const uint64_t CompositingReasonLayerForHorizontalScrollbar = UINT64_C(1) << 49;

-const uint64_t CompositingReasonLayerForVerticalScrollbar = UINT64_C(1) << 50;

-const uint64_t CompositingReasonLayerForOverflowControlsHost = UINT64_C(1) << 51;

-const uint64_t CompositingReasonLayerForScrollCorner = UINT64_C(1) << 52;

-const uint64_t CompositingReasonLayerForScrollingContents = UINT64_C(1) << 53;

-const uint64_t CompositingReasonLayerForScrollingContainer = UINT64_C(1) << 54;

-const uint64_t CompositingReasonLayerForSquashingContents = UINT64_C(1) << 55;

-const uint64_t CompositingReasonLayerForSquashingContainer = UINT64_C(1) << 56;

-const uint64_t CompositingReasonLayerForForeground = UINT64_C(1) << 57;

-const uint64_t CompositingReasonLayerForBackground = UINT64_C(1) << 58;

-const uint64_t CompositingReasonLayerForMask = UINT64_C(1) << 59;

-const uint64_t CompositingReasonLayerForClippingMask = UINT64_C(1) << 60;

-const uint64_t CompositingReasonLayerForScrollingBlockSelection = UINT64_C(1) << 61;

+const uint64_t CompositingReasonLayerForAncestorClip = UINT64_C(1) << 32;

+const uint64_t CompositingReasonLayerForDescendantClip = UINT64_C(1) << 33;

+const uint64_t CompositingReasonLayerForPerspective = UINT64_C(1) << 34;

+const uint64_t CompositingReasonLayerForHorizontalScrollbar = UINT64_C(1) << 35;

+const uint64_t CompositingReasonLayerForVerticalScrollbar = UINT64_C(1) << 36;

+const uint64_t CompositingReasonLayerForOverflowControlsHost = UINT64_C(1) << 37;

+const uint64_t CompositingReasonLayerForScrollCorner = UINT64_C(1) << 38;

+const uint64_t CompositingReasonLayerForScrollingContents = UINT64_C(1) << 39;

+const uint64_t CompositingReasonLayerForScrollingContainer = UINT64_C(1) << 40;

+const uint64_t CompositingReasonLayerForSquashingContents = UINT64_C(1) << 41;

+const uint64_t CompositingReasonLayerForSquashingContainer = UINT64_C(1) << 42;

+const uint64_t CompositingReasonLayerForForeground = UINT64_C(1) << 43;

+const uint64_t CompositingReasonLayerForBackground = UINT64_C(1) << 44;

+const uint64_t CompositingReasonLayerForMask = UINT64_C(1) << 45;

+const uint64_t CompositingReasonLayerForClippingMask = UINT64_C(1) << 46;

+const uint64_t CompositingReasonLayerForScrollingBlockSelection = UINT64_C(1) << 47;

// Composited elements with inline transforms trigger assumed overlap so that

// we can update their transforms quickly.

-const uint64_t CompositingReasonInlineTransform = UINT64_C(1) << 62;

+const uint64_t CompositingReasonInlineTransform = UINT64_C(1) << 48;

-const uint64_t CompositingReasonCompositorProxy = UINT64_C(1) << 63;

+const uint64_t CompositingReasonCompositorProxy = UINT64_C(1) << 49;

// Various combinations of compositing reasons are defined here also, for more intutive and faster bitwise logic.

const uint64_t CompositingReasonComboAllDirectReasons =

@@ -148,18 +134,7 @@ const uint64_t CompositingReasonComboReasonsThatRequireOwnBacking =

| CompositingReasonOverlap

| CompositingReasonAssumedOverlap

| CompositingReasonNegativeZIndexChildren

- | CompositingReasonScrollsWithRespectToSquashingLayer

- | CompositingReasonSquashingSparsityExceeded

- | CompositingReasonSquashingClippingContainerMismatch

- | CompositingReasonSquashingOpacityAncestorMismatch

- | CompositingReasonSquashingTransformAncestorMismatch

- | CompositingReasonSquashingFilterMismatch

- | CompositingReasonSquashingWouldBreakPaintOrder

- | CompositingReasonSquashingVideoIsDisallowed

- | CompositingReasonSquashedLayerClipsCompositingDescendants

- | CompositingReasonSquashingLayoutPartIsDisallowed

- | CompositingReasonSquashingReflectionIsDisallowed

- | CompositingReasonSquashingBlendingIsDisallowed

+ | CompositingReasonSquashingDisallowed

| CompositingReasonTransformWithCompositedDescendants

| CompositingReasonOpacityWithCompositedDescendants

| CompositingReasonMaskWithCompositedDescendants

@@ -167,11 +142,8 @@ const uint64_t CompositingReasonComboReasonsThatRequireOwnBacking =

| CompositingReasonBlendingWithCompositedDescendants

| CompositingReasonIsolateCompositedDescendants

| CompositingReasonPreserve3DWith3DDescendants // preserve-3d has to create backing store to ensure that 3d-transformed elements intersect.

- | CompositingReasonSquashingNearestFixedPositionMismatch

- | CompositingReasonScrollChildWithCompositedDescendants

| CompositingReasonBackdropFilter

- | CompositingReasonPositionFixedWithCompositedDescendants

- | CompositingReasonSquashingLayerIsAnimating;

+ | CompositingReasonPositionFixedWithCompositedDescendants;

const uint64_t CompositingReasonComboSquashableReasons =

CompositingReasonOverlap