Commit 3f7e3611 authored by Chris Harrelson's avatar Chris Harrelson Committed by Commit Bot

Turn on FastBorderRadius by default on non-Mac platforms.

Bug: 967076

Change-Id: I099d7862e216ea656fccef800d38e3396b0a8668
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1761077
Commit-Queue: Chris Harrelson <chrishtr@chromium.org>
Reviewed-by: default avatarMason Freed <masonfreed@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689112}
parent a9f91114
...@@ -1203,8 +1203,9 @@ bool EffectTree::ClippedHitTestRegionIsRectangle(int effect_id) const { ...@@ -1203,8 +1203,9 @@ bool EffectTree::ClippedHitTestRegionIsRectangle(int effect_id) const {
bool EffectTree::HitTestMayBeAffectedByMask(int effect_id) const { bool EffectTree::HitTestMayBeAffectedByMask(int effect_id) const {
const EffectNode* effect_node = Node(effect_id); const EffectNode* effect_node = Node(effect_id);
for (; effect_node->id != kContentsRootNodeId; for (; effect_node->id != kContentsRootNodeId;
effect_node = Node(effect_node->target_id)) { effect_node = Node(effect_node->parent_id)) {
if (effect_node->has_masking_child || effect_node->is_masked) if (!effect_node->rounded_corner_bounds.IsEmpty() ||
effect_node->has_masking_child || effect_node->is_masked)
return true; return true;
} }
return false; return false;
......
...@@ -73,8 +73,16 @@ const base::Feature kDisplayLocking{"DisplayLocking", ...@@ -73,8 +73,16 @@ const base::Feature kDisplayLocking{"DisplayLocking",
// Enable applying rounded corner masks via a GL shader rather than // Enable applying rounded corner masks via a GL shader rather than
// a mask layer. // a mask layer.
const base::Feature kFastBorderRadius{"FastBorderRadius", const base::Feature kFastBorderRadius {
base::FEATURE_DISABLED_BY_DEFAULT}; "FastBorderRadius",
#if defined(OS_MACOSX)
// A FastBorderRadiusMac experiment is rolling out separately for that
// platform, due to complications with CALayer overlay optimizations.
base::FEATURE_DISABLED_BY_DEFAULT
#else
base::FEATURE_ENABLED_BY_DEFAULT
#endif
};
// Enable LayoutNG. // Enable LayoutNG.
const base::Feature kLayoutNG{"LayoutNG", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kLayoutNG{"LayoutNG", base::FEATURE_ENABLED_BY_DEFAULT};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment