content/base/src/nsViewportInfo.cpp

Thu, 15 Jan 2015 21:03:48 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 15 Jan 2015 21:03:48 +0100
branch
TOR_BUG_9701
changeset 11
deefc01c0e14
permissions
-rw-r--r--

Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)

     1 /* This Source Code Form is subject to the terms of the Mozilla Public
     2  * License, v. 2.0. If a copy of the MPL was not distributed with this
     3  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
     5 #include "nsViewportInfo.h"
     6 #include "mozilla/Assertions.h"
     7 #include <algorithm>
     9 using namespace mozilla;
    11 void
    12 nsViewportInfo::SetDefaultZoom(const CSSToScreenScale& aDefaultZoom)
    13 {
    14   MOZ_ASSERT(aDefaultZoom.scale >= 0.0f);
    15   mDefaultZoom = aDefaultZoom;
    16 }
    18 void
    19 nsViewportInfo::ConstrainViewportValues()
    20 {
    21   // Constrain the min/max zoom as specified at:
    22   // dev.w3.org/csswg/css-device-adapt section 6.2
    23   mMaxZoom = std::max(mMinZoom, mMaxZoom);
    25   mDefaultZoom = mDefaultZoom < mMaxZoom ? mDefaultZoom : mMaxZoom;
    26   mDefaultZoom = mDefaultZoom > mMinZoom ? mDefaultZoom : mMinZoom;
    27 }

mercurial