Merge 92316 - Chromium Mac: Make sure scrollbars flash when web page loads

Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm

 /*
  * Copyright (C) 2010, 2011 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 1269 matching lines @@
     return m_initialScrollbarPaintTimer.isActive();
 }
 
 void ScrollAnimatorChromiumMac::stopScrollbarPaintTimer()
 {
     m_initialScrollbarPaintTimer.stop();
 }
 
 void ScrollAnimatorChromiumMac::initialScrollbarPaintTimerFired(Timer<ScrollAnimatorChromiumMac>*)
 {
-    wkScrollbarPainterForceFlashScrollers(m_scrollbarPainterController.get());
+    if (scrollableArea()->shouldSuspendScrollAnimations())
+        startScrollbarPaintTimer();
+    else
+        wkScrollbarPainterForceFlashScrollers(m_scrollbarPainterController.get());
 }
 #endif
 
 void ScrollAnimatorChromiumMac::setVisibleScrollerThumbRect(const IntRect& scrollerThumb)
 {
     IntRect rectInViewCoordinates = scrollerThumb;
     if (Scrollbar* verticalScrollbar = m_scrollableArea->verticalScrollbar())
         rectInViewCoordinates = verticalScrollbar->convertToContainingView(scrollerThumb);
 
     if (rectInViewCoordinates == m_visibleScrollerThumbRect)
         return;
 
     m_scrollableArea->setVisibleScrollerThumbRect(rectInViewCoordinates);
     m_visibleScrollerThumbRect = rectInViewCoordinates;
 }
 
 } // namespace WebCore