Ensure display item ids are unique for image areas

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 42 matching lines @@
 
     Path path = areaElement.computePath(&m_layoutImage);
     if (path.isEmpty())
         return;
 
     const ComputedStyle& areaElementStyle = *areaElement.ensureComputedStyle();
     int outlineWidth = areaElementStyle.outlineWidth();
     if (!outlineWidth)
         return;
 
-    if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_layoutImage, paintInfo.phase))
+    if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_layoutImage, DisplayItem::ImageAreaFocusRing))
         return;
 
     IntRect focusRect = m_layoutImage.absoluteContentBox();
-    LayoutObjectDrawingRecorder drawingRecorder(paintInfo.context, m_layoutImage, paintInfo.phase, focusRect);
+    LayoutObjectDrawingRecorder drawingRecorder(paintInfo.context, m_layoutImage, DisplayItem::ImageAreaFocusRing, 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.drawFocusRing(path, outlineWidth,
         areaElementStyle.outlineOffset(),
         m_layoutImage.resolveColor(areaElementStyle, CSSPropertyOutlineColor));
     paintInfo.context.restore();
@@ skipping 58 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