Add |GraphicsLayerDebugInfo::getAnnotatedInvalidationRects|

Source/platform/graphics/GraphicsLayer.cpp

 /*
  * Copyright (C) 2009 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 255 matching lines @@
 
     // If the compositing layer offset changes, we need to repaint.
     if (shouldSetNeedsDisplay == SetNeedsDisplay)
         setNeedsDisplay();
 }
 
 void GraphicsLayer::paintGraphicsLayerContents(GraphicsContext& context, const IntRect& clip)
 {
     if (!m_client)
         return;
+    m_debugInfo.clearAnnotatedInvalidateRects();
     incrementPaintCount();
     m_client->paintContents(this, context, m_paintingPhase, clip);
 }
 
 void GraphicsLayer::updateChildList()
 {
     WebLayer* childHost = m_layer->layer();
     childHost->removeAllChildren();
 
     clearContentsLayerIfUnregistered();
@@ skipping 604 matching lines @@
 void GraphicsLayer::setNeedsDisplay()
 {
     if (drawsContent()) {
         m_layer->layer()->invalidate();
         addRepaintRect(FloatRect(FloatPoint(), m_size));
         for (size_t i = 0; i < m_linkHighlights.size(); ++i)
             m_linkHighlights[i]->invalidate();
     }
 }
 
-void GraphicsLayer::setNeedsDisplayInRect(const FloatRect& rect)
+void GraphicsLayer::setNeedsDisplayInRect(const FloatRect& rect, WebInvalidationDebugAnnotations annotations)
 {
     if (drawsContent()) {
         m_layer->layer()->invalidateRect(rect);
+        m_debugInfo.appendAnnotatedInvalidateRect(rect, annotations);

[enne (OOO), 2014/09/02 19:41:34]

Is there a way to only do this when tracing or showing paint rects?

[kouhei (in TOK), 2014/09/03 22:53:47]

I agree we should have a way to only enable these when tracing is enabled, but
I'm not sure what would be a best way. I'm thinking of adding an entry in
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...
, but was wondering if it would be too heavyweight to query it everytime in this
hot call path.

abarth: Do you have any other idea on adding a flag?

[dsinclair, 2014/09/04 15:38:38]

For tracing, you can check if the given trace category is enabled. Take a look
at TRACE_EVENT_CATEGORY_GROUP_ENABLED. I'm not sure how to check if show paint
rects is enabled or not though.

If that is too heavy, there is a TRACE_EVENT_GET_CATEGORY_GROUP_ENABLED in
chromium tracing header which can be ported to Blink. This will give a unsigned
char* which can be stored in a static that you reference if the given category
is enabled or not. So, after the first time just becomes a branch instead of a
lookup and branch.

         addRepaintRect(rect);
         for (size_t i = 0; i < m_linkHighlights.size(); ++i)
             m_linkHighlights[i]->invalidate();
     }
 }
 
 void GraphicsLayer::setContentsRect(const IntRect& rect)
 {
     if (rect == m_contentsRect)
         return;
@@ skipping 142 matching lines @@
 #ifndef NDEBUG
 void showGraphicsLayerTree(const blink::GraphicsLayer* layer)
 {
     if (!layer)
         return;
 
     String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo);
     fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif