mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-22 01:35:35 +00:00
91b071ed14
gfx::Color is currently misused in many places. The DrawTargets expect the color space to be in device space, e.g. what we are actually going to draw using. Everything sitting above generally deals with sRGB, as specified in CSS. Sometimes we missed the conversion from sRGB to device space when issuing draw calls, and similarly sometimes we converted the color to device space twice. This patch splits the type in two. sRGBColor and DeviceColor now represent sRGB and device color spaces respectively. DrawTarget only accepts DeviceColor, and one can get a DeviceColor from an sRGBColor via the ToDeviceColor helper API. The reftests now pass with color management enabled for everything (e.g. CSS) instead of just tagged raster images. There will be a follow up patch to enable color management everywhere by default on all supported platforms. Differential Revision: https://phabricator.services.mozilla.com/D64771 --HG-- extra : moz-landing-system : lando
152 lines
5.6 KiB
C++
152 lines
5.6 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/SVGFEDropShadowElement.h"
|
|
#include "mozilla/dom/SVGFEDropShadowElementBinding.h"
|
|
#include "nsIFrame.h"
|
|
#include "nsSVGFilterInstance.h"
|
|
|
|
NS_IMPL_NS_NEW_SVG_ELEMENT(FEDropShadow)
|
|
|
|
using namespace mozilla::gfx;
|
|
|
|
namespace mozilla {
|
|
namespace dom {
|
|
|
|
JSObject* SVGFEDropShadowElement::WrapNode(JSContext* aCx,
|
|
JS::Handle<JSObject*> aGivenProto) {
|
|
return SVGFEDropShadowElement_Binding::Wrap(aCx, this, aGivenProto);
|
|
}
|
|
|
|
SVGElement::NumberInfo SVGFEDropShadowElement::sNumberInfo[2] = {
|
|
{nsGkAtoms::dx, 2, false}, {nsGkAtoms::dy, 2, false}};
|
|
|
|
SVGElement::NumberPairInfo SVGFEDropShadowElement::sNumberPairInfo[1] = {
|
|
{nsGkAtoms::stdDeviation, 2, 2}};
|
|
|
|
SVGElement::StringInfo SVGFEDropShadowElement::sStringInfo[2] = {
|
|
{nsGkAtoms::result, kNameSpaceID_None, true},
|
|
{nsGkAtoms::in, kNameSpaceID_None, true}};
|
|
|
|
//----------------------------------------------------------------------
|
|
// nsINode methods
|
|
|
|
NS_IMPL_ELEMENT_CLONE_WITH_INIT(SVGFEDropShadowElement)
|
|
|
|
//----------------------------------------------------------------------
|
|
|
|
already_AddRefed<DOMSVGAnimatedString> SVGFEDropShadowElement::In1() {
|
|
return mStringAttributes[IN1].ToDOMAnimatedString(this);
|
|
}
|
|
|
|
already_AddRefed<DOMSVGAnimatedNumber> SVGFEDropShadowElement::Dx() {
|
|
return mNumberAttributes[DX].ToDOMAnimatedNumber(this);
|
|
}
|
|
|
|
already_AddRefed<DOMSVGAnimatedNumber> SVGFEDropShadowElement::Dy() {
|
|
return mNumberAttributes[DY].ToDOMAnimatedNumber(this);
|
|
}
|
|
|
|
already_AddRefed<DOMSVGAnimatedNumber> SVGFEDropShadowElement::StdDeviationX() {
|
|
return mNumberPairAttributes[STD_DEV].ToDOMAnimatedNumber(
|
|
SVGAnimatedNumberPair::eFirst, this);
|
|
}
|
|
|
|
already_AddRefed<DOMSVGAnimatedNumber> SVGFEDropShadowElement::StdDeviationY() {
|
|
return mNumberPairAttributes[STD_DEV].ToDOMAnimatedNumber(
|
|
SVGAnimatedNumberPair::eSecond, this);
|
|
}
|
|
|
|
void SVGFEDropShadowElement::SetStdDeviation(float stdDeviationX,
|
|
float stdDeviationY) {
|
|
mNumberPairAttributes[STD_DEV].SetBaseValues(stdDeviationX, stdDeviationY,
|
|
this);
|
|
}
|
|
|
|
FilterPrimitiveDescription SVGFEDropShadowElement::GetPrimitiveDescription(
|
|
nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion,
|
|
const nsTArray<bool>& aInputsAreTainted,
|
|
nsTArray<RefPtr<SourceSurface>>& aInputImages) {
|
|
float stdX = aInstance->GetPrimitiveNumber(SVGContentUtils::X,
|
|
&mNumberPairAttributes[STD_DEV],
|
|
SVGAnimatedNumberPair::eFirst);
|
|
float stdY = aInstance->GetPrimitiveNumber(SVGContentUtils::Y,
|
|
&mNumberPairAttributes[STD_DEV],
|
|
SVGAnimatedNumberPair::eSecond);
|
|
if (stdX < 0 || stdY < 0) {
|
|
return FilterPrimitiveDescription();
|
|
}
|
|
|
|
Point offset(
|
|
aInstance->GetPrimitiveNumber(SVGContentUtils::X, &mNumberAttributes[DX]),
|
|
aInstance->GetPrimitiveNumber(SVGContentUtils::Y,
|
|
&mNumberAttributes[DY]));
|
|
|
|
DropShadowAttributes atts;
|
|
atts.mStdDeviation = Size(stdX, stdY);
|
|
atts.mOffset = offset;
|
|
|
|
nsIFrame* frame = GetPrimaryFrame();
|
|
if (frame) {
|
|
const nsStyleSVGReset* styleSVGReset = frame->Style()->StyleSVGReset();
|
|
sRGBColor color(
|
|
sRGBColor::FromABGR(styleSVGReset->mFloodColor.CalcColor(frame)));
|
|
color.a *= styleSVGReset->mFloodOpacity;
|
|
atts.mColor = color;
|
|
} else {
|
|
atts.mColor = sRGBColor();
|
|
}
|
|
return FilterPrimitiveDescription(AsVariant(std::move(atts)));
|
|
}
|
|
|
|
bool SVGFEDropShadowElement::AttributeAffectsRendering(
|
|
int32_t aNameSpaceID, nsAtom* aAttribute) const {
|
|
return SVGFEDropShadowElementBase::AttributeAffectsRendering(aNameSpaceID,
|
|
aAttribute) ||
|
|
(aNameSpaceID == kNameSpaceID_None &&
|
|
(aAttribute == nsGkAtoms::in ||
|
|
aAttribute == nsGkAtoms::stdDeviation ||
|
|
aAttribute == nsGkAtoms::dx || aAttribute == nsGkAtoms::dy));
|
|
}
|
|
|
|
void SVGFEDropShadowElement::GetSourceImageNames(
|
|
nsTArray<SVGStringInfo>& aSources) {
|
|
aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN1], this));
|
|
}
|
|
|
|
//----------------------------------------------------------------------
|
|
// nsIContent methods
|
|
|
|
NS_IMETHODIMP_(bool)
|
|
SVGFEDropShadowElement::IsAttributeMapped(const nsAtom* name) const {
|
|
static const MappedAttributeEntry* const map[] = {sFEFloodMap};
|
|
|
|
return FindAttributeDependence(name, map) ||
|
|
SVGFEDropShadowElementBase::IsAttributeMapped(name);
|
|
}
|
|
|
|
//----------------------------------------------------------------------
|
|
// SVGElement methods
|
|
|
|
SVGElement::NumberAttributesInfo SVGFEDropShadowElement::GetNumberInfo() {
|
|
return NumberAttributesInfo(mNumberAttributes, sNumberInfo,
|
|
ArrayLength(sNumberInfo));
|
|
}
|
|
|
|
SVGElement::NumberPairAttributesInfo
|
|
SVGFEDropShadowElement::GetNumberPairInfo() {
|
|
return NumberPairAttributesInfo(mNumberPairAttributes, sNumberPairInfo,
|
|
ArrayLength(sNumberPairInfo));
|
|
}
|
|
|
|
SVGElement::StringAttributesInfo SVGFEDropShadowElement::GetStringInfo() {
|
|
return StringAttributesInfo(mStringAttributes, sStringInfo,
|
|
ArrayLength(sStringInfo));
|
|
}
|
|
|
|
} // namespace dom
|
|
} // namespace mozilla
|