Reland of Remove blink::WebLayerClient and WebGraphicsLayerDebugInfo.

third_party/WebKit/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 10 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/graphics/GraphicsLayer.h"
 
 #include "SkImageFilter.h"
 #include "SkMatrix44.h"
+#include "base/trace_event/trace_event_argument.h"
+#include "cc/layers/layer.h"
 #include "platform/DragImage.h"
+#include "platform/JSONValues.h"
 #include "platform/TraceEvent.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/BitmapImage.h"
 #include "platform/graphics/FirstPaintInvalidationTracking.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayerFactory.h"
 #include "platform/graphics/Image.h"
 #include "platform/graphics/LinkHighlight.h"
 #include "platform/graphics/filters/SkiaImageFilterBuilder.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 #include "platform/graphics/paint/PaintController.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "platform/text/TextStream.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorAnimation.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebFilterOperations.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebFloatRect.h"
-#include "public/platform/WebGraphicsLayerDebugInfo.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebPoint.h"
 #include "public/platform/WebSize.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
+#include "wtf/text/StringUTF8Adaptor.h"
 #include "wtf/text/WTFString.h"
 #include <algorithm>
 
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
 namespace blink {
 
 static bool s_drawDebugRedFill = true;
@@ skipping 48 matching lines @@
     , m_3dRenderingContext(0)
 {
 #if ENABLE(ASSERT)
     if (m_client)
         m_client->verifyNotPainting();
 #endif
 
     m_contentLayerDelegate = adoptPtr(new ContentLayerDelegate(this));
     m_layer = adoptPtr(Platform::current()->compositorSupport()->createContentLayer(m_contentLayerDelegate.get()));
     m_layer->layer()->setDrawsContent(m_drawsContent && m_contentsVisible);
-    m_layer->layer()->setWebLayerClient(this);
+    m_layer->layer()->setLayerClient(this);
 
     // TODO(rbyers): Expose control over this to the web - crbug.com/489802:
     setScrollBlocksOn(WebScrollBlocksOnStartTouch | WebScrollBlocksOnWheelEvent);
 }
 
 GraphicsLayer::~GraphicsLayer()
 {
     for (size_t i = 0; i < m_linkHighlights.size(); ++i)
         m_linkHighlights[i]->clearCurrentGraphicsLayer();
     m_linkHighlights.clear();
@@ skipping 309 matching lines @@
     if (childrenChanged)
         updateChildList();
 }
 
 void GraphicsLayer::setupContentsLayer(WebLayer* contentsLayer)
 {
     ASSERT(contentsLayer);
     m_contentsLayer = contentsLayer;
     m_contentsLayerId = m_contentsLayer->id();
 
-    m_contentsLayer->setWebLayerClient(this);
+    m_contentsLayer->setLayerClient(this);
     m_contentsLayer->setTransformOrigin(FloatPoint3D());
     m_contentsLayer->setUseParentBackfaceVisibility(true);
 
     // It is necessary to call setDrawsContent as soon as we receive the new contentsLayer, for
     // the correctness of early exit conditions in setDrawsContent() and setContentsVisible().
     m_contentsLayer->setDrawsContent(m_contentsVisible);
 
     // Insert the content layer first. Video elements require this, because they have
     // shadow content that must display in front of the video.
     m_layer->layer()->insertChild(m_contentsLayer, 0);
@@ skipping 10 matching lines @@
 
     m_contentsLayer = 0;
     m_contentsLayerId = 0;
 }
 
 GraphicsLayerDebugInfo& GraphicsLayer::debugInfo()
 {
     return m_debugInfo;
 }
 
-WebGraphicsLayerDebugInfo* GraphicsLayer::takeDebugInfoFor(WebLayer* layer)
-{
-    GraphicsLayerDebugInfo* clone = m_debugInfo.clone();
-    clone->setDebugName(debugName(layer));
-    return clone;
-}
-
 WebLayer* GraphicsLayer::contentsLayerIfRegistered()
 {
     clearContentsLayerIfUnregistered();
     return m_contentsLayer;
 }
 
 void GraphicsLayer::resetTrackedPaintInvalidations()
 {
     paintInvalidationTrackingMap().remove(this);
 }
@@ skipping 259 matching lines @@
     return json;
 }
 
 String GraphicsLayer::layerTreeAsText(LayerTreeFlags flags) const
 {
     RenderingContextMap renderingContextMap;
     RefPtr<JSONObject> json = layerTreeAsJSON(flags, renderingContextMap);
     return json->toPrettyJSONString();
 }
 
-String GraphicsLayer::debugName(WebLayer* webLayer) const
+static const cc::Layer* ccLayerForWebLayer(const WebLayer* webLayer)
+{
+    return webLayer ? webLayer->ccLayer() : nullptr;
+}
+
+String GraphicsLayer::debugName(cc::Layer* layer) const
 {
     String name;
     if (!m_client)
         return name;
 
     String highlightDebugName;
     for (size_t i = 0; i < m_linkHighlights.size(); ++i) {
-        if (webLayer == m_linkHighlights[i]->layer()) {
+        if (layer == ccLayerForWebLayer(m_linkHighlights[i]->layer())) {
             highlightDebugName = "LinkHighlight[" + String::number(i) + "] for " + m_client->debugName(this);
             break;
         }
     }
 
-    if (webLayer == m_contentsLayer) {
+    if (layer->id() == m_contentsLayerId) {
         name = "ContentsLayer for " + m_client->debugName(this);
     } else if (!highlightDebugName.isEmpty()) {
         name = highlightDebugName;
-    } else if (webLayer == m_layer->layer()) {
+    } else if (layer == ccLayerForWebLayer(m_layer->layer())) {
         name = m_client->debugName(this);
     } else {
         ASSERT_NOT_REACHED();
     }
     return name;
 }
 
 void GraphicsLayer::setCompositingReasons(CompositingReasons reasons)
 {
     m_debugInfo.setCompositingReasons(reasons);
@@ skipping 333 matching lines @@
     if (m_paintingPhase == phase)
         return;
     m_paintingPhase = phase;
     setNeedsDisplay();
 }
 
 void GraphicsLayer::addLinkHighlight(LinkHighlight* linkHighlight)
 {
     ASSERT(linkHighlight && !m_linkHighlights.contains(linkHighlight));
     m_linkHighlights.append(linkHighlight);
-    linkHighlight->layer()->setWebLayerClient(this);
+    linkHighlight->layer()->setLayerClient(this);
     updateChildList();
 }
 
 void GraphicsLayer::removeLinkHighlight(LinkHighlight* linkHighlight)
 {
     m_linkHighlights.remove(m_linkHighlights.find(linkHighlight));
     updateChildList();
 }
 
 void GraphicsLayer::setScrollableArea(ScrollableArea* scrollableArea, bool isViewport)
@@ skipping 27 matching lines @@
 {
     if (m_scrollableArea) {
         DoublePoint newPosition = m_scrollableArea->minimumScrollPosition() + toDoubleSize(m_layer->layer()->scrollPositionDouble());
 
         // FrameView::setScrollPosition doesn't work for compositor commits (interacts poorly with programmatic scroll animations)
         // so we need to use the ScrollableArea version. The FrameView method should go away soon anyway.
         m_scrollableArea->ScrollableArea::setScrollPosition(newPosition, CompositorScroll);
     }
 }
 
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> GraphicsLayer::TakeDebugInfo(cc::Layer* layer)
+{
+    scoped_refptr<base::trace_event::TracedValue> tracedValue = m_debugInfo.asTracedValue();
+    tracedValue->SetString("layer_name", WTF::StringUTF8Adaptor(debugName(layer)).asStringPiece());
+    return tracedValue;
+}
+
 PaintController* GraphicsLayer::paintController()
 {
     if (!m_paintController)
         m_paintController = PaintController::create();
     return m_paintController.get();
 }
 
 } // namespace blink
 
 #ifndef NDEBUG
 void showGraphicsLayerTree(const blink::GraphicsLayer* layer)
 {
     if (!layer) {
         fprintf(stderr, "Cannot showGraphicsLayerTree for (nil).\n");
         return;
     }
 
     String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo);
     fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif