Use display item visual rects for scrollbars

Bug: 1104064
Change-Id: Ieeaa46b1167dd029e07dc003f616fdafebe5b52f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2304951
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Reviewed-by: Philip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789764}

third_party/blink/renderer/core/layout/custom_scrollbar.cc

@@ -417,10 +417,4 @@ void CustomScrollbar::ClearPaintFlags() {
     part.value->ClearPaintFlags();
 }
 
-void CustomScrollbar::SetVisualRect(const IntRect& rect) {
-  Scrollbar::SetVisualRect(rect);
-  for (auto& part : parts_)
-    part.value->GetMutableForPainting().FirstFragment().SetVisualRect(rect);
-}
-
 }  // namespace blink

third_party/blink/renderer/core/layout/custom_scrollbar.h

@@ -73,7 +73,6 @@ class CORE_EXPORT CustomScrollbar final : public Scrollbar {
 
   void InvalidateDisplayItemClientsOfScrollbarParts();
   void ClearPaintFlags();
-  void SetVisualRect(const IntRect&) final;
 
   void Trace(Visitor*) const override;
 

third_party/blink/renderer/core/paint/compositing/composited_layer_mapping_test.cc

@@ -1794,7 +1794,7 @@ TEST_F(CompositedLayerMappingTest,
   ASSERT_TRUE(scrollable_area->VerticalScrollbar()->IsOverlayScrollbar());
 
   ASSERT_FALSE(scrollable_area->NeedsCompositedScrolling());
-  EXPECT_FALSE(scrollable_area->VerticalScrollbar()->VisualRect().IsEmpty());
+  EXPECT_FALSE(scrollable_area->VerticalScrollbar()->FrameRect().IsEmpty());
 
   GraphicsLayer* vertical_scrollbar_layer =
       scrollable_area->GraphicsLayerForVerticalScrollbar();

third_party/blink/renderer/core/paint/custom_scrollbar_theme.cc

@@ -141,7 +141,7 @@ void CustomScrollbarTheme::PaintScrollCorner(
     return;
 
   DrawingRecorder recorder(context, display_item_client,
-                           DisplayItem::kScrollCorner);
+                           DisplayItem::kScrollCorner, corner_rect);
   // FIXME: Implement.
   context.FillRect(corner_rect, Color::kWhite);
 }

third_party/blink/renderer/core/paint/paint_layer_scrollable_area.cc

@@ -3028,29 +3028,31 @@ void PaintLayerScrollableArea::InvalidatePaintOfScrollControlsIfNeeded(
     const PaintInvalidatorContext& context) {
   LayoutBox& box = *GetLayoutBox();
   bool box_geometry_has_been_invalidated = false;
-  SetHorizontalScrollbarVisualRect(InvalidatePaintOfScrollbarIfNeeded(
+  horizontal_scrollbar_visual_rect_ = InvalidatePaintOfScrollbarIfNeeded(
       HorizontalScrollbar(), GraphicsLayerForHorizontalScrollbar(),
       horizontal_scrollbar_previously_was_overlay_,
       horizontal_scrollbar_visual_rect_,
       HorizontalScrollbarNeedsPaintInvalidation(), box,
-      box_geometry_has_been_invalidated, context));
-  SetVerticalScrollbarVisualRect(InvalidatePaintOfScrollbarIfNeeded(
+      box_geometry_has_been_invalidated, context);
+  vertical_scrollbar_visual_rect_ = InvalidatePaintOfScrollbarIfNeeded(
       VerticalScrollbar(), GraphicsLayerForVerticalScrollbar(),
       vertical_scrollbar_previously_was_overlay_,
       vertical_scrollbar_visual_rect_,
       VerticalScrollbarNeedsPaintInvalidation(), box,
-      box_geometry_has_been_invalidated, context));
+      box_geometry_has_been_invalidated, context);
 
-  IntRect scroll_corner_and_resizer_visual_rect = ScrollCornerAndResizerRect();
+  IntRect new_scroll_corner_and_resizer_visual_rect =
+      ScrollCornerAndResizerRect();
   // TODO(crbug.com/1020913): We should not round paint_offset but should
   // consider subpixel accumulation when painting scrollbars.
-  scroll_corner_and_resizer_visual_rect.MoveBy(
+  new_scroll_corner_and_resizer_visual_rect.MoveBy(
       RoundedIntPoint(context.fragment_data->PaintOffset()));
   if (ScrollControlNeedsPaintInvalidation(
-          scroll_corner_and_resizer_visual_rect,
+          new_scroll_corner_and_resizer_visual_rect,
           scroll_corner_and_resizer_visual_rect_,
           ScrollCornerNeedsPaintInvalidation())) {
-    SetScrollCornerAndResizerVisualRect(scroll_corner_and_resizer_visual_rect);
+    scroll_corner_and_resizer_visual_rect_ =
+        new_scroll_corner_and_resizer_visual_rect;
     if (LayoutCustomScrollbarPart* scroll_corner = ScrollCorner()) {
       ObjectPaintInvalidator(*scroll_corner)
           .SlowSetPaintingLayerNeedsRepaintAndInvalidateDisplayItemClient(
@@ -3072,29 +3074,6 @@ void PaintLayerScrollableArea::InvalidatePaintOfScrollControlsIfNeeded(
   ClearNeedsPaintInvalidationForScrollControls();
 }
 
-void PaintLayerScrollableArea::SetHorizontalScrollbarVisualRect(
-    const IntRect& rect) {
-  horizontal_scrollbar_visual_rect_ = rect;
-  if (Scrollbar* scrollbar = HorizontalScrollbar())
-    scrollbar->SetVisualRect(rect);
-}
-
-void PaintLayerScrollableArea::SetVerticalScrollbarVisualRect(
-    const IntRect& rect) {
-  vertical_scrollbar_visual_rect_ = rect;
-  if (Scrollbar* scrollbar = VerticalScrollbar())
-    scrollbar->SetVisualRect(rect);
-}
-
-void PaintLayerScrollableArea::SetScrollCornerAndResizerVisualRect(
-    const IntRect& rect) {
-  scroll_corner_and_resizer_visual_rect_ = rect;
-  if (LayoutCustomScrollbarPart* scroll_corner = ScrollCorner())
-    scroll_corner->GetMutableForPainting().FirstFragment().SetVisualRect(rect);
-  if (LayoutCustomScrollbarPart* resizer = Resizer())
-    resizer->GetMutableForPainting().FirstFragment().SetVisualRect(rect);
-}
-
 void PaintLayerScrollableArea::ScrollControlWasSetNeedsPaintInvalidation() {
   GetLayoutBox()->SetShouldCheckForPaintInvalidation();
 }
@@ -3228,11 +3207,6 @@ PaintLayerScrollableArea::ScrollingBackgroundDisplayItemClient::OwnerNodeId()
       ->OwnerNodeId();
 }
 
-IntRect PaintLayerScrollableArea::ScrollCornerDisplayItemClient::VisualRect()
-    const {
-  return scrollable_area_->scroll_corner_and_resizer_visual_rect_;
-}
-
 String PaintLayerScrollableArea::ScrollCornerDisplayItemClient::DebugName()
     const {
   return "Scroll corner of " + scrollable_area_->GetLayoutBox()->DebugName();

third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h

@@ -675,10 +675,6 @@ class CORE_EXPORT PaintLayerScrollableArea final
 
   void ScrollControlWasSetNeedsPaintInvalidation() override;
 
-  void SetHorizontalScrollbarVisualRect(const IntRect&);
-  void SetVerticalScrollbarVisualRect(const IntRect&);
-  void SetScrollCornerAndResizerVisualRect(const IntRect&);
-
   bool HasNonCompositedStickyDescendants() const;
 
   IntSize PixelSnappedBorderBoxSize() const;
@@ -799,7 +795,6 @@ class CORE_EXPORT PaintLayerScrollableArea final
     void Trace(Visitor* visitor) const { visitor->Trace(scrollable_area_); }
 
    private:
-    IntRect VisualRect() const final;
     String DebugName() const final;
     DOMNodeId OwnerNodeId() const final;
 

third_party/blink/renderer/core/paint/scrollable_area_painter.cc

@@ -29,17 +29,18 @@ void ScrollableAreaPainter::PaintResizer(GraphicsContext& context,
   if (!GetScrollableArea().GetLayoutBox()->StyleRef().HasResize())
     return;
 
-  IntRect abs_rect = GetScrollableArea().ResizerCornerRect(kResizerForPointer);
-  if (abs_rect.IsEmpty())
+  IntRect visual_rect =
+      GetScrollableArea().ResizerCornerRect(kResizerForPointer);
+  if (visual_rect.IsEmpty())
     return;
-  abs_rect.MoveBy(paint_offset);
+  visual_rect.MoveBy(paint_offset);
 
   const auto& client = DisplayItemClientForCorner();
   if (const auto* resizer = GetScrollableArea().Resizer()) {
-    if (!cull_rect.Intersects(abs_rect))
+    if (!cull_rect.Intersects(visual_rect))
       return;
     CustomScrollbarTheme::PaintIntoRect(*resizer, context,
-                                        PhysicalRect(abs_rect));
+                                        PhysicalRect(visual_rect));
     return;
   }
 
@@ -47,16 +48,16 @@ void ScrollableAreaPainter::PaintResizer(GraphicsContext& context,
                                                   DisplayItem::kResizer))
     return;
 
-  DrawingRecorder recorder(context, client, DisplayItem::kResizer);
+  DrawingRecorder recorder(context, client, DisplayItem::kResizer, visual_rect);
 
-  DrawPlatformResizerImage(context, abs_rect);
+  DrawPlatformResizerImage(context, visual_rect);
 
   // Draw a frame around the resizer (1px grey line) if there are any scrollbars
   // present.  Clipping will exclude the right and bottom edges of this frame.
   if (GetScrollableArea().HasNonOverlayOverflowControls()) {
     GraphicsContextStateSaver state_saver(context);
-    context.Clip(abs_rect);
-    IntRect larger_corner = abs_rect;
+    context.Clip(visual_rect);
+    IntRect larger_corner = visual_rect;
     larger_corner.SetSize(
         IntSize(larger_corner.Width() + 1, larger_corner.Height() + 1));
     context.SetStrokeColor(Color(217, 217, 217));
@@ -195,9 +196,9 @@ void ScrollableAreaPainter::PaintScrollbar(GraphicsContext& context,
                                            const CullRect& cull_rect) {
   // TODO(crbug.com/1020913): We should not round paint_offset but should
   // consider subpixel accumulation when painting scrollbars.
-  IntRect rect = scrollbar.FrameRect();
-  rect.MoveBy(paint_offset);
-  if (!cull_rect.Intersects(rect))
+  IntRect visual_rect = scrollbar.FrameRect();
+  visual_rect.MoveBy(paint_offset);
+  if (!cull_rect.Intersects(visual_rect))
     return;
 
   if (scrollbar.IsCustomScrollbar()) {
@@ -206,7 +207,7 @@ void ScrollableAreaPainter::PaintScrollbar(GraphicsContext& context,
     // Prevent composited scroll hit test on the custom scrollbar which always
     // need main thread scrolling.
     context.GetPaintController().RecordScrollHitTestData(
-        scrollbar, DisplayItem::kCustomScrollbarHitTest, nullptr, rect);
+        scrollbar, DisplayItem::kCustomScrollbarHitTest, nullptr, visual_rect);
     return;
   }
 
@@ -232,23 +233,23 @@ void ScrollableAreaPainter::PaintScrollbar(GraphicsContext& context,
   }
   auto delegate = base::MakeRefCounted<ScrollbarLayerDelegate>(
       scrollbar, context.DeviceScaleFactor());
-  ScrollbarDisplayItem::Record(context, scrollbar, type, delegate, rect,
+  ScrollbarDisplayItem::Record(context, scrollbar, type, delegate, visual_rect,
                                scroll_translation, scrollbar.GetElementId());
 }
 
 void ScrollableAreaPainter::PaintScrollCorner(GraphicsContext& context,
                                               const IntPoint& paint_offset,
                                               const CullRect& cull_rect) {
-  IntRect abs_rect = GetScrollableArea().ScrollCornerRect();
-  if (abs_rect.IsEmpty())
+  IntRect visual_rect = GetScrollableArea().ScrollCornerRect();
+  if (visual_rect.IsEmpty())
     return;
-  abs_rect.MoveBy(paint_offset);
+  visual_rect.MoveBy(paint_offset);
 
   if (const auto* scroll_corner = GetScrollableArea().ScrollCorner()) {
-    if (!cull_rect.Intersects(abs_rect))
+    if (!cull_rect.Intersects(visual_rect))
       return;
     CustomScrollbarTheme::PaintIntoRect(*scroll_corner, context,
-                                        PhysicalRect(abs_rect));
+                                        PhysicalRect(visual_rect));
     return;
   }
 
@@ -269,7 +270,7 @@ void ScrollableAreaPainter::PaintScrollCorner(GraphicsContext& context,
 
   const auto& client = DisplayItemClientForCorner();
   theme->PaintScrollCorner(context, GetScrollableArea().VerticalScrollbar(),
-                           client, abs_rect,
+                           client, visual_rect,
                            GetScrollableArea().UsedColorScheme());
 }
 

third_party/blink/renderer/core/scroll/scrollbar.h

@@ -170,14 +170,11 @@ class CORE_EXPORT Scrollbar : public GarbageCollected<Scrollbar>,
   bool ThumbNeedsRepaint() const { return thumb_needs_repaint_; }
   void ClearThumbNeedsRepaint() { thumb_needs_repaint_ = false; }
 
-  // DisplayItemClient methods.
+  // DisplayItemClient.
   String DebugName() const final {
     return orientation_ == kHorizontalScrollbar ? "HorizontalScrollbar"
                                                 : "VerticalScrollbar";
   }
-  IntRect VisualRect() const final { return visual_rect_; }
-
-  virtual void SetVisualRect(const IntRect& r) { visual_rect_ = r; }
 
   // Marks the scrollbar as needing to be redrawn.
   //
@@ -263,7 +260,6 @@ class CORE_EXPORT Scrollbar : public GarbageCollected<Scrollbar>,
   // additional state is necessary.
   bool scrollbar_manipulation_in_progress_on_cc_thread_;
 
-  IntRect visual_rect_;
   IntRect frame_rect_;
   Member<Element> style_source_;
 };

third_party/blink/renderer/core/scroll/scrollbar_theme.cc

@@ -118,7 +118,7 @@ void ScrollbarTheme::PaintScrollCorner(
     return;
 
   DrawingRecorder recorder(context, display_item_client,
-                           DisplayItem::kScrollCorner);
+                           DisplayItem::kScrollCorner, corner_rect);
 #if defined(OS_MACOSX)
   context.FillRect(corner_rect, Color::kWhite);
 #else
@@ -148,8 +148,8 @@ void ScrollbarTheme::PaintTickmarks(GraphicsContext& context,
           context, scrollbar, DisplayItem::kScrollbarTickmarks))
     return;
 
-  DrawingRecorder recorder(context, scrollbar,
-                           DisplayItem::kScrollbarTickmarks);
+  DrawingRecorder recorder(context, scrollbar, DisplayItem::kScrollbarTickmarks,
+                           rect);
   GraphicsContextStateSaver state_saver(context);
   context.SetShouldAntialias(false);
 
@@ -308,8 +308,10 @@ void ScrollbarTheme::PaintTrackAndButtons(GraphicsContext& context,
   if (DrawingRecorder::UseCachedDrawingIfPossible(
           context, scrollbar, DisplayItem::kScrollbarTrackAndButtons))
     return;
+  IntRect visual_rect = scrollbar.FrameRect();
+  visual_rect.MoveBy(offset);
   DrawingRecorder recorder(context, scrollbar,
-                           DisplayItem::kScrollbarTrackAndButtons);
+                           DisplayItem::kScrollbarTrackAndButtons, visual_rect);
 
   if (HasButtons(scrollbar)) {
     IntRect back_button_rect = BackButtonRect(scrollbar);

third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc

@@ -260,7 +260,7 @@ void ScrollbarThemeAura::PaintThumb(GraphicsContext& gc,
                                                   DisplayItem::kScrollbarThumb))
     return;
 
-  DrawingRecorder recorder(gc, scrollbar, DisplayItem::kScrollbarThumb);
+  DrawingRecorder recorder(gc, scrollbar, DisplayItem::kScrollbarThumb, rect);
 
   WebThemeEngine::State state;
   cc::PaintCanvas* canvas = gc.Canvas();

third_party/blink/renderer/core/scroll/scrollbar_theme_mac.mm

@@ -311,7 +311,7 @@ void ScrollbarThemeMac::PaintScrollCorner(GraphicsContext& context,
                                                   DisplayItem::kScrollCorner)) {
     return;
   }
-  DrawingRecorder recorder(context, item, DisplayItem::kScrollCorner);
+  DrawingRecorder recorder(context, item, DisplayItem::kScrollCorner, rect);
 
   GraphicsContextStateSaver state_saver(context);
   context.Translate(rect.X(), rect.Y());
@@ -332,7 +332,8 @@ void ScrollbarThemeMac::PaintThumbInternal(GraphicsContext& context,
           context, scrollbar, DisplayItem::kScrollbarThumb)) {
     return;
   }
-  DrawingRecorder recorder(context, scrollbar, DisplayItem::kScrollbarThumb);
+  DrawingRecorder recorder(context, scrollbar, DisplayItem::kScrollbarThumb,
+                           rect);
 
   GraphicsContextStateSaver state_saver(context);
   context.Translate(rect.X(), rect.Y());

third_party/blink/renderer/core/scroll/scrollbar_theme_overlay.cc

@@ -149,7 +149,8 @@ void ScrollbarThemeOverlay::PaintThumb(GraphicsContext& context,
                                                   DisplayItem::kScrollbarThumb))
     return;
 
-  DrawingRecorder recorder(context, scrollbar, DisplayItem::kScrollbarThumb);
+  DrawingRecorder recorder(context, scrollbar, DisplayItem::kScrollbarThumb,
+                           rect);
 
   WebThemeEngine::State state = WebThemeEngine::kStateNormal;
 

third_party/blink/renderer/core/scroll/scrollbar_theme_overlay_mobile.cc

@@ -58,7 +58,8 @@ void ScrollbarThemeOverlayMobile::PaintThumb(GraphicsContext& context,
                                                   DisplayItem::kScrollbarThumb))
     return;
 
-  DrawingRecorder recorder(context, scrollbar, DisplayItem::kScrollbarThumb);
+  DrawingRecorder recorder(context, scrollbar, DisplayItem::kScrollbarThumb,
+                           rect);
   context.FillRect(rect, color_);
 }
 

third_party/blink/web_tests/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt

@@ -6,7 +6,7 @@
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [193, 100, 7, 200]
+        [193, 104, 3, 96]
       ]
     }
   ]

third_party/blink/web_tests/platform/mac-mac10.13/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt

@@ -6,7 +6,7 @@
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [193, 100, 7, 200]
+        [193, 104, 3, 96]
       ]
     }
   ]