WebScrollbarThemeClientImpl should not be DisplayItemClient

third_party/WebKit/Source/platform/scroll/ScrollbarTheme.cpp

 /*
  * Copyright (C) 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 16 matching lines @@
 
 #include "platform/PlatformMouseEvent.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/CompositingRecorder.h"
 #include "platform/graphics/paint/CullRect.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 #include "platform/graphics/paint/PaintController.h"
-#include "platform/scroll/ScrollbarThemeClient.h"
+#include "platform/scroll/Scrollbar.h"
 #include "platform/scroll/ScrollbarThemeMock.h"
 #include "platform/scroll/ScrollbarThemeOverlayMock.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebPoint.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebScrollbarBehavior.h"
 #include "wtf/Optional.h"
 
 #if !OS(MACOSX)
 #include "public/platform/WebThemeEngine.h"
 #endif
 
 namespace blink {
 
 bool ScrollbarTheme::gMockScrollbarsEnabled = false;
 
 static inline bool shouldPaintScrollbarPart(const IntRect& partRect, const CullRect& cullRect)
 {
     return (!partRect.isEmpty()) || cullRect.intersectsCullRect(partRect);
 }
 
-bool ScrollbarTheme::paint(const ScrollbarThemeClient& scrollbar, GraphicsContext& graphicsContext, const CullRect& cullRect)
+bool ScrollbarTheme::paint(const Scrollbar& scrollbar, GraphicsContext& graphicsContext, const CullRect& cullRect)
 {
     // Create the ScrollbarControlPartMask based on the cullRect
     ScrollbarControlPartMask scrollMask = NoPart;
 
     IntRect backButtonStartPaintRect;
     IntRect backButtonEndPaintRect;
     IntRect forwardButtonStartPaintRect;
     IntRect forwardButtonEndPaintRect;
     if (hasButtons(scrollbar)) {
         backButtonStartPaintRect = backButtonRect(scrollbar, BackButtonStartPart, true);
@@ skipping 271 matching lines @@
         return DisplayItem::ScrollbarBackTrack;
     case ForwardTrackPart:
         return DisplayItem::ScrollbarForwardTrack;
     default:
         ASSERT_NOT_REACHED();
         return DisplayItem::ScrollbarBackTrack;
     }
 }
 
 } // namespace blink