Reland PaintChunk::id

third_party/WebKit/Source/core/paint/SVGPaintContext.h

 /**
  * Copyright (C) 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.  All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  * Copyright (C) 2012 Zoltan Herczeg <zherczeg@webkit.org>.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 47 matching lines @@
             if (!objectProperties)
                 return;
             if (object.isSVGRoot()) {
                 // If a transform exists, we can rely on a layer existing to apply it.
                 DCHECK(!objectProperties || !objectProperties->transform() || object.hasLayer());
                 if (objectProperties->svgLocalToBorderBoxTransform()) {
                     DCHECK(objectProperties->svgLocalToBorderBoxTransform()->matrix() == transform.toTransformationMatrix());
                     auto& paintController = context.getPaintController();
                     PaintChunkProperties properties(paintController.currentPaintChunkProperties());
                     properties.transform = objectProperties->svgLocalToBorderBoxTransform();
-                    m_transformPropertyScope.emplace(paintController, properties);
+                    m_transformPropertyScope.emplace(paintController, object, properties);
                 }
             } else {
                 DCHECK(object.isSVG());
                 // Should only be used by LayoutSVGRoot.
                 DCHECK(!objectProperties->svgLocalToBorderBoxTransform());
 
                 if (objectProperties->transform()) {
                     DCHECK(objectProperties->transform()->matrix() == transform.toTransformationMatrix());
                     auto& paintController = context.getPaintController();
                     PaintChunkProperties properties(paintController.currentPaintChunkProperties());
                     properties.transform = objectProperties->transform();
-                    m_transformPropertyScope.emplace(paintController, properties);
+                    m_transformPropertyScope.emplace(paintController, object, properties);
                 }
             }
         }
     }
 private:
     Optional<ScopedPaintChunkProperties> m_transformPropertyScope;
 };
 
 class SVGPaintContext {
     STACK_ALLOCATED();
@@ skipping 48 matching lines @@
     std::unique_ptr<ClipPathRecorder> m_clipPathRecorder;
     std::unique_ptr<SVGFilterRecordingContext> m_filterRecordingContext;
 #if ENABLE(ASSERT)
     bool m_applyClipMaskAndFilterIfNecessaryCalled;
 #endif
 };
 
 } // namespace blink
 
 #endif // SVGPaintContext_h