diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/base/models/image_model.cc | |
parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
download | qtwebengine-chromium-85-based.tar.gz |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/base/models/image_model.cc')
-rw-r--r-- | chromium/ui/base/models/image_model.cc | 8 |
1 files changed, 8 insertions, 0 deletions
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(); |