Commit 8278c367 authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

[blink]: removes WebkitBoxLayoutUsesFlexLayout feature

It's the default and we started removing code that means we can no
longer disable it.

BUG=993813
TEST=none

Change-Id: I9f65953bd5a696ad9281644285caa3f9ccba8c81
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1975303
Commit-Queue: Ian Kilpatrick <ikilpatrick@chromium.org>
Reviewed-by: default avatarIan Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726396}
parent e9af78d1
...@@ -220,8 +220,7 @@ bool ComputedStyle::NeedsReattachLayoutTree(const ComputedStyle* old_style, ...@@ -220,8 +220,7 @@ bool ComputedStyle::NeedsReattachLayoutTree(const ComputedStyle* old_style,
// line-clamping is currently only handled by LayoutDeprecatedFlexibleBox, // line-clamping is currently only handled by LayoutDeprecatedFlexibleBox,
// so that if line-clamping changes then the LayoutObject needs to be // so that if line-clamping changes then the LayoutObject needs to be
// recreated. // recreated.
if (RuntimeEnabledFeatures::WebkitBoxLayoutUsesFlexLayoutEnabled() && if (new_style->IsDeprecatedWebkitBox() &&
(new_style->IsDeprecatedWebkitBox()) &&
(old_style->HasLineClamp() != new_style->HasLineClamp() && (old_style->HasLineClamp() != new_style->HasLineClamp() &&
new_style->BoxOrient() == EBoxOrient::kVertical)) { new_style->BoxOrient() == EBoxOrient::kVertical)) {
return true; return true;
......
...@@ -1223,7 +1223,6 @@ class ComputedStyle : public ComputedStyleBase, ...@@ -1223,7 +1223,6 @@ class ComputedStyle : public ComputedStyleBase,
} }
bool IsDeprecatedFlexboxUsingFlexLayout() const { bool IsDeprecatedFlexboxUsingFlexLayout() const {
return IsDeprecatedWebkitBox() && return IsDeprecatedWebkitBox() &&
RuntimeEnabledFeatures::WebkitBoxLayoutUsesFlexLayoutEnabled() &&
(!HasLineClamp() || BoxOrient() == EBoxOrient::kHorizontal); (!HasLineClamp() || BoxOrient() == EBoxOrient::kHorizontal);
} }
......
...@@ -1829,10 +1829,6 @@ ...@@ -1829,10 +1829,6 @@
name: "WebHID", name: "WebHID",
status: "experimental", status: "experimental",
}, },
{
name: "WebkitBoxLayoutUsesFlexLayout",
status: "stable",
},
{ {
name: "WebNFC", name: "WebNFC",
status: "experimental", status: "experimental",
......
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