Add paint chunk recording to ImagePainter

Source/core/paint/ImagePainter.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/ImagePainter.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/editing/FrameSelection.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLAreaElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/page/Page.h"
 #include "core/paint/BoxPainter.h"
+#include "core/paint/ViewDisplayList.h"
 #include "core/rendering/PaintInfo.h"
 #include "core/rendering/RenderImage.h"
 #include "core/rendering/RenderReplaced.h"
 #include "core/rendering/TextRunConstructor.h"
 #include "platform/geometry/LayoutPoint.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 #include "platform/graphics/Path.h"
 
 namespace blink {
 
@@ skipping 28 matching lines @@
         return;
 
     RenderStyle* areaElementStyle = areaElement.computedStyle();
     unsigned short outlineWidth = areaElementStyle->outlineWidth();
     if (!outlineWidth)
         return;
 
     // FIXME: Clip path instead of context when Skia pathops is ready.
     // https://crbug.com/251206
     GraphicsContextStateSaver savedContext(*paintInfo.context);
-    paintInfo.context->clip(m_renderImage.absoluteContentBox());
+    IntRect focusRect = m_renderImage.absoluteContentBox();
+    PaintCommandRecorder recorder(paintInfo.context, &m_renderImage, paintInfo.phase, focusRect);
+    paintInfo.context->clip(focusRect);
     paintInfo.context->drawFocusRing(path, outlineWidth,
         areaElementStyle->outlineOffset(),
         m_renderImage.resolveColor(areaElementStyle, CSSPropertyOutlineColor));
 }
 
 void ImagePainter::paintReplaced(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     LayoutUnit cWidth = m_renderImage.contentWidth();
     LayoutUnit cHeight = m_renderImage.contentHeight();
 
     GraphicsContext* context = paintInfo.context;
 
     if (!m_renderImage.imageResource()->hasImage() || m_renderImage.imageResource()->errorOccurred()) {
         if (paintInfo.phase == PaintPhaseSelection)
             return;
 
         if (cWidth > 2 && cHeight > 2) {
             const int borderWidth = 1;
 
             LayoutUnit leftBorder = m_renderImage.borderLeft();
             LayoutUnit topBorder = m_renderImage.borderTop();
             LayoutUnit leftPad = m_renderImage.paddingLeft();
             LayoutUnit topPad = m_renderImage.paddingTop();
 
             // Draw an outline rect where the image should be.
+            IntRect paintRect = pixelSnappedIntRect(LayoutRect(paintOffset.x() + leftBorder + leftPad, paintOffset.y() + topBorder + topPad, cWidth, cHeight));
+            PaintCommandRecorder recorder(context, &m_renderImage, paintInfo.phase, paintRect);
             context->setStrokeStyle(SolidStroke);
             context->setStrokeColor(Color::lightGray);
             context->setFillColor(Color::transparent);
-            context->drawRect(pixelSnappedIntRect(LayoutRect(paintOffset.x() + leftBorder + leftPad, paintOffset.y() + topBorder + topPad, cWidth, cHeight)));
+            context->drawRect(paintRect);
 
             bool errorPictureDrawn = false;
             LayoutSize imageOffset;
             // When calculating the usable dimensions, exclude the pixels of
             // the ouline rect so the error image/alt text doesn't draw on it.
             LayoutUnit usableWidth = cWidth - 2 * borderWidth;
             LayoutUnit usableHeight = cHeight - 2 * borderWidth;
 
             RefPtr<Image> image = m_renderImage.imageResource()->image();
 
@@ skipping 41 matching lines @@
                 } else if (usableWidth >= textWidth && usableHeight >= fontMetrics.height()) {
                     context->drawBidiText(font, textRunPaintInfo, textOrigin);
                 }
             }
         }
     } else if (m_renderImage.imageResource()->hasImage() && cWidth > 0 && cHeight > 0) {
         LayoutRect contentRect = m_renderImage.contentBoxRect();
         contentRect.moveBy(paintOffset);
         LayoutRect paintRect = m_renderImage.replacedContentRect();
         paintRect.moveBy(paintOffset);
+        PaintCommandRecorder recorder(context, &m_renderImage, paintInfo.phase, contentRect);
         bool clip = !contentRect.contains(paintRect);
         if (clip) {
             context->save();
             context->clip(contentRect);
         }
 
         paintIntoRect(context, paintRect);
 
         if (clip)
             context->restore();
@@ skipping 19 matching lines @@
     // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeline migrates to tracing.
     InspectorInstrumentation::willPaintImage(&m_renderImage);
     InterpolationQuality previousInterpolationQuality = context->imageInterpolationQuality();
     context->setImageInterpolationQuality(interpolationQuality);
     context->drawImage(image, alignedRect, compositeOperator, m_renderImage.shouldRespectImageOrientation());
     context->setImageInterpolationQuality(previousInterpolationQuality);
     InspectorInstrumentation::didPaintImage(&m_renderImage);
 }
 
 } // namespace blink