Skip to content

GitLab

T
tangled
Commit 8f1da6e5 authored by Ian Kilpatrick's avatar Ian Kilpatrick Committed by Commit Bot
Browse files
Options

[FlexNG] Remove LayoutNGFlexBox flag. 

There should be no behaviour change.

Change-Id: Iaf844f6ba65813022147d91fe8e0d7ebdaacd7e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2386457
Commit-Queue: Ian Kilpatrick <ikilpatrick@chromium.org>
Reviewed-by: default avatarDavid Grogan <dgrogan@chromium.org>
Reviewed-by: default avatarChristian Biesinger <cbiesinger@chromium.org>
Reviewed-by: default avatarChris Harrelson <chrishtr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812029}
parent 8a93811e
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 20 deletions
content/child/runtime_features.cc
View file @ 8f1da6e5
...@@ -356,7 +356,6 @@ void SetRuntimeFeaturesFromChromiumFeatures() { ...@@ -356,7 +356,6 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
{"LangClientHintHeader", features::kLangClientHintHeader}, {"LangClientHintHeader", features::kLangClientHintHeader},
{"LayoutNG", blink::features::kLayoutNG}, {"LayoutNG", blink::features::kLayoutNG},
{"LayoutNGFieldset", blink::features::kLayoutNGFieldset}, {"LayoutNGFieldset", blink::features::kLayoutNGFieldset},
{"LayoutNGFlexBox", blink::features::kFlexNG},
{"LayoutNGFragmentItem", blink::features::kFragmentItem}, {"LayoutNGFragmentItem", blink::features::kFragmentItem},
{"LayoutNGRuby", blink::features::kLayoutNGRuby}, {"LayoutNGRuby", blink::features::kLayoutNGRuby},
{"LegacyWindowsDWriteFontFallback", {"LegacyWindowsDWriteFontFallback",
......
third_party/blink/common/features.cc
View file @ 8f1da6e5
...@@ -565,7 +565,6 @@ const base::FeatureParam<int> kFontPreloadingDelaysRenderingParam{ ...@@ -565,7 +565,6 @@ const base::FeatureParam<int> kFontPreloadingDelaysRenderingParam{
const base::Feature kFlexAspectRatio{"FlexAspectRatio", const base::Feature kFlexAspectRatio{"FlexAspectRatio",
base::FEATURE_ENABLED_BY_DEFAULT}; base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kFlexNG{"FlexNG", base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kKeepScriptResourceAlive{"KeepScriptResourceAlive", const base::Feature kKeepScriptResourceAlive{"KeepScriptResourceAlive",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
......
third_party/blink/public/common/features.h
View file @ 8f1da6e5
...@@ -177,7 +177,6 @@ BLINK_COMMON_EXPORT extern const base::FeatureParam<int> ...@@ -177,7 +177,6 @@ BLINK_COMMON_EXPORT extern const base::FeatureParam<int>
kFontPreloadingDelaysRenderingParam; kFontPreloadingDelaysRenderingParam;
BLINK_COMMON_EXPORT extern const base::Feature kFlexAspectRatio; BLINK_COMMON_EXPORT extern const base::Feature kFlexAspectRatio;
BLINK_COMMON_EXPORT extern const base::Feature kFlexNG;
BLINK_COMMON_EXPORT extern const base::Feature kKeepScriptResourceAlive; BLINK_COMMON_EXPORT extern const base::Feature kKeepScriptResourceAlive;
......
third_party/blink/renderer/core/layout/layout_object_factory.cc
View file @ 8f1da6e5
...@@ -120,11 +120,8 @@ LayoutBlock* LayoutObjectFactory::CreateBlockForLineClamp( ...@@ -120,11 +120,8 @@ LayoutBlock* LayoutObjectFactory::CreateBlockForLineClamp(
LayoutBlock* LayoutObjectFactory::CreateFlexibleBox(Node& node, LayoutBlock* LayoutObjectFactory::CreateFlexibleBox(Node& node,
const ComputedStyle& style, const ComputedStyle& style,
LegacyLayout legacy) { LegacyLayout legacy) {
bool disable_ng_for_type = !RuntimeEnabledFeatures::LayoutNGFlexBoxEnabled();
if (disable_ng_for_type)
UseCounter::Count(node.GetDocument(), WebFeature::kLegacyLayoutByFlexBox);
return CreateObject<LayoutBlock, LayoutNGFlexibleBox, LayoutFlexibleBox>( return CreateObject<LayoutBlock, LayoutNGFlexibleBox, LayoutFlexibleBox>(
node, style, legacy, disable_ng_for_type); node, style, legacy);
} }
LayoutBlock* LayoutObjectFactory::CreateGrid(Node& node, LayoutBlock* LayoutObjectFactory::CreateGrid(Node& node,
...@@ -240,11 +237,8 @@ LayoutBox* LayoutObjectFactory::CreateTableSection(Node& node, ...@@ -240,11 +237,8 @@ LayoutBox* LayoutObjectFactory::CreateTableSection(Node& node,
LayoutObject* LayoutObjectFactory::CreateButton(Node& node, LayoutObject* LayoutObjectFactory::CreateButton(Node& node,
const ComputedStyle& style, const ComputedStyle& style,
LegacyLayout legacy) { LegacyLayout legacy) {
bool disable_ng_for_type = !RuntimeEnabledFeatures::LayoutNGFlexBoxEnabled(); return CreateObject<LayoutBlock, LayoutNGButton, LayoutButton>(node, style,
if (disable_ng_for_type) legacy);
UseCounter::Count(node.GetDocument(), WebFeature::kLegacyLayoutByFlexBox);
return CreateObject<LayoutBlock, LayoutNGButton, LayoutButton>(
node, style, legacy, disable_ng_for_type);
} }
LayoutBlock* LayoutObjectFactory::CreateFieldset(Node& node, LayoutBlock* LayoutObjectFactory::CreateFieldset(Node& node,
......
third_party/blink/renderer/core/layout/ng/ng_layout_result_caching_test.cc
View file @ 8f1da6e5
...@@ -1503,8 +1503,6 @@ TEST_F(NGLayoutResultCachingTest, MissIsFixedBlockSizeIndefinite) { ...@@ -1503,8 +1503,6 @@ TEST_F(NGLayoutResultCachingTest, MissIsFixedBlockSizeIndefinite) {
} }
TEST_F(NGLayoutResultCachingTest, HitColumnFlexBoxMeasureAndLayout) { TEST_F(NGLayoutResultCachingTest, HitColumnFlexBoxMeasureAndLayout) {
ScopedLayoutNGFlexBoxForTest layout_ng_flex_box(true);
SetBodyInnerHTML(R"HTML( SetBodyInnerHTML(R"HTML(
<!DOCTYPE html> <!DOCTYPE html>
<style> <style>
...@@ -1557,8 +1555,6 @@ TEST_F(NGLayoutResultCachingTest, HitColumnFlexBoxMeasureAndLayout) { ...@@ -1557,8 +1555,6 @@ TEST_F(NGLayoutResultCachingTest, HitColumnFlexBoxMeasureAndLayout) {
} }
TEST_F(NGLayoutResultCachingTest, HitRowFlexBoxMeasureAndLayout) { TEST_F(NGLayoutResultCachingTest, HitRowFlexBoxMeasureAndLayout) {
ScopedLayoutNGFlexBoxForTest layout_ng_flex_box(true);
SetBodyInnerHTML(R"HTML( SetBodyInnerHTML(R"HTML(
<!DOCTYPE html> <!DOCTYPE html>
<style> <style>
......
third_party/blink/renderer/platform/runtime_enabled_features.json5
View file @ 8f1da6e5
...@@ -1001,10 +1001,6 @@ ...@@ -1001,10 +1001,6 @@
depends_on: ["LayoutNG"], depends_on: ["LayoutNG"],
status: "stable", status: "stable",
}, },
{
name: "LayoutNGFlexBox",
status: "stable",
},
{ {
name: "LayoutNGForControls", name: "LayoutNGForControls",
depends_on: ["LayoutNG"], depends_on: ["LayoutNG"],
......
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