| Index: ui/base/resource/resource_bundle.cc
|
| diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
|
| index 899a8a45cb95aaf05737504cde5e9780fdf25afd..d5942fdfb5984056ef22e43321bbeb4d98ddfb96 100644
|
| --- a/ui/base/resource/resource_bundle.cc
|
| +++ b/ui/base/resource/resource_bundle.cc
|
| @@ -830,7 +830,11 @@ bool ResourceBundle::LoadBitmap(int resource_id,
|
| *scale_factor = ui::SCALE_FACTOR_NONE;
|
| return true;
|
| }
|
| - if (data_packs_[i]->GetScaleFactor() == ui::SCALE_FACTOR_100P)
|
| +
|
| + // There may be multiple SCALE_FACTOR_100P providers, assume only the first
|
| + // may provide test fallbacks.
|
| + if (!data_handle_100_percent &&
|
| + data_packs_[i]->GetScaleFactor() == ui::SCALE_FACTOR_100P)
|
| data_handle_100_percent = data_packs_[i];
|
|
|
| if (data_packs_[i]->GetScaleFactor() == *scale_factor &&
|
|
|