WebScrollbarThemeClientImpl should not be DisplayItemClient

third_party/WebKit/Source/platform/scroll/ScrollbarThemeMac.mm

 /*
  * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 119 matching lines @@
     static bool globalSupportsExpandedScrollbars = [NSClassFromString(@"NSScrollerImp") instancesRespondToSelector:@selector(setExpanded:)];
     return globalSupportsExpandedScrollbars;
 }
 
 ScrollbarTheme& ScrollbarTheme::nativeTheme()
 {
     DEFINE_STATIC_LOCAL(ScrollbarThemeMac, overlayTheme, ());
     return overlayTheme;
 }
 
-void ScrollbarThemeMac::paintGivenTickmarks(SkCanvas* canvas, const ScrollbarThemeClient& scrollbar, const IntRect& rect, const Vector<IntRect>& tickmarks)
+void ScrollbarThemeMac::paintGivenTickmarks(SkCanvas* canvas, const Scrollbar& scrollbar, const IntRect& rect, const Vector<IntRect>& tickmarks)
 {
     if (scrollbar.orientation() != VerticalScrollbar)
         return;
 
     if (rect.height() <= 0 || rect.width() <= 0)
         return;  // nothing to draw on.
 
     if (!tickmarks.size())
         return;
 
@@ skipping 18 matching lines @@
         // Calculate how far down (in pixels) the tick-mark should appear.
         const int yPos = rect.y() + (rect.height() * percent);
 
         // Paint.
         FloatRect tickRect(rect.x(), yPos, rect.width(), 2);
         canvas->drawRect(tickRect, fillPaint);
         canvas->drawRect(tickRect, strokePaint);
     }
 }
 
-void ScrollbarThemeMac::paintTickmarks(GraphicsContext& context, const ScrollbarThemeClient& scrollbar, const IntRect& rect)
+void ScrollbarThemeMac::paintTickmarks(GraphicsContext& context, const Scrollbar& scrollbar, const IntRect& rect)
 {
     // Note: This is only used for css-styled scrollbars on mac.
     if (scrollbar.orientation() != VerticalScrollbar)
         return;
 
     if (rect.height() <= 0 || rect.width() <= 0)
         return;
 
     Vector<IntRect> tickmarks;
     scrollbar.getTickmarks(tickmarks);
@@ skipping 96 matching lines @@
     scrollbarPainterMap().set(&scrollbar, observer);
     updateEnabledState(scrollbar);
     updateScrollbarOverlayStyle(scrollbar);
 }
 
 ScrollbarPainter ScrollbarThemeMac::painterForScrollbar(const ScrollbarThemeClient& scrollbar) const
 {
     return [scrollbarPainterMap().get(const_cast<ScrollbarThemeClient*>(&scrollbar)).get() painter];
 }
 
-void ScrollbarThemeMac::paintTrackBackground(GraphicsContext& context, const ScrollbarThemeClient& scrollbar, const IntRect& rect) {
+void ScrollbarThemeMac::paintTrackBackground(GraphicsContext& context, const Scrollbar& scrollbar, const IntRect& rect) {
     if (DrawingRecorder::useCachedDrawingIfPossible(context, scrollbar, DisplayItem::ScrollbarTrackBackground))
         return;
 
     DrawingRecorder recorder(context, scrollbar, DisplayItem::ScrollbarTrackBackground, rect);
 
     GraphicsContextStateSaver stateSaver(context);
     context.translate(rect.x(), rect.y());
     LocalCurrentGraphicsContext localContext(context, IntRect(IntPoint(), rect.size()));
 
     CGRect frameRect = scrollbar.frameRect();
     ScrollbarPainter scrollbarPainter = painterForScrollbar(scrollbar);
     [scrollbarPainter setEnabled:scrollbar.enabled()];
     [scrollbarPainter setBoundsSize: NSSizeFromCGSize(frameRect.size)];
     NSRect trackRect = NSMakeRect(0, 0, frameRect.size.width, frameRect.size.height);
     [scrollbarPainter drawKnobSlotInRect:trackRect highlight:NO];
 }
 
-void ScrollbarThemeMac::paintThumb(GraphicsContext& context, const ScrollbarThemeClient& scrollbar, const IntRect& rect) {
+void ScrollbarThemeMac::paintThumb(GraphicsContext& context, const Scrollbar& scrollbar, const IntRect& rect) {
     if (DrawingRecorder::useCachedDrawingIfPossible(context, scrollbar, DisplayItem::ScrollbarThumb))
         return;
 
     // Expand dirty rect to allow for scroll thumb anti-aliasing in minimum thumb size case.
     IntRect dirtyRect = IntRect(rect);
     dirtyRect.inflate(1);
     DrawingRecorder recorder(context, scrollbar, DisplayItem::ScrollbarThumb, dirtyRect);
 
     GraphicsContextStateSaver stateSaver(context);
     context.translate(rect.x(), rect.y());
@@ skipping 103 matching lines @@
 
 // static
 NSScrollerStyle ScrollbarThemeMac::recommendedScrollerStyle()
 {
     if (RuntimeEnabledFeatures::overlayScrollbarsEnabled())
         return NSScrollerStyleOverlay;
     return gPreferredScrollerStyle;
 }
 
 } // namespace blink