content/base/src/nsViewportInfo.cpp

Tue, 06 Jan 2015 21:39:09 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Tue, 06 Jan 2015 21:39:09 +0100
branch
TOR_BUG_9701
changeset 8
97036ab72558
permissions
-rw-r--r--

Conditionally force memory storage according to privacy.thirdparty.isolate;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.

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

mercurial