Commit 87fde4b8 authored by Jonathan Metzman's avatar Jonathan Metzman Committed by Commit Bot

Finish removal of fuzzing SkRRectsGaussianEdgeMaskFilter

Finish removing fuzzing to fix CHECK failure.

Bug: 835177
Change-Id: Ia65d58861a4842cba214eb2dc7bb5e01b8740949
Reviewed-on: https://chromium-review.googlesource.com/1022336Reviewed-by: default avatarAbhishek Arya <inferno@chromium.org>
Commit-Queue: Jonathan Metzman <metzman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552444}
parent 76ccc833
...@@ -733,20 +733,9 @@ message MaskFilterChild { ...@@ -733,20 +733,9 @@ message MaskFilterChild {
oneof children { oneof children {
BlurMaskFilter blur_mask_filter_impl = 1; BlurMaskFilter blur_mask_filter_impl = 1;
EmbossMaskFilter emboss_mask_filter = 2; EmbossMaskFilter emboss_mask_filter = 2;
RRectsGaussianEdgeMaskFilterImpl r_rects_gaussian_edge_mask_filter_impl = 3;
} }
} }
message RRectsGaussianEdgeMaskFilterImpl {
required Rectangle rect_1 = 1;
required float x_rad_1 = 2;
required float y_rad_1 = 3;
required Rectangle rect_2 = 4;
required float x_rad_2 = 5;
required float y_rad_2 = 6;
required float radius = 7;
}
message EmbossMaskFilterLight { message EmbossMaskFilterLight {
required float direction_x = 1; required float direction_x = 1;
required float direction_y = 2; required float direction_y = 2;
......
...@@ -1419,14 +1419,6 @@ void Converter::Visit(const Path& path) { ...@@ -1419,14 +1419,6 @@ void Converter::Visit(const Path& path) {
CheckAlignment(); CheckAlignment();
} }
void Converter::Visit(const RRectsGaussianEdgeMaskFilterImpl&
r_rects_gaussian_edge_mask_filter_impl) {
Visit(r_rects_gaussian_edge_mask_filter_impl.rect_1());
WriteFields(r_rects_gaussian_edge_mask_filter_impl, 2, 3);
Visit(r_rects_gaussian_edge_mask_filter_impl.rect_2());
WriteFields(r_rects_gaussian_edge_mask_filter_impl, 5);
}
void Converter::Visit(const BlurMaskFilter& blur_mask_filter) { void Converter::Visit(const BlurMaskFilter& blur_mask_filter) {
// Sigma must be a finite number <= 0. // Sigma must be a finite number <= 0.
float sigma = fabs(BoundFloat(blur_mask_filter.sigma())); float sigma = fabs(BoundFloat(blur_mask_filter.sigma()));
...@@ -1980,7 +1972,6 @@ void Converter::Visit(const DiscretePathEffect& discrete_path_effect) { ...@@ -1980,7 +1972,6 @@ void Converter::Visit(const DiscretePathEffect& discrete_path_effect) {
void Converter::Visit(const MaskFilterChild& mask_filter) { void Converter::Visit(const MaskFilterChild& mask_filter) {
bool flattenable_visited = false; bool flattenable_visited = false;
VISIT_ONEOF_FLATTENABLE(mask_filter, emboss_mask_filter); VISIT_ONEOF_FLATTENABLE(mask_filter, emboss_mask_filter);
VISIT_ONEOF_FLATTENABLE(mask_filter, r_rects_gaussian_edge_mask_filter_impl);
VISIT_DEFAULT_FLATTENABLE(mask_filter, blur_mask_filter_impl); VISIT_DEFAULT_FLATTENABLE(mask_filter, blur_mask_filter_impl);
} }
......
...@@ -242,7 +242,6 @@ class Converter { ...@@ -242,7 +242,6 @@ class Converter {
void Visit(const LightChild&); void Visit(const LightChild&);
void Visit(const CropRectangle&); void Visit(const CropRectangle&);
void Visit(const Rectangle&); void Visit(const Rectangle&);
void Visit(const RRectsGaussianEdgeMaskFilterImpl&);
void Visit(const PictureInfo&); void Visit(const PictureInfo&);
void Visit(const BlurMaskFilter&); void Visit(const BlurMaskFilter&);
void Visit(const HighContrast_Filter&); void Visit(const HighContrast_Filter&);
......
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