Merge 92319 - Chromium Mac: Fix position of search tickmarks

Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 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:
  * 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
@@ skipping 473 matching lines @@
         context->translate(scrollbar->frameRect().x(), scrollbar->frameRect().y());
         LocalCurrentGraphicsContext localContext(context);
         WKScrollbarPainterRef scrollbarPainter = scrollbarMap()->get(scrollbar).get();
         wkScrollbarPainterPaintTrack(scrollbarPainter,
                                      scrollbar->enabled(),
                                      value,
                                      (static_cast<CGFloat>(scrollbar->visibleSize()) - overhang) / scrollbar->totalSize(),
                                      scrollbar->frameRect());
 
         IntRect tickmarkTrackRect(IntPoint(), trackRect(scrollbar, false).size());
-        // Inset by 2 on the left and 3 on the right.
-        tickmarkTrackRect.setX(tickmarkTrackRect.x() + 2);
-        tickmarkTrackRect.setWidth(tickmarkTrackRect.width() - 3);
+        if (tickmarkTrackRect.width() <= 10) {
+            // For narrow scrollbars inset by 1 on the left and 3 on the right.
+            tickmarkTrackRect.setX(tickmarkTrackRect.x() + 1);
+            tickmarkTrackRect.setWidth(tickmarkTrackRect.width() - 4);
+        } else {
+            // For wide scrollbars inset by 2 on the left and 3 on the right.
+            tickmarkTrackRect.setX(tickmarkTrackRect.x() + 2);
+            tickmarkTrackRect.setWidth(tickmarkTrackRect.width() - 5);
+        }
         paintTickmarks(context, scrollbar, tickmarkTrackRect);
 
         wkScrollbarPainterPaintKnob(scrollbarPainter);
 
         scrollAnimator->setIsDrawingIntoLayer(false);
         return true;
     }
 
     HIThemeTrackDrawInfo trackInfo;
     trackInfo.version = 0;
@@ skipping 52 matching lines @@
 
     IntRect tickmarkTrackRect = trackRect(scrollbar, false);
     if (!canDrawDirectly) {
         tickmarkTrackRect.setX(0);
         tickmarkTrackRect.setY(0);
     }
     // The ends are rounded and the thumb doesn't go there.
     tickmarkTrackRect.inflateY(-tickmarkTrackRect.width());
     // Inset by 2 on the left and 3 on the right.
     tickmarkTrackRect.setX(tickmarkTrackRect.x() + 2);
-    tickmarkTrackRect.setWidth(tickmarkTrackRect.width() - 3);
+    tickmarkTrackRect.setWidth(tickmarkTrackRect.width() - 5);
     paintTickmarks(drawingContext, scrollbar, tickmarkTrackRect);
 
     if (hasThumb(scrollbar)) {
         PlatformBridge::ThemePaintScrollbarInfo scrollbarInfo;
         scrollbarInfo.orientation = scrollbar->orientation() == HorizontalScrollbar ? PlatformBridge::ScrollbarOrientationHorizontal : PlatformBridge::ScrollbarOrientationVertical;
         scrollbarInfo.parent = scrollbar->parent() && scrollbar->parent()->isFrameView() && static_cast<FrameView*>(scrollbar->parent())->isScrollViewScrollbar(scrollbar) ? PlatformBridge::ScrollbarParentScrollView : PlatformBridge::ScrollbarParentRenderLayer;
         scrollbarInfo.maxValue = scrollbar->maximum();
         scrollbarInfo.currentValue = scrollbar->currentPos();
         scrollbarInfo.visibleSize = scrollbar->visibleSize();
         scrollbarInfo.totalSize = scrollbar->totalSize();
@@ skipping 51 matching lines @@
         // Paint.
         FloatRect tickRect(rect.x(), yPos, rect.width(), 2);
         context->fillRect(tickRect);
         context->strokeRect(tickRect, 1);
     }
 
     context->restore();
 }
 
 }