mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
e1776c67f8
- Bug 1199885 - Part 2: Add AsyncDragMetrics. r=kats (220a4f445e)
- Bug 1149482 - Localize the 'none' string for APZ in about:support. r=dvander (3e0128f62e)
- Bug 1199885 - Part 3: Add 'apz.drag.enabled' preference for async scrollbars. r=kats (5133061d3f)
- Bug 1199885 - Part 4: Let the hit testing tree know about the scroll thumb. r=kats (26a9a69443)
- Bug 1199885 - Part 5: Make mRootLayerTreeID const to prove that there's no data races. r=kats (88e2eb80f1)
- Bug 1199885 - Part 8: Add FindScrollNode to locate the scrollbar thumb. r=kats (a545ec9569)
- Bug 1199885 - Part 9: Let APZC handle the drag events. r=kats (4cc0f88153)
- Bug 1199885 - Part 9.5: Make the mouse events APZC aware. r=kats (69bd4caf94)
- Bug 1199885 - Part 10: Add APZTeeManager API to start an async scroll. r=kats (e212ee2750)
- Bug 1199885 - Part 12: Add StartScrollbarDrag IPC message. r=kats (705af3b233)
- Bug 1199885 - Part 13: Let nsSliderFrame trigger async scrolling via StartScrollbarDrag. r=kats (d31b5a790d)
- put in gstreamer as of 2015-10-05 Bug 1146482 (7cca45858c)
- pointer style (f8041af438)
- Bug 1197097 - Don't use a context-wide cycle-detection mechanism for detecting cycles during JSON.stringify. This prevents nested (yet separate) JSON.stringify, and it causes that algorithm to be affected by specification-unrelated operations like toSource. r=jonco (09652471c1)
- align to ugly grammaer of 1114782 (c760693693)
- remove space (7158a0c2bf)
- align to FF/TFF (27138a55bb)
- Bug 1205887 - Verify that MOZILLA_VERSION was set correctly, r=glandium (2269e8f31b)
- Bug 1205012 - Allow rust source code in SpiderMonkey; r=mshal (9ebca9ed28)
- Bug 1197281 - Use MOZ_FIND_WINSDK_VERSION for MOZ_WINSDK_MAXVER on mingw. r=glandium (2910b2160e)
- Bug 1207893 - Refactor how build backend execution is summarized. r=gps (56d8fecbc2)
- Bug 1207893 - Allow to create multiple build backends at once. r=gps (d8cba87d2b)
- Bug 1207897 - Add a configure option to build multiple build backends. r=gps (f9c7851d02)
- Bug 1188555 - part 1 - remove write-only configure.in variable NO_LD_ARCHIVE_FLAGS; r=mshal (461958b100)
- Bug 1188555 - part 2 - remove write-only configure.in variables MKSHLIB_{UN,}FORCE_ALL; r=mshal (1813210dda)
- Bug 1207882 - Ensure chrome manifests are created in a directory that exists when processing jar manifests. r=gps (59165a64cb)
- Bug 1204712 - Handle wildcards properly for localized content in jar manifests. r=gps (54dfb632c7)
- Bug 1188551: treat assertion failures as bad mozconfig; r=mshal (e307769de7)
- Bug 1181040 - Set ${var}_IS_SET variables for mk_add_options-defined variables. r=gps (19f169556b)
- Bug 1193015 - Require MOZ_GLX_USE_SURFACE_SHARING to enable WebGL surface sharing on GLX. r=jgilbert (9aa4fa8f41)
- Bug 1211324 (part 1) - Remove BILINEAR and GAUSSIAN filter constants. (3d9290ef02)
- Bug 1211324 (part 2) - Make gfx::FILTER::GOOD convert to GraphicsFilter::FILTER_GOOD. r=mattwoodrow. (16e7607c70)
- Bug 1208365 (part 1) - Remove unused EXTEND_PAD_EDGE. r=Bas. (10920e2bb6)
- Bug 1208365 (part 2) - Remove gfxPattern::Extend(). r=bas. (3703b9748a)
- Bug 1208365 (part 3) - Change gfxPattern::mExtend from a GraphicsExtend to a gfx::ExtendMode. r=bas. (b105d06e91)
- Bug 1208365 (part 4) - Remove gfxPattern::GraphicsExtend. r=bas. (7a16d48995)
- Bug 1211324 (part 3) - Remove GraphicsFilter::FILTER_FAST and replace it with FILTER_BEST. r=mattwoodrow. (b5101e049f)
- Bug 1211324 (part 4) - Replace GraphicsFilter constants with gfx::Filter equivalents. r=mattwoodrow. (c19b6b030e)
- Bug 1190117 - Track mLastProducerID and mLastFrameID explicitly in ImageLayerProperties. r=roc (ed9a5c777f)
- Bug 1211324 (part 5) - Remove GraphicsFilter and gfxGraphicsFilter. r=mattwoodrow. (0bd4ce7160)
- Bug 1194954 - Fix -Wunreachable-code warnings in gfx/layers and gfx/thebes. r=BenWa (1a3d68c490)
- Bug 1180509 - Fix judder of icons in Australis doorhanger menu at the end of its scale-in animation. r=roc (9b4df470fa)
- Bug 1206915 - Make paint dumping to a file e10s-friendly. r=mattwoodrow (87d2e12c2b)
- Bug 1206915 - Handle nested PaintFrame() calls correctly during paint dumping. r=mattwoodrow,BenWa (d30f77fbdd)
- Fix max texture size handling in displayport clamping. (bug 1135907 follow-up, r=kats) (a791894332)
- Fix bogus assertion in nsLayoutUtils::SetDisplayPortMargins. (bug 1156409, r=botond, a=philor) (b635b21c34)
- Bug 1169879 - Use only the critical displayport when computing image visibility. r=tn (9ec91c9527)
- Bug 1169881 - Recompute image visibility when display port margins change. r=tn (35a5bd3a51)
- Bug 1197765 - Compare text content inside frame instead of the content node for ruby autohiding. r=dbaron (00cf5b7674)
- Bug 1173580 - Record content descriptions in APZ test data. r=kats (7a72d1ac0a)
- Bug 1178971 - Changed line snapping behaviour depending on even/odd-ness of stroke width. r=mstange (495b32dc23)
- Bug 1208953: [mp3] Don't parse data we've already parsed. r=cpearce (72eed4309f)
- Bug 1137151: Marked destructor of |android::MediaCodecReader| as protected, r=sotaro (0632b34bc5)
- Bug 1205351 - Replace nsBaseHashtable::Enumerate() calls in dom/media/ with iterators r=cpearce (45976c24c0)
- Bug 1133624 - Add lang-specific ruby rules to ua.css. r=dbaron (46788cc220)
- Bug 1133624 - followup add fuzzy maxdiff on CLOSED TREE (1b6b62aded)
- Bug 1180443 - Consider whitespace collapse when calculating intrinsic isize of ruby. r=dbaron (3862184acd)
- Bug 1153764 - Avoid explicitly doing break before when there is ruby span. r=roc (71b4ec7749)
- add gstreamer parts (7e562556be)
- some preferences aligned to FF (b26d0b389c)
- Bug 1166301 - If APZ is enabled, clip fixed background images at the layer level rather than the display item level. r=mattwoodrow (5644e22090)
- Bug 1144990 - Dump display items with class id and name, r=roc (aa2e227e35)
- Bug 1205087 - Remove LayerManager parameter for ShouldFixToViewport. r=roc (00a1f2e36f)
- Bug 1205087 - Make nsSVGIntegrationUtils paint frame continuations manually since combining them meant that our reference frame wasn't an ancestor of all painted frames. r=roc (e40f6b7b81)
- Bug 1195400 - Check ancestor geometry roots when determining scrollability of a layer. r=mattwoodrow (4699b7e935)
- Bug 1205087 - Cache the AnimatedGeometryRoot on DisplayItem. r=roc (06bba311c3)
- Back out the bits of bug 1205087 that cache the AnimatedGeometryRoot on DisplayItem. r=backout (254057a6b6)
- Bug 1203190 - Don't intersect with the visible rect for fixed background images. r=mattwoodrow (1c5a432459)
- Bug 1208438 - Don't allow layers with scrolling clips to occlusion-cull layers behind them. r=mattwoodrow (c3d77a9846)
- Bug 1205630 - Translate a fixed background display item's clip rect correctly when setting it on the layer. r=mstange (49039f0e2d)
- Bug 1205630 - Reftest. r=mstange (a8db59eaee)
- Bug 1105832 - Also dump inactive layer managers when display list dumping is enabled. r=mattwoodrow (564fe5fcbc)
- Bug 1208661 - Move Dump() up from ContentClient to CompositableClient. r=BenWa (37915312b3)
282 lines
9.6 KiB
C++
282 lines
9.6 KiB
C++
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
* 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/. */
|
|
|
|
#define _USE_MATH_DEFINES
|
|
#include <cmath>
|
|
|
|
#include "PathHelpers.h"
|
|
|
|
namespace mozilla {
|
|
namespace gfx {
|
|
|
|
UserDataKey sDisablePixelSnapping;
|
|
|
|
void
|
|
AppendRectToPath(PathBuilder* aPathBuilder,
|
|
const Rect& aRect,
|
|
bool aDrawClockwise)
|
|
{
|
|
if (aDrawClockwise) {
|
|
aPathBuilder->MoveTo(aRect.TopLeft());
|
|
aPathBuilder->LineTo(aRect.TopRight());
|
|
aPathBuilder->LineTo(aRect.BottomRight());
|
|
aPathBuilder->LineTo(aRect.BottomLeft());
|
|
} else {
|
|
aPathBuilder->MoveTo(aRect.TopRight());
|
|
aPathBuilder->LineTo(aRect.TopLeft());
|
|
aPathBuilder->LineTo(aRect.BottomLeft());
|
|
aPathBuilder->LineTo(aRect.BottomRight());
|
|
}
|
|
aPathBuilder->Close();
|
|
}
|
|
|
|
void
|
|
AppendRoundedRectToPath(PathBuilder* aPathBuilder,
|
|
const Rect& aRect,
|
|
const RectCornerRadii& aRadii,
|
|
bool aDrawClockwise)
|
|
{
|
|
// For CW drawing, this looks like:
|
|
//
|
|
// ...******0** 1 C
|
|
// ****
|
|
// *** 2
|
|
// **
|
|
// *
|
|
// *
|
|
// 3
|
|
// *
|
|
// *
|
|
//
|
|
// Where 0, 1, 2, 3 are the control points of the Bezier curve for
|
|
// the corner, and C is the actual corner point.
|
|
//
|
|
// At the start of the loop, the current point is assumed to be
|
|
// the point adjacent to the top left corner on the top
|
|
// horizontal. Note that corner indices start at the top left and
|
|
// continue clockwise, whereas in our loop i = 0 refers to the top
|
|
// right corner.
|
|
//
|
|
// When going CCW, the control points are swapped, and the first
|
|
// corner that's drawn is the top left (along with the top segment).
|
|
//
|
|
// There is considerable latitude in how one chooses the four
|
|
// control points for a Bezier curve approximation to an ellipse.
|
|
// For the overall path to be continuous and show no corner at the
|
|
// endpoints of the arc, points 0 and 3 must be at the ends of the
|
|
// straight segments of the rectangle; points 0, 1, and C must be
|
|
// collinear; and points 3, 2, and C must also be collinear. This
|
|
// leaves only two free parameters: the ratio of the line segments
|
|
// 01 and 0C, and the ratio of the line segments 32 and 3C. See
|
|
// the following papers for extensive discussion of how to choose
|
|
// these ratios:
|
|
//
|
|
// Dokken, Tor, et al. "Good approximation of circles by
|
|
// curvature-continuous Bezier curves." Computer-Aided
|
|
// Geometric Design 7(1990) 33--41.
|
|
// Goldapp, Michael. "Approximation of circular arcs by cubic
|
|
// polynomials." Computer-Aided Geometric Design 8(1991) 227--238.
|
|
// Maisonobe, Luc. "Drawing an elliptical arc using polylines,
|
|
// quadratic, or cubic Bezier curves."
|
|
// http://www.spaceroots.org/documents/ellipse/elliptical-arc.pdf
|
|
//
|
|
// We follow the approach in section 2 of Goldapp (least-error,
|
|
// Hermite-type approximation) and make both ratios equal to
|
|
//
|
|
// 2 2 + n - sqrt(2n + 28)
|
|
// alpha = - * ---------------------
|
|
// 3 n - 4
|
|
//
|
|
// where n = 3( cbrt(sqrt(2)+1) - cbrt(sqrt(2)-1) ).
|
|
//
|
|
// This is the result of Goldapp's equation (10b) when the angle
|
|
// swept out by the arc is pi/2, and the parameter "a-bar" is the
|
|
// expression given immediately below equation (21).
|
|
//
|
|
// Using this value, the maximum radial error for a circle, as a
|
|
// fraction of the radius, is on the order of 0.2 x 10^-3.
|
|
// Neither Dokken nor Goldapp discusses error for a general
|
|
// ellipse; Maisonobe does, but his choice of control points
|
|
// follows different constraints, and Goldapp's expression for
|
|
// 'alpha' gives much smaller radial error, even for very flat
|
|
// ellipses, than Maisonobe's equivalent.
|
|
//
|
|
// For the various corners and for each axis, the sign of this
|
|
// constant changes, or it might be 0 -- it's multiplied by the
|
|
// appropriate multiplier from the list before using.
|
|
|
|
const Float alpha = Float(0.55191497064665766025);
|
|
|
|
typedef struct { Float a, b; } twoFloats;
|
|
|
|
twoFloats cwCornerMults[4] = { { -1, 0 }, // cc == clockwise
|
|
{ 0, -1 },
|
|
{ +1, 0 },
|
|
{ 0, +1 } };
|
|
twoFloats ccwCornerMults[4] = { { +1, 0 }, // ccw == counter-clockwise
|
|
{ 0, -1 },
|
|
{ -1, 0 },
|
|
{ 0, +1 } };
|
|
|
|
twoFloats *cornerMults = aDrawClockwise ? cwCornerMults : ccwCornerMults;
|
|
|
|
Point cornerCoords[] = { aRect.TopLeft(), aRect.TopRight(),
|
|
aRect.BottomRight(), aRect.BottomLeft() };
|
|
|
|
Point pc, p0, p1, p2, p3;
|
|
|
|
if (aDrawClockwise) {
|
|
aPathBuilder->MoveTo(Point(aRect.X() + aRadii[RectCorner::TopLeft].width,
|
|
aRect.Y()));
|
|
} else {
|
|
aPathBuilder->MoveTo(Point(aRect.X() + aRect.Width() - aRadii[RectCorner::TopRight].width,
|
|
aRect.Y()));
|
|
}
|
|
|
|
for (int i = 0; i < 4; ++i) {
|
|
// the corner index -- either 1 2 3 0 (cw) or 0 3 2 1 (ccw)
|
|
int c = aDrawClockwise ? ((i+1) % 4) : ((4-i) % 4);
|
|
|
|
// i+2 and i+3 respectively. These are used to index into the corner
|
|
// multiplier table, and were deduced by calculating out the long form
|
|
// of each corner and finding a pattern in the signs and values.
|
|
int i2 = (i+2) % 4;
|
|
int i3 = (i+3) % 4;
|
|
|
|
pc = cornerCoords[c];
|
|
|
|
if (aRadii[c].width > 0.0 && aRadii[c].height > 0.0) {
|
|
p0.x = pc.x + cornerMults[i].a * aRadii[c].width;
|
|
p0.y = pc.y + cornerMults[i].b * aRadii[c].height;
|
|
|
|
p3.x = pc.x + cornerMults[i3].a * aRadii[c].width;
|
|
p3.y = pc.y + cornerMults[i3].b * aRadii[c].height;
|
|
|
|
p1.x = p0.x + alpha * cornerMults[i2].a * aRadii[c].width;
|
|
p1.y = p0.y + alpha * cornerMults[i2].b * aRadii[c].height;
|
|
|
|
p2.x = p3.x - alpha * cornerMults[i3].a * aRadii[c].width;
|
|
p2.y = p3.y - alpha * cornerMults[i3].b * aRadii[c].height;
|
|
|
|
aPathBuilder->LineTo(p0);
|
|
aPathBuilder->BezierTo(p1, p2, p3);
|
|
} else {
|
|
aPathBuilder->LineTo(pc);
|
|
}
|
|
}
|
|
|
|
aPathBuilder->Close();
|
|
}
|
|
|
|
void
|
|
AppendEllipseToPath(PathBuilder* aPathBuilder,
|
|
const Point& aCenter,
|
|
const Size& aDimensions)
|
|
{
|
|
Size halfDim = aDimensions / 2.f;
|
|
Rect rect(aCenter - Point(halfDim.width, halfDim.height), aDimensions);
|
|
RectCornerRadii radii(halfDim.width, halfDim.height);
|
|
|
|
AppendRoundedRectToPath(aPathBuilder, rect, radii);
|
|
}
|
|
|
|
bool
|
|
SnapLineToDevicePixelsForStroking(Point& aP1, Point& aP2,
|
|
const DrawTarget& aDrawTarget,
|
|
Float aLineWidth)
|
|
{
|
|
Matrix mat = aDrawTarget.GetTransform();
|
|
if (mat.HasNonTranslation()) {
|
|
return false;
|
|
}
|
|
if (aP1.x != aP2.x && aP1.y != aP2.y) {
|
|
return false; // not a horizontal or vertical line
|
|
}
|
|
Point p1 = aP1 + mat.GetTranslation(); // into device space
|
|
Point p2 = aP2 + mat.GetTranslation();
|
|
p1.Round();
|
|
p2.Round();
|
|
p1 -= mat.GetTranslation(); // back into user space
|
|
p2 -= mat.GetTranslation();
|
|
|
|
aP1 = p1;
|
|
aP2 = p2;
|
|
|
|
bool lineWidthIsOdd = (int(aLineWidth) % 2) == 1;
|
|
if (lineWidthIsOdd) {
|
|
if (aP1.x == aP2.x) {
|
|
// snap vertical line, adding 0.5 to align it to be mid-pixel:
|
|
aP1 += Point(0.5, 0);
|
|
aP2 += Point(0.5, 0);
|
|
} else {
|
|
// snap horizontal line, adding 0.5 to align it to be mid-pixel:
|
|
aP1 += Point(0, 0.5);
|
|
aP2 += Point(0, 0.5);
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void
|
|
StrokeSnappedEdgesOfRect(const Rect& aRect, DrawTarget& aDrawTarget,
|
|
const ColorPattern& aColor,
|
|
const StrokeOptions& aStrokeOptions)
|
|
{
|
|
if (aRect.IsEmpty()) {
|
|
return;
|
|
}
|
|
|
|
Point p1 = aRect.TopLeft();
|
|
Point p2 = aRect.BottomLeft();
|
|
SnapLineToDevicePixelsForStroking(p1, p2, aDrawTarget,
|
|
aStrokeOptions.mLineWidth);
|
|
aDrawTarget.StrokeLine(p1, p2, aColor, aStrokeOptions);
|
|
|
|
p1 = aRect.BottomLeft();
|
|
p2 = aRect.BottomRight();
|
|
SnapLineToDevicePixelsForStroking(p1, p2, aDrawTarget,
|
|
aStrokeOptions.mLineWidth);
|
|
aDrawTarget.StrokeLine(p1, p2, aColor, aStrokeOptions);
|
|
|
|
p1 = aRect.TopLeft();
|
|
p2 = aRect.TopRight();
|
|
SnapLineToDevicePixelsForStroking(p1, p2, aDrawTarget,
|
|
aStrokeOptions.mLineWidth);
|
|
aDrawTarget.StrokeLine(p1, p2, aColor, aStrokeOptions);
|
|
|
|
p1 = aRect.TopRight();
|
|
p2 = aRect.BottomRight();
|
|
SnapLineToDevicePixelsForStroking(p1, p2, aDrawTarget,
|
|
aStrokeOptions.mLineWidth);
|
|
aDrawTarget.StrokeLine(p1, p2, aColor, aStrokeOptions);
|
|
}
|
|
|
|
// The logic for this comes from _cairo_stroke_style_max_distance_from_path
|
|
Margin
|
|
MaxStrokeExtents(const StrokeOptions& aStrokeOptions,
|
|
const Matrix& aTransform)
|
|
{
|
|
double styleExpansionFactor = 0.5f;
|
|
|
|
if (aStrokeOptions.mLineCap == CapStyle::SQUARE) {
|
|
styleExpansionFactor = M_SQRT1_2;
|
|
}
|
|
|
|
if (aStrokeOptions.mLineJoin == JoinStyle::MITER &&
|
|
styleExpansionFactor < M_SQRT2 * aStrokeOptions.mMiterLimit) {
|
|
styleExpansionFactor = M_SQRT2 * aStrokeOptions.mMiterLimit;
|
|
}
|
|
|
|
styleExpansionFactor *= aStrokeOptions.mLineWidth;
|
|
|
|
double dx = styleExpansionFactor * hypot(aTransform._11, aTransform._21);
|
|
double dy = styleExpansionFactor * hypot(aTransform._22, aTransform._12);
|
|
return Margin(dy, dx, dy, dx);
|
|
}
|
|
|
|
} // namespace gfx
|
|
} // namespace mozilla
|
|
|