Clear scrollbar damages in time

Source/core/rendering/RenderBox.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 1579 matching lines @@
         || (shouldDoFullPaintInvalidationIfSelfPaintingLayer()
             && hasLayer()
             && layer()->isSelfPaintingLayer())) {
         setShouldDoFullPaintInvalidation(true, MarkOnlyThis);
     }
 
     if (!RenderObject::invalidatePaintIfNeeded(newPaintInvalidationContainer, oldPaintInvalidationRect, oldPositionFromPaintInvalidationContainer, paintInvalidationState))
         invalidatePaintForOverflowIfNeeded();
 
     // Issue paint invalidations for any scrollbars if there is a scrollable area for this renderer.
-    if (enclosingLayer()) {
-        if (RenderLayerScrollableArea* area = enclosingLayer()->scrollableArea()) {
+    if (hasLayer()) {

[Julien - ping for review, 2014/08/01 19:05:02]

Better even:
if (RenderLayer* layer = this->layer()) {
   if (RenderLayerScrollableArea* area = layer->scrollableArea()) {

or even better: let's add a scrollableArea() function to RenderBox to that would
do it for us.

[Xianzhu, 2014/08/01 22:07:23]

Just found we already have RenderLayerModelObject::scrollableArea(). Now using
it.

+        if (RenderLayerScrollableArea* area = layer()->scrollableArea()) {
             if (area->hasVerticalBarDamage())
                 invalidatePaintRectangle(area->verticalBarDamage());
             if (area->hasHorizontalBarDamage())
                 invalidatePaintRectangle(area->horizontalBarDamage());
-            area->resetScrollbarDamage();
         }
     }
 }
 
+void RenderBox::clearPaintInvalidationState()
+{
+    RenderBoxModelObject::clearPaintInvalidationState();
+
+    if (hasLayer()) {

[Julien - ping for review, 2014/08/01 19:05:02]

Ditto.

[Xianzhu, 2014/08/01 22:07:23]

Done.

+        if (RenderLayerScrollableArea* area = layer()->scrollableArea())
+            area->resetScrollbarDamage();
+    }
+}
+
+#if ENABLE(ASSERT)
+bool RenderBox::paintInvalidationStateIsDirty() const
+{
+    if (hasLayer()) {

[Julien - ping for review, 2014/08/01 19:05:02]

Ditto.

[Xianzhu, 2014/08/01 22:07:23]

Done.

+        if (RenderLayerScrollableArea* area = layer()->scrollableArea()) {
+            if (area->hasVerticalBarDamage() || area->hasHorizontalBarDamage())
+                return true;
+        }
+    }
+    return RenderBoxModelObject::paintInvalidationStateIsDirty();
+}
+#endif
+
 bool RenderBox::pushContentsClip(PaintInfo& paintInfo, const LayoutPoint& accumulatedOffset, ContentsClipBehavior contentsClipBehavior)
 {
     if (paintInfo.phase == PaintPhaseBlockBackground || paintInfo.phase == PaintPhaseSelfOutline || paintInfo.phase == PaintPhaseMask)
         return false;
 
     bool isControlClip = hasControlClip();
     bool isOverflowClip = hasOverflowClip() && !layer()->isSelfPaintingLayer();
 
     if (!isControlClip && !isOverflowClip)
         return false;
@@ skipping 3085 matching lines @@
 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
 {
     backgroundColor = style.visitedDependentColor(CSSPropertyBackgroundColor);
     hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
     ASSERT(hasBackground == style.hasBackground());
     hasBorder = style.hasBorder();
     hasAppearance = style.hasAppearance();
 }
 
 } // namespace blink