[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 186a54f28de6111503b5819f7a6c97d3bc0dd183
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 9 19:52:28 2009 +0000

    2009-12-09  Avi Drissman  <avi at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Chromium tickmarks in scrollbar now UX approved.
            https://bugs.webkit.org/show_bug.cgi?id=32069
    
            * platform/chromium/ScrollbarThemeChromiumMac.mm:
            (WebCore::ScrollbarThemeChromiumMac::paint):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51909 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1e2d3c0..925887a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-09  Avi Drissman  <avi at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Chromium tickmarks in scrollbar now UX approved.
+        https://bugs.webkit.org/show_bug.cgi?id=32069
+
+        * platform/chromium/ScrollbarThemeChromiumMac.mm:
+        (WebCore::ScrollbarThemeChromiumMac::paint):
+
 2009-12-09  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm b/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
index 525de21..b4ebaf6 100644
--- a/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
+++ b/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
@@ -415,12 +415,10 @@ bool ScrollbarThemeChromiumMac::paint(Scrollbar* scrollbar, GraphicsContext* con
     Vector<IntRect> tickmarks;
     scrollbar->client()->getTickmarks(tickmarks);
     if (scrollbar->orientation() == VerticalScrollbar && tickmarks.size()) {
-        static RefPtr<Image> dash = Image::loadPlatformResource("tickmarkDash");
-        if (dash->isNull()) {
-            ASSERT_NOT_REACHED();
-        }
-
         drawingContext->save();
+        drawingContext->setShouldAntialias(false);
+        drawingContext->setStrokeColor(Color(0xCC, 0xAA, 0x00, 0xFF), DeviceColorSpace);
+        drawingContext->setFillColor(Color(0xFF, 0xDD, 0x00, 0xFF), DeviceColorSpace);
 
         IntRect thumbArea = trackRect(scrollbar, false);
         if (!canDrawDirectly) {
@@ -428,17 +426,22 @@ bool ScrollbarThemeChromiumMac::paint(Scrollbar* scrollbar, GraphicsContext* con
             thumbArea.setY(0);
         }
         // The ends are rounded and the thumb doesn't go there.
-        thumbArea.inflateY(-thumbArea.width() * 2 / 3);
+        thumbArea.inflateY(-thumbArea.width());
 
         for (Vector<IntRect>::const_iterator i = tickmarks.begin(); i != tickmarks.end(); ++i) {
             // Calculate how far down (in %) the tick-mark should appear.
             const float percent = static_cast<float>(i->y()) / scrollbar->totalSize();
+            if (percent < 0.0 || percent > 1.0)
+              continue;
 
             // Calculate how far down (in pixels) the tick-mark should appear.
-            const int yPos = thumbArea.topLeft().y() + (thumbArea.height() * percent);
+            const int yPos = static_cast<int>((thumbArea.topLeft().y() + (thumbArea.height() * percent))) & ~1;
 
-            IntPoint tick(thumbArea.topLeft().x(), yPos);
-            drawingContext->drawImage(dash.get(), DeviceColorSpace, tick);
+            // Paint.
+            const int indent = 2;
+            FloatRect tickRect(thumbArea.topLeft().x() + indent, yPos, thumbArea.width() - 2 * indent - 1, 2);
+            drawingContext->fillRect(tickRect);
+            drawingContext->strokeRect(tickRect, 1);
         }
 
         drawingContext->restore();

-- 
WebKit Debian packaging