Changeset 98396 in webkit

Timestamp:

Oct 25, 2011, 2:25:34 PM (15 years ago)

Author:

eae@chromium.org

Message:

Fix scrollbars for chromium/linux

Location:

branches/subpixellayout/Source/WebCore/platform

Files:

• ScrollbarThemeComposite.h (modified) (4 diffs)
• chromium/ScrollbarThemeChromium.cpp (modified) (2 diffs)
• chromium/ScrollbarThemeChromium.h (modified) (1 diff)
• chromium/ScrollbarThemeChromiumLinux.cpp (modified) (4 diffs)
• chromium/ScrollbarThemeChromiumLinux.h (modified) (1 diff)

branches/subpixellayout/Source/WebCore/platform/ScrollbarThemeComposite.h

@@ -27 +27 @@
 #define ScrollbarThemeComposite_h
 
-#include "LayoutTypes.h"
+#include "FixedRect.h"
 #include "ScrollbarTheme.h"
 
@@ -34 +34 @@
 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&);
@@ -45 +45 @@
     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:
@@ -52 +52 @@
     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; }
 };
 

branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromium.cpp

@@ -93 +93 @@
 }
 
-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.
@@ -100 +100 @@
 }
 
-void ScrollbarThemeChromium::paintTickmarks(GraphicsContext* context, Scrollbar* scrollbar, const IntRect& rect)
+void ScrollbarThemeChromium::paintTickmarks(GraphicsContext* context, Scrollbar* scrollbar, const FixedRect& rect)
 {
     if (scrollbar->orientation() != VerticalScrollbar)

branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromium.h

@@ -49 +49 @@
         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;

branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp

@@ -51 +51 @@
 }
 
-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;
@@ -64 +64 @@
         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;
@@ -100 +100 @@
             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;
@@ -117 +117 @@
         scrollbar->orientation() == HorizontalScrollbar ? PlatformSupport::PartScrollbarHorizontalThumb : PlatformSupport::PartScrollbarVerticalThumb,
         state,
-        rect,
+        enclosingIntRect(rect),
         0);
 }

branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.h

@@ -42 +42 @@
 
     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*);