Revert of Enable fast/images with slimming paint

Source/core/paint/HTMLCanvasPainter.cpp

Index: Source/core/paint/HTMLCanvasPainter.cpp
diff --git a/Source/core/paint/HTMLCanvasPainter.cpp b/Source/core/paint/HTMLCanvasPainter.cpp
index e4ac72522478d69b04bf9aceaa3ef14dac5c5c5d..71879c536ea27a806d5fd62d20d9c5e4bdeadd8b 100644
--- a/Source/core/paint/HTMLCanvasPainter.cpp
+++ b/Source/core/paint/HTMLCanvasPainter.cpp
@@ -6,8 +6,6 @@
 #include "core/paint/HTMLCanvasPainter.h"
 
 #include "core/html/HTMLCanvasElement.h"
-#include "core/paint/ClipRecorder.h"
-#include "core/paint/DrawingRecorder.h"
 #include "core/rendering/PaintInfo.h"
 #include "core/rendering/RenderHTMLCanvas.h"
 #include "platform/geometry/LayoutPoint.h"
@@ -23,11 +21,12 @@
     LayoutRect paintRect = m_renderHTMLCanvas.replacedContentRect();
     paintRect.moveBy(paintOffset);
 
-    PaintInfo localPaintInfo(paintInfo);
-    OwnPtr<ClipRecorder> clipRecorder;
     bool clip = !contentRect.contains(paintRect);
-    if (clip)
-        clipRecorder = adoptPtr(new ClipRecorder(m_renderHTMLCanvas, paintInfo, contentRect));
+    if (clip) {
+        // Not allowed to overflow the content box.
+        paintInfo.context->save();
+        paintInfo.context->clip(pixelSnappedIntRect(contentRect));
+    }
 
     // FIXME: InterpolationNone should be used if ImageRenderingOptimizeContrast is set.
     // See bug for more details: crbug.com/353716.
@@ -40,11 +39,13 @@
         interpolationQuality = InterpolationNone;
     }
 
-    DrawingRecorder recorder(context, &m_renderHTMLCanvas, localPaintInfo.phase, pixelSnappedIntRect(paintRect));
     InterpolationQuality previousInterpolationQuality = context->imageInterpolationQuality();
     context->setImageInterpolationQuality(interpolationQuality);
     canvas->paint(context, paintRect);
     context->setImageInterpolationQuality(previousInterpolationQuality);
+
+    if (clip)
+        context->restore();
 }
 
 } // namespace blink