Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3480)

Unified Diff: cc/output/filter_operation.cc

Issue 1998233002: cc: Implement and use FilterOperations::MapRectReverse for mapping backdrop bounding box. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: allow for negative scale (due to framebuffer flipping) in gaussian blur calculation Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/output/filter_operation.cc
diff --git a/cc/output/filter_operation.cc b/cc/output/filter_operation.cc
index 78588748ba59d63c5d68bd35e1df56cba76f0d22..efa91b4347f46a78d53082eda67f60861e2f5bf4 100644
--- a/cc/output/filter_operation.cc
+++ b/cc/output/filter_operation.cc
@@ -327,14 +327,18 @@ gfx::Rect FilterOperation::MapRect(const gfx::Rect& rect,
switch (type_) {
case FilterOperation::BLUR: {
SkVector spread = MapStdDeviation(amount(), matrix);
+ float spreadX = std::abs(spread.x());
+ float spreadY = std::abs(spread.y());
gfx::Rect result = rect;
- result.Inset(-spread.x(), -spread.y(), -spread.x(), -spread.y());
+ result.Inset(-spreadX, -spreadY, -spreadX, -spreadY);
return result;
}
case FilterOperation::DROP_SHADOW: {
SkVector spread = MapStdDeviation(amount(), matrix);
+ float spreadX = std::abs(spread.x());
+ float spreadY = std::abs(spread.y());
gfx::Rect result = rect;
- result.Inset(-spread.x(), -spread.y(), -spread.x(), -spread.y());
+ result.Inset(-spreadX, -spreadY, -spreadX, -spreadY);
result += drop_shadow_offset().OffsetFromOrigin();
result.Union(rect);
return result;
@@ -352,4 +356,38 @@ gfx::Rect FilterOperation::MapRect(const gfx::Rect& rect,
}
}
+gfx::Rect FilterOperation::MapRectReverse(const gfx::Rect& rect,
Stephen White 2016/06/07 16:00:34 This looks awfully similar to the existing flavour
jbroman 2016/06/08 15:17:37 Done.
+ const SkMatrix& matrix) const {
+ switch (type_) {
+ case FilterOperation::BLUR: {
+ SkVector spread = MapStdDeviation(amount(), matrix);
+ float spreadX = std::abs(spread.x());
Stephen White 2016/06/07 16:00:34 If this needs to be abs'ed to handle negative scal
jbroman 2016/06/08 15:17:37 SkBlurImageFilter does apply abs: sigma.fX = SkMi
Stephen White 2016/06/08 22:05:23 So it does. Thanks!
+ float spreadY = std::abs(spread.y());
+ gfx::Rect result = rect;
+ result.Inset(-spreadX, -spreadY, -spreadX, -spreadY);
+ return result;
+ }
+ case FilterOperation::DROP_SHADOW: {
+ SkVector spread = MapStdDeviation(amount(), matrix);
+ float spreadX = std::abs(spread.x());
+ float spreadY = std::abs(spread.y());
+ gfx::Rect result = rect;
+ result.Inset(-spreadX, -spreadY, -spreadX, -spreadY);
+ result -= drop_shadow_offset().OffsetFromOrigin();
+ result.Union(rect);
+ return result;
+ }
+ case FilterOperation::REFERENCE: {
+ if (!image_filter())
+ return rect;
+ SkIRect in_rect = gfx::RectToSkIRect(rect);
+ SkIRect out_rect = image_filter()->filterBounds(
+ in_rect, matrix, SkImageFilter::kReverse_MapDirection);
+ return gfx::SkIRectToRect(out_rect);
+ }
+ default:
+ return rect;
+ }
+}
+
} // namespace cc

Powered by Google App Engine
This is Rietveld 408576698