Merge repaintRects and paintInvalidationObjects in text-based-repaint test results

third_party/WebKit/Source/web/LinkHighlightImpl.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 311 matching lines @@
 }
 
 void LinkHighlightImpl::notifyAnimationFinished(double, int)
 {
     // Since WebViewImpl may hang on to us for a while, make sure we
     // release resources as soon as possible.
     clearGraphicsLayerLinkHighlightPointer();
     releaseResources();
 }
 
+class LinkHighlightDisplayItemClientForTracking : public DisplayItemClient {
+    String debugName() const final { return "LinkHighlight"; }
+    LayoutRect visualRect() const final { return LayoutRect(); }
+};
+
 void LinkHighlightImpl::updateGeometry()
 {
     // To avoid unnecessary updates (e.g. other entities have requested animations from our WebViewImpl),
     // only proceed if we actually requested an update.
     if (!m_geometryNeedsUpdate)
         return;
 
     m_geometryNeedsUpdate = false;
 
     bool hasLayoutObject = m_node && m_node->layoutObject();
     if (hasLayoutObject) {
         const LayoutBoxModelObject& paintInvalidationContainer = m_node->layoutObject()->containerForPaintInvalidation();
         attachLinkHighlightToCompositingLayer(paintInvalidationContainer);
         if (computeHighlightLayerPathAndPosition(paintInvalidationContainer)) {
             // We only need to invalidate the layer if the highlight size has changed, otherwise
             // we can just re-position the layer without needing to repaint.
             m_contentLayer->layer()->invalidate();
 
             if (m_currentGraphicsLayer && m_currentGraphicsLayer->isTrackingPaintInvalidations())
-                m_currentGraphicsLayer->trackPaintInvalidationRect(FloatRect(layer()->position().x, layer()->position().y, layer()->bounds().width, layer()->bounds().height));
+                m_currentGraphicsLayer->trackPaintInvalidation(LinkHighlightDisplayItemClientForTracking(), FloatRect(layer()->position().x, layer()->position().y, layer()->bounds().width, layer()->bounds().height), PaintInvalidationFull);
         }
     } else {
         clearGraphicsLayerLinkHighlightPointer();
         releaseResources();
     }
 }
 
 void LinkHighlightImpl::clearCurrentGraphicsLayer()
 {
     m_currentGraphicsLayer = 0;
@@ skipping 10 matching lines @@
 {
     return clipLayer();
 }
 
 CompositorAnimationPlayer* LinkHighlightImpl::compositorPlayer() const
 {
     return m_compositorPlayer.get();
 }
 
 } // namespace blink