Revert of Calculate paint invalidation rect for scrollbars

third_party/WebKit/Source/core/layout/LayoutScrollbarPart.cpp

 /*
  * Copyright (C) 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 13 matching lines @@
  */
 
 #include "config.h"
 #include "core/layout/LayoutScrollbarPart.h"
 
 #include "core/frame/FrameView.h"
 #include "core/frame/UseCounter.h"
 #include "core/layout/LayoutScrollbar.h"
 #include "core/layout/LayoutScrollbarTheme.h"
 #include "core/layout/LayoutView.h"
-#include "core/paint/PaintLayerScrollableArea.h"
 #include "platform/LengthFunctions.h"
 
 namespace blink {
 
 LayoutScrollbarPart::LayoutScrollbarPart(LayoutScrollbar* scrollbar, ScrollbarPart part)
     : LayoutBlock(nullptr)
     , m_scrollbar(scrollbar)
     , m_part(part)
 {
 }
@@ skipping 128 matching lines @@
     setInline(false);
 }
 
 void LayoutScrollbarPart::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)
 {
     LayoutBlock::styleDidChange(diff, oldStyle);
     setInline(false);
     clearPositionedState();
     setFloating(false);
     setHasOverflowClip(false);
-    if (oldStyle && (diff.needsPaintInvalidation() || diff.needsLayout()))
-        setNeedsPaintInvalidation();
+    if (oldStyle && m_scrollbar && m_part != NoPart && (diff.needsPaintInvalidation() || diff.needsLayout()))
+        m_scrollbar->theme()->invalidatePart(m_scrollbar, m_part);
 }
 
 void LayoutScrollbarPart::imageChanged(WrappedImagePtr image, const IntRect* rect)
 {
-    setNeedsPaintInvalidation();
-    LayoutBlock::imageChanged(image, rect);
+    if (m_scrollbar && m_part != NoPart) {
+        m_scrollbar->theme()->invalidatePart(m_scrollbar, m_part);
+    } else {
+        if (FrameView* frameView = view()->frameView()) {
+            if (frameView->isFrameViewScrollCorner(this)) {
+                frameView->invalidateScrollCorner(frameView->scrollCornerRect());
+                return;
+            }
+        }
+
+        LayoutBlock::imageChanged(image, rect);
+    }
 }
 
 LayoutObject* LayoutScrollbarPart::layoutObjectOwningScrollbar() const
 {
     return (!m_scrollbar) ? nullptr : m_scrollbar->owningLayoutObject();
 }
 
-void LayoutScrollbarPart::setNeedsPaintInvalidation()
-{
-    if (m_scrollbar) {
-        m_scrollbar->setNeedsPaintInvalidation();
-        return;
-    }
-
-    // This LayoutScrollbarPart is a scroll corner or a resizer.
-    ASSERT(m_part == NoPart);
-    if (FrameView* frameView = view()->frameView()) {
-        if (frameView->isFrameViewScrollCorner(this)) {
-            frameView->setScrollCornerNeedsPaintInvalidation();
-            return;
-        }
-    }
-
-    // This LayoutScrollbarPart belongs to a PaintLayerScrollableArea.
-    toLayoutBox(parent())->scrollableArea()->setScrollCornerNeedsPaintInvalidation();
 }
-
-}