client-goodbye

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

 /*
  * Copyright (C) 2009, 2010, 2011 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 2748 matching lines @@
   // FIXME: need to split out paint invalidations for the background.
   ApplyToGraphicsLayers(this, SetContentsNeedsDisplayFunctor(),
                         ApplyToContentLayers);
 }
 
 struct SetContentsNeedsDisplayInRectFunctor {
   void operator()(GraphicsLayer* layer) const {
     if (layer->drawsContent()) {
       IntRect layerDirtyRect = r;
       layerDirtyRect.move(-layer->offsetFromLayoutObject());
-      layer->setNeedsDisplayInRect(layerDirtyRect, invalidationReason, client);
+      layer->setNeedsDisplayInRect(layerDirtyRect, invalidationReason, debug);
     }
   }
 
   IntRect r;
   PaintInvalidationReason invalidationReason;
-  const DisplayItemClient& client;
+  const InvalidationDebugging& debug;
 };
 
 void CompositedLayerMapping::setContentsNeedDisplayInRect(
     const LayoutRect& r,
     PaintInvalidationReason invalidationReason,
-    const DisplayItemClient& client) {
+    const InvalidationDebugging& debug) {
   DCHECK(!m_owningLayer.layoutObject()->usesCompositedScrolling());
   // TODO(wangxianzhu): Enable the following assert after paint invalidation for
   // spv2 is ready.
   // ASSERT(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());
 
   SetContentsNeedsDisplayInRectFunctor functor = {
       enclosingIntRect(LayoutRect(
           r.location() + m_owningLayer.subpixelAccumulation(), r.size())),
-      invalidationReason, client};
+      invalidationReason, debug};
   ApplyToGraphicsLayers(this, functor, ApplyToContentLayers);
 }
 
 void CompositedLayerMapping::setNonScrollingContentsNeedDisplayInRect(
     const LayoutRect& r,
     PaintInvalidationReason invalidationReason,
-    const DisplayItemClient& client) {
+    const InvalidationDebugging& debug) {
   DCHECK(m_owningLayer.layoutObject()->usesCompositedScrolling());
   // TODO(wangxianzhu): Enable the following assert after paint invalidation for
   // spv2 is ready.
   // ASSERT(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());
 
   SetContentsNeedsDisplayInRectFunctor functor = {
       enclosingIntRect(LayoutRect(
           r.location() + m_owningLayer.subpixelAccumulation(), r.size())),
-      invalidationReason, client};
+      invalidationReason, debug};
   ApplyToGraphicsLayers(this, functor, ApplyToNonScrollingContentLayers);
 }
 
 void CompositedLayerMapping::setScrollingContentsNeedDisplayInRect(
     const LayoutRect& r,
     PaintInvalidationReason invalidationReason,
-    const DisplayItemClient& client) {
+    const InvalidationDebugging& debug) {
   DCHECK(m_owningLayer.layoutObject()->usesCompositedScrolling());
   // TODO(wangxianzhu): Enable the following assert after paint invalidation for
   // spv2 is ready.
   // ASSERT(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());
 
   SetContentsNeedsDisplayInRectFunctor functor = {
       enclosingIntRect(LayoutRect(
           r.location() + m_owningLayer.subpixelAccumulation(), r.size())),
-      invalidationReason, client};
+      invalidationReason, debug};
   ApplyToGraphicsLayers(this, functor, ApplyToScrollingContentLayers);
 }
 
 const GraphicsLayerPaintInfo* CompositedLayerMapping::containingSquashedLayer(
     const LayoutObject* layoutObject,
     const Vector<GraphicsLayerPaintInfo>& layers,
     unsigned maxSquashedLayerIndex) {
   if (!layoutObject)
     return nullptr;
   for (size_t i = 0; i < layers.size() && i < maxSquashedLayerIndex; ++i) {
@@ skipping 49 matching lines @@
     const GraphicsLayerPaintInfo& paintInfo,
     const GraphicsLayer& graphicsLayer,
     const PaintLayerFlags& paintLayerFlags,
     GraphicsContext& context,
     const IntRect& clip /* In the coords of rootLayer */) const {
   FontCachePurgePreventer fontCachePurgePreventer;
 
   IntSize offset = paintInfo.offsetFromLayoutObject;
   AffineTransform translation;
   translation.translate(-offset.width(), -offset.height());
-  TransformRecorder transformRecorder(context, graphicsLayer, translation);
+  TransformRecorder transformRecorder(
+      context, translation, graphicsLayer.visualRect(),
+      graphicsLayer.debugName(),
+      graphicsLayer.paintedOutputOfObjectHasNoEffectRegardlessOfSize());
 
   // The dirtyRect is in the coords of the painting root.
   IntRect dirtyRect(clip);
   dirtyRect.move(offset);
 
   if (paintLayerFlags & (PaintLayerPaintingOverflowContents |
                          PaintLayerPaintingAncestorClippingMaskPhase)) {
     dirtyRect.move(
         roundedIntSize(paintInfo.paintLayer->subpixelAccumulation()));
   } else {
@@ skipping 50 matching lines @@
 }
 
 static void paintScrollbar(const Scrollbar* scrollbar,
                            GraphicsContext& context,
                            const IntRect& clip) {
   if (!scrollbar)
     return;
 
   const IntRect& scrollbarRect = scrollbar->frameRect();
   TransformRecorder transformRecorder(
-      context, *scrollbar,
-      AffineTransform::translation(-scrollbarRect.x(), -scrollbarRect.y()));
+      context,
+      AffineTransform::translation(-scrollbarRect.x(), -scrollbarRect.y()),
+      scrollbar->visualRect(), scrollbar->debugName(),
+      scrollbar->paintedOutputOfObjectHasNoEffectRegardlessOfSize());
   IntRect transformedClip = clip;
   transformedClip.moveBy(scrollbarRect.location());
   scrollbar->paint(context, CullRect(transformedClip));
 }
 
 // TODO(eseckler): Make recording distance configurable, e.g. for use in
 // headless, where we would like to record an exact area.
 // Note however that the minimum value for this constant is the size of a
 // raster tile. This is because the raster system is not able to raster a
 // tile that is not completely covered by a display list. If the constant
@@ skipping 503 matching lines @@
   } else if (graphicsLayer == m_decorationOutlineLayer.get()) {
     name = "Decoration Layer";
   } else {
     ASSERT_NOT_REACHED();
   }
 
   return name;
 }
 
 }  // namespace blink