mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: -Wunsafe-buffer-usage warnings in GetNextZoomLevel() (#44149)

Browse source 
fixup e8948397 really fix the warning this time
This commit is contained in:
Charles Kerr 2024-10-09 09:12:48 -05:00 committed by GitHub
parent 08d315da14
commit b5227b4a17
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
shell/browser/ui/inspectable_web_contents.cc
View file

@ -118,20 +118,20 @@ void SetZoomLevelForWebContents(content::WebContents* web_contents,
content::HostZoomMap::SetZoomLevel(web_contents, level); content::HostZoomMap::SetZoomLevel(web_contents, level);
} }
double GetNextZoomLevel(const double level, const bool out) { double GetNextZoomLevel(double level, bool out) {
static constexpr std::array<double, 16U> kPresetFactors{ static constexpr std::array<double, 16U> kPresetFactors{
0.25, 0.333, 0.5, 0.666, 0.75, 0.9, 1.0, 1.1, 0.25, 0.333, 0.5, 0.666, 0.75, 0.9, 1.0, 1.1,
1.25, 1.5, 1.75, 2.0, 2.5, 3.0, 4.0, 5.0}; 1.25, 1.5, 1.75, 2.0, 2.5, 3.0, 4.0, 5.0};
static constexpr auto kBegin = kPresetFactors.begin(); static constexpr size_t size = std::size(kPresetFactors);
static constexpr auto kEnd = kPresetFactors.end();
const double factor = blink::ZoomLevelToZoomFactor(level); const double factor = blink::ZoomLevelToZoomFactor(level);
auto matches = [=](auto val) { return blink::ZoomValuesEqual(factor, val); }; for (size_t i = 0U; i < size; ++i) {
if (auto iter = std::find_if(kBegin, kEnd, matches); iter != kEnd) { if (!blink::ZoomValuesEqual(kPresetFactors[i], factor))
if (out && iter != kBegin) continue;
return blink::ZoomFactorToZoomLevel(*--iter); if (out && i > 0U)
if (!out && ++iter != kEnd) return blink::ZoomFactorToZoomLevel(kPresetFactors[i - 1U]);
return blink::ZoomFactorToZoomLevel(*iter); if (!out && i + 1U < size)
return blink::ZoomFactorToZoomLevel(kPresetFactors[i + 1U]);
} }
return level; return level;
} }