mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
1367963d3d
- Bug 1198124 - Enable -Wshadow in directories that have no -Wshadow warnings. r=glandium (d03cfc1bb6) - Bug 1204403 - Fix -Wshadow warnings in xpcom. r=mccr8 (3247b5b146) - Bug 1140120 - Remove a couple of unused test functions on ServiceWorkerContainer; r=baku (efe1119749) - Bug 1180148 - Clear service workers registered for a site when clearing the cookies and stored data is not working in b2g. r=baku (7fb1d522ff) - Bug 1162333 - Add stronger assertions to PromiseWorkerProxy in debug builds. r=catalinb (0005a76252) - Bug 1190672 - Fix use of AutoReleasePromiseWorkerProxy in PushManager. r=catalinb (18f7358163) - Bug 1191495 - Relax PushManager callback assertions. r=kitcambridge (8a3822969f) - Bug 1189543 - pushManager.getSubscription() should return null for nonexistent push subscriptions in workers. r=nsm (b990083262) - spacing (44b87017a7) - Bug 1180295 - Rip out the Fennec code to set the screen render offset. r=rbarker (67183ae8bf) - Bug 1187804 - Un-adjust fixed layers by the async transform of the scroll frame that they're fixed with respect to, not of the nearest ancestor scroll frame. r=kats (7c5e7ac29c) - Bug 1131359 - Fix an include-what-you-use error in AsyncCompositionManager.cpp. r=kats (fe04815939) - Bug 1187804 - When a layer is scrolled by multiple scroll frames, do an AlignFixedAndStickyLayers pass on its subtree for each of the scroll frames. r=kats (031a5686f1) - Bug 1180295 - Stop clipping the content while the toolbar is in the process of sliding off. r=rbarker (9d806870e4) - Bug 1186968 - Fix Compositor::SetScreenRotation() call r=nical (e554c4b4a2) - Bug 1180295 - Implement seamless snapping to the stable state. r=rbarker (d1e7978eb7) - Bug 1131470 - Part 1: Rename existing use of ScreenOrientation to ScreenOrientationInternal. r=baku (63f0cb994b) - Bug 1131470 - Part 2: Update screen configuration HAL to report orientation angle. r=snorp,mwu (39b537f008) - Bug 1167597 - Mark PromiseReportRejectFeature::mPromise as MOZ_NON_OWNING_REF. r=ehsan (3ad520790a) - Bug 1086627 - Rename Promise constructs to more closely match the specification. r=nsm,jst (cea1d71cb1) - Bug 1086627 - Rename ThenableResolverTask to PromiseResolveThenableJob to more closely match Promise spec. r=nsm (e7102fe506) - Bug 1164725 - Convert flags in nsIDocument into bit fields. r=smaug (9f5d5f352d) - Bug 1192467 - Formalize precondition that SetDisplayDocument must not be called with null. - r=peterv (1aa8e91d14) - Bug 1153841 - Remove the 'it must be 2D' restriction for transforms on fixed-pos layers. r=BenWa,mattwoodrow (5bab86ec6a) - Bug 1173521 - Properly handle unapplying 3D projective transforms to rectangles in APZ code. r=botond (45c9850d5c) - Bug 1166301 - When applying an async adjustment to a fixed layer, only adjust its mask layer under the same circumstances as its clip rect. r=mattwoodrow (2801c48fe9) - Bug 1166301 - Update an old comment in AsyncCompositionManager::AlignFixedAndStickyLayers. r=kats (7e1d5c97d0) - Bug 1166301 - Allow async scrolling to move the clip rects of fixed background layers. r=mattwoodrow (edd889ec2b) - Bug 1200399 - Only send the RCD's metrics to Java-land for fennec-apz. r=rbarker (3b36a52f3a) - Bug 1201625 - Special-case B2GDroid since it doesn't have a root content document. r=rbarker (4fcdda1b0a) - Bug 1201529 - Fall back to rootmost metrics if there is no root content document metrics. r=botond (615c2ee727) - Bug 1201581 - Extract a helper method. r=rbarker (f2cccb8666) - Bug 1201581 - Hook up the syncFrameMetrics call to sync metrics info from the compositor to Java-land on each composite. r=rbarker (48e15bbde8) - Bug 1203760 P1 Allow pipe to wake up multiple streams at the same time. r=froydnj (5baed00637) - Bug 1203760 P2 Add gtests for nsPipeInputStream AsyncRead(). r=froydnj (52e5129dc8) - Bug 1201889 - When adjusting fixed and sticky layers in AsyncCompsitionManager, unapply all async transforms on the path from the fixed layer to the layer it's fixed with respect to. r=kats (dbb203178e) - Bug 1165536. Don't include resolution compensation when adjusting the cliprect of ancestors of scrollbars. r=botond (3bef5f2c18) - Fix async transforms on scrollbars not including any existing shadow transform. (bug 1128740 part 2, r=botond) (af12d76775) - missing of Bug 943728 - Replace double quotes with single quotes in Makefiles (e11470540f) - Bug 1188766 - Avoid exporting UPLOAD_EXTRA_FILES from mozconfig. r=mshal (4241b9e80b) - Fixup for bug 1188766 for valgrind bustage on a CLOSED TREE. r=me (4401dedf06) - Bug 1077622 - Fixes cp missing operand message if no .mozconfig found r=glandium (6eca1e5214) - Bug 1200523 - Remove leftover debugging code from js/src/Makefile.in; r=ted (414b72c74e) - spacing (99cda3f8a7)
226 lines
11 KiB
C++
226 lines
11 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_UNIT_TRANSFORMS_H_
|
|
#define MOZ_UNIT_TRANSFORMS_H_
|
|
|
|
#include "Units.h"
|
|
#include "mozilla/gfx/Matrix.h"
|
|
|
|
namespace mozilla {
|
|
|
|
// Convenience functions for converting an entity from one strongly-typed
|
|
// coordinate system to another without changing the values it stores (this
|
|
// can be thought of as a cast).
|
|
// To use these functions, you must provide a justification for each use!
|
|
// Feel free to add more justifications to PixelCastJustification, along with
|
|
// a comment that explains under what circumstances it is appropriate to use.
|
|
|
|
enum class PixelCastJustification : uint8_t {
|
|
// For the root layer, Screen Pixel = Parent Layer Pixel.
|
|
ScreenIsParentLayerForRoot,
|
|
// On the layout side, Screen Pixel = LayoutDevice at the outer-window level.
|
|
LayoutDeviceIsScreenForBounds,
|
|
// For the root layer, Render Target Pixel = Parent Layer Pixel.
|
|
RenderTargetIsParentLayerForRoot,
|
|
// For the root composition size we want to view it as layer pixels in any layer
|
|
ParentLayerToLayerForRootComposition,
|
|
// The Layer coordinate space for one layer is the ParentLayer coordinate
|
|
// space for its children
|
|
MovingDownToChildren,
|
|
// The transform that is usually used to convert between two coordinate
|
|
// systems is not available (for example, because the object that stores it
|
|
// is being destroyed), so fall back to the identity.
|
|
TransformNotAvailable,
|
|
// When an OS event is initially constructed, its reference point is
|
|
// technically in screen pixels, as it has not yet accounted for any
|
|
// asynchronous transforms. This justification is for viewing the initial
|
|
// reference point as a screen point.
|
|
LayoutDeviceToScreenForUntransformedEvent,
|
|
// Similar to LayoutDeviceToScreenForUntransformedEvent, PBrowser handles
|
|
// some widget/tab dimension information as the OS does -- in screen units.
|
|
LayoutDeviceIsScreenForTabDims
|
|
};
|
|
|
|
template <class TargetUnits, class SourceUnits>
|
|
gfx::SizeTyped<TargetUnits> ViewAs(const gfx::SizeTyped<SourceUnits>& aSize, PixelCastJustification) {
|
|
return gfx::SizeTyped<TargetUnits>(aSize.width, aSize.height);
|
|
}
|
|
template <class TargetUnits, class SourceUnits>
|
|
gfx::IntSizeTyped<TargetUnits> ViewAs(const gfx::IntSizeTyped<SourceUnits>& aSize, PixelCastJustification) {
|
|
return gfx::IntSizeTyped<TargetUnits>(aSize.width, aSize.height);
|
|
}
|
|
template <class TargetUnits, class SourceUnits>
|
|
gfx::PointTyped<TargetUnits> ViewAs(const gfx::PointTyped<SourceUnits>& aPoint, PixelCastJustification) {
|
|
return gfx::PointTyped<TargetUnits>(aPoint.x, aPoint.y);
|
|
}
|
|
template <class TargetUnits, class SourceUnits>
|
|
gfx::IntPointTyped<TargetUnits> ViewAs(const gfx::IntPointTyped<SourceUnits>& aPoint, PixelCastJustification) {
|
|
return gfx::IntPointTyped<TargetUnits>(aPoint.x, aPoint.y);
|
|
}
|
|
template <class TargetUnits, class SourceUnits>
|
|
gfx::RectTyped<TargetUnits> ViewAs(const gfx::RectTyped<SourceUnits>& aRect, PixelCastJustification) {
|
|
return gfx::RectTyped<TargetUnits>(aRect.x, aRect.y, aRect.width, aRect.height);
|
|
}
|
|
template <class TargetUnits, class SourceUnits>
|
|
gfx::IntRectTyped<TargetUnits> ViewAs(const gfx::IntRectTyped<SourceUnits>& aRect, PixelCastJustification) {
|
|
return gfx::IntRectTyped<TargetUnits>(aRect.x, aRect.y, aRect.width, aRect.height);
|
|
}
|
|
template <class TargetUnits, class SourceUnits>
|
|
gfx::MarginTyped<TargetUnits> ViewAs(const gfx::MarginTyped<SourceUnits>& aMargin, PixelCastJustification) {
|
|
return gfx::MarginTyped<TargetUnits>(aMargin.top, aMargin.right, aMargin.bottom, aMargin.left);
|
|
}
|
|
template <class TargetUnits, class SourceUnits>
|
|
gfx::IntMarginTyped<TargetUnits> ViewAs(const gfx::IntMarginTyped<SourceUnits>& aMargin, PixelCastJustification) {
|
|
return gfx::IntMarginTyped<TargetUnits>(aMargin.top, aMargin.right, aMargin.bottom, aMargin.left);
|
|
}
|
|
template <class NewTargetUnits, class OldTargetUnits, class SourceUnits>
|
|
gfx::ScaleFactor<SourceUnits, NewTargetUnits> ViewTargetAs(
|
|
const gfx::ScaleFactor<SourceUnits, OldTargetUnits>& aScaleFactor,
|
|
PixelCastJustification) {
|
|
return gfx::ScaleFactor<SourceUnits, NewTargetUnits>(aScaleFactor.scale);
|
|
}
|
|
|
|
// Convenience functions for casting untyped entities to typed entities.
|
|
// Using these functions does not require a justification, but once we convert
|
|
// all code to use strongly typed units they should not be needed any longer.
|
|
template <class TargetUnits>
|
|
gfx::PointTyped<TargetUnits> ViewAs(const gfxPoint& aPoint) {
|
|
return gfx::PointTyped<TargetUnits>(aPoint.x, aPoint.y);
|
|
}
|
|
template <class TargetUnits>
|
|
gfx::PointTyped<TargetUnits> ViewAs(const gfx::Point& aPoint) {
|
|
return gfx::PointTyped<TargetUnits>(aPoint.x, aPoint.y);
|
|
}
|
|
template <class TargetUnits>
|
|
gfx::RectTyped<TargetUnits> ViewAs(const gfx::Rect& aRect) {
|
|
return gfx::RectTyped<TargetUnits>(aRect.x, aRect.y, aRect.width, aRect.height);
|
|
}
|
|
template <class TargetUnits>
|
|
gfx::IntSizeTyped<TargetUnits> ViewAs(const nsIntSize& aSize) {
|
|
return gfx::IntSizeTyped<TargetUnits>(aSize.width, aSize.height);
|
|
}
|
|
template <class TargetUnits>
|
|
gfx::IntPointTyped<TargetUnits> ViewAs(const nsIntPoint& aPoint) {
|
|
return gfx::IntPointTyped<TargetUnits>(aPoint.x, aPoint.y);
|
|
}
|
|
template <class TargetUnits>
|
|
gfx::IntRectTyped<TargetUnits> ViewAs(const nsIntRect& aRect) {
|
|
return gfx::IntRectTyped<TargetUnits>(aRect.x, aRect.y, aRect.width, aRect.height);
|
|
}
|
|
|
|
// Convenience functions for transforming an entity from one strongly-typed
|
|
// coordinate system to another using the provided transformation matrix.
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static gfx::PointTyped<TargetUnits> TransformTo(const gfx::Matrix4x4& aTransform,
|
|
const gfx::PointTyped<SourceUnits>& aPoint)
|
|
{
|
|
return ViewAs<TargetUnits>(aTransform * aPoint.ToUnknownPoint());
|
|
}
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static gfx::IntPointTyped<TargetUnits> TransformTo(const gfx::Matrix4x4& aTransform,
|
|
const gfx::IntPointTyped<SourceUnits>& aPoint)
|
|
{
|
|
return RoundedToInt(TransformTo<TargetUnits>(aTransform, gfx::PointTyped<SourceUnits>(aPoint)));
|
|
}
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static gfx::RectTyped<TargetUnits> TransformTo(const gfx::Matrix4x4& aTransform,
|
|
const gfx::RectTyped<SourceUnits>& aRect)
|
|
{
|
|
return ViewAs<TargetUnits>(aTransform.TransformBounds(aRect.ToUnknownRect()));
|
|
}
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static gfx::IntRectTyped<TargetUnits> TransformTo(const gfx::Matrix4x4& aTransform,
|
|
const gfx::IntRectTyped<SourceUnits>& aRect)
|
|
{
|
|
gfx::Rect rect(aRect.ToUnknownRect());
|
|
return RoundedToInt(ViewAs<TargetUnits>(aTransform.TransformBounds(rect)));
|
|
}
|
|
|
|
// Transform |aVector|, which is anchored at |aAnchor|, by the given transform
|
|
// matrix, yielding a point in |TargetUnits|.
|
|
// The anchor is necessary because with 3D tranforms, the location of the
|
|
// vector can affect the result of the transform.
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static gfx::PointTyped<TargetUnits> TransformVector(const gfx::Matrix4x4& aTransform,
|
|
const gfx::PointTyped<SourceUnits>& aVector,
|
|
const gfx::PointTyped<SourceUnits>& aAnchor) {
|
|
gfx::PointTyped<TargetUnits> transformedStart = TransformTo<TargetUnits>(aTransform, aAnchor);
|
|
gfx::PointTyped<TargetUnits> transformedEnd = TransformTo<TargetUnits>(aTransform, aAnchor + aVector);
|
|
return transformedEnd - transformedStart;
|
|
}
|
|
|
|
// UntransformTo() and UntransformVector() are like TransformTo() and
|
|
// TransformVector(), respectively, but are intended for cases where
|
|
// the transformation matrix is the inverse of a 3D projection. When
|
|
// using such transforms, the resulting Point4D is only meaningful
|
|
// if it has a positive w-coordinate. To handle this, these functions
|
|
// return a Maybe object which contains a value if and only if the
|
|
// result is meaningful
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static Maybe<gfx::PointTyped<TargetUnits>> UntransformTo(const gfx::Matrix4x4& aTransform,
|
|
const gfx::PointTyped<SourceUnits>& aPoint)
|
|
{
|
|
gfx::Point4D point = aTransform.ProjectPoint(aPoint.ToUnknownPoint());
|
|
if (!point.HasPositiveWCoord()) {
|
|
return Nothing();
|
|
}
|
|
return Some(ViewAs<TargetUnits>(point.As2DPoint()));
|
|
}
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static Maybe<gfx::IntPointTyped<TargetUnits>> UntransformTo(const gfx::Matrix4x4& aTransform,
|
|
const gfx::IntPointTyped<SourceUnits>& aPoint)
|
|
{
|
|
gfx::Point4D point = aTransform.ProjectPoint(aPoint.ToUnknownPoint());
|
|
if (!point.HasPositiveWCoord()) {
|
|
return Nothing();
|
|
}
|
|
return Some(RoundedToInt(ViewAs<TargetUnits>(point.As2DPoint())));
|
|
}
|
|
|
|
// The versions of UntransformTo() that take a rectangle also take a clip,
|
|
// which represents the bounds within which the target must fall. The
|
|
// result of the transform is intersected with this clip, and is considered
|
|
// meaningful if the intersection is not empty.
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static Maybe<gfx::RectTyped<TargetUnits>> UntransformTo(const gfx::Matrix4x4& aTransform,
|
|
const gfx::RectTyped<SourceUnits>& aRect,
|
|
const gfx::RectTyped<TargetUnits>& aClip)
|
|
{
|
|
gfx::Rect rect = aTransform.ProjectRectBounds(aRect.ToUnknownRect(), aClip.ToUnknownRect());
|
|
if (rect.IsEmpty()) {
|
|
return Nothing();
|
|
}
|
|
return Some(ViewAs<TargetUnits>(rect));
|
|
}
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static Maybe<gfx::IntRectTyped<TargetUnits>> UntransformTo(const gfx::Matrix4x4& aTransform,
|
|
const gfx::IntRectTyped<SourceUnits>& aRect,
|
|
const gfx::IntRectTyped<TargetUnits>& aClip)
|
|
{
|
|
gfx::Rect rect = aTransform.ProjectRectBounds(aRect.ToUnknownRect(), aClip.ToUnknownRect());
|
|
if (rect.IsEmpty()) {
|
|
return Nothing();
|
|
}
|
|
return Some(RoundedToInt(ViewAs<TargetUnits>(rect)));
|
|
}
|
|
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static Maybe<gfx::PointTyped<TargetUnits>> UntransformVector(const gfx::Matrix4x4& aTransform,
|
|
const gfx::PointTyped<SourceUnits>& aVector,
|
|
const gfx::PointTyped<SourceUnits>& aAnchor) {
|
|
gfx::Point4D projectedAnchor = aTransform.ProjectPoint(aAnchor.ToUnknownPoint());
|
|
gfx::Point4D projectedTarget = aTransform.ProjectPoint(aAnchor.ToUnknownPoint() + aVector.ToUnknownPoint());
|
|
if (!projectedAnchor.HasPositiveWCoord() || !projectedTarget.HasPositiveWCoord()){
|
|
return Nothing();
|
|
}
|
|
return Some(ViewAs<TargetUnits>(projectedAnchor.As2DPoint() - projectedTarget.As2DPoint()));
|
|
}
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif
|