Pārlūkot izejas kodu

LibWeb: Use ScopedCornerRadiusClip for image painting

MacDue 3 gadi atpakaļ
vecāks
revīzija
8c8dde59d2

+ 1 - 15
Userland/Libraries/LibWeb/Painting/ImagePaintable.cpp

@@ -49,22 +49,8 @@ void ImagePaintable::paint(PaintContext& context, PaintPhase phase) const
             context.painter().draw_text(enclosing_int_rect(absolute_rect()), alt, Gfx::TextAlignment::Center, computed_values().color(), Gfx::TextElision::Right);
             context.painter().draw_text(enclosing_int_rect(absolute_rect()), alt, Gfx::TextAlignment::Center, computed_values().color(), Gfx::TextElision::Right);
         } else if (auto bitmap = layout_box().image_loader().bitmap(layout_box().image_loader().current_frame_index())) {
         } else if (auto bitmap = layout_box().image_loader().bitmap(layout_box().image_loader().current_frame_index())) {
             auto image_rect = absolute_rect().to_rounded<int>();
             auto image_rect = absolute_rect().to_rounded<int>();
-            auto border_radii_data = normalized_border_radii_data();
-
-            Optional<BorderRadiusCornerClipper> corner_clipper;
-            if (border_radii_data.has_any_radius()) {
-                auto clipper = BorderRadiusCornerClipper::create(image_rect, border_radii_data);
-                if (!clipper.is_error())
-                    corner_clipper = clipper.release_value();
-            }
-
-            if (corner_clipper.has_value())
-                corner_clipper->sample_under_corners(context.painter());
-
+            ScopedCornerRadiusClip corner_clip { context.painter(), image_rect, normalized_border_radii_data() };
             context.painter().draw_scaled_bitmap(image_rect, *bitmap, bitmap->rect(), 1.0f, to_gfx_scaling_mode(computed_values().image_rendering()));
             context.painter().draw_scaled_bitmap(image_rect, *bitmap, bitmap->rect(), 1.0f, to_gfx_scaling_mode(computed_values().image_rendering()));
-
-            if (corner_clipper.has_value())
-                corner_clipper->blit_corner_clipping(context.painter());
         }
         }
     }
     }
 }
 }