diff options
Diffstat (limited to 'chromium/cc/output/filter_operations.cc')
| -rw-r--r-- | chromium/cc/output/filter_operations.cc | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/chromium/cc/output/filter_operations.cc b/chromium/cc/output/filter_operations.cc index 24208418026..e526f5c419b 100644 --- a/chromium/cc/output/filter_operations.cc +++ b/chromium/cc/output/filter_operations.cc @@ -86,7 +86,16 @@ bool FilterOperations::HasFilterThatMovesPixels() const { case FilterOperation::DROP_SHADOW: case FilterOperation::ZOOM: return true; - default: + case FilterOperation::OPACITY: + case FilterOperation::COLOR_MATRIX: + case FilterOperation::GRAYSCALE: + case FilterOperation::SEPIA: + case FilterOperation::SATURATE: + case FilterOperation::HUE_ROTATE: + case FilterOperation::INVERT: + case FilterOperation::BRIGHTNESS: + case FilterOperation::CONTRAST: + case FilterOperation::SATURATING_BRIGHTNESS: break; } } @@ -104,10 +113,22 @@ bool FilterOperations::HasFilterThatAffectsOpacity() const { return true; case FilterOperation::COLOR_MATRIX: { const SkScalar* matrix = op.matrix(); - return matrix[15] || matrix[16] || matrix[17] || matrix[18] != 1 || - matrix[19]; + if (matrix[15] || + matrix[16] || + matrix[17] || + matrix[18] != 1 || + matrix[19]) + return true; + break; } - default: + case FilterOperation::GRAYSCALE: + case FilterOperation::SEPIA: + case FilterOperation::SATURATE: + case FilterOperation::HUE_ROTATE: + case FilterOperation::INVERT: + case FilterOperation::BRIGHTNESS: + case FilterOperation::CONTRAST: + case FilterOperation::SATURATING_BRIGHTNESS: break; } } |