Revert of Fix overflow:overlay scrollbar width for paint.

third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp

Index: third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
index aa63b15fee9840d7b799655f02dc440f1be828e7..9fc2b4dc3a4755b3684f3eca47c19bb7872e786d 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
@@ -450,23 +450,23 @@
       paintLayerForFragments->appendSingleFragmentIgnoringPagination(
           layerFragments, localPaintingInfo.rootLayer,
           localPaintingInfo.paintDirtyRect, cacheSlot, geometryMapperOption,
-          IgnorePlatformOverlayScrollbarSize, respectOverflowClip,
-          &offsetFromRoot, localPaintingInfo.subPixelAccumulation);
+          IgnoreOverlayScrollbarSize, respectOverflowClip, &offsetFromRoot,
+          localPaintingInfo.subPixelAccumulation);
     } else if (isFixedPositionObjectInPagedMedia()) {
       PaintLayerFragments singleFragment;
       paintLayerForFragments->appendSingleFragmentIgnoringPagination(
           singleFragment, localPaintingInfo.rootLayer,
           localPaintingInfo.paintDirtyRect, cacheSlot, geometryMapperOption,
-          IgnorePlatformOverlayScrollbarSize, respectOverflowClip,
-          &offsetFromRoot, localPaintingInfo.subPixelAccumulation);
+          IgnoreOverlayScrollbarSize, respectOverflowClip, &offsetFromRoot,
+          localPaintingInfo.subPixelAccumulation);
       repeatFixedPositionObjectInPages(singleFragment[0], paintingInfo,
                                        layerFragments);
     } else {
       paintLayerForFragments->collectFragments(
           layerFragments, localPaintingInfo.rootLayer,
           localPaintingInfo.paintDirtyRect, cacheSlot, geometryMapperOption,
-          IgnorePlatformOverlayScrollbarSize, respectOverflowClip,
-          &offsetFromRoot, localPaintingInfo.subPixelAccumulation);
+          IgnoreOverlayScrollbarSize, respectOverflowClip, &offsetFromRoot,
+          localPaintingInfo.subPixelAccumulation);
     }
 
     if (paintFlags & PaintLayerPaintingAncestorClippingMaskPhase) {
@@ -729,7 +729,7 @@
     // here.
     paginationLayer->collectFragments(
         layerFragments, paintingInfo.rootLayer, paintingInfo.paintDirtyRect,
-        cacheSlot, geometryMapperOption, IgnorePlatformOverlayScrollbarSize,
+        cacheSlot, geometryMapperOption, IgnoreOverlayScrollbarSize,
         respectOverflowClip, nullptr, paintingInfo.subPixelAccumulation,
         &transformedExtent);
   }
@@ -746,7 +746,7 @@
           paintingInfo.rootLayer,
           (paintFlags & PaintLayerUncachedClipRects) ? UncachedClipRects
                                                      : PaintingClipRects,
-          IgnorePlatformOverlayScrollbarSize);
+          IgnoreOverlayScrollbarSize);
       if (shouldRespectOverflowClip(paintFlags, m_paintLayer.layoutObject()) ==
           IgnoreOverflowClip)
         clipRectsContext.setIgnoreOverflowClip();