Commit a3cd8a9c authored by Kent Tamura's avatar Kent Tamura Committed by Commit Bot

Count cases where a <button> provides a wrong baseline

This CL has no behavior changes.

Bug: 690036
Change-Id: I8ca4936b9b9fc841199b3762146bcd9233fc34c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2134751
Commit-Queue: Kent Tamura <tkent@chromium.org>
Commit-Queue: Koji Ishii <kojii@chromium.org>
Auto-Submit: Kent Tamura <tkent@chromium.org>
Reviewed-by: default avatarKoji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756178}
parent d75c9b33
...@@ -2536,6 +2536,9 @@ enum WebFeature { ...@@ -2536,6 +2536,9 @@ enum WebFeature {
kCrossOriginOpenerPolicySameOriginAllowPopups = 3198, kCrossOriginOpenerPolicySameOriginAllowPopups = 3198,
kCrossOriginEmbedderPolicyRequireCorp = 3199, kCrossOriginEmbedderPolicyRequireCorp = 3199,
kCoopAndCoepIsolated = 3200, kCoopAndCoepIsolated = 3200,
// The above items are available in M83 branch.
kWrongBaselineOfButtonElement = 3201,
// Add new features immediately above this line. Don't change assigned // Add new features immediately above this line. Don't change assigned
// numbers of any item, and don't reuse removed slots. // numbers of any item, and don't reuse removed slots.
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#include "third_party/blink/renderer/core/layout/layout_button.h" #include "third_party/blink/renderer/core/layout/layout_button.h"
#include "third_party/blink/renderer/core/frame/web_feature.h"
namespace blink { namespace blink {
LayoutButton::LayoutButton(Element* element) LayoutButton::LayoutButton(Element* element)
...@@ -94,8 +96,12 @@ LayoutUnit LayoutButton::BaselinePosition( ...@@ -94,8 +96,12 @@ LayoutUnit LayoutButton::BaselinePosition(
return MarginRight() + Size().Width() - BorderLeft() - PaddingLeft() - return MarginRight() + Size().Width() - BorderLeft() - PaddingLeft() -
VerticalScrollbarWidth(); VerticalScrollbarWidth();
} }
return LayoutFlexibleBox::BaselinePosition(baseline, first_line, direction, LayoutUnit result_baseline = LayoutFlexibleBox::BaselinePosition(
line_position_mode); baseline, first_line, direction, line_position_mode);
LayoutUnit correct_baseline = LayoutBlock::InlineBlockBaseline(direction);
if (correct_baseline != result_baseline)
UseCounter::Count(GetDocument(), WebFeature::kWrongBaselineOfButtonElement);
return result_baseline;
} }
} // namespace blink } // namespace blink
...@@ -26899,6 +26899,7 @@ Called by update_use_counter_feature_enum.py.--> ...@@ -26899,6 +26899,7 @@ Called by update_use_counter_feature_enum.py.-->
<int value="3198" label="CrossOriginOpenerPolicySameOriginAllowPopups"/> <int value="3198" label="CrossOriginOpenerPolicySameOriginAllowPopups"/>
<int value="3199" label="CrossOriginEmbedderPolicyRequireCorp"/> <int value="3199" label="CrossOriginEmbedderPolicyRequireCorp"/>
<int value="3200" label="CoopAndCoepIsolated"/> <int value="3200" label="CoopAndCoepIsolated"/>
<int value="3201" label="WrongBaselineOfButtonElement"/>
</enum> </enum>
<enum name="FeaturePolicyAllowlistType"> <enum name="FeaturePolicyAllowlistType">
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