[StyleBuilder] Pass a DisplayStyle to LayoutObjectIsNeeded

We need to call Element::LayoutObjectIsNeeded in several places
before the ComputedStyle is actually finished. To avoid calling
InternalStyle, we can instead transport the relevant data in a new
DisplayStyle class, and let various LayoutObjectIsNeeded overrides
act on this instead of acting on ComputedStyle directly.

This is a noisy CL, but there should not be any behavior change.

Bug: 1377295
Change-Id: I565ece32a6d127c549dee5f9bc1f5786c9927e7c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4188888
Commit-Queue: Anders Hartvoll Ruud <andruud@chromium.org>
Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1096856}

third_party/blink/renderer/core/css/resolver/style_adjuster.cc

@@ -685,7 +685,7 @@ void StyleAdjuster::AdjustEffectiveTouchAction(
         IsA<HTMLImageElement>(element) || is_replaced_canvas);
   bool is_table_row_or_column = builder.IsDisplayTableRowOrColumnType();
   bool is_layout_object_needed =
-      element && element->LayoutObjectIsNeeded(*builder.InternalStyle());
+      element && element->LayoutObjectIsNeeded(builder.GetDisplayStyle());
 
   TouchAction element_touch_action = TouchAction::kAuto;
   // Touch actions are only supported by elements that support both the CSS
@@ -846,7 +846,7 @@ void StyleAdjuster::AdjustComputedStyle(StyleResolverState& state,
   auto* html_element = DynamicTo<HTMLElement>(element);
   if (html_element &&
       (builder.Display() != EDisplay::kNone ||
-       element->LayoutObjectIsNeeded(*builder.InternalStyle()))) {
+       element->LayoutObjectIsNeeded(builder.GetDisplayStyle()))) {
     AdjustStyleForHTMLElement(builder, *html_element);
   }
 

third_party/blink/renderer/core/css/resolver/style_resolver_state.cc

@@ -169,7 +169,7 @@ void StyleResolverState::LoadPendingResources() {
   if (pseudo_request_type_ == StyleRequest::kForComputedStyle ||
       (ParentStyle() && ParentStyle()->IsEnsuredInDisplayNone()) ||
       (StyleBuilder().Display() == EDisplay::kNone &&
-       !GetElement().LayoutObjectIsNeeded(*style_builder_.InternalStyle())) ||
+       !GetElement().LayoutObjectIsNeeded(style_builder_.GetDisplayStyle())) ||
       StyleBuilder().IsEnsuredOutsideFlatTree()) {
     return;
   }

third_party/blink/renderer/core/dom/element.cc

@@ -2640,11 +2640,15 @@ const AtomicString Element::ImageSourceURL() const {
   return FastGetAttribute(html_names::kSrcAttr);
 }
 
-bool Element::LayoutObjectIsNeeded(const ComputedStyle& style) const {
+bool Element::LayoutObjectIsNeeded(const DisplayStyle& style) const {
   return style.Display() != EDisplay::kNone &&
          style.Display() != EDisplay::kContents;
 }
 
+bool Element::LayoutObjectIsNeeded(const ComputedStyle& style) const {
+  return LayoutObjectIsNeeded(style.GetDisplayStyle());
+}
+
 LayoutObject* Element::CreateLayoutObject(const ComputedStyle& style,
                                           LegacyLayout legacy) {
   return LayoutObject::CreateObject(this, style, legacy);

third_party/blink/renderer/core/dom/element.h

@@ -83,6 +83,7 @@ class DOMRectList;
 class DOMStringMap;
 class DOMTokenList;
 class DisplayLockContext;
+class DisplayStyle;
 class Document;
 class EditContext;
 class ElementAnimations;
@@ -593,7 +594,8 @@ class CORE_EXPORT Element : public ContainerNode, public Animatable {
   void DetachLayoutTree(bool performing_reattach = false) override;
 
   virtual LayoutObject* CreateLayoutObject(const ComputedStyle&, LegacyLayout);
-  virtual bool LayoutObjectIsNeeded(const ComputedStyle&) const;
+  virtual bool LayoutObjectIsNeeded(const DisplayStyle&) const;
+  bool LayoutObjectIsNeeded(const ComputedStyle&) const;
 
   const ComputedStyle* ParentComputedStyle() const;
 

third_party/blink/renderer/core/dom/pseudo_element.cc

@@ -48,6 +48,9 @@
 
 namespace blink {
 
+bool PseudoElementLayoutObjectIsNeeded(const DisplayStyle& pseudo_style,
+                                       const Element* originating_element);
+
 PseudoElement* PseudoElement::Create(Element* parent,
                                      PseudoId pseudo_id,
                                      const AtomicString& view_transition_name) {
@@ -313,8 +316,8 @@ void PseudoElement::AttachLayoutTree(AttachContext& context) {
   }
 }
 
-bool PseudoElement::LayoutObjectIsNeeded(const ComputedStyle& style) const {
-  return PseudoElementLayoutObjectIsNeeded(&style, parentElement());
+bool PseudoElement::LayoutObjectIsNeeded(const DisplayStyle& style) const {
+  return PseudoElementLayoutObjectIsNeeded(style, parentElement());
 }
 
 bool PseudoElement::CanGeneratePseudoElement(PseudoId pseudo_id) const {
@@ -350,9 +353,16 @@ bool PseudoElementLayoutObjectIsNeeded(const ComputedStyle* pseudo_style,
                                        const Element* originating_element) {
   if (!pseudo_style)
     return false;
-  if (pseudo_style->Display() == EDisplay::kNone)
+  return PseudoElementLayoutObjectIsNeeded(pseudo_style->GetDisplayStyle(),
+                                           originating_element);
+}
+
+bool PseudoElementLayoutObjectIsNeeded(const DisplayStyle& pseudo_style,
+                                       const Element* originating_element) {
+  if (pseudo_style.Display() == EDisplay::kNone) {
     return false;
-  switch (pseudo_style->StyleType()) {
+  }
+  switch (pseudo_style.StyleType()) {
     case kPseudoIdFirstLetter:
     case kPseudoIdBackdrop:
     case kPseudoIdViewTransition:
@@ -363,10 +373,11 @@ bool PseudoElementLayoutObjectIsNeeded(const ComputedStyle* pseudo_style,
       return true;
     case kPseudoIdBefore:
     case kPseudoIdAfter:
-      return !pseudo_style->ContentPreventsBoxGeneration();
+      return !pseudo_style.ContentPreventsBoxGeneration();
     case kPseudoIdMarker: {
-      if (!pseudo_style->ContentBehavesAsNormal())
-        return !pseudo_style->ContentPreventsBoxGeneration();
+      if (!pseudo_style.ContentBehavesAsNormal()) {
+        return !pseudo_style.ContentPreventsBoxGeneration();
+      }
       const ComputedStyle* parent_style =
           originating_element->GetComputedStyle();
       return parent_style && (parent_style->ListStyleType() ||

third_party/blink/renderer/core/dom/pseudo_element.h

@@ -57,7 +57,7 @@ class CORE_EXPORT PseudoElement : public Element {
   scoped_refptr<ComputedStyle> CustomStyleForLayoutObject(
       const StyleRecalcContext&) override;
   void AttachLayoutTree(AttachContext&) override;
-  bool LayoutObjectIsNeeded(const ComputedStyle&) const override;
+  bool LayoutObjectIsNeeded(const DisplayStyle&) const override;
   bool CanGeneratePseudoElement(PseudoId) const override;
 
   bool CanStartSelection() const override { return false; }

third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.cc

@@ -610,7 +610,7 @@ void HTMLFencedFrameElement::AttachLayoutTree(AttachContext& context) {
 }
 
 bool HTMLFencedFrameElement::LayoutObjectIsNeeded(
-    const ComputedStyle& style) const {
+    const DisplayStyle& style) const {
   return !collapsed_by_client_ &&
          HTMLFrameOwnerElement::LayoutObjectIsNeeded(style);
 }

third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.h

@@ -145,7 +145,7 @@ class CORE_EXPORT HTMLFencedFrameElement : public HTMLFrameOwnerElement {
       const QualifiedName&,
       const AtomicString&,
       MutableCSSPropertyValueSet*) override;
-  bool LayoutObjectIsNeeded(const ComputedStyle&) const override;
+  bool LayoutObjectIsNeeded(const DisplayStyle&) const override;
   LayoutObject* CreateLayoutObject(const ComputedStyle&, LegacyLayout) override;
   void AttachLayoutTree(AttachContext& context) override;
   bool SupportsFocus() const override;

third_party/blink/renderer/core/html/forms/html_input_element.cc

@@ -939,7 +939,7 @@ void HTMLInputElement::FinishParsingChildren() {
   }
 }
 
-bool HTMLInputElement::LayoutObjectIsNeeded(const ComputedStyle& style) const {
+bool HTMLInputElement::LayoutObjectIsNeeded(const DisplayStyle& style) const {
   return input_type_->LayoutObjectIsNeeded() &&
          TextControlElement::LayoutObjectIsNeeded(style);
 }

third_party/blink/renderer/core/html/forms/html_input_element.h

@@ -217,7 +217,7 @@ class CORE_EXPORT HTMLInputElement
                                    unsigned end,
                                    ExceptionState&);
 
-  bool LayoutObjectIsNeeded(const ComputedStyle&) const final;
+  bool LayoutObjectIsNeeded(const DisplayStyle&) const final;
   LayoutObject* CreateLayoutObject(const ComputedStyle&, LegacyLayout) override;
   void DetachLayoutTree(bool performing_reattach) final;
   void UpdateSelectionOnFocus(SelectionBehaviorOnFocus,

third_party/blink/renderer/core/html/html_embed_element.cc

@@ -173,7 +173,7 @@ void HTMLEmbedElement::UpdatePluginInternal() {
   RequestObject(plugin_params);
 }
 
-bool HTMLEmbedElement::LayoutObjectIsNeeded(const ComputedStyle& style) const {
+bool HTMLEmbedElement::LayoutObjectIsNeeded(const DisplayStyle& style) const {
   if (IsImageType())
     return HTMLPlugInElement::LayoutObjectIsNeeded(style);
 

third_party/blink/renderer/core/html/html_embed_element.h

@@ -51,7 +51,7 @@ class CORE_EXPORT HTMLEmbedElement final : public HTMLPlugInElement {
       const AtomicString&,
       MutableCSSPropertyValueSet*) override;
 
-  bool LayoutObjectIsNeeded(const ComputedStyle&) const override;
+  bool LayoutObjectIsNeeded(const DisplayStyle&) const override;
 
   bool IsURLAttribute(const Attribute&) const override;
   const QualifiedName& SubResourceAttributeName() const override;

third_party/blink/renderer/core/html/html_frame_element.cc

@@ -37,7 +37,7 @@ HTMLFrameElement::HTMLFrameElement(Document& document)
       frame_border_(true),
       frame_border_set_(false) {}
 
-bool HTMLFrameElement::LayoutObjectIsNeeded(const ComputedStyle&) const {
+bool HTMLFrameElement::LayoutObjectIsNeeded(const DisplayStyle&) const {
   // For compatibility, frames render even when display: none is set.
   return ContentFrame();
 }

third_party/blink/renderer/core/html/html_frame_element.h

@@ -49,7 +49,7 @@ class CORE_EXPORT HTMLFrameElement final : public HTMLFrameElementBase {
   }
 
  private:
-  bool LayoutObjectIsNeeded(const ComputedStyle&) const override;
+  bool LayoutObjectIsNeeded(const DisplayStyle&) const override;
   LayoutObject* CreateLayoutObject(const ComputedStyle&, LegacyLayout) override;
 
   void ParseAttribute(const AttributeModificationParams&) override;

third_party/blink/renderer/core/html/html_frame_set_element.cc

@@ -408,7 +408,7 @@ const Vector<bool>& HTMLFrameSetElement::AllowBorderColumns() const {
 }
 
 bool HTMLFrameSetElement::LayoutObjectIsNeeded(
-    const ComputedStyle& style) const {
+    const DisplayStyle& style) const {
   // For compatibility, frames layoutObject even when display: none is set.
   return true;
 }

third_party/blink/renderer/core/html/html_frame_set_element.h

@@ -89,7 +89,7 @@ class HTMLFrameSetElement final : public HTMLElement {
       MutableCSSPropertyValueSet*) override;
 
   void AttachLayoutTree(AttachContext&) override;
-  bool LayoutObjectIsNeeded(const ComputedStyle&) const override;
+  bool LayoutObjectIsNeeded(const DisplayStyle&) const override;
   LayoutObject* CreateLayoutObject(const ComputedStyle&, LegacyLayout) override;
 
   void DefaultEventHandler(Event&) override;

third_party/blink/renderer/core/html/html_iframe_element.cc

@@ -443,7 +443,7 @@ ParsedPermissionsPolicy HTMLIFrameElement::ConstructContainerPolicy() const {
   return container_policy;
 }
 
-bool HTMLIFrameElement::LayoutObjectIsNeeded(const ComputedStyle& style) const {
+bool HTMLIFrameElement::LayoutObjectIsNeeded(const DisplayStyle& style) const {
   return ContentFrame() && !collapsed_by_client_ &&
          HTMLElement::LayoutObjectIsNeeded(style);
 }

third_party/blink/renderer/core/html/html_iframe_element.h

@@ -76,7 +76,7 @@ class CORE_EXPORT HTMLIFrameElement : public HTMLFrameElementBase,
   InsertionNotificationRequest InsertedInto(ContainerNode&) override;
   void RemovedFrom(ContainerNode&) override;
 
-  bool LayoutObjectIsNeeded(const ComputedStyle&) const override;
+  bool LayoutObjectIsNeeded(const DisplayStyle&) const override;
   LayoutObject* CreateLayoutObject(const ComputedStyle&, LegacyLayout) override;
 
   bool IsInteractiveContent() const override;

third_party/blink/renderer/core/html/html_no_embed_element.cc

@@ -40,8 +40,7 @@ namespace blink {
 HTMLNoEmbedElement::HTMLNoEmbedElement(Document& document)
     : HTMLElement(html_names::kNoembedTag, document) {}
 
-bool HTMLNoEmbedElement::LayoutObjectIsNeeded(
-    const ComputedStyle& style) const {
+bool HTMLNoEmbedElement::LayoutObjectIsNeeded(const DisplayStyle& style) const {
   if (GetDocument().GetFrame()->Loader().AllowPlugins())
     return false;
   return Element::LayoutObjectIsNeeded(style);

third_party/blink/renderer/core/html/html_no_embed_element.h

@@ -42,7 +42,7 @@ class HTMLNoEmbedElement final : public HTMLElement {
   explicit HTMLNoEmbedElement(Document&);
 
  private:
-  bool LayoutObjectIsNeeded(const ComputedStyle&) const override;
+  bool LayoutObjectIsNeeded(const DisplayStyle&) const override;
 };
 
 }  // namespace blink

third_party/blink/renderer/core/html/html_no_script_element.cc

@@ -41,7 +41,7 @@ HTMLNoScriptElement::HTMLNoScriptElement(Document& document)
     : HTMLElement(html_names::kNoscriptTag, document) {}
 
 bool HTMLNoScriptElement::LayoutObjectIsNeeded(
-    const ComputedStyle& style) const {
+    const DisplayStyle& style) const {
   if (GetExecutionContext()->CanExecuteScripts(kNotAboutToExecuteScript))
     return false;
   return Element::LayoutObjectIsNeeded(style);

third_party/blink/renderer/core/html/html_no_script_element.h

@@ -42,7 +42,7 @@ class HTMLNoScriptElement final : public HTMLElement {
   explicit HTMLNoScriptElement(Document&);
 
  private:
-  bool LayoutObjectIsNeeded(const ComputedStyle&) const override;
+  bool LayoutObjectIsNeeded(const DisplayStyle&) const override;
 };
 
 }  // namespace blink

third_party/blink/renderer/core/html/media/html_media_element.cc

@@ -800,7 +800,7 @@ void HTMLMediaElement::FinishParsingChildren() {
     ScheduleTextTrackResourceLoad();
 }
 
-bool HTMLMediaElement::LayoutObjectIsNeeded(const ComputedStyle& style) const {
+bool HTMLMediaElement::LayoutObjectIsNeeded(const DisplayStyle& style) const {
   return ShouldShowControls() && HTMLElement::LayoutObjectIsNeeded(style);
 }
 

third_party/blink/renderer/core/html/media/html_media_element.h

@@ -494,7 +494,7 @@ class CORE_EXPORT HTMLMediaElement
 
   bool SupportsFocus() const final;
   bool IsMouseFocusable() const final;
-  bool LayoutObjectIsNeeded(const ComputedStyle&) const override;
+  bool LayoutObjectIsNeeded(const DisplayStyle&) const override;
   LayoutObject* CreateLayoutObject(const ComputedStyle&, LegacyLayout) override;
   void DidNotifySubtreeInsertionsToDocument() override;
   void DidRecalcStyle(const StyleRecalcChange) final;

third_party/blink/renderer/core/html/media/html_video_element.cc

@@ -144,7 +144,7 @@ void HTMLVideoElement::ContextDestroyed() {
   HTMLMediaElement::ContextDestroyed();
 }
 
-bool HTMLVideoElement::LayoutObjectIsNeeded(const ComputedStyle& style) const {
+bool HTMLVideoElement::LayoutObjectIsNeeded(const DisplayStyle& style) const {
   return HTMLElement::LayoutObjectIsNeeded(style);
 }
 

third_party/blink/renderer/core/html/media/html_video_element.h

@@ -178,7 +178,7 @@ class CORE_EXPORT HTMLVideoElement final
   // ExecutionContextLifecycleStateObserver functions.
   void ContextDestroyed() final;
 
-  bool LayoutObjectIsNeeded(const ComputedStyle&) const override;
+  bool LayoutObjectIsNeeded(const DisplayStyle&) const override;
   LayoutObject* CreateLayoutObject(const ComputedStyle&, LegacyLayout) override;
   void AttachLayoutTree(AttachContext&) override;
   void UpdatePosterImage();

third_party/blink/renderer/core/layout/layout_embedded_content_test.cc

@@ -43,9 +43,7 @@ class HTMLFreezableIFrameElement : public HTMLIFrameElement {
   }
 
  private:
-  bool LayoutObjectIsNeeded(const ComputedStyle&) const override {
-    return true;
-  }
+  bool LayoutObjectIsNeeded(const DisplayStyle&) const override { return true; }
   LayoutObject* CreateLayoutObject(const ComputedStyle&,
                                    LegacyLayout) override {
     return MakeGarbageCollected<LayoutFreezableIFrame>(this);

third_party/blink/renderer/core/style/build.gni

@@ -28,6 +28,7 @@ blink_core_sources_style = [
   "cursor_data.h",
   "cursor_list.h",
   "data_ref.h",
+  "display_style.h",
   "fill_layer.cc",
   "fill_layer.h",
   "filter_operation.cc",

third_party/blink/renderer/core/style/computed_style.h

@@ -52,6 +52,7 @@
 #include "third_party/blink/renderer/core/style/computed_style_initial_values.h"
 #include "third_party/blink/renderer/core/style/cursor_list.h"
 #include "third_party/blink/renderer/core/style/data_ref.h"
+#include "third_party/blink/renderer/core/style/display_style.h"
 #include "third_party/blink/renderer/core/style/style_cached_data.h"
 #include "third_party/blink/renderer/core/style/style_highlight_data.h"
 #include "third_party/blink/renderer/core/style/transform_origin.h"
@@ -1730,25 +1731,16 @@ class ComputedStyle : public ComputedStyleBase,
   // Isolation utility functions.
   bool HasIsolation() const { return Isolation() != EIsolation::kAuto; }
 
+  DisplayStyle GetDisplayStyle() const {
+    return DisplayStyle(Display(), StyleType(), GetContentData());
+  }
+
   // Content utility functions.
   bool ContentBehavesAsNormal() const {
-    switch (StyleType()) {
-      case kPseudoIdMarker:
-        return !GetContentData();
-      default:
-        return !GetContentData() || GetContentData()->IsNone();
-    }
+    return GetDisplayStyle().ContentBehavesAsNormal();
   }
   bool ContentPreventsBoxGeneration() const {
-    switch (StyleType()) {
-      case kPseudoIdBefore:
-      case kPseudoIdAfter:
-        return ContentBehavesAsNormal();
-      case kPseudoIdMarker:
-        return GetContentData() && GetContentData()->IsNone();
-      default:
-        return false;
-    }
+    return GetDisplayStyle().ContentPreventsBoxGeneration();
   }
 
   // Cursor utility functions.
@@ -2958,6 +2950,9 @@ class ComputedStyleBuilder final : public ComputedStyleBuilderBase {
            Display() == EDisplay::kTableColumn ||
            Display() == EDisplay::kTableColumnGroup;
   }
+  DisplayStyle GetDisplayStyle() const {
+    return DisplayStyle(Display(), StyleType(), GetContentData());
+  }
 
   // filter
   FilterOperations& MutableFilter() {