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

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

Issue 195893026: Fix restrictions on squashing with incompatible scroll. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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/platform/graphics/CompositingReasons.h
diff --git a/Source/platform/graphics/CompositingReasons.h b/Source/platform/graphics/CompositingReasons.h
index b50a6d64c50994cb575416f8f478d37f53b12f19..906fd67e6c7840dcc52971ad44d7819e605800f7 100644
--- a/Source/platform/graphics/CompositingReasons.h
+++ b/Source/platform/graphics/CompositingReasons.h
@@ -34,7 +34,7 @@ const uint64_t CompositingReasonWillChange = UINT64_
const uint64_t CompositingReasonAssumedOverlap = UINT64_C(1) << 16;
const uint64_t CompositingReasonOverlap = UINT64_C(1) << 17;
const uint64_t CompositingReasonNegativeZIndexChildren = UINT64_C(1) << 18;
-const uint64_t CompositingReasonOverlapsWithoutSquashingTarget = UINT64_C(1) << 19;
+const uint64_t CompositingReasonNoSquashingTargetFound = UINT64_C(1) << 19;
// Subtree reasons that require knowing what the status of your subtree is before knowing the answer
const uint64_t CompositingReasonTransformWithCompositedDescendants = UINT64_C(1) << 20;
@@ -93,7 +93,7 @@ const uint64_t CompositingReasonComboReasonsThatRequireOwnBacking =
| CompositingReasonOverlap
| CompositingReasonAssumedOverlap
| CompositingReasonNegativeZIndexChildren
- | CompositingReasonOverlapsWithoutSquashingTarget
+ | CompositingReasonNoSquashingTargetFound
| CompositingReasonTransformWithCompositedDescendants
| CompositingReasonOpacityWithCompositedDescendants
| CompositingReasonMaskWithCompositedDescendants
@@ -175,9 +175,9 @@ static const CompositingReasonStringMap compositingReasonStringMap[] = {
{ CompositingReasonNegativeZIndexChildren,
"negativeZIndexChildren",
"Parent with composited negative z-index content" },
- { CompositingReasonOverlapsWithoutSquashingTarget,
- "overlapsWithoutSquashingTarget",
- "Cannot be squashed with content immediately behind it" },
+ { CompositingReasonNoSquashingTargetFound,
+ "noSquashingTargetFound",
+ "Cannot be squashed due to no compatible squashing owner found" },
{ CompositingReasonTransformWithCompositedDescendants,
"transformWithCompositedDescendants",
"Has a transform that needs to be known by compositor because of composited descendants" },

Powered by Google App Engine
This is Rietveld 408576698