summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/layout/layout_object_factory.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-05-20 09:47:09 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-06-07 11:15:42 +0000
commit189d4fd8fad9e3c776873be51938cd31a42b6177 (patch)
tree6497caeff5e383937996768766ab3bb2081a40b2 /chromium/third_party/blink/renderer/core/layout/layout_object_factory.cc
parent8bc75099d364490b22f43a7ce366b366c08f4164 (diff)
downloadqtwebengine-chromium-189d4fd8fad9e3c776873be51938cd31a42b6177.tar.gz
BASELINE: Update Chromium to 90.0.4430.221
Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/layout/layout_object_factory.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/layout/layout_object_factory.cc13
1 files changed, 6 insertions, 7 deletions
diff --git a/chromium/third_party/blink/renderer/core/layout/layout_object_factory.cc b/chromium/third_party/blink/renderer/core/layout/layout_object_factory.cc
index d67ea5ad9d3..9f810d0d1a0 100644
--- a/chromium/third_party/blink/renderer/core/layout/layout_object_factory.cc
+++ b/chromium/third_party/blink/renderer/core/layout/layout_object_factory.cc
@@ -250,11 +250,8 @@ LayoutObject* LayoutObjectFactory::CreateButton(Node& node,
LayoutBlock* LayoutObjectFactory::CreateFieldset(Node& node,
const ComputedStyle& style,
LegacyLayout legacy) {
- bool disable_ng_for_type = !RuntimeEnabledFeatures::LayoutNGFieldsetEnabled();
- if (disable_ng_for_type)
- UseCounter::Count(node.GetDocument(), WebFeature::kLegacyLayoutByFieldSet);
return CreateObject<LayoutBlock, LayoutNGFieldset, LayoutFieldset>(
- node, style, legacy, disable_ng_for_type);
+ node, style, legacy);
}
LayoutBlockFlow* LayoutObjectFactory::CreateFileUploadControl(
@@ -351,13 +348,15 @@ LayoutObject* LayoutObjectFactory::CreateRubyText(Node* node,
}
LayoutBox* LayoutObjectFactory::CreateAnonymousTableWithParent(
- const LayoutObject& parent) {
+ const LayoutObject& parent,
+ bool child_forces_legacy) {
scoped_refptr<ComputedStyle> new_style =
ComputedStyle::CreateAnonymousStyleWithDisplay(
parent.StyleRef(),
parent.IsLayoutInline() ? EDisplay::kInlineTable : EDisplay::kTable);
- LegacyLayout legacy =
- parent.ForceLegacyLayout() ? LegacyLayout::kForce : LegacyLayout::kAuto;
+ LegacyLayout legacy = parent.ForceLegacyLayout() || child_forces_legacy
+ ? LegacyLayout::kForce
+ : LegacyLayout::kAuto;
LayoutBlock* new_table =
CreateTable(parent.GetDocument(), *new_style, legacy);