Fix image map focus ring painting

third_party/WebKit/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 "core/paint/ImagePainter.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/editing/FrameSelection.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 15 matching lines @@
 void ImagePainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     m_layoutImage.LayoutReplaced::paint(paintInfo, paintOffset);
 
     if (paintInfo.phase == PaintPhaseOutline)
         paintAreaElementFocusRing(paintInfo, paintOffset);
 }
 
 void ImagePainter::paintAreaElementFocusRing(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    // TODO(wangxianzhu): In other places, we just paint focus ring if outline style is auto.
-    // We should also do that here to keep consistency.
     Document& document = m_layoutImage.document();
 
     if (paintInfo.isPrinting() || !document.frame()->selection().isFocusedAndActive())
         return;
 
     Element* focusedElement = document.focusedElement();
     if (!isHTMLAreaElement(focusedElement))
         return;
 
     HTMLAreaElement& areaElement = toHTMLAreaElement(*focusedElement);
     if (areaElement.imageElement() != m_layoutImage.node())
         return;
 
     // Even if the theme handles focus ring drawing for entire elements, it won't do it for
     // an area within an image, so we don't call LayoutTheme::themeDrawsFocusRing here.
 
-    Path path = areaElement.computePath(&m_layoutImage);
-    if (path.isEmpty())
-        return;
-
     const ComputedStyle& areaElementStyle = *areaElement.ensureComputedStyle();
     int outlineWidth = areaElementStyle.outlineWidth();
     if (!outlineWidth)
         return;
 
+    Path path = areaElement.getPath();
+    if (path.isEmpty())
+        return;
+
+    AffineTransform zoomTransform;
+    zoomTransform.scale(m_layoutImage.styleRef().effectiveZoom());
+    path.transform(zoomTransform);
+
+    LayoutPoint adjustedPaintOffset = paintOffset;
+    adjustedPaintOffset.moveBy(m_layoutImage.location());
+    path.translate(FloatSize(adjustedPaintOffset.x(), adjustedPaintOffset.y()));
+
     if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_layoutImage, paintInfo.phase))
         return;
 
-    IntRect focusRect = m_layoutImage.absoluteContentBox();
+    LayoutRect focusRect = m_layoutImage.contentBoxRect();
+    focusRect.moveBy(adjustedPaintOffset);
     LayoutObjectDrawingRecorder drawingRecorder(paintInfo.context, m_layoutImage, paintInfo.phase, focusRect);
 
     // FIXME: Clip path instead of context when Skia pathops is ready.
     // https://crbug.com/251206
 
     paintInfo.context.save();
-    paintInfo.context.clip(focusRect);
+    paintInfo.context.clip(pixelSnappedIntRect(focusRect));
     paintInfo.context.drawFocusRing(path, outlineWidth,
         areaElementStyle.outlineOffset(),
         m_layoutImage.resolveColor(areaElementStyle, CSSPropertyOutlineColor));
     paintInfo.context.restore();
 }
 
 void ImagePainter::paintReplaced(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     LayoutUnit cWidth = m_layoutImage.contentWidth();
     LayoutUnit cHeight = m_layoutImage.contentHeight();
@@ skipping 52 matching lines @@
 
     TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage", "data", InspectorPaintImageEvent::data(m_layoutImage));
 
     InterpolationQuality previousInterpolationQuality = context.imageInterpolationQuality();
     context.setImageInterpolationQuality(interpolationQuality);
     context.drawImage(image.get(), alignedRect, SkXfermode::kSrcOver_Mode, LayoutObject::shouldRespectImageOrientation(&m_layoutImage));
     context.setImageInterpolationQuality(previousInterpolationQuality);
 }
 
 } // namespace blink