From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/ui/base/models/image_model.cc | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'chromium/ui/base/models/image_model.cc') diff --git a/chromium/ui/base/models/image_model.cc b/chromium/ui/base/models/image_model.cc index 501f8dc9495..9578759666b 100644 --- a/chromium/ui/base/models/image_model.cc +++ b/chromium/ui/base/models/image_model.cc @@ -84,6 +84,14 @@ bool ImageModel::IsImage() const { return image_ && !image_.value().IsEmpty(); } +gfx::Size ImageModel::Size() const { + if (IsVectorIcon()) { + const int icon_size = GetVectorIcon().icon_size(); + return gfx::Size(icon_size, icon_size); + } + return IsImage() ? GetImage().Size() : gfx::Size(); +} + const VectorIconModel ImageModel::GetVectorIcon() const { DCHECK(IsVectorIcon()); return vector_icon_model_.value(); -- cgit v1.2.1