[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: David Grogan <dgrogan@chromium.org> Reviewed-by: Christian Biesinger <cbiesinger@chromium.org> Reviewed-by: Chris Harrelson <chrishtr@chromium.org> Cr-Commit-Position: refs/heads/master@{#812029}

[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: David Grogan <dgrogan@chromium.org> Reviewed-by: Christian Biesinger <cbiesinger@chromium.org> Reviewed-by: Chris Harrelson <chrishtr@chromium.org> Cr-Commit-Position: refs/heads/master@{#812029}
8f1da6e5 · Ian Kilpatrick · Commit Bot · 8a93811e · 8f1da6e5 · 8f1da6e5
Commit 8f1da6e5 authored Sep 30, 2020 by Ian Kilpatrick Committed by Commit Bot Sep 30, 2020
6 changed files
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -356,7 +356,6 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
          {"LangClientHintHeader", features::kLangClientHintHeader},
          {"LayoutNG", blink::features::kLayoutNG},
          {"LayoutNGFieldset", blink::features::kLayoutNGFieldset},
-          {"LayoutNGFlexBox", blink::features::kFlexNG},
          {"LayoutNGFragmentItem", blink::features::kFragmentItem},
          {"LayoutNGRuby", blink::features::kLayoutNGRuby},
          {"LegacyWindowsDWriteFontFallback",

--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -565,7 +565,6 @@ const base::FeatureParam<int> kFontPreloadingDelaysRenderingParam{

 const base::Feature kFlexAspectRatio{"FlexAspectRatio",
                                     base::FEATURE_ENABLED_BY_DEFAULT};
-const base::Feature kFlexNG{"FlexNG", base::FEATURE_ENABLED_BY_DEFAULT};

 const base::Feature kKeepScriptResourceAlive{"KeepScriptResourceAlive",
                                             base::FEATURE_DISABLED_BY_DEFAULT};

--- a/third_party/blink/public/common/features.h
+++ b/third_party/blink/public/common/features.h
@@ -177,7 +177,6 @@ BLINK_COMMON_EXPORT extern const base::FeatureParam<int>
    kFontPreloadingDelaysRenderingParam;

 BLINK_COMMON_EXPORT extern const base::Feature kFlexAspectRatio;
-BLINK_COMMON_EXPORT extern const base::Feature kFlexNG;

 BLINK_COMMON_EXPORT extern const base::Feature kKeepScriptResourceAlive;


--- a/third_party/blink/renderer/core/layout/layout_object_factory.cc
+++ b/third_party/blink/renderer/core/layout/layout_object_factory.cc
@@ -120,11 +120,8 @@ LayoutBlock* LayoutObjectFactory::CreateBlockForLineClamp(
 LayoutBlock* LayoutObjectFactory::CreateFlexibleBox(Node& node,
                                                    const ComputedStyle& style,
                                                    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>(
-      node, style, legacy, disable_ng_for_type);
+      node, style, legacy);
 }

 LayoutBlock* LayoutObjectFactory::CreateGrid(Node& node,
@@ -240,11 +237,8 @@ LayoutBox* LayoutObjectFactory::CreateTableSection(Node& node,
 LayoutObject* LayoutObjectFactory::CreateButton(Node& node,
                                                const ComputedStyle& style,
                                                LegacyLayout legacy) {
-  bool disable_ng_for_type = !RuntimeEnabledFeatures::LayoutNGFlexBoxEnabled();
-  if (disable_ng_for_type)
-    UseCounter::Count(node.GetDocument(), WebFeature::kLegacyLayoutByFlexBox);
-  return CreateObject<LayoutBlock, LayoutNGButton, LayoutButton>(
-      node, style, legacy, disable_ng_for_type);
+  return CreateObject<LayoutBlock, LayoutNGButton, LayoutButton>(node, style,
+                                                                 legacy);
 }

 LayoutBlock* LayoutObjectFactory::CreateFieldset(Node& node,

--- a/third_party/blink/renderer/core/layout/ng/ng_layout_result_caching_test.cc
+++ b/third_party/blink/renderer/core/layout/ng/ng_layout_result_caching_test.cc
@@ -1503,8 +1503,6 @@ TEST_F(NGLayoutResultCachingTest, MissIsFixedBlockSizeIndefinite) {
 }

 TEST_F(NGLayoutResultCachingTest, HitColumnFlexBoxMeasureAndLayout) {
-  ScopedLayoutNGFlexBoxForTest layout_ng_flex_box(true);
-
  SetBodyInnerHTML(R"HTML(
    <!DOCTYPE html>
    <style>
@@ -1557,8 +1555,6 @@ TEST_F(NGLayoutResultCachingTest, HitColumnFlexBoxMeasureAndLayout) {
 }

 TEST_F(NGLayoutResultCachingTest, HitRowFlexBoxMeasureAndLayout) {
-  ScopedLayoutNGFlexBoxForTest layout_ng_flex_box(true);
-
  SetBodyInnerHTML(R"HTML(
    <!DOCTYPE html>
    <style>

--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1001,10 +1001,6 @@
      depends_on: ["LayoutNG"],
      status: "stable",
    },
-    {
-      name: "LayoutNGFlexBox",
-      status: "stable",
-    },
    {
      name: "LayoutNGForControls",
      depends_on: ["LayoutNG"],