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

Unified Diff: cc/layers/render_surface_impl.cc

Issue 2468113004: Revert of cc: Make visible rect computation aware of pixel-moving filters (Closed)
Patch Set: Created 4 years, 1 month 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
« no previous file with comments | « cc/layers/render_surface_impl.h ('k') | cc/proto/cc_conversions.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/render_surface_impl.cc
diff --git a/cc/layers/render_surface_impl.cc b/cc/layers/render_surface_impl.cc
index 2dbc2cfd3929603aac72e7c072a128f250100826..483ad01162f162a3b3410542126dc763746e5528 100644
--- a/cc/layers/render_surface_impl.cc
+++ b/cc/layers/render_surface_impl.cc
@@ -190,17 +190,6 @@
SetContentRect(rect);
}
-gfx::Rect RenderSurfaceImpl::CalculateExpandedClipForFilters(
- const gfx::Transform& target_to_surface) {
- gfx::Rect clip_in_surface_space =
- MathUtil::ProjectEnclosingClippedRect(target_to_surface, clip_rect());
- gfx::Rect expanded_clip_in_surface_space = Filters().MapRectReverse(
- clip_in_surface_space, FiltersTransform().matrix());
- gfx::Rect expanded_clip_in_target_space = MathUtil::MapEnclosingClippedRect(
- draw_transform(), expanded_clip_in_surface_space);
- return expanded_clip_in_target_space;
-}
-
gfx::Rect RenderSurfaceImpl::CalculateClippedAccumulatedContentRect() {
if (HasCopyRequest() || !is_clipped())
return accumulated_content_rect();
@@ -225,13 +214,7 @@
if (clip_rect().Contains(accumulated_rect_in_target_space))
return accumulated_content_rect();
- gfx::Rect clipped_accumulated_rect_in_target_space;
- if (Filters().HasFilterThatMovesPixels()) {
- clipped_accumulated_rect_in_target_space =
- CalculateExpandedClipForFilters(target_to_surface);
- } else {
- clipped_accumulated_rect_in_target_space = clip_rect();
- }
+ gfx::Rect clipped_accumulated_rect_in_target_space = clip_rect();
clipped_accumulated_rect_in_target_space.Intersect(
accumulated_rect_in_target_space);
« no previous file with comments | « cc/layers/render_surface_impl.h ('k') | cc/proto/cc_conversions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698