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

third_party/WebKit/WebCore/rendering/RenderTheme.h

 /*
  * This file is part of the theme implementation for form controls in WebCore.
  *
  * Copyright (C) 2005, 2006, 2007, 2008 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 11 matching lines @@
 
 #ifndef RenderTheme_h
 #define RenderTheme_h
 
 #include "RenderObject.h"
 #if USE(NEW_THEME)
 #include "Theme.h"
 #else
 #include "ThemeTypes.h"
 #endif
+#include "ScrollTypes.h"
 
 namespace WebCore {
 
 class Element;
 class PopupMenu;
 class RenderMenuList;
 class CSSStyleSheet;
 
 class RenderTheme {
 public:
@@ skipping 87 matching lines @@
     virtual int minimumMenuListSize(RenderStyle*) const { return 0; }
 
     virtual void adjustButtonInnerStyle(RenderStyle*) const;
     virtual void adjustSliderThumbSize(RenderObject*) const;
 
     virtual int popupInternalPaddingLeft(RenderStyle*) const { return 0; }
     virtual int popupInternalPaddingRight(RenderStyle*) const { return 0; }
     virtual int popupInternalPaddingTop(RenderStyle*) const { return 0; }
     virtual int popupInternalPaddingBottom(RenderStyle*) const { return 0; }
     
+    virtual ScrollbarControlSize scrollbarControlSizeForPart(ControlPart) { return RegularScrollbar; }
+
     // Method for painting the caps lock indicator
     virtual bool paintCapsLockIndicator(RenderObject*, const RenderObject::PaintInfo&, const IntRect&) { return 0; };
 
 #if ENABLE(VIDEO)
     // Media controls
     virtual bool hitTestMediaControlPart(RenderObject*, const IntPoint& absPoint);
 #endif
 
 protected:
     // The platform selection color.
@@ skipping 98 matching lines @@
 #endif
 };
 
 // Function to obtain the theme.  This is implemented in your platform-specific theme implementation to hand
 // back the appropriate platform theme.
 RenderTheme* theme();
 
 } // namespace WebCore
 
 #endif // RenderTheme_h