Move paint code from RenderHTMLCanvas to HTMLCanvasPainter.

Source/core/rendering/RenderHTMLCanvas.cpp

 /*
  * Copyright (C) 2004, 2006, 2007 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/rendering/RenderHTMLCanvas.h"
 
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/canvas/CanvasRenderingContext.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/page/Page.h"
+#include "core/paint/HTMLCanvasPainter.h"
 #include "core/rendering/PaintInfo.h"
 #include "core/rendering/RenderView.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 RenderHTMLCanvas::RenderHTMLCanvas(HTMLCanvasElement* element)
     : RenderReplaced(element, element->size())
 {
     view()->frameView()->setIsVisuallyNonEmpty();
 }
 
 LayerType RenderHTMLCanvas::layerTypeRequired() const
 {
     return NormalLayer;
 }
 
 void RenderHTMLCanvas::paintReplaced(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    GraphicsContext* context = paintInfo.context;
-
-    LayoutRect contentRect = contentBoxRect();
-    contentRect.moveBy(paintOffset);
-    LayoutRect paintRect = replacedContentRect();
-    paintRect.moveBy(paintOffset);
-
-    bool clip = !contentRect.contains(paintRect);
-    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.
-    InterpolationQuality interpolationQuality = style()->imageRendering() == ImageRenderingOptimizeContrast ? InterpolationLow : CanvasDefaultInterpolationQuality;
-
-    HTMLCanvasElement* canvas = toHTMLCanvasElement(node());
-    LayoutSize layoutSize = contentRect.size();
-    if (style()->imageRendering() == ImageRenderingPixelated
-        && (layoutSize.width() > canvas->width() || layoutSize.height() > canvas->height() || layoutSize == canvas->size())) {
-        interpolationQuality = InterpolationNone;
-    }
-
-    InterpolationQuality previousInterpolationQuality = context->imageInterpolationQuality();
-    context->setImageInterpolationQuality(interpolationQuality);
-    canvas->paint(context, paintRect);
-    context->setImageInterpolationQuality(previousInterpolationQuality);
-
-    if (clip)
-        context->restore();
+    HTMLCanvasPainter(*this).paintReplaced(paintInfo, paintOffset);
 }
 
 void RenderHTMLCanvas::canvasSizeChanged()
 {
     IntSize canvasSize = toHTMLCanvasElement(node())->size();
     LayoutSize zoomedSize(canvasSize.width() * style()->effectiveZoom(), canvasSize.height() * style()->effectiveZoom());
 
     if (zoomedSize == intrinsicSize())
         return;
 
@@ skipping 18 matching lines @@
 CompositingReasons RenderHTMLCanvas::additionalCompositingReasons() const
 {
     HTMLCanvasElement* canvas = toHTMLCanvasElement(node());
     if (canvas->renderingContext() && canvas->renderingContext()->isAccelerated())
         return CompositingReasonCanvas;
 
     return CompositingReasonNone;
 }
 
 } // namespace blink