Implement clip and scroll DisplayItems for PartPainter

Source/core/paint/ReplacedPainter.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/ReplacedPainter.h"
 
 #include "core/paint/BoxPainter.h"
 #include "core/paint/GraphicsContextAnnotator.h"
 #include "core/paint/ObjectPainter.h"
 #include "core/paint/RenderDrawingRecorder.h"
+#include "core/paint/RoundedInnerRectClipper.h"
 #include "core/rendering/PaintInfo.h"
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderReplaced.h"
 
 namespace blink {
 
 void ReplacedPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     ANNOTATE_GRAPHICS_CONTEXT(paintInfo, &m_renderReplaced);
 
@@ skipping 32 matching lines @@
     }
 
     // FIXME(crbug.com/444591): Refactor this to not create a drawing recorder for renderers with children.
     OwnPtr<RenderDrawingRecorder> renderDrawingRecorder;
     if (!m_renderReplaced.isSVGRoot())
         renderDrawingRecorder = adoptPtr(new RenderDrawingRecorder(paintInfo.context, m_renderReplaced, paintInfo.phase, paintRect));
     if (renderDrawingRecorder && renderDrawingRecorder->canUseCachedDrawing())
         return;
 
     bool completelyClippedOut = false;
+    OwnPtr<RoundedInnerRectClipper> clipper;
     if (m_renderReplaced.style()->hasBorderRadius()) {
         LayoutRect borderRect = LayoutRect(adjustedPaintOffset, m_renderReplaced.size());
 
         if (borderRect.isEmpty()) {
             completelyClippedOut = true;
         } else {
             // Push a clip if we have a border radius, since we want to round the foreground content that gets painted.
             paintInfo.context->save();
             FloatRoundedRect roundedInnerRect = m_renderReplaced.style()->getRoundedInnerBorderFor(paintRect,
                 m_renderReplaced.paddingTop() + m_renderReplaced.borderTop(), m_renderReplaced.paddingBottom() + m_renderReplaced.borderBottom(), m_renderReplaced.paddingLeft() + m_renderReplaced.borderLeft(), m_renderReplaced.paddingRight() + m_renderReplaced.borderRight(), true, true);
-            BoxPainter::clipRoundedInnerRect(paintInfo.context, paintRect, roundedInnerRect);
+
+            clipper = adoptPtr(new RoundedInnerRectClipper(m_renderReplaced, paintInfo, paintRect, roundedInnerRect, ApplyToContext));
         }
     }
 
     if (!completelyClippedOut) {
         if (paintInfo.phase == PaintPhaseClippingMask) {
             m_renderReplaced.paintClippingMask(paintInfo, adjustedPaintOffset);
         } else {
             m_renderReplaced.paintReplaced(paintInfo, adjustedPaintOffset);
         }
-
-        if (m_renderReplaced.style()->hasBorderRadius())
-            paintInfo.context->restore();
     }
+    clipper.clear();

[chrishtr, 2015/01/23 23:35:33]

Same comment here.

[trchen, 2015/01/23 23:40:43]

Acknowledged.

[trchen, 2015/01/23 23:47:59]

Done.

 
     // The selection tint never gets clipped by border-radius rounding, since we want it to run right up to the edges of
     // surrounding content.
     if (drawSelectionTint) {
         LayoutRect selectionPaintingRect = m_renderReplaced.localSelectionRect();
         selectionPaintingRect.moveBy(adjustedPaintOffset);
         paintInfo.context->fillRect(pixelSnappedIntRect(selectionPaintingRect), m_renderReplaced.selectionBackgroundColor());
     }
 }
 
 } // namespace blink