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

Unified Diff: cc/output/filter_operation.cc

Issue 2155893002: cc: Fix filter operation LinearIntValueBetween parameter order. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/filter_operation.cc
diff --git a/cc/output/filter_operation.cc b/cc/output/filter_operation.cc
index 289ca348b7ee58de687148fb8ebd7d1fe216f338..5b30c42bb56853eadbcabff9955bad9987be5568 100644
--- a/cc/output/filter_operation.cc
+++ b/cc/output/filter_operation.cc
@@ -247,7 +247,7 @@ FilterOperation FilterOperation::Blend(const FilterOperation* from,
} else if (to_op.type() == FilterOperation::ZOOM) {
blended_filter.set_zoom_inset(
std::max(gfx::Tween::LinearIntValueBetween(
- from_op.zoom_inset(), to_op.zoom_inset(), progress),
+ progress, from_op.zoom_inset(), to_op.zoom_inset()),
0));
} else if (to_op.type() == FilterOperation::ALPHA_THRESHOLD) {
blended_filter.set_outer_threshold(ClampAmountForFilterType(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698