Commit 156d2a45 authored by vmpstr's avatar vmpstr Committed by Commit bot

cc: Fix filter operation LinearIntValueBetween parameter order.

This patch fixes the order of parameters to be correct (progress
comes first).

BUG=588506
R=danakj
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_blink_rel

Review-Url: https://codereview.chromium.org/2155893002
Cr-Commit-Position: refs/heads/master@{#406027}
parent d594dc5f
...@@ -247,7 +247,7 @@ FilterOperation FilterOperation::Blend(const FilterOperation* from, ...@@ -247,7 +247,7 @@ FilterOperation FilterOperation::Blend(const FilterOperation* from,
} else if (to_op.type() == FilterOperation::ZOOM) { } else if (to_op.type() == FilterOperation::ZOOM) {
blended_filter.set_zoom_inset( blended_filter.set_zoom_inset(
std::max(gfx::Tween::LinearIntValueBetween( std::max(gfx::Tween::LinearIntValueBetween(
from_op.zoom_inset(), to_op.zoom_inset(), progress), progress, from_op.zoom_inset(), to_op.zoom_inset()),
0)); 0));
} else if (to_op.type() == FilterOperation::ALPHA_THRESHOLD) { } else if (to_op.type() == FilterOperation::ALPHA_THRESHOLD) {
blended_filter.set_outer_threshold(ClampAmountForFilterType( blended_filter.set_outer_threshold(ClampAmountForFilterType(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment