Revert of Enable fast/images with slimming paint

Source/core/paint/BoxClipper.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/BoxClipper.h"
 
 #include "core/paint/ClipRecorder.h"
 #include "core/paint/ViewDisplayList.h"
 #include "core/rendering/PaintInfo.h"
@@ skipping 34 matching lines @@
         if (hasBorderRadius)
             conservativeClipRect.intersect(clipRoundedRect.radiusCenterRect());
         conservativeClipRect.moveBy(-m_accumulatedOffset);
         if (m_box.hasLayer())
             conservativeClipRect.move(m_box.scrolledContentOffset());
         if (conservativeClipRect.contains(contentsVisualOverflow))
             return;
     }
 
     DisplayItem::Type clipType = DisplayItem::ClipBoxForeground;
-    if (RuntimeEnabledFeatures::slimmingPaintEnabled())
-        clipType = ClipRecorder::paintPhaseToClipType(m_paintInfo.phase);
+    if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
+        switch (m_paintInfo.phase) {
+        case PaintPhaseChildBlockBackgrounds:
+            clipType = DisplayItem::ClipBoxChildBlockBackgrounds;
+            break;
+        case PaintPhaseFloat:
+            clipType = DisplayItem::ClipBoxFloat;
+            break;
+        case PaintPhaseForeground:
+            clipType = DisplayItem::ClipBoxChildBlockBackgrounds;
+            break;
+        case PaintPhaseChildOutlines:
+            clipType = DisplayItem::ClipBoxChildOutlines;
+            break;
+        case PaintPhaseSelection:
+            clipType = DisplayItem::ClipBoxSelection;
+            break;
+        case PaintPhaseCollapsedTableBorders:
+            clipType = DisplayItem::ClipBoxCollapsedTableBorders;
+            break;
+        case PaintPhaseTextClip:
+            clipType = DisplayItem::ClipBoxTextClip;
+            break;
+        case PaintPhaseClippingMask:
+            clipType = DisplayItem::ClipBoxClippingMask;
+            break;
+        case PaintPhaseChildBlockBackground:
+        case PaintPhaseOutline:
+        case PaintPhaseBlockBackground:
+        case PaintPhaseSelfOutline:
+        case PaintPhaseMask:
+            ASSERT_NOT_REACHED();
+        }
+    }
 
     OwnPtr<ClipDisplayItem> clipDisplayItem = adoptPtr(new ClipDisplayItem(&m_box, clipType, pixelSnappedIntRect(clipRect)));
     if (hasBorderRadius)
         clipDisplayItem->roundedRectClips().append(clipRoundedRect);
 
     if (RuntimeEnabledFeatures::slimmingPaintEnabled())
         m_box.view()->viewDisplayList().add(clipDisplayItem.release());
     else
         clipDisplayItem->replay(paintInfo.context);
 
@@ skipping 10 matching lines @@
     OwnPtr<EndClipDisplayItem> endClipDisplayItem = adoptPtr(new EndClipDisplayItem(&m_box));
 
     if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
         m_box.view()->viewDisplayList().add(endClipDisplayItem.release());
     } else {
         endClipDisplayItem->replay(m_paintInfo.context);
     }
 }
 
 } // namespace blink