LibWeb/Painting: Do not clip border radius when it is out of viewport

Painting optimization to do less unnecessary work.
lanmonster · Oct 19, 2023 · 708574d · 708574d
1 parent b835d2b
commit 708574d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/Userland/Libraries/LibWeb/Painting/BorderRadiusCornerClipper.cpp b/Userland/Libraries/LibWeb/Painting/BorderRadiusCornerClipper.cpp
@@ -53,7 +53,7 @@ ErrorOr<NonnullRefPtr<BorderRadiusCornerClipper>> BorderRadiusCornerClipper::cre
  .corner_bitmap_size = corners_bitmap_size
  };
 
- return try_make_ref_counted<BorderRadiusCornerClipper>(corner_data, corner_bitmap.release_nonnull(), corner_clip);
+ return try_make_ref_counted<BorderRadiusCornerClipper>(corner_data, corner_bitmap.release_nonnull(), corner_clip, border_rect);
 }
 
 void BorderRadiusCornerClipper::sample_under_corners(Gfx::Painter& page_painter)

diff --git a/Userland/Libraries/LibWeb/Painting/BorderRadiusCornerClipper.h b/Userland/Libraries/LibWeb/Painting/BorderRadiusCornerClipper.h
@@ -41,17 +41,21 @@ class BorderRadiusCornerClipper : public RefCounted<BorderRadiusCornerClipper> {
  DevicePixelSize corner_bitmap_size;
  } m_data;
 
- BorderRadiusCornerClipper(CornerData corner_data, NonnullRefPtr<Gfx::Bitmap> corner_bitmap, CornerClip corner_clip)
+ DevicePixelRect border_rect() const { return m_border_rect; }
+
+ BorderRadiusCornerClipper(CornerData corner_data, NonnullRefPtr<Gfx::Bitmap> corner_bitmap, CornerClip corner_clip, DevicePixelRect const& border_rect)
  : m_data(move(corner_data))
  , m_corner_bitmap(corner_bitmap)
  , m_corner_clip(corner_clip)
+ , m_border_rect(border_rect)
  {
  }
 
 private:
  NonnullRefPtr<Gfx::Bitmap> m_corner_bitmap;
  bool m_has_sampled { false };
  CornerClip m_corner_clip { false };
+ DevicePixelRect m_border_rect;
 };
 
 struct ScopedCornerRadiusClip {

diff --git a/Userland/Libraries/LibWeb/Painting/RecordingPainter.cpp b/Userland/Libraries/LibWeb/Painting/RecordingPainter.cpp
@@ -482,13 +482,17 @@ CommandResult DrawTriangleWave::execute(CommandExecutionState& state) const
 
 CommandResult SampleUnderCorners::execute(CommandExecutionState& state) const
 {
+ if (state.would_be_fully_clipped_by_painter(corner_clipper->border_rect().to_type<int>()))
+ return CommandResult::Continue;
  auto& painter = state.painter();
  corner_clipper->sample_under_corners(painter);
  return CommandResult::Continue;
 }
 
 CommandResult BlitCornerClipping::execute(CommandExecutionState& state) const
 {
+ if (state.would_be_fully_clipped_by_painter(corner_clipper->border_rect().to_type<int>()))
+ return CommandResult::Continue;
  auto& painter = state.painter();
  corner_clipper->blit_corner_clipping(painter);
  return CommandResult::Continue;