Diff
Modified: branches/subpixellayout/Source/WebCore/platform/ScrollbarThemeComposite.h (98395 => 98396)
--- branches/subpixellayout/Source/WebCore/platform/ScrollbarThemeComposite.h 2011-10-25 21:16:39 UTC (rev 98395)
+++ branches/subpixellayout/Source/WebCore/platform/ScrollbarThemeComposite.h 2011-10-25 21:25:34 UTC (rev 98396)
@@ -26,14 +26,14 @@
#ifndef ScrollbarThemeComposite_h
#define ScrollbarThemeComposite_h
-#include "LayoutTypes.h"
+#include "FixedRect.h"
#include "ScrollbarTheme.h"
namespace WebCore {
class ScrollbarThemeComposite : public ScrollbarTheme {
public:
- virtual bool paint(Scrollbar*, GraphicsContext* context, const LayoutRect& damageRect);
+ virtual bool paint(Scrollbar*, GraphicsContext* context, const FixedRect& damageRect);
virtual ScrollbarPart hitTest(Scrollbar*, const PlatformMouseEvent&);
@@ -44,29 +44,29 @@
virtual int trackPosition(Scrollbar*);
virtual int trackLength(Scrollbar*);
- virtual void paintScrollCorner(ScrollView*, GraphicsContext*, const LayoutRect& cornerRect);
- virtual void paintOverhangAreas(ScrollView*, GraphicsContext*, const LayoutRect& horizontalOverhangArea, const LayoutRect& verticalOverhangArea, const LayoutRect& dirtyRect);
+ virtual void paintScrollCorner(ScrollView*, GraphicsContext*, const FixedRect& cornerRect);
+ virtual void paintOverhangAreas(ScrollView*, GraphicsContext*, const FixedRect& horizontalOverhangArea, const FixedRect& verticalOverhangArea, const FixedRect& dirtyRect);
protected:
virtual bool hasButtons(Scrollbar*) = 0;
virtual bool hasThumb(Scrollbar*) = 0;
- virtual LayoutRect backButtonRect(Scrollbar*, ScrollbarPart, bool painting = false) = 0;
- virtual LayoutRect forwardButtonRect(Scrollbar*, ScrollbarPart, bool painting = false) = 0;
- virtual LayoutRect trackRect(Scrollbar*, bool painting = false) = 0;
+ virtual FixedRect backButtonRect(Scrollbar*, ScrollbarPart, bool painting = false) = 0;
+ virtual FixedRect forwardButtonRect(Scrollbar*, ScrollbarPart, bool painting = false) = 0;
+ virtual FixedRect trackRect(Scrollbar*, bool painting = false) = 0;
- virtual void splitTrack(Scrollbar*, const LayoutRect& track, LayoutRect& startTrack, LayoutRect& thumb, LayoutRect& endTrack);
+ virtual void splitTrack(Scrollbar*, const FixedRect& track, FixedRect& startTrack, FixedRect& thumb, FixedRect& endTrack);
virtual LayoutUnit minimumThumbLength(Scrollbar*);
virtual void paintScrollbarBackground(GraphicsContext*, Scrollbar*) {}
- virtual void paintTrackBackground(GraphicsContext*, Scrollbar*, const LayoutRect&) {}
- virtual void paintTrackPiece(GraphicsContext*, Scrollbar*, const LayoutRect&, ScrollbarPart) {}
- virtual void paintButton(GraphicsContext*, Scrollbar*, const LayoutRect&, ScrollbarPart) {}
- virtual void paintThumb(GraphicsContext*, Scrollbar*, const LayoutRect&) {}
- virtual void paintTickmarks(GraphicsContext*, Scrollbar*, const LayoutRect&) {}
+ virtual void paintTrackBackground(GraphicsContext*, Scrollbar*, const FixedRect&) {}
+ virtual void paintTrackPiece(GraphicsContext*, Scrollbar*, const FixedRect&, ScrollbarPart) {}
+ virtual void paintButton(GraphicsContext*, Scrollbar*, const FixedRect&, ScrollbarPart) {}
+ virtual void paintThumb(GraphicsContext*, Scrollbar*, const FixedRect&) {}
+ virtual void paintTickmarks(GraphicsContext*, Scrollbar*, const FixedRect&) {}
- virtual LayoutRect constrainTrackRectToTrackPieces(Scrollbar*, const LayoutRect& rect) { return rect; }
+ virtual FixedRect constrainTrackRectToTrackPieces(Scrollbar*, const FixedRect& rect) { return rect; }
};
}
Modified: branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromium.cpp (98395 => 98396)
--- branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromium.cpp 2011-10-25 21:16:39 UTC (rev 98395)
+++ branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromium.cpp 2011-10-25 21:25:34 UTC (rev 98396)
@@ -92,14 +92,14 @@
return FixedRect(scrollbar->x(), scrollbar->y() + bs.height(), thickness, scrollbar->height() - 2 * bs.height());
}
-void ScrollbarThemeChromium::paintTrackBackground(GraphicsContext* context, Scrollbar* scrollbar, const IntRect& rect)
+void ScrollbarThemeChromium::paintTrackBackground(GraphicsContext* context, Scrollbar* scrollbar, const FixedRect& rect)
{
// Just assume a forward track part. We only paint the track as a single piece when there is no thumb.
if (!hasThumb(scrollbar))
paintTrackPiece(context, scrollbar, rect, ForwardTrackPart);
}
-void ScrollbarThemeChromium::paintTickmarks(GraphicsContext* context, Scrollbar* scrollbar, const IntRect& rect)
+void ScrollbarThemeChromium::paintTickmarks(GraphicsContext* context, Scrollbar* scrollbar, const FixedRect& rect)
{
if (scrollbar->orientation() != VerticalScrollbar)
return;
Modified: branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromium.h (98395 => 98396)
--- branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromium.h 2011-10-25 21:16:39 UTC (rev 98395)
+++ branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromium.h 2011-10-25 21:25:34 UTC (rev 98396)
@@ -48,8 +48,8 @@
virtual LayoutRect forwardButtonRect(Scrollbar*, ScrollbarPart, bool painting = false);
virtual LayoutRect trackRect(Scrollbar*, bool painting = false);
- virtual void paintTrackBackground(GraphicsContext*, Scrollbar*, const IntRect&);
- virtual void paintTickmarks(GraphicsContext*, Scrollbar*, const IntRect&);
+ virtual void paintTrackBackground(GraphicsContext*, Scrollbar*, const FixedRect&);
+ virtual void paintTickmarks(GraphicsContext*, Scrollbar*, const FixedRect&);
virtual FixedSize buttonSize(Scrollbar*) = 0;
};
Modified: branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp (98395 => 98396)
--- branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp 2011-10-25 21:16:39 UTC (rev 98395)
+++ branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp 2011-10-25 21:25:34 UTC (rev 98396)
@@ -50,7 +50,7 @@
return scrollbarSize.width();
}
-void ScrollbarThemeChromiumLinux::paintTrackPiece(GraphicsContext* gc, Scrollbar* scrollbar, const IntRect& rect, ScrollbarPart partType)
+void ScrollbarThemeChromiumLinux::paintTrackPiece(GraphicsContext* gc, Scrollbar* scrollbar, const FixedRect& rect, ScrollbarPart partType)
{
PlatformSupport::ThemePaintState state = scrollbar->hoveredPart() == partType ? PlatformSupport::StateHover : PlatformSupport::StateNormal;
FixedRect alignRect = trackRect(scrollbar, false);
@@ -63,11 +63,11 @@
gc,
scrollbar->orientation() == HorizontalScrollbar ? PlatformSupport::PartScrollbarHorizontalTrack : PlatformSupport::PartScrollbarVerticalTrack,
state,
- rect,
+ enclosingIntRect(rect),
&extraParams);
}
-void ScrollbarThemeChromiumLinux::paintButton(GraphicsContext* gc, Scrollbar* scrollbar, const IntRect& rect, ScrollbarPart part)
+void ScrollbarThemeChromiumLinux::paintButton(GraphicsContext* gc, Scrollbar* scrollbar, const FixedRect& rect, ScrollbarPart part)
{
PlatformSupport::ThemePart paintPart;
PlatformSupport::ThemePaintState state = PlatformSupport::StateNormal;
@@ -99,10 +99,10 @@
else if (part == scrollbar->hoveredPart())
state = PlatformSupport::StateHover;
}
- PlatformSupport::paintThemePart(gc, paintPart, state, rect, 0);
+ PlatformSupport::paintThemePart(gc, paintPart, state, enclosingIntRect(rect), 0);
}
-void ScrollbarThemeChromiumLinux::paintThumb(GraphicsContext* gc, Scrollbar* scrollbar, const IntRect& rect)
+void ScrollbarThemeChromiumLinux::paintThumb(GraphicsContext* gc, Scrollbar* scrollbar, const FixedRect& rect)
{
PlatformSupport::ThemePaintState state;
@@ -116,7 +116,7 @@
gc,
scrollbar->orientation() == HorizontalScrollbar ? PlatformSupport::PartScrollbarHorizontalThumb : PlatformSupport::PartScrollbarVerticalThumb,
state,
- rect,
+ enclosingIntRect(rect),
0);
}
Modified: branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.h (98395 => 98396)
--- branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.h 2011-10-25 21:16:39 UTC (rev 98395)
+++ branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.h 2011-10-25 21:25:34 UTC (rev 98396)
@@ -41,9 +41,9 @@
virtual int scrollbarThickness(ScrollbarControlSize);
protected:
- virtual void paintTrackPiece(GraphicsContext*, Scrollbar*, const IntRect&, ScrollbarPart);
- virtual void paintButton(GraphicsContext*, Scrollbar*, const IntRect&, ScrollbarPart);
- virtual void paintThumb(GraphicsContext*, Scrollbar*, const IntRect&);
+ virtual void paintTrackPiece(GraphicsContext*, Scrollbar*, const FixedRect&, ScrollbarPart);
+ virtual void paintButton(GraphicsContext*, Scrollbar*, const FixedRect&, ScrollbarPart);
+ virtual void paintThumb(GraphicsContext*, Scrollbar*, const FixedRect&);
virtual bool shouldCenterOnThumb(Scrollbar*, const PlatformMouseEvent&);
virtual FixedSize buttonSize(Scrollbar*);
virtual AppUnit minimumThumbLength(Scrollbar*);
