Lands the patch for WebKit bug 24171 locally, and rebaselines the necessary l...

third_party/WebKit/WebCore/platform/chromium/ScrollbarThemeChromium.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2008, 2009 Google Inc.
  *
  * 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 78 matching lines @@
     } else {
         x = scrollbar->x();
         y = scrollbar->y() + scrollbar->height() - size.height();
     }
     return IntRect(x, y, size.width(), size.height());
 }
 
 IntRect ScrollbarThemeChromium::trackRect(Scrollbar* scrollbar, bool)
 {
     IntSize bs = buttonSize(scrollbar);
-    int thickness = scrollbarThickness();
+    int thickness = scrollbarThickness(scrollbar->controlSize());
     if (scrollbar->orientation() == HorizontalScrollbar) {
         if (scrollbar->width() < 2 * thickness)
             return IntRect();
         return IntRect(scrollbar->x() + bs.width(), scrollbar->y(), scrollbar->width() - 2 * bs.width(), thickness);
     }
     if (scrollbar->height() < 2 * thickness)
         return IntRect();
     return IntRect(scrollbar->x(), scrollbar->y() + bs.height(), thickness, scrollbar->height() - 2 * bs.height());
 }
 
@@ skipping 56 matching lines @@
 }
 
 IntSize ScrollbarThemeChromium::buttonSize(Scrollbar* scrollbar)
 {
     // Our desired rect is essentially thickness by thickness.
 
     // Our actual rect will shrink to half the available space when we have < 2
     // times thickness pixels left.  This allows the scrollbar to scale down
     // and function even at tiny sizes.
 
-    int thickness = scrollbarThickness();
+    int thickness = scrollbarThickness(scrollbar->controlSize());
 
 #if !defined(__linux__)
     // In layout test mode, we force the button "girth" (i.e., the length of
     // the button along the axis of the scrollbar) to be a fixed size.
     // FIXME: This is retarded!  scrollbarThickness is already fixed in layout
     // test mode so that should be enough to result in repeatable results, but
     // preserving this hack avoids having to rebaseline pixel tests.
     const int kLayoutTestModeGirth = 17;
 
     int girth = ChromiumBridge::layoutTestMode() ? kLayoutTestModeGirth : thickness;
 #else
     int girth = thickness;
 #endif
 
     if (scrollbar->orientation() == HorizontalScrollbar) {
         int width = scrollbar->width() < 2 * girth ? scrollbar->width() / 2 : girth;
         return IntSize(width, thickness);
     }
 
     int height = scrollbar->height() < 2 * girth ? scrollbar->height() / 2 : girth;
     return IntSize(thickness, height);
 }
 
 } // namespace WebCore