0

views: Remove GetHeightForWidth in //a/a/u.

Because both GetHeightForWidth and CalculatePreferredSize can provide
calculation options for preferred size calculation, but in some cases we
have to calculate both. Their coexistence also leads to some
implementation differences, such as Label fully respects row height in
GetHeightForWidth, but has limited respect for row height in
CalculatePreferredSize. In fact, we can merge them through
CalculatePreferredSize(views::SizeBounds).

Now is the stage to delete the GetHeightForWidth overload.

Bug: 40232718
Change-Id: I450ae9d282ac1ccaef84541aad5d72440974acdd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5667459
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: Weidong Liu <weidongliu@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1322467}
This commit is contained in:
weidongliu
2024-07-02 23:33:06 +00:00
committed by Chromium LUCI CQ
parent 05ddbf1ff7
commit acf1c4a388
17 changed files with 17 additions and 51 deletions

@ -44,11 +44,7 @@ MicView::~MicView() {
gfx::Size MicView::CalculatePreferredSize( gfx::Size MicView::CalculatePreferredSize(
const views::SizeBounds& available_size) const { const views::SizeBounds& available_size) const {
return gfx::Size(kPreferredSizeDip, GetHeightForWidth(kPreferredSizeDip)); return gfx::Size(kPreferredSizeDip, kPreferredSizeDip);
}
int MicView::GetHeightForWidth(int width) const {
return kPreferredSizeDip;
} }
void MicView::OnAssistantControllerDestroying() { void MicView::OnAssistantControllerDestroying() {

@ -35,7 +35,6 @@ class COMPONENT_EXPORT(ASSISTANT_UI) MicView
gfx::Size CalculatePreferredSize( gfx::Size CalculatePreferredSize(
const views::SizeBounds& available_size) const override; const views::SizeBounds& available_size) const override;
int GetHeightForWidth(int width) const override;
// AssistantControllerObserver: // AssistantControllerObserver:
void OnAssistantControllerDestroying() override; void OnAssistantControllerDestroying() override;

@ -55,11 +55,7 @@ AssistantFooterView::~AssistantFooterView() {
gfx::Size AssistantFooterView::CalculatePreferredSize( gfx::Size AssistantFooterView::CalculatePreferredSize(
const views::SizeBounds& available_size) const { const views::SizeBounds& available_size) const {
return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX)); return gfx::Size(INT_MAX, kPreferredHeightDip);
}
int AssistantFooterView::GetHeightForWidth(int width) const {
return kPreferredHeightDip;
} }
void AssistantFooterView::InitLayout() { void AssistantFooterView::InitLayout() {

@ -40,7 +40,6 @@ class COMPONENT_EXPORT(ASSISTANT_UI) AssistantFooterView
// views::View: // views::View:
gfx::Size CalculatePreferredSize( gfx::Size CalculatePreferredSize(
const views::SizeBounds& available_size) const override; const views::SizeBounds& available_size) const override;
int GetHeightForWidth(int width) const override;
// AssistantStateObserver: // AssistantStateObserver:
void OnAssistantConsentStatusChanged(int consent_status) override; void OnAssistantConsentStatusChanged(int consent_status) override;

@ -119,8 +119,11 @@ AssistantOnboardingSuggestionView::~AssistantOnboardingSuggestionView() {
views::InkDrop::Remove(this); views::InkDrop::Remove(this);
} }
int AssistantOnboardingSuggestionView::GetHeightForWidth(int width) const { gfx::Size AssistantOnboardingSuggestionView::CalculatePreferredSize(
return kPreferredHeightDip; const views::SizeBounds& available_size) const {
const int preferred_width =
views::Button::CalculatePreferredSize(available_size).width();
return gfx::Size(preferred_width, kPreferredHeightDip);
} }
void AssistantOnboardingSuggestionView::ChildPreferredSizeChanged( void AssistantOnboardingSuggestionView::ChildPreferredSizeChanged(

@ -42,7 +42,8 @@ class COMPONENT_EXPORT(ASSISTANT_UI) AssistantOnboardingSuggestionView
~AssistantOnboardingSuggestionView() override; ~AssistantOnboardingSuggestionView() override;
// views::View: // views::View:
int GetHeightForWidth(int width) const override; gfx::Size CalculatePreferredSize(
const views::SizeBounds& available_size) const override;
void AddLayerToRegion(ui::Layer* layer, views::LayerRegion region) override; void AddLayerToRegion(ui::Layer* layer, views::LayerRegion region) override;
void RemoveLayerFromRegions(ui::Layer* layer) override; void RemoveLayerFromRegions(ui::Layer* layer) override;
void ChildPreferredSizeChanged(views::View* child) override; void ChildPreferredSizeChanged(views::View* child) override;

@ -73,11 +73,7 @@ class AssistantOptInContainer : public views::Button {
const views::SizeBounds& available_size) const override { const views::SizeBounds& available_size) const override {
const int preferred_width = const int preferred_width =
views::View::CalculatePreferredSize(available_size).width(); views::View::CalculatePreferredSize(available_size).width();
return gfx::Size(preferred_width, GetHeightForWidth(preferred_width)); return gfx::Size(preferred_width, kPreferredHeightDip);
}
int GetHeightForWidth(int width) const override {
return kPreferredHeightDip;
} }
void ChildPreferredSizeChanged(views::View* child) override { void ChildPreferredSizeChanged(views::View* child) override {

@ -82,11 +82,7 @@ gfx::Size AssistantProgressIndicator::CalculatePreferredSize(
const views::SizeBounds& available_size) const { const views::SizeBounds& available_size) const {
const int preferred_width = const int preferred_width =
views::View::CalculatePreferredSize(available_size).width(); views::View::CalculatePreferredSize(available_size).width();
return gfx::Size(preferred_width, GetHeightForWidth(preferred_width)); return gfx::Size(preferred_width, kPreferredHeightDip);
}
int AssistantProgressIndicator::GetHeightForWidth(int width) const {
return kPreferredHeightDip;
} }
void AssistantProgressIndicator::AddedToWidget() { void AssistantProgressIndicator::AddedToWidget() {

@ -27,7 +27,6 @@ class COMPONENT_EXPORT(ASSISTANT_UI) AssistantProgressIndicator
// views::View: // views::View:
gfx::Size CalculatePreferredSize( gfx::Size CalculatePreferredSize(
const views::SizeBounds& available_size) const override; const views::SizeBounds& available_size) const override;
int GetHeightForWidth(int width) const override;
void AddedToWidget() override; void AddedToWidget() override;
void RemovedFromWidget() override; void RemovedFromWidget() override;
void OnLayerOpacityChanged(ui::PropertyChangeReason reason) override; void OnLayerOpacityChanged(ui::PropertyChangeReason reason) override;

@ -58,11 +58,7 @@ AssistantQueryView::~AssistantQueryView() = default;
gfx::Size AssistantQueryView::CalculatePreferredSize( gfx::Size AssistantQueryView::CalculatePreferredSize(
const views::SizeBounds& available_size) const { const views::SizeBounds& available_size) const {
return gfx::Size(kMaxWidthDip, GetHeightForWidth(kMaxWidthDip)); return gfx::Size(kMaxWidthDip, kHeightDip);
}
int AssistantQueryView::GetHeightForWidth(int width) const {
return kHeightDip;
} }
void AssistantQueryView::OnThemeChanged() { void AssistantQueryView::OnThemeChanged() {

@ -33,7 +33,6 @@ class COMPONENT_EXPORT(ASSISTANT_UI) AssistantQueryView : public views::View {
// views::View: // views::View:
gfx::Size CalculatePreferredSize( gfx::Size CalculatePreferredSize(
const views::SizeBounds& available_size) const override; const views::SizeBounds& available_size) const override;
int GetHeightForWidth(int width) const override;
void OnThemeChanged() override; void OnThemeChanged() override;
void SetQuery(const AssistantQuery& query); void SetQuery(const AssistantQuery& query);

@ -107,12 +107,9 @@ gfx::Size ChipView::CalculatePreferredSize(
const views::SizeBounds& available_size) const { const views::SizeBounds& available_size) const {
const int preferred_width = const int preferred_width =
views::View::CalculatePreferredSize(available_size).width(); views::View::CalculatePreferredSize(available_size).width();
return gfx::Size(preferred_width, GetHeightForWidth(preferred_width)); return gfx::Size(preferred_width, type_ == Type::kDefault
} ? kPreferredHeightDipDefault
: kPreferredHeightDipLarge);
int ChipView::GetHeightForWidth(int width) const {
return type_ == Type::kDefault ? kPreferredHeightDipDefault
: kPreferredHeightDipLarge;
} }
void ChipView::ChildVisibilityChanged(views::View* child) { void ChipView::ChildVisibilityChanged(views::View* child) {

@ -29,7 +29,6 @@ class COMPONENT_EXPORT(ASSISTANT_UI) ChipView : public views::Button {
// views::View: // views::View:
gfx::Size CalculatePreferredSize( gfx::Size CalculatePreferredSize(
const views::SizeBounds& available_size) const override; const views::SizeBounds& available_size) const override;
int GetHeightForWidth(int width) const override;
void ChildVisibilityChanged(views::View* child) override; void ChildVisibilityChanged(views::View* child) override;
bool OnKeyPressed(const ui::KeyEvent& event) override; bool OnKeyPressed(const ui::KeyEvent& event) override;
void OnThemeChanged() override; void OnThemeChanged() override;

@ -124,11 +124,7 @@ SuggestionContainerView::~SuggestionContainerView() {
gfx::Size SuggestionContainerView::CalculatePreferredSize( gfx::Size SuggestionContainerView::CalculatePreferredSize(
const views::SizeBounds& available_size) const { const views::SizeBounds& available_size) const {
return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX)); return gfx::Size(INT_MAX, kPreferredHeightDip);
}
int SuggestionContainerView::GetHeightForWidth(int width) const {
return kPreferredHeightDip;
} }
void SuggestionContainerView::OnContentsPreferredSizeChanged( void SuggestionContainerView::OnContentsPreferredSizeChanged(

@ -47,7 +47,6 @@ class COMPONENT_EXPORT(ASSISTANT_UI) SuggestionContainerView
// AnimatedContainerView: // AnimatedContainerView:
gfx::Size CalculatePreferredSize( gfx::Size CalculatePreferredSize(
const views::SizeBounds& available_size) const override; const views::SizeBounds& available_size) const override;
int GetHeightForWidth(int width) const override;
void OnContentsPreferredSizeChanged(views::View* content_view) override; void OnContentsPreferredSizeChanged(views::View* content_view) override;
void OnAssistantControllerDestroying() override; void OnAssistantControllerDestroying() override;
void OnCommittedQueryChanged(const AssistantQuery& query) override; void OnCommittedQueryChanged(const AssistantQuery& query) override;

@ -96,11 +96,7 @@ UiElementContainerView::~UiElementContainerView() = default;
gfx::Size UiElementContainerView::CalculatePreferredSize( gfx::Size UiElementContainerView::CalculatePreferredSize(
const views::SizeBounds& available_size) const { const views::SizeBounds& available_size) const {
return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX)); return gfx::Size(INT_MAX, content_view()->GetHeightForWidth(INT_MAX));
}
int UiElementContainerView::GetHeightForWidth(int width) const {
return content_view()->GetHeightForWidth(width);
} }
gfx::Size UiElementContainerView::GetMinimumSize() const { gfx::Size UiElementContainerView::GetMinimumSize() const {

@ -43,7 +43,6 @@ class COMPONENT_EXPORT(ASSISTANT_UI) UiElementContainerView
// AnimatedContainerView: // AnimatedContainerView:
gfx::Size CalculatePreferredSize( gfx::Size CalculatePreferredSize(
const views::SizeBounds& available_size) const override; const views::SizeBounds& available_size) const override;
int GetHeightForWidth(int width) const override;
gfx::Size GetMinimumSize() const override; gfx::Size GetMinimumSize() const override;
void Layout(PassKey) override; void Layout(PassKey) override;
void OnCommittedQueryChanged(const AssistantQuery& query) override; void OnCommittedQueryChanged(const AssistantQuery& query) override;