Remove the clip argument to WebContentLayerClient::paintContents.

third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.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
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 20 matching lines @@
 #include "platform/TraceEvent.h"
 #include "platform/TracedValue.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/PaintArtifactToSkCanvas.h"
 #include "platform/graphics/paint/PaintController.h"
 #include "platform/transforms/AffineTransform.h"
 #include "platform/transforms/TransformationMatrix.h"
 #include "public/platform/WebDisplayItemList.h"
 #include "public/platform/WebFloatRect.h"
-#include "public/platform/WebRect.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace blink {
 
 ContentLayerDelegate::ContentLayerDelegate(GraphicsContextPainter* painter)
     : m_painter(painter)
 {
 }
 
 ContentLayerDelegate::~ContentLayerDelegate()
 {
 }
 
-PassRefPtr<TracedValue> toTracedValue(const WebRect& clip)
-{
-    RefPtr<TracedValue> tracedValue = TracedValue::create();
-    tracedValue->beginArray("clip_rect");
-    tracedValue->pushInteger(clip.x);
-    tracedValue->pushInteger(clip.y);
-    tracedValue->pushInteger(clip.width);
-    tracedValue->pushInteger(clip.height);
-    tracedValue->endArray();
-    return tracedValue;
-}
-
-static void paintArtifactToWebDisplayItemList(WebDisplayItemList* list, const PaintArtifact& artifact, const WebRect& bounds)
+static void paintArtifactToWebDisplayItemList(WebDisplayItemList* list, const PaintArtifact& artifact, const gfx::Rect& bounds)
 {
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         // This is a temporary path to paint the artifact using the paint chunk
         // properties. Ultimately, we should instead split the artifact into
         // separate layers and send those to the compositor, instead of sending
         // one big flat SkPicture.
-        SkRect skBounds = SkRect::MakeXYWH(bounds.x, bounds.y, bounds.width, bounds.height);
+        SkRect skBounds = SkRect::MakeXYWH(bounds.x(), bounds.y(), bounds.width(), bounds.height());
         RefPtr<SkPicture> picture = paintArtifactToSkPicture(artifact, skBounds);
         // TODO(wkorman): Pass actual visual rect with the drawing item.
         list->appendDrawingItem(IntRect(), picture.get());
         return;
     }
     artifact.appendToWebDisplayItemList(list);
 }
 
 gfx::Rect ContentLayerDelegate::paintableRegion()
 {
     IntRect interestRect = m_painter->interestRect();
     return gfx::Rect(interestRect.x(), interestRect.y(), interestRect.width(), interestRect.height());
 }
 
 void ContentLayerDelegate::paintContents(
-    WebDisplayItemList* webDisplayItemList, const WebRect& clip,
-    WebContentLayerClient::PaintingControlSetting paintingControl)
+    WebDisplayItemList* webDisplayItemList, WebContentLayerClient::PaintingControlSetting paintingControl)
 {
-    TRACE_EVENT1("blink,benchmark", "ContentLayerDelegate::paintContents", "clip_rect", toTracedValue(clip));
+    TRACE_EVENT0("blink,benchmark", "ContentLayerDelegate::paintContents");
 
     PaintController* paintController = m_painter->paintController();
     ASSERT(paintController);
     paintController->setDisplayItemConstructionIsDisabled(
         paintingControl == WebContentLayerClient::DisplayListConstructionDisabled);
 
     // We also disable caching when Painting or Construction are disabled. In both cases we would like
     // to compare assuming the full cost of recording, not the cost of re-using cached content.
     if (paintingControl != WebContentLayerClient::PaintDefaultBehavior)
         paintController->invalidateAll();
 
     GraphicsContext::DisabledMode disabledMode = GraphicsContext::NothingDisabled;
     if (paintingControl == WebContentLayerClient::DisplayListPaintingDisabled
         || paintingControl == WebContentLayerClient::DisplayListConstructionDisabled)
         disabledMode = GraphicsContext::FullyDisabled;
     GraphicsContext context(*paintController, disabledMode);
 
-    IntRect interestRect = clip;
-    m_painter->paint(context, &interestRect);
+    m_painter->paint(context, nullptr);
 
     paintController->commitNewDisplayItems();
-    paintArtifactToWebDisplayItemList(webDisplayItemList, paintController->paintArtifact(), clip);
+    paintArtifactToWebDisplayItemList(webDisplayItemList, paintController->paintArtifact(), paintableRegion());
     paintController->setDisplayItemConstructionIsDisabled(false);
 }
 
 size_t ContentLayerDelegate::approximateUnsharedMemoryUsage() const
 {
     return m_painter->paintController()->approximateUnsharedMemoryUsage();
 }
 
 } // namespace blink