mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
67e04cfead
- Bug 1236750 - Introduce a new unit type CSSTransformedLayerPixel. r=kats (4e9bba3d19) - Bug 1236750 - Add a ViewAs() overload for casting (with a justification) one typed matrix to another. r=kats (c48e143508) - Bug 1236750 - Add some specialized typedefs of Matrix4x4 to represent layer transform matrices. r=kats (cc50113c98) - Bug 1239300 - reject promise with null while creating imagebitmap from empty blob; r=smaug (bff7483bf1) - Bug 1233056 - Long tapping on a link will select a different link from the page r=tnikkel (3a727b33c1) - Bug 1245674. Null-check mGlobal before dereferencing it in one more place in Promise code. r=smaug (68cf5312dc) - Bug 1236750 - Use strongly-typed matrices to represent layer transforms in APZ code. r=kats (63931eb2a1) - Bug 1236750 - Add typed getters for layer transform matrices. r=kats (baef978fe1) - Bug 1147673 - Relax the ancestor transform assertion a little. r=kats (ec9ce47ba4) - Bug 1154161 Initialize WidgetQueryContentEvent::mReply r=smaug (6086291313) - Bug 1240921 - Use nsAutoTArray in nsStyleSet::RuleNodeWithReplacement. r=bz. (66f6823b46) - Bug 1229437 part 1 - Add a helper function to get the float containing block of a given frame. r=dbaron (72de452e5d) - Bug 1229437 part 2 - Reparent floats inside pulled ruby segment. r=dbaron (82cc44632d) - Bug 1229437 part 3 - Support iterating frames of RubyColumn. r=dholbert (5d43e7f6ff) - Bug 1229437 part 4 - Reparent floats inside pulled ruby column. r=dbaron (4c1a7ff20b) - Bug 1229437 part 5 - Add crashtests for this bug. r=dbaron (6afabe1604) - Bug 1229437 followup - Fix sign-compare error in RubyColumn::Iterator on CLOSED TREE. (e93453d00a) - Bug 1229437 followup 2 - Fix another sign-compare error in RubyColumn::Iterator on CLOSED TREE. (c0bf6a2a7b) - Bug 1229437 followup 3 - Fix a mistake in RubyColumn::Iterator::SkipUntilExistingFrame(). a=me (1ce408e194) - bits of Bug 1072150 - Use the opt-out for various sloppy consumers (29d97c59ca) - Make test_bug946632 compatible with asynchronous scrolling. (bug 1140293, r=mstange) (e975a8350c) - fix misspatch of 1072150 (a3e580fa4b) - Bug 686281 - Implement nsStyleImageLayers; r=dbaron (85bb33c8e6) - Bug 686281 - Rename *background* to *imagelayer*; r=dbaron. (36d90f112d) - Bug 1230034 part 4 - Make FramePropertyDescriptor to be a template. r=froydnj,dbaron (271cd19b6e) - Bug 1230034 part 5 - Convert all frame properties which use DeleteValue and ReleaseValue as destructor to be typesafe. r=dbaron (efc8d63c9d) - Bug 1230034 part 6 - Convert all frame properties which do not hold pointer to be typed. r=dbaron (b5541775f7) - Bug 1230034 part 7 - Convert nsIFrame::GenConProperty to be typed. r=dbaron (2b71527b2c) - Bug 1230034 part 8 - Convert frame properties which assert on destructor to be typed. r=dbaron (0f125a3414) - Bug 1230034 part 9 - Convert FrameLayerBuilder::LayerManagerDataProperty to be typed. r=dbaron (1147498c2f) - Bug 1230034 part 10 - Convert remaining frame properties to by typed and remove the unsafe declaring macro. r=dbaron (d59d94eac4) - Bug 1072501: Unmap file mapping on source surface destruction. r=jrmuizel (19fd63890a) - Bug 1235613 - Make gfxCriticalError/Note strings in gfx/ unique. r=jrmuizel (780c6ff862) - Bug 1247535 - Fix -Wunreachable-code warning in mfbt/Poison.cpp. r=froydnj (0e7cf60b6d) - Bug 1239479: Add comments to mfbt/XorShift128PlusRNG.h from the RNG's designer. DONTBUILD r=Waldo (bb674b07ce) - Add an assertion message to the assert-is-empty in LinkedList::~LinkedList, to indicate to users who hit it that it's the fault of the caller, not the fault of MFBT code. No bug, rs=froydnj (4cad80874c) - Bug 1221103 - Add a comment to nsIChannel::securityInfo noting that this info may appear on non-nsHttpChannels and how that may happen. r=bz IGNORE IDL (cd9cebc3f2) - Bug 1001765 - Make login credentials in Saved Passwords manager editable. r=MattN (09eec4f6f8) - Bug 1188478 - Add an Import button to the password manager to open the browser migrator. r=dolske (d1126a89fc) - Bug 1199382 - Rename some strings from "password" to "login" in preferences and the manager. r=markh (60638f5e2a) - Bug 1207733 - Update @disabled on the Remove Password button when selection changes. r=MattN (64ac9f22f6) - bits of 1124472 and 1166840 (26e2681183) - Bug 1219707 - fix argument passing to migration.js, r=jaws (55d332f5c6) - bug 1215657 - make AccessibleWrap::get_accSelection work with proxies=davidb (4e72111032) - fix missing telemetry entry (4fcfabb3e6) and follow-up API changes of TFF#493.
287 lines
13 KiB
C++
287 lines
13 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"
|
|
#include "nsRegion.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. The reverse is useful when synthetically
|
|
// created WidgetEvents need to be converted back to InputData.
|
|
LayoutDeviceIsScreenForUntransformedEvent,
|
|
// Similar to LayoutDeviceIsScreenForUntransformedEvent, PBrowser handles
|
|
// some widget/tab dimension information as the OS does -- in screen units.
|
|
LayoutDeviceIsScreenForTabDims,
|
|
// A combination of LayoutDeviceIsScreenForBounds and
|
|
// ScreenIsParentLayerForRoot, which is how we're using it.
|
|
LayoutDeviceIsParentLayerForRCDRSF,
|
|
// Used to treat the product of AsyncTransformComponentMatrix objects
|
|
// as an AsyncTransformMatrix. See the definitions of these matrices in
|
|
// LayersTypes.h for details.
|
|
MultipleAsyncTransforms
|
|
};
|
|
|
|
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 TargetUnits, class SourceUnits>
|
|
gfx::IntRegionTyped<TargetUnits> ViewAs(const gfx::IntRegionTyped<SourceUnits>& aRegion, PixelCastJustification) {
|
|
return gfx::IntRegionTyped<TargetUnits>::FromUnknownRegion(aRegion.ToUnknownRegion());
|
|
}
|
|
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);
|
|
}
|
|
// Unlike the other functions in this category, this function takes the
|
|
// target matrix type, rather than its source and target unit types, as
|
|
// the explicit template argument, so an example invocation is:
|
|
// ViewAs<ScreenToLayerMatrix4x4>(otherTypedMatrix, justification)
|
|
// The reason is that if it took the source and target unit types as two
|
|
// template arguments, there may be some confusion as to which is the
|
|
// source and which is the target.
|
|
template <class TargetMatrix, class SourceMatrixSourceUnits, class SourceMatrixTargetUnits>
|
|
TargetMatrix ViewAs(
|
|
const gfx::Matrix4x4Typed<SourceMatrixSourceUnits, SourceMatrixTargetUnits>& aMatrix,
|
|
PixelCastJustification) {
|
|
return TargetMatrix::FromUnknownMatrix(aMatrix.ToUnknownMatrix());
|
|
}
|
|
|
|
// 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);
|
|
}
|
|
template <class TargetUnits>
|
|
gfx::IntRegionTyped<TargetUnits> ViewAs(const nsIntRegion& aRegion) {
|
|
return gfx::IntRegionTyped<TargetUnits>::FromUnknownRegion(aRegion);
|
|
}
|
|
// Unlike the other functions in this category, this function takes the
|
|
// target matrix type, rather than its source and target unit types, as
|
|
// the template argument, so an example invocation is:
|
|
// ViewAs<ScreenToLayerMatrix4x4>(untypedMatrix)
|
|
// The reason is that if it took the source and target unit types as two
|
|
// template arguments, there may be some confusion as to which is the
|
|
// source and which is the target.
|
|
template <class TypedMatrix>
|
|
TypedMatrix ViewAs(const gfx::Matrix4x4& aMatrix) {
|
|
return TypedMatrix::FromUnknownMatrix(aMatrix);
|
|
}
|
|
|
|
// 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>
|
|
TransformBy(const gfx::Matrix4x4Typed<SourceUnits, TargetUnits>& aTransform,
|
|
const gfx::PointTyped<SourceUnits>& aPoint)
|
|
{
|
|
return aTransform * aPoint;
|
|
}
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static gfx::IntPointTyped<TargetUnits>
|
|
TransformBy(const gfx::Matrix4x4Typed<SourceUnits, TargetUnits>& aTransform,
|
|
const gfx::IntPointTyped<SourceUnits>& aPoint)
|
|
{
|
|
return RoundedToInt(TransformBy(aTransform, gfx::PointTyped<SourceUnits>(aPoint)));
|
|
}
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static gfx::RectTyped<TargetUnits>
|
|
TransformBy(const gfx::Matrix4x4Typed<SourceUnits, TargetUnits>& aTransform,
|
|
const gfx::RectTyped<SourceUnits>& aRect)
|
|
{
|
|
return aTransform.TransformBounds(aRect);
|
|
}
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static gfx::IntRectTyped<TargetUnits>
|
|
TransformBy(const gfx::Matrix4x4Typed<SourceUnits, TargetUnits>& aTransform,
|
|
const gfx::IntRectTyped<SourceUnits>& aRect)
|
|
{
|
|
return RoundedToInt(TransformBy(aTransform, gfx::RectTyped<SourceUnits>(aRect)));
|
|
}
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static gfx::IntRegionTyped<TargetUnits>
|
|
TransformBy(const gfx::Matrix4x4Typed<SourceUnits, TargetUnits>& aTransform,
|
|
const gfx::IntRegionTyped<SourceUnits>& aRegion)
|
|
{
|
|
return ViewAs<TargetUnits>(aRegion.ToUnknownRegion().Transform(
|
|
aTransform.ToUnknownMatrix()));
|
|
}
|
|
|
|
// 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::Matrix4x4Typed<SourceUnits, TargetUnits>& aTransform,
|
|
const gfx::PointTyped<SourceUnits>& aVector,
|
|
const gfx::PointTyped<SourceUnits>& aAnchor)
|
|
{
|
|
gfx::PointTyped<TargetUnits> transformedStart = TransformBy(aTransform, aAnchor);
|
|
gfx::PointTyped<TargetUnits> transformedEnd = TransformBy(aTransform, aAnchor + aVector);
|
|
return transformedEnd - transformedStart;
|
|
}
|
|
|
|
// UntransformBy() and UntransformVector() are like TransformBy() 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>>
|
|
UntransformBy(const gfx::Matrix4x4Typed<SourceUnits, TargetUnits>& aTransform,
|
|
const gfx::PointTyped<SourceUnits>& aPoint)
|
|
{
|
|
gfx::Point4DTyped<TargetUnits> point = aTransform.ProjectPoint(aPoint);
|
|
if (!point.HasPositiveWCoord()) {
|
|
return Nothing();
|
|
}
|
|
return Some(point.As2DPoint());
|
|
}
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static Maybe<gfx::IntPointTyped<TargetUnits>>
|
|
UntransformBy(const gfx::Matrix4x4Typed<SourceUnits, TargetUnits>& aTransform,
|
|
const gfx::IntPointTyped<SourceUnits>& aPoint)
|
|
{
|
|
gfx::PointTyped<SourceUnits> p = aPoint;
|
|
gfx::Point4DTyped<TargetUnits> point = aTransform.ProjectPoint(p);
|
|
if (!point.HasPositiveWCoord()) {
|
|
return Nothing();
|
|
}
|
|
return Some(RoundedToInt(point.As2DPoint()));
|
|
}
|
|
|
|
// The versions of UntransformBy() 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>>
|
|
UntransformBy(const gfx::Matrix4x4Typed<SourceUnits, TargetUnits>& aTransform,
|
|
const gfx::RectTyped<SourceUnits>& aRect,
|
|
const gfx::RectTyped<TargetUnits>& aClip)
|
|
{
|
|
gfx::RectTyped<TargetUnits> rect = aTransform.ProjectRectBounds(aRect, aClip);
|
|
if (rect.IsEmpty()) {
|
|
return Nothing();
|
|
}
|
|
return Some(rect);
|
|
}
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static Maybe<gfx::IntRectTyped<TargetUnits>>
|
|
UntransformBy(const gfx::Matrix4x4Typed<SourceUnits, TargetUnits>& aTransform,
|
|
const gfx::IntRectTyped<SourceUnits>& aRect,
|
|
const gfx::IntRectTyped<TargetUnits>& aClip)
|
|
{
|
|
gfx::RectTyped<TargetUnits> rect = aTransform.ProjectRectBounds(aRect, aClip);
|
|
if (rect.IsEmpty()) {
|
|
return Nothing();
|
|
}
|
|
return Some(RoundedToInt(rect));
|
|
}
|
|
|
|
template <typename TargetUnits, typename SourceUnits>
|
|
static Maybe<gfx::PointTyped<TargetUnits>>
|
|
UntransformVector(const gfx::Matrix4x4Typed<SourceUnits, TargetUnits>& aTransform,
|
|
const gfx::PointTyped<SourceUnits>& aVector,
|
|
const gfx::PointTyped<SourceUnits>& aAnchor)
|
|
{
|
|
gfx::Point4DTyped<TargetUnits> projectedAnchor = aTransform.ProjectPoint(aAnchor);
|
|
gfx::Point4DTyped<TargetUnits> projectedTarget = aTransform.ProjectPoint(aAnchor + aVector);
|
|
if (!projectedAnchor.HasPositiveWCoord() || !projectedTarget.HasPositiveWCoord()){
|
|
return Nothing();
|
|
}
|
|
return Some(projectedTarget.As2DPoint() - projectedAnchor.As2DPoint());
|
|
}
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif
|