mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-25 01:01:52 +00:00
9afd262a59
Various changes to FrameMetrics and such have causes the tile coherency checks to end up with nonsense values, meaning updates are always happening a tile at a time. This fixes the calculation of those values, adds some documentation and converts a large part of it to using typed units, to make it easier to understand what's happening.
283 lines
12 KiB
C++
283 lines
12 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/. */
|
|
|
|
#ifndef MOZ_UNITS_H_
|
|
#define MOZ_UNITS_H_
|
|
|
|
#include "mozilla/gfx/Point.h"
|
|
#include "mozilla/gfx/Rect.h"
|
|
#include "mozilla/gfx/ScaleFactor.h"
|
|
#include "nsRect.h"
|
|
#include "nsMargin.h"
|
|
#include "mozilla/AppUnits.h"
|
|
|
|
namespace mozilla {
|
|
|
|
struct CSSPixel;
|
|
struct LayoutDevicePixel;
|
|
struct LayerPixel;
|
|
struct ScreenPixel;
|
|
|
|
typedef gfx::PointTyped<CSSPixel> CSSPoint;
|
|
typedef gfx::IntPointTyped<CSSPixel> CSSIntPoint;
|
|
typedef gfx::SizeTyped<CSSPixel> CSSSize;
|
|
typedef gfx::IntSizeTyped<CSSPixel> CSSIntSize;
|
|
typedef gfx::RectTyped<CSSPixel> CSSRect;
|
|
typedef gfx::IntRectTyped<CSSPixel> CSSIntRect;
|
|
typedef gfx::MarginTyped<CSSPixel> CSSMargin;
|
|
typedef gfx::IntMarginTyped<CSSPixel> CSSIntMargin;
|
|
|
|
typedef gfx::PointTyped<LayoutDevicePixel> LayoutDevicePoint;
|
|
typedef gfx::IntPointTyped<LayoutDevicePixel> LayoutDeviceIntPoint;
|
|
typedef gfx::SizeTyped<LayoutDevicePixel> LayoutDeviceSize;
|
|
typedef gfx::IntSizeTyped<LayoutDevicePixel> LayoutDeviceIntSize;
|
|
typedef gfx::RectTyped<LayoutDevicePixel> LayoutDeviceRect;
|
|
typedef gfx::IntRectTyped<LayoutDevicePixel> LayoutDeviceIntRect;
|
|
typedef gfx::MarginTyped<LayoutDevicePixel> LayoutDeviceMargin;
|
|
typedef gfx::IntMarginTyped<LayoutDevicePixel> LayoutDeviceIntMargin;
|
|
|
|
typedef gfx::PointTyped<LayerPixel> LayerPoint;
|
|
typedef gfx::IntPointTyped<LayerPixel> LayerIntPoint;
|
|
typedef gfx::SizeTyped<LayerPixel> LayerSize;
|
|
typedef gfx::IntSizeTyped<LayerPixel> LayerIntSize;
|
|
typedef gfx::RectTyped<LayerPixel> LayerRect;
|
|
typedef gfx::IntRectTyped<LayerPixel> LayerIntRect;
|
|
typedef gfx::MarginTyped<LayerPixel> LayerMargin;
|
|
typedef gfx::IntMarginTyped<LayerPixel> LayerIntMargin;
|
|
|
|
typedef gfx::PointTyped<ScreenPixel> ScreenPoint;
|
|
typedef gfx::IntPointTyped<ScreenPixel> ScreenIntPoint;
|
|
typedef gfx::SizeTyped<ScreenPixel> ScreenSize;
|
|
typedef gfx::IntSizeTyped<ScreenPixel> ScreenIntSize;
|
|
typedef gfx::RectTyped<ScreenPixel> ScreenRect;
|
|
typedef gfx::IntRectTyped<ScreenPixel> ScreenIntRect;
|
|
typedef gfx::MarginTyped<ScreenPixel> ScreenMargin;
|
|
typedef gfx::IntMarginTyped<ScreenPixel> ScreenIntMargin;
|
|
|
|
typedef gfx::ScaleFactor<CSSPixel, LayoutDevicePixel> CSSToLayoutDeviceScale;
|
|
typedef gfx::ScaleFactor<LayoutDevicePixel, CSSPixel> LayoutDeviceToCSSScale;
|
|
typedef gfx::ScaleFactor<CSSPixel, LayerPixel> CSSToLayerScale;
|
|
typedef gfx::ScaleFactor<LayerPixel, CSSPixel> LayerToCSSScale;
|
|
typedef gfx::ScaleFactor<CSSPixel, ScreenPixel> CSSToScreenScale;
|
|
typedef gfx::ScaleFactor<ScreenPixel, CSSPixel> ScreenToCSSScale;
|
|
typedef gfx::ScaleFactor<LayoutDevicePixel, LayerPixel> LayoutDeviceToLayerScale;
|
|
typedef gfx::ScaleFactor<LayerPixel, LayoutDevicePixel> LayerToLayoutDeviceScale;
|
|
typedef gfx::ScaleFactor<LayoutDevicePixel, ScreenPixel> LayoutDeviceToScreenScale;
|
|
typedef gfx::ScaleFactor<ScreenPixel, LayoutDevicePixel> ScreenToLayoutDeviceScale;
|
|
typedef gfx::ScaleFactor<LayerPixel, ScreenPixel> LayerToScreenScale;
|
|
typedef gfx::ScaleFactor<ScreenPixel, LayerPixel> ScreenToLayerScale;
|
|
|
|
/*
|
|
* The pixels that content authors use to specify sizes in.
|
|
*/
|
|
struct CSSPixel {
|
|
|
|
// Conversions from app units
|
|
|
|
static CSSPoint FromAppUnits(const nsPoint& aPoint) {
|
|
return CSSPoint(NSAppUnitsToFloatPixels(aPoint.x, float(AppUnitsPerCSSPixel())),
|
|
NSAppUnitsToFloatPixels(aPoint.y, float(AppUnitsPerCSSPixel())));
|
|
}
|
|
|
|
static CSSRect FromAppUnits(const nsRect& aRect) {
|
|
return CSSRect(NSAppUnitsToFloatPixels(aRect.x, float(AppUnitsPerCSSPixel())),
|
|
NSAppUnitsToFloatPixels(aRect.y, float(AppUnitsPerCSSPixel())),
|
|
NSAppUnitsToFloatPixels(aRect.width, float(AppUnitsPerCSSPixel())),
|
|
NSAppUnitsToFloatPixels(aRect.height, float(AppUnitsPerCSSPixel())));
|
|
}
|
|
|
|
static CSSMargin FromAppUnits(const nsMargin& aMargin) {
|
|
return CSSMargin(NSAppUnitsToFloatPixels(aMargin.top, float(AppUnitsPerCSSPixel())),
|
|
NSAppUnitsToFloatPixels(aMargin.right, float(AppUnitsPerCSSPixel())),
|
|
NSAppUnitsToFloatPixels(aMargin.bottom, float(AppUnitsPerCSSPixel())),
|
|
NSAppUnitsToFloatPixels(aMargin.left, float(AppUnitsPerCSSPixel())));
|
|
}
|
|
|
|
static CSSIntPoint FromAppUnitsRounded(const nsPoint& aPoint) {
|
|
return CSSIntPoint(NSAppUnitsToIntPixels(aPoint.x, float(AppUnitsPerCSSPixel())),
|
|
NSAppUnitsToIntPixels(aPoint.y, float(AppUnitsPerCSSPixel())));
|
|
}
|
|
|
|
static CSSIntSize FromAppUnitsRounded(const nsSize& aSize)
|
|
{
|
|
return CSSIntSize(NSAppUnitsToIntPixels(aSize.width, float(AppUnitsPerCSSPixel())),
|
|
NSAppUnitsToIntPixels(aSize.height, float(AppUnitsPerCSSPixel())));
|
|
}
|
|
|
|
static CSSIntRect FromAppUnitsRounded(const nsRect& aRect) {
|
|
return CSSIntRect(NSAppUnitsToIntPixels(aRect.x, float(AppUnitsPerCSSPixel())),
|
|
NSAppUnitsToIntPixels(aRect.y, float(AppUnitsPerCSSPixel())),
|
|
NSAppUnitsToIntPixels(aRect.width, float(AppUnitsPerCSSPixel())),
|
|
NSAppUnitsToIntPixels(aRect.height, float(AppUnitsPerCSSPixel())));
|
|
}
|
|
|
|
// Conversions to app units
|
|
|
|
static nsPoint ToAppUnits(const CSSPoint& aPoint) {
|
|
return nsPoint(NSToCoordRoundWithClamp(aPoint.x * float(AppUnitsPerCSSPixel())),
|
|
NSToCoordRoundWithClamp(aPoint.y * float(AppUnitsPerCSSPixel())));
|
|
}
|
|
|
|
static nsPoint ToAppUnits(const CSSIntPoint& aPoint) {
|
|
return nsPoint(NSToCoordRoundWithClamp(float(aPoint.x) * float(AppUnitsPerCSSPixel())),
|
|
NSToCoordRoundWithClamp(float(aPoint.y) * float(AppUnitsPerCSSPixel())));
|
|
}
|
|
|
|
static nsRect ToAppUnits(const CSSRect& aRect) {
|
|
return nsRect(NSToCoordRoundWithClamp(aRect.x * float(AppUnitsPerCSSPixel())),
|
|
NSToCoordRoundWithClamp(aRect.y * float(AppUnitsPerCSSPixel())),
|
|
NSToCoordRoundWithClamp(aRect.width * float(AppUnitsPerCSSPixel())),
|
|
NSToCoordRoundWithClamp(aRect.height * float(AppUnitsPerCSSPixel())));
|
|
}
|
|
};
|
|
|
|
/*
|
|
* The pixels that are referred to as "device pixels" in layout code. In
|
|
* general this is obtained by converting a value in app units value by the
|
|
* AppUnitsPerDevPixel() value. The size of these pixels
|
|
* are affected by:
|
|
* 1) the "full zoom" (see nsPresContext::SetFullZoom)
|
|
* 2) the "widget scale" (see nsIWidget::GetDefaultScale)
|
|
*/
|
|
struct LayoutDevicePixel {
|
|
static LayoutDeviceIntPoint FromUntyped(const nsIntPoint& aPoint) {
|
|
return LayoutDeviceIntPoint(aPoint.x, aPoint.y);
|
|
}
|
|
|
|
static nsIntPoint ToUntyped(const LayoutDeviceIntPoint& aPoint) {
|
|
return nsIntPoint(aPoint.x, aPoint.y);
|
|
}
|
|
|
|
static LayoutDeviceIntRect FromUntyped(const nsIntRect& aRect) {
|
|
return LayoutDeviceIntRect(aRect.x, aRect.y, aRect.width, aRect.height);
|
|
}
|
|
|
|
static nsIntRect ToUntyped(const LayoutDeviceIntRect& aRect) {
|
|
return nsIntRect(aRect.x, aRect.y, aRect.width, aRect.height);
|
|
}
|
|
|
|
static LayoutDeviceRect FromAppUnits(const nsRect& aRect, nscoord aAppUnitsPerDevPixel) {
|
|
return LayoutDeviceRect(NSAppUnitsToFloatPixels(aRect.x, float(aAppUnitsPerDevPixel)),
|
|
NSAppUnitsToFloatPixels(aRect.y, float(aAppUnitsPerDevPixel)),
|
|
NSAppUnitsToFloatPixels(aRect.width, float(aAppUnitsPerDevPixel)),
|
|
NSAppUnitsToFloatPixels(aRect.height, float(aAppUnitsPerDevPixel)));
|
|
}
|
|
|
|
static LayoutDeviceIntPoint FromAppUnitsRounded(const nsPoint& aPoint, nscoord aAppUnitsPerDevPixel) {
|
|
return LayoutDeviceIntPoint(NSAppUnitsToIntPixels(aPoint.x, aAppUnitsPerDevPixel),
|
|
NSAppUnitsToIntPixels(aPoint.y, aAppUnitsPerDevPixel));
|
|
}
|
|
|
|
static LayoutDeviceIntPoint FromAppUnitsToNearest(const nsPoint& aPoint, nscoord aAppUnitsPerDevPixel) {
|
|
return FromUntyped(aPoint.ToNearestPixels(aAppUnitsPerDevPixel));
|
|
}
|
|
|
|
static LayoutDeviceIntRect FromAppUnitsToNearest(const nsRect& aRect, nscoord aAppUnitsPerDevPixel) {
|
|
return FromUntyped(aRect.ToNearestPixels(aAppUnitsPerDevPixel));
|
|
}
|
|
};
|
|
|
|
/*
|
|
* The pixels that layout rasterizes and delivers to the graphics code.
|
|
* These are generally referred to as "device pixels" in layout code. Layer
|
|
* pixels are affected by:
|
|
* 1) the "display resolution" (see nsIPresShell::SetResolution)
|
|
* 2) the "full zoom" (see nsPresContext::SetFullZoom)
|
|
* 3) the "widget scale" (see nsIWidget::GetDefaultScale)
|
|
*/
|
|
struct LayerPixel {
|
|
};
|
|
|
|
/*
|
|
* The pixels that are displayed on the screen.
|
|
* On non-OMTC platforms this should be equivalent to LayerPixel units.
|
|
* On OMTC platforms these may diverge from LayerPixel units temporarily,
|
|
* while an asynchronous zoom is happening, but should eventually converge
|
|
* back to LayerPixel units. Some variables (such as those representing
|
|
* chrome UI element sizes) that are not subject to content zoom should
|
|
* generally be represented in ScreenPixel units.
|
|
*/
|
|
struct ScreenPixel {
|
|
};
|
|
|
|
// Operators to apply ScaleFactors directly to Points, Rects, Sizes and Margins
|
|
|
|
template<class src, class dst>
|
|
gfx::PointTyped<dst> operator*(const gfx::PointTyped<src>& aPoint, const gfx::ScaleFactor<src, dst>& aScale) {
|
|
return gfx::PointTyped<dst>(aPoint.x * aScale.scale,
|
|
aPoint.y * aScale.scale);
|
|
}
|
|
|
|
template<class src, class dst>
|
|
gfx::PointTyped<dst> operator/(const gfx::PointTyped<src>& aPoint, const gfx::ScaleFactor<dst, src>& aScale) {
|
|
return gfx::PointTyped<dst>(aPoint.x / aScale.scale,
|
|
aPoint.y / aScale.scale);
|
|
}
|
|
|
|
template<class src, class dst>
|
|
gfx::RectTyped<dst> operator*(const gfx::RectTyped<src>& aRect, const gfx::ScaleFactor<src, dst>& aScale) {
|
|
return gfx::RectTyped<dst>(aRect.x * aScale.scale,
|
|
aRect.y * aScale.scale,
|
|
aRect.width * aScale.scale,
|
|
aRect.height * aScale.scale);
|
|
}
|
|
|
|
template<class src, class dst>
|
|
gfx::RectTyped<dst> operator/(const gfx::RectTyped<src>& aRect, const gfx::ScaleFactor<dst, src>& aScale) {
|
|
return gfx::RectTyped<dst>(aRect.x / aScale.scale,
|
|
aRect.y / aScale.scale,
|
|
aRect.width / aScale.scale,
|
|
aRect.height / aScale.scale);
|
|
}
|
|
|
|
template<class src, class dst>
|
|
gfx::RectTyped<dst> operator*(const gfx::IntRectTyped<src>& aRect, const gfx::ScaleFactor<src, dst>& aScale) {
|
|
return gfx::RectTyped<dst>(float(aRect.x) * aScale.scale,
|
|
float(aRect.y) * aScale.scale,
|
|
float(aRect.width) * aScale.scale,
|
|
float(aRect.height) * aScale.scale);
|
|
}
|
|
|
|
template<class src, class dst>
|
|
gfx::RectTyped<dst> operator/(const gfx::IntRectTyped<src>& aRect, const gfx::ScaleFactor<dst, src>& aScale) {
|
|
return gfx::RectTyped<dst>(float(aRect.x) / aScale.scale,
|
|
float(aRect.y) / aScale.scale,
|
|
float(aRect.width) / aScale.scale,
|
|
float(aRect.height) / aScale.scale);
|
|
}
|
|
|
|
template<class src, class dst>
|
|
gfx::SizeTyped<dst> operator*(const gfx::SizeTyped<src>& aSize, const gfx::ScaleFactor<src, dst>& aScale) {
|
|
return gfx::SizeTyped<dst>(aSize.width * aScale.scale,
|
|
aSize.height * aScale.scale);
|
|
}
|
|
|
|
template<class src, class dst>
|
|
gfx::SizeTyped<dst> operator/(const gfx::SizeTyped<src>& aSize, const gfx::ScaleFactor<dst, src>& aScale) {
|
|
return gfx::SizeTyped<dst>(aSize.width / aScale.scale,
|
|
aSize.height / aScale.scale);
|
|
}
|
|
|
|
template<class src, class dst>
|
|
gfx::MarginTyped<dst> operator*(const gfx::MarginTyped<src>& aMargin, const gfx::ScaleFactor<src, dst>& aScale) {
|
|
return gfx::MarginTyped<dst>(aMargin.top * aScale.scale,
|
|
aMargin.right * aScale.scale,
|
|
aMargin.bottom * aScale.scale,
|
|
aMargin.left * aScale.scale);
|
|
}
|
|
|
|
template<class src, class dst>
|
|
gfx::MarginTyped<dst> operator/(const gfx::MarginTyped<src>& aMargin, const gfx::ScaleFactor<dst, src>& aScale) {
|
|
return gfx::MarginTyped<dst>(aMargin.top / aScale.scale,
|
|
aMargin.right / aScale.scale,
|
|
aMargin.bottom / aScale.scale,
|
|
aMargin.left / aScale.scale);
|
|
}
|
|
|
|
};
|
|
|
|
#endif
|