mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 23:35:34 +00:00
cadab956a0
This is a follow-up fix for bug 1431601, I didn't notice that we constrain mMaxZoom in here nsViewport class. In bug 1431601, instead we did constrain the value in nsIDocument::GetViewportInfo since the contrained value is used in the function. Differential Revision: https://phabricator.services.mozilla.com/D9459 --HG-- extra : moz-landing-system : lando
58 lines
1.4 KiB
C++
58 lines
1.4 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsViewportInfo.h"
|
|
#include "mozilla/Assertions.h"
|
|
#include <algorithm>
|
|
|
|
using namespace mozilla;
|
|
|
|
void
|
|
nsViewportInfo::ConstrainViewportValues()
|
|
{
|
|
if (mDefaultZoom > mMaxZoom) {
|
|
mDefaultZoomValid = false;
|
|
mDefaultZoom = mMaxZoom;
|
|
}
|
|
if (mDefaultZoom < mMinZoom) {
|
|
mDefaultZoomValid = false;
|
|
mDefaultZoom = mMinZoom;
|
|
}
|
|
}
|
|
|
|
static const float&
|
|
MinOrMax(const float& aA, const float& aB,
|
|
const float& (*aMinOrMax)(const float&,
|
|
const float&))
|
|
{
|
|
MOZ_ASSERT(aA != nsViewportInfo::ExtendToZoom &&
|
|
aA != nsViewportInfo::DeviceSize &&
|
|
aB != nsViewportInfo::ExtendToZoom &&
|
|
aB != nsViewportInfo::DeviceSize);
|
|
if (aA == nsViewportInfo::Auto) {
|
|
return aB;
|
|
}
|
|
if (aB == nsViewportInfo::Auto) {
|
|
return aA;
|
|
}
|
|
return aMinOrMax(aA, aB);
|
|
}
|
|
|
|
// static
|
|
const float&
|
|
nsViewportInfo::Min(const float& aA, const float& aB)
|
|
{
|
|
return MinOrMax(aA, aB, std::min);
|
|
}
|
|
|
|
//static
|
|
const float&
|
|
nsViewportInfo::Max(const float& aA, const float& aB)
|
|
{
|
|
return MinOrMax(aA, aB, std::max);
|
|
}
|
|
|