Remove LayoutMenuList::options_width_

options_width_ is updated at the beginning of
ComputeIntrinsicLogicalWidths(), and referred only in it. It doesn't
need to be a data member of LayoutMenuList.

This CL renames UpdateOptionsWidth() to MeasureOptionsWidth(), and it
returns the measured value, and removes LayoutMenuList::options_width_.

This CL has no behavior changes.

Bug: 1040828
Change-Id: Ic33faffa74ede63444e150914541ed4985f70243
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2043340Reviewed-by: Koji Ishii <kojii@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#739343}

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

@@ -35,9 +35,7 @@
 
 namespace blink {
 
-LayoutMenuList::LayoutMenuList(Element* element)
-    : LayoutFlexibleBox(element),
-      options_width_(0) {
+LayoutMenuList::LayoutMenuList(Element* element) : LayoutFlexibleBox(element) {
   DCHECK(IsA<HTMLSelectElement>(element));
 }
 
@@ -59,11 +57,9 @@ LayoutBlock* LayoutMenuList::InnerBlock() const {
   return To<LayoutBlock>(SelectElement()->InnerElement().GetLayoutObject());
 }
 
-void LayoutMenuList::UpdateOptionsWidth() const {
-  if (ShouldApplySizeContainment()) {
-    options_width_ = 0;
-    return;
-  }
+int LayoutMenuList::MeasureOptionsWidth() const {
+  if (ShouldApplySizeContainment())
+    return 0;
 
   float max_option_width = 0;
 
@@ -72,13 +68,13 @@ void LayoutMenuList::UpdateOptionsWidth() const {
     const ComputedStyle* item_style =
         option->GetComputedStyle() ? option->GetComputedStyle() : Style();
     item_style->ApplyTextTransform(&text);
-    // We apply SELECT's style, not OPTION's style because m_optionsWidth is
+    // We apply SELECT's style, not OPTION's style because max_option_width is
     // used to determine intrinsic width of the menulist box.
     TextRun text_run = ConstructTextRun(StyleRef().GetFont(), text, *Style());
     max_option_width =
         std::max(max_option_width, StyleRef().GetFont().Width(text_run));
   }
-  options_width_ = static_cast<int>(ceilf(max_option_width));
+  return static_cast<int>(ceilf(max_option_width));
 }
 
 PhysicalRect LayoutMenuList::ControlClipRect(
@@ -102,11 +98,11 @@ PhysicalRect LayoutMenuList::ControlClipRect(
 void LayoutMenuList::ComputeIntrinsicLogicalWidths(
     LayoutUnit& min_logical_width,
     LayoutUnit& max_logical_width) const {
-  UpdateOptionsWidth();
+  int options_width = MeasureOptionsWidth();
 
   LayoutBlock* block = InnerBlock();
   max_logical_width =
-      std::max(options_width_,
+      std::max(options_width,
                LayoutTheme::GetTheme().MinimumMenuListSize(StyleRef())) +
       block->PaddingLeft() + block->PaddingRight();
   if (!StyleRef().Width().IsPercentOrCalc())

third_party/blink/renderer/core/layout/layout_menu_list.h

@@ -58,11 +58,7 @@ class CORE_EXPORT LayoutMenuList final : public LayoutFlexibleBox {
                             LogicalExtentComputedValues&) const override;
 
   LayoutBlock* InnerBlock() const;
-  void UpdateOptionsWidth() const;
-
-  // m_optionsWidth is calculated and cached on demand.
-  // updateOptionsWidth() should be called before reading them.
-  mutable int options_width_;
+  int MeasureOptionsWidth() const;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMenuList, IsMenuList());