Rename enums/functions that collide in chromium style in platform/

third_party/WebKit/Source/platform/scroll/Scrollbar.cpp

 /*
  * Copyright (C) 2004, 2006, 2008 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 91 matching lines @@
 
 void Scrollbar::setFrameRect(const IntRect& frameRect)
 {
     if (frameRect == this->frameRect())
         return;
 
     Widget::setFrameRect(frameRect);
     setNeedsPaintInvalidation(AllParts);
 }
 
-ScrollbarOverlayStyle Scrollbar::scrollbarOverlayStyle() const
+ScrollbarOverlayStyle Scrollbar::getScrollbarOverlayStyle() const
 {
-    return m_scrollableArea ? m_scrollableArea->scrollbarOverlayStyle() : ScrollbarOverlayStyleDefault;
+    return m_scrollableArea ? m_scrollableArea->getScrollbarOverlayStyle() : ScrollbarOverlayStyleDefault;
 }
 
 void Scrollbar::getTickmarks(Vector<IntRect>& tickmarks) const
 {
     if (m_scrollableArea)
         m_scrollableArea->getTickmarks(tickmarks);
 }
 
 bool Scrollbar::isScrollableAreaActive() const
 {
@@ skipping 455 matching lines @@
         invalidParts = AllParts;
     if (invalidParts & ~ThumbPart)
         m_trackNeedsRepaint = true;
     if (invalidParts & ThumbPart)
         m_thumbNeedsRepaint = true;
     if (m_scrollableArea)
         m_scrollableArea->setScrollbarNeedsPaintInvalidation(orientation());
 }
 
 } // namespace blink