WebScrollbarThemeClientImpl should not be DisplayItemClient

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

 /*
  * Copyright (c) 2008, 2009, Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 #include "platform/scroll/ScrollbarThemeAura.h"
 
 #include "platform/LayoutTestSupport.h"
 #include "platform/PlatformMouseEvent.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 #include "platform/scroll/ScrollableArea.h"
-#include "platform/scroll/ScrollbarThemeClient.h"
+#include "platform/scroll/Scrollbar.h"
 #include "platform/scroll/ScrollbarThemeOverlay.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebThemeEngine.h"
 
 namespace blink {
 
 namespace {
 
 static bool useMockTheme()
@@ skipping 151 matching lines @@
 {
     if (scrollbar.orientation() == VerticalScrollbar) {
         IntSize size = Platform::current()->themeEngine()->getSize(WebThemeEngine::PartScrollbarVerticalThumb);
         return size.height();
     }
 
     IntSize size = Platform::current()->themeEngine()->getSize(WebThemeEngine::PartScrollbarHorizontalThumb);
     return size.width();
 }
 
-void ScrollbarThemeAura::paintTickmarks(GraphicsContext& context, const ScrollbarThemeClient& scrollbar, const IntRect& rect)
+void ScrollbarThemeAura::paintTickmarks(GraphicsContext& context, const Scrollbar& scrollbar, const IntRect& rect)
 {
     if (scrollbar.orientation() != VerticalScrollbar)
         return;
 
     if (rect.height() <= 0 || rect.width() <= 0)
         return;
 
     // Get the tickmarks for the frameview.
     Vector<IntRect> tickmarks;
     scrollbar.getTickmarks(tickmarks);
@@ skipping 15 matching lines @@
         const int yPos = rect.y() + (rect.height() * percent);
 
         FloatRect tickRect(rect.x(), yPos, rect.width(), 3);
         context.fillRect(tickRect, Color(0xCC, 0xAA, 0x00, 0xFF));
 
         FloatRect tickStroke(rect.x(), yPos + 1, rect.width(), 1);
         context.fillRect(tickStroke, Color(0xFF, 0xDD, 0x00, 0xFF));
     }
 }
 
-void ScrollbarThemeAura::paintTrackBackground(GraphicsContext& context, const ScrollbarThemeClient& scrollbar, const IntRect& rect)
+void ScrollbarThemeAura::paintTrackBackground(GraphicsContext& context, const Scrollbar& scrollbar, const IntRect& rect)
 {
     // Just assume a forward track part. We only paint the track as a single piece when there is no thumb.
     if (!hasThumb(scrollbar) && !rect.isEmpty())
         paintTrackPiece(context, scrollbar, rect, ForwardTrackPart);
 }
 
-void ScrollbarThemeAura::paintTrackPiece(GraphicsContext& gc, const ScrollbarThemeClient& scrollbar, const IntRect& rect, ScrollbarPart partType)
+void ScrollbarThemeAura::paintTrackPiece(GraphicsContext& gc, const Scrollbar& scrollbar, const IntRect& rect, ScrollbarPart partType)
 {
     DisplayItem::Type displayItemType = trackPiecePartToDisplayItemType(partType);
     if (DrawingRecorder::useCachedDrawingIfPossible(gc, scrollbar, displayItemType))
         return;
 
     DrawingRecorder recorder(gc, scrollbar, displayItemType, rect);
 
     WebThemeEngine::State state = scrollbar.hoveredPart() == partType ? WebThemeEngine::StateHover : WebThemeEngine::StateNormal;
 
     if (useMockTheme() && !scrollbar.enabled())
         state = WebThemeEngine::StateDisabled;
 
     IntRect alignRect = trackRect(scrollbar, false);
     WebThemeEngine::ExtraParams extraParams;
     extraParams.scrollbarTrack.isBack = (partType == BackTrackPart);
     extraParams.scrollbarTrack.trackX = alignRect.x();
     extraParams.scrollbarTrack.trackY = alignRect.y();
     extraParams.scrollbarTrack.trackWidth = alignRect.width();
     extraParams.scrollbarTrack.trackHeight = alignRect.height();
     Platform::current()->themeEngine()->paint(gc.canvas(), scrollbar.orientation() == HorizontalScrollbar ? WebThemeEngine::PartScrollbarHorizontalTrack : WebThemeEngine::PartScrollbarVerticalTrack, state, WebRect(rect), &extraParams);
 }
 
-void ScrollbarThemeAura::paintButton(GraphicsContext& gc, const ScrollbarThemeClient& scrollbar, const IntRect& rect, ScrollbarPart part)
+void ScrollbarThemeAura::paintButton(GraphicsContext& gc, const Scrollbar& scrollbar, const IntRect& rect, ScrollbarPart part)
 {
     DisplayItem::Type displayItemType = buttonPartToDisplayItemType(part);
     if (DrawingRecorder::useCachedDrawingIfPossible(gc, scrollbar, displayItemType))
         return;
     PartPaintingParams params = buttonPartPaintingParams(scrollbar, scrollbar.currentPos(), part);
     if (!params.shouldPaint)
         return;
     DrawingRecorder recorder(gc, scrollbar, displayItemType, rect);
     Platform::current()->themeEngine()->paint(gc.canvas(), params.part, params.state, WebRect(rect), 0);
 }
 
-void ScrollbarThemeAura::paintThumb(GraphicsContext& gc, const ScrollbarThemeClient& scrollbar, const IntRect& rect)
+void ScrollbarThemeAura::paintThumb(GraphicsContext& gc, const Scrollbar& scrollbar, const IntRect& rect)
 {
     if (DrawingRecorder::useCachedDrawingIfPossible(gc, scrollbar, DisplayItem::ScrollbarThumb))
         return;
 
     DrawingRecorder recorder(gc, scrollbar, DisplayItem::ScrollbarThumb, rect);
 
     WebThemeEngine::State state;
     WebCanvas* canvas = gc.canvas();
     if (scrollbar.pressedPart() == ThumbPart)
         state = WebThemeEngine::StatePressed;
@@ skipping 40 matching lines @@
         int squareSize = scrollbar.width();
         return IntSize(squareSize, scrollbar.height() < 2 * squareSize ? scrollbar.height() / 2 : squareSize);
     }
 
     // HorizontalScrollbar
     int squareSize = scrollbar.height();
     return IntSize(scrollbar.width() < 2 * squareSize ? scrollbar.width() / 2 : squareSize, squareSize);
 }
 
 } // namespace blink