Apply scale in Filter::Resolve3dPoint
This function should be consistent with the Apply{Horizontal,Vertical}Scale functions. The input |point| is assumed to be unzoomed - as is the reference box - and the output should have zoom applied. Bug: 1198084 Change-Id: If7500635281f431d29ac5a07b92a876f50ca5c05 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2818027 Reviewed-by: Philip Rogers <pdr@chromium.org> Commit-Queue: Fredrik Söderquist <fs@opera.com> Cr-Commit-Position: refs/heads/master@{#871585}


@ -78,13 +78,14 @@ float Filter::ApplyVerticalScale(float value) const {
|
||||
return scale_ * value;
|
||||
}
|
||||
|
||||
FloatPoint3D Filter::Resolve3dPoint(const FloatPoint3D& point) const {
|
||||
if (unit_scaling_ != kBoundingBox)
|
||||
return point;
|
||||
return FloatPoint3D(
|
||||
point.X() * ReferenceBox().Width() + ReferenceBox().X(),
|
||||
point.Y() * ReferenceBox().Height() + ReferenceBox().Y(),
|
||||
point.Z() * sqrtf(ReferenceBox().Size().DiagonalLengthSquared() / 2));
|
||||
FloatPoint3D Filter::Resolve3dPoint(FloatPoint3D point) const {
|
||||
if (unit_scaling_ == kBoundingBox) {
|
||||
point = FloatPoint3D(
|
||||
point.X() * ReferenceBox().Width() + ReferenceBox().X(),
|
||||
point.Y() * ReferenceBox().Height() + ReferenceBox().Y(),
|
||||
point.Z() * sqrtf(ReferenceBox().Size().DiagonalLengthSquared() / 2));
|
||||
}
|
||||
return scale_ * point;
|
||||
}
|
||||
|
||||
void Filter::SetLastEffect(FilterEffect* effect) {
|
||||
|
@ -53,7 +53,7 @@ class PLATFORM_EXPORT Filter final : public GarbageCollected<Filter> {
|
||||
float ApplyHorizontalScale(float value) const;
|
||||
float ApplyVerticalScale(float value) const;
|
||||
|
||||
FloatPoint3D Resolve3dPoint(const FloatPoint3D&) const;
|
||||
FloatPoint3D Resolve3dPoint(FloatPoint3D) const;
|
||||
|
||||
const FloatRect& FilterRegion() const { return filter_region_; }
|
||||
const FloatRect& ReferenceBox() const { return reference_box_; }
|
||||
|
Before ![]() (image error) Size: 31 KiB After ![]() (image error) Size: 31 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/composite-after-paint/css3/filters/effect-reference-zoom-hw-expected.png
vendored
Before ![]() (image error) Size: 31 KiB After ![]() (image error) Size: 31 KiB ![]() ![]() |
Before ![]() (image error) Size: 151 KiB After ![]() (image error) Size: 150 KiB ![]() ![]() |
Before ![]() (image error) Size: 236 KiB After ![]() (image error) Size: 236 KiB ![]() ![]() |
Before ![]() (image error) Size: 133 KiB After ![]() (image error) Size: 133 KiB ![]() ![]() |
Before ![]() (image error) Size: 151 KiB After ![]() (image error) Size: 150 KiB ![]() ![]() |
Before ![]() (image error) Size: 150 KiB After ![]() (image error) Size: 148 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/platform/linux/virtual/scalefactor200/css3/filters/effect-reference-expected.png
vendored
Before ![]() (image error) Size: 236 KiB After ![]() (image error) Size: 236 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/platform/linux/virtual/scalefactor200/css3/filters/effect-reference-hw-expected.png
vendored
Before ![]() (image error) Size: 235 KiB After ![]() (image error) Size: 234 KiB ![]() ![]() |
Before ![]() (image error) Size: 133 KiB After ![]() (image error) Size: 133 KiB ![]() ![]() |
Before ![]() (image error) Size: 129 KiB After ![]() (image error) Size: 128 KiB ![]() ![]() |
Before ![]() (image error) Size: 150 KiB |
BIN
third_party/blink/web_tests/platform/mac/css3/filters/effect-reference-zoom-hw-expected.png
vendored
Before ![]() (image error) Size: 32 KiB After ![]() (image error) Size: 32 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-zoom-expected.png
vendored
Before ![]() (image error) Size: 80 KiB After ![]() (image error) Size: 81 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/platform/mac/virtual/scalefactor200/css3/filters/effect-reference-zoom-hw-expected.png
vendored
Before ![]() (image error) Size: 81 KiB After ![]() (image error) Size: 82 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/platform/win/css3/filters/effect-reference-zoom-hw-expected.png
vendored
Before ![]() (image error) Size: 32 KiB After ![]() (image error) Size: 32 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/effect-reference-colorspace-expected.png
vendored
Before ![]() (image error) Size: 151 KiB After ![]() (image error) Size: 150 KiB ![]() ![]() |
Before ![]() (image error) Size: 150 KiB After ![]() (image error) Size: 148 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/effect-reference-expected.png
vendored
Before ![]() (image error) Size: 236 KiB After ![]() (image error) Size: 236 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/effect-reference-hw-expected.png
vendored
Before ![]() (image error) Size: 235 KiB After ![]() (image error) Size: 234 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/platform/win/virtual/scalefactor200/css3/filters/effect-reference-subregion-expected.png
vendored
Before ![]() (image error) Size: 133 KiB After ![]() (image error) Size: 133 KiB ![]() ![]() |
Before ![]() (image error) Size: 129 KiB After ![]() (image error) Size: 128 KiB ![]() ![]() |
Before ![]() (image error) Size: 151 KiB |
BIN
third_party/blink/web_tests/virtual/scalefactor200/css3/filters/effect-reference-colorspace-expected.png
vendored
Before ![]() (image error) Size: 151 KiB |