mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
b808ffac2d
- Bug 1196391, part 3 - Make argument count assertions fatal in js::ExpandErrorArgumentsVA(). r=Waldo (8233c0afac) - minor cleanup (1da0b2c3e9) - Bug 1191765: Make Debugger.Object.prototype.getScript properly recognize functions without scripts. r=fitzgen (3e2753577f) - Bug 1165807 - display WeakSet and WeakMap contents in console; r=bz,fitzgen (d8f70d8e6a) - Bug 1226024 - Expose the root of the dominator tree to JavaScript; r=bz,sfink x # Please enter the commit message for your changes. Lines starting (1949832288) - Bug 1220702 - Part 1: Replace callback() and newNode() with variadic templates. What could go wrong? r=Waldo. (80e1b40871) - Bug 1220702 - Part 2: Fix the .method property of certain FunctionDeclaration nodes. r=Waldo. (47f244a6e0) - Bug 1220702 - Part 3: Distinguish ES6 generators from legacy generators in Reflect.parse() output. r=Waldo. (362bb8ea4b) - bit of Bug 1180017 - Fix up the badly-horked backout and re-land. (f4f92ff88c) - Bug 1155303 - Add telemetry for async DeferredFinalize max pause. r=smaug (3ddc7b8856) - Bug 1174796 - Make sure ReleaseNow releases everything. r=smaug (5065aa1f52) - Bug 1191918 - Remove printf debugging r=me (48e95e425e) - update some tests (26ae4a8050) - Bug 1218643 - correct a DOM test. r=smaug " (75c6302bbb) - space (26dfeca131) - Bug 1166805 part 1 - refactor common tests for whether an animated list mirrors the base version of the list into methods. r=dholbert (e538b90e00) - Bug 1166805 part 2 - Call SetCapacity before calling DOMSVGXXXList::MaybeInsertNullInAnimValListAt, to prevent fallible InsertElementAt calls from failing r=dholbert (918397681f) - Bug 1092125 - Part 1 - Add non-scaling-stroke support to nsSVGPathGeometryElement::GetGeometryBounds (except line). r=jwatt (19ee6f9517) - Bug 1092125 - part 2 - add non-scaling-stroke support to SVGLineElement::GetGeometryBounds. r=jwatt (2c84b88ff1) - Bug 1140080 - ensure we only create stop frames for gradients. r=dholbert (636db91975) - Bug 1182496 - Don't create frames for SVG <text> descendants with failing conditional processing attributes. r=dholbert (4e976c1587) - Bug 1149542 - Part 3: Crashtest. r=dholbert (cde5ca0f57) - Bug 1209525 - Protect GetGeometryBounds from a singular non-scaling-stroke transform. r=longsonr (2cd1f2e0a4) - Bug 325427 - Add crashtest. (98ab5e6907) - Bug 803562 - force -moz-appearance: none on foreignObject elements. r=dbaron (0ba37f76ad) - Bug 950324 - Add crashtest. (6e2f7bc4c2) - Bug 1178159 - Ignore stroke-linecap:"square" on circle and ellipse. r=longsonr (42f4a9a71c) - Bug 1187770 - work around draw targets that don't display zero-length lines. r=longsonr (a612616ecb) - Bug 1222812 - add a null check in case there is no old style. r=dholbert (6a883edea2) - Bug 958160 - Compute bounds in transformed space instead of user space in GetCoveredRegion. r=longsonr (d020a10c56) - Bug 1224061: Followup to fix b2g bustage r=me CLOSED TREE (1dc2693955) - Bug 1173573 - Fix possible crash initializing sessionstorage. r=honzab (c6c77ccf7d) - Bug 536509 - Update localStorage to use common StorageAllowedForWindow logic, r=ehsan (825ee71ff3) - Bug 606655 - delete cookies UI option AskMeEveryTime and its related comments and tests. r=mak (828dfe54a5) - Bug 1194052 - Append to redirectchain before asyncopen() is called (r=sicking,mayhemer) (bb051ceb94) - Bug 1145503 - TP exceptions added while in Private Browsing mode persist beyond the Private Browsing session. r=ehsan Import url-classifier and private browsing modules. (4492b2de09) - Bug 1138979 - Pref to turn TP on when in Private Browsing mode. r=mmc , r=ehsan (5078eaa914) - Bug 1168635 - Extend nsITLSServerSocket to customize cipher suites. r=keeler (185a551640) - Bug 1165423 - WebRTC Fix DTLS handshake by expanding UDP buffer. r=rjesup (1f207e03ee) - Bug 1219939 - make nsTemporaryFileInputStream nsISeekableStream, r=jduell (f2a5ddfbf2) - Bug 1125816 - Parse FTP directory listings of Windows CE and WEC7 FTP Server r=jduell (4137b29d21) - Bug 1171016 - Initialize the linelen variable at its declaration in ParseFTPList.cpp. r=mcmanus (2a3960897d) - Bug 1197313 - remove PR_snprintf calls in netwerk/; r=froydnj (005da76d31) - Bug 1219910 - make gSocketThread a relaxed atomic variable; r=mcmanus (620d299605) - Bug 1222867 - part 1 - return already_AddRefed from WebSocketEventService::CreateFrameIfNeeded; r=mcmanus (0eee829a08) - Bug 1222867 - part 2 - be smarter about transferring ownership of WebSocketFrame; r=mcmanus (4a9fd71798) - Bug 1211001 - constant ASSERTION: nsITimer->SetDelay() called when the one-shot timer is not set up, r=mcmanus (451c903cbe) - Bug 1130822 - properly decode arbitrarily aligned data for non-tier1 platforms. r=mcmanus (bcb99913dc) - Bug 1204731 - telemetry for peer h2 goaway r=hurley (d6748682b4) - Bug 1205810 - telemetry for local h2 goaway code r=hurley (e142625588) - bug 1194818 - h2 header priority handling r=hurley (51766fff44) - bug 1194820 - h2 push promise padding handling r=hurley (560ee1f480) - bug 1208114 - fix h2 connect tunnels r=hurley (d17f920c31) - Bug 1213060 (part 1) - Properly handle discarding padding in Http2Session::OnWriteSegment. r=mcmanus (2cce4ac006) - Bug 1213060 (part 2) - Re-add state assertion in Http2Session::OnWriteSegment. r=mcmanus (6b1c030780) - fix build (39845819f6) - Bug 1214076 - allow TokenServerClient errors to be JSON.stringify'd. r=rnewman (ab6085fa97) - Bug 1220007 P1 Allow ConsoleReportCollectors to flush to another collector. r=bz (a97b2c5a57) - Bug 1220007 P2 Make InterceptedChannel's collect logs locally and only flush to nsIChannel on main thread r=bz (85b77c5a44) - Bug 867407 - Fix cloning of file URIs with search query strings (r=sworkman) (da6fd51c15) - Bug 1220728 Clear pending exceptions if string conversion fails in SWintercept error handling. r=bz (b188c34862) - Bug 1147913 - Change NS_SOCKETTRANSPORTSERVICE_CONTRACTID to NS_STREAMTRANSPORTSERVICE_CONTRACTID in RespondWithHandler::ResolvedCallback. r=ehsan (5b443e88ab) - fix namespace (562ed51caa) - Bug 1206060 - Show pinning status at about:cache. r=michal (75ed53663f) - Bug 1032254 - Generic way to pin reasource in the HTTP cache, r=michal (eeb860f8e3) - Bug 1211504. Remove unused member from RefLayer. (fab6bae915)
258 lines
7.9 KiB
C++
258 lines
7.9 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/. */
|
|
|
|
#include "mozilla/dom/SVGLineElement.h"
|
|
#include "mozilla/dom/SVGLineElementBinding.h"
|
|
#include "mozilla/gfx/2D.h"
|
|
|
|
NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(Line)
|
|
|
|
using namespace mozilla::gfx;
|
|
|
|
namespace mozilla {
|
|
namespace dom {
|
|
|
|
JSObject*
|
|
SVGLineElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)
|
|
{
|
|
return SVGLineElementBinding::Wrap(aCx, this, aGivenProto);
|
|
}
|
|
|
|
nsSVGElement::LengthInfo SVGLineElement::sLengthInfo[4] =
|
|
{
|
|
{ &nsGkAtoms::x1, 0, nsIDOMSVGLength::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X },
|
|
{ &nsGkAtoms::y1, 0, nsIDOMSVGLength::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y },
|
|
{ &nsGkAtoms::x2, 0, nsIDOMSVGLength::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X },
|
|
{ &nsGkAtoms::y2, 0, nsIDOMSVGLength::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y },
|
|
};
|
|
|
|
//----------------------------------------------------------------------
|
|
// Implementation
|
|
|
|
SVGLineElement::SVGLineElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
|
|
: SVGLineElementBase(aNodeInfo)
|
|
{
|
|
}
|
|
|
|
void
|
|
SVGLineElement::MaybeAdjustForZeroLength(float aX1, float aY1,
|
|
float& aX2, float aY2)
|
|
{
|
|
if (aX1 == aX2 && aY1 == aY2) {
|
|
SVGContentUtils::AutoStrokeOptions strokeOptions;
|
|
SVGContentUtils::GetStrokeOptions(&strokeOptions, this, nullptr, nullptr,
|
|
SVGContentUtils::eIgnoreStrokeDashing);
|
|
|
|
if (strokeOptions.mLineCap != CapStyle::BUTT) {
|
|
float tinyLength =
|
|
strokeOptions.mLineWidth / SVG_ZERO_LENGTH_PATH_FIX_FACTOR;
|
|
aX2 += tinyLength;
|
|
}
|
|
}
|
|
}
|
|
|
|
//----------------------------------------------------------------------
|
|
// nsIDOMNode methods
|
|
|
|
NS_IMPL_ELEMENT_CLONE_WITH_INIT(SVGLineElement)
|
|
|
|
//----------------------------------------------------------------------
|
|
|
|
already_AddRefed<SVGAnimatedLength>
|
|
SVGLineElement::X1()
|
|
{
|
|
return mLengthAttributes[ATTR_X1].ToDOMAnimatedLength(this);
|
|
}
|
|
|
|
already_AddRefed<SVGAnimatedLength>
|
|
SVGLineElement::Y1()
|
|
{
|
|
return mLengthAttributes[ATTR_Y1].ToDOMAnimatedLength(this);
|
|
}
|
|
|
|
already_AddRefed<SVGAnimatedLength>
|
|
SVGLineElement::X2()
|
|
{
|
|
return mLengthAttributes[ATTR_X2].ToDOMAnimatedLength(this);
|
|
}
|
|
|
|
already_AddRefed<SVGAnimatedLength>
|
|
SVGLineElement::Y2()
|
|
{
|
|
return mLengthAttributes[ATTR_Y2].ToDOMAnimatedLength(this);
|
|
}
|
|
|
|
//----------------------------------------------------------------------
|
|
// nsIContent methods
|
|
|
|
NS_IMETHODIMP_(bool)
|
|
SVGLineElement::IsAttributeMapped(const nsIAtom* name) const
|
|
{
|
|
static const MappedAttributeEntry* const map[] = {
|
|
sMarkersMap
|
|
};
|
|
|
|
return FindAttributeDependence(name, map) ||
|
|
SVGLineElementBase::IsAttributeMapped(name);
|
|
}
|
|
|
|
//----------------------------------------------------------------------
|
|
// nsSVGElement methods
|
|
|
|
nsSVGElement::LengthAttributesInfo
|
|
SVGLineElement::GetLengthInfo()
|
|
{
|
|
return LengthAttributesInfo(mLengthAttributes, sLengthInfo,
|
|
ArrayLength(sLengthInfo));
|
|
}
|
|
|
|
//----------------------------------------------------------------------
|
|
// nsSVGPathGeometryElement methods
|
|
|
|
void
|
|
SVGLineElement::GetMarkPoints(nsTArray<nsSVGMark> *aMarks) {
|
|
float x1, y1, x2, y2;
|
|
|
|
GetAnimatedLengthValues(&x1, &y1, &x2, &y2, nullptr);
|
|
|
|
float angle = atan2(y2 - y1, x2 - x1);
|
|
|
|
aMarks->AppendElement(nsSVGMark(x1, y1, angle, nsSVGMark::eStart));
|
|
aMarks->AppendElement(nsSVGMark(x2, y2, angle, nsSVGMark::eEnd));
|
|
}
|
|
|
|
void
|
|
SVGLineElement::GetAsSimplePath(SimplePath* aSimplePath)
|
|
{
|
|
float x1, y1, x2, y2;
|
|
GetAnimatedLengthValues(&x1, &y1, &x2, &y2, nullptr);
|
|
|
|
MaybeAdjustForZeroLength(x1, y1, x2, y2);
|
|
aSimplePath->SetLine(x1, y1, x2, y2);
|
|
}
|
|
|
|
already_AddRefed<Path>
|
|
SVGLineElement::BuildPath(PathBuilder* aBuilder)
|
|
{
|
|
float x1, y1, x2, y2;
|
|
GetAnimatedLengthValues(&x1, &y1, &x2, &y2, nullptr);
|
|
|
|
MaybeAdjustForZeroLength(x1, y1, x2, y2);
|
|
aBuilder->MoveTo(Point(x1, y1));
|
|
aBuilder->LineTo(Point(x2, y2));
|
|
|
|
return aBuilder->Finish();
|
|
}
|
|
|
|
bool
|
|
SVGLineElement::GetGeometryBounds(Rect* aBounds,
|
|
const StrokeOptions& aStrokeOptions,
|
|
const Matrix& aToBoundsSpace,
|
|
const Matrix* aToNonScalingStrokeSpace)
|
|
{
|
|
float x1, y1, x2, y2;
|
|
GetAnimatedLengthValues(&x1, &y1, &x2, &y2, nullptr);
|
|
|
|
if (aStrokeOptions.mLineWidth <= 0) {
|
|
*aBounds = Rect(aToBoundsSpace * Point(x1, y1), Size());
|
|
aBounds->ExpandToEnclose(aToBoundsSpace * Point(x2, y2));
|
|
return true;
|
|
}
|
|
|
|
// transform from non-scaling-stroke space to the space in which we compute
|
|
// bounds
|
|
Matrix nonScalingToBounds;
|
|
if (aToNonScalingStrokeSpace) {
|
|
MOZ_ASSERT(!aToNonScalingStrokeSpace->IsSingular());
|
|
Matrix nonScalingToUser = aToNonScalingStrokeSpace->Inverse();
|
|
nonScalingToBounds = nonScalingToUser * aToBoundsSpace;
|
|
}
|
|
|
|
if (aStrokeOptions.mLineCap == CapStyle::ROUND) {
|
|
if (!aToBoundsSpace.IsRectilinear() ||
|
|
(aToNonScalingStrokeSpace &&
|
|
!aToNonScalingStrokeSpace->IsRectilinear())) {
|
|
// TODO: handle this case.
|
|
return false;
|
|
}
|
|
Rect bounds(Point(x1, y1), Size());
|
|
bounds.ExpandToEnclose(Point(x2, y2));
|
|
if (aToNonScalingStrokeSpace) {
|
|
bounds = aToNonScalingStrokeSpace->TransformBounds(bounds);
|
|
bounds.Inflate(aStrokeOptions.mLineWidth / 2.f);
|
|
*aBounds = nonScalingToBounds.TransformBounds(bounds);
|
|
} else {
|
|
bounds.Inflate(aStrokeOptions.mLineWidth / 2.f);
|
|
*aBounds = aToBoundsSpace.TransformBounds(bounds);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
// Handle butt and square linecap, normal and non-scaling stroke cases
|
|
// together: start with endpoints (x1, y1), (x2, y2) in the stroke space,
|
|
// compute the four corners of the stroked line, transform the corners to
|
|
// bounds space, and compute bounds there.
|
|
|
|
if (aToNonScalingStrokeSpace) {
|
|
Point nonScalingSpaceP1, nonScalingSpaceP2;
|
|
nonScalingSpaceP1 = *aToNonScalingStrokeSpace * Point(x1, y1);
|
|
nonScalingSpaceP2 = *aToNonScalingStrokeSpace * Point(x2, y2);
|
|
x1 = nonScalingSpaceP1.x;
|
|
y1 = nonScalingSpaceP1.y;
|
|
x2 = nonScalingSpaceP2.x;
|
|
y2 = nonScalingSpaceP2.y;
|
|
}
|
|
|
|
Float length = Float(NS_hypot(x2 - x1, y2 - y1));
|
|
Float xDelta;
|
|
Float yDelta;
|
|
Point points[4];
|
|
|
|
if (aStrokeOptions.mLineCap == CapStyle::BUTT) {
|
|
if (length == 0.f) {
|
|
xDelta = yDelta = 0.f;
|
|
} else {
|
|
Float ratio = aStrokeOptions.mLineWidth / 2.f / length;
|
|
xDelta = ratio * (y2 - y1);
|
|
yDelta = ratio * (x2 - x1);
|
|
}
|
|
points[0] = Point(x1 - xDelta, y1 + yDelta);
|
|
points[1] = Point(x1 + xDelta, y1 - yDelta);
|
|
points[2] = Point(x2 + xDelta, y2 - yDelta);
|
|
points[3] = Point(x2 - xDelta, y2 + yDelta);
|
|
} else {
|
|
MOZ_ASSERT(aStrokeOptions.mLineCap == CapStyle::SQUARE);
|
|
if (length == 0.f) {
|
|
xDelta = yDelta = aStrokeOptions.mLineWidth / 2.f;
|
|
points[0] = Point(x1 - xDelta, y1 + yDelta);
|
|
points[1] = Point(x1 - xDelta, y1 - yDelta);
|
|
points[2] = Point(x1 + xDelta, y1 - yDelta);
|
|
points[3] = Point(x1 + xDelta, y1 + yDelta);
|
|
} else {
|
|
Float ratio = aStrokeOptions.mLineWidth / 2.f / length;
|
|
yDelta = ratio * (x2 - x1);
|
|
xDelta = ratio * (y2 - y1);
|
|
points[0] = Point(x1 - yDelta - xDelta, y1 - xDelta + yDelta);
|
|
points[1] = Point(x1 - yDelta + xDelta, y1 - xDelta - yDelta);
|
|
points[2] = Point(x2 + yDelta + xDelta, y2 + xDelta - yDelta);
|
|
points[3] = Point(x2 + yDelta - xDelta, y2 + xDelta + yDelta);
|
|
}
|
|
}
|
|
|
|
const Matrix& toBoundsSpace = aToNonScalingStrokeSpace ?
|
|
nonScalingToBounds : aToBoundsSpace;
|
|
|
|
*aBounds = Rect(toBoundsSpace * points[0], Size());
|
|
for (uint32_t i = 1; i < 4; ++i) {
|
|
aBounds->ExpandToEnclose(toBoundsSpace * points[i]);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
} // namespace dom
|
|
} // namespace mozilla
|