Add an alternate paintContents method to WebContentLayerClient.

Source/platform/graphics/ContentLayerDelegate.cpp

Index: Source/platform/graphics/ContentLayerDelegate.cpp
diff --git a/Source/platform/graphics/OpaqueRectTrackingContentLayerDelegate.cpp b/Source/platform/graphics/ContentLayerDelegate.cpp
similarity index 67%
rename from Source/platform/graphics/OpaqueRectTrackingContentLayerDelegate.cpp
rename to Source/platform/graphics/ContentLayerDelegate.cpp
index 703c45c7f25299f97586f9d9fe781f04147c80a9..bd637ba0482fb5a7637dbfcfb5380a3b4511a5bb 100644
--- a/Source/platform/graphics/OpaqueRectTrackingContentLayerDelegate.cpp
+++ b/Source/platform/graphics/ContentLayerDelegate.cpp
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "platform/graphics/OpaqueRectTrackingContentLayerDelegate.h"
+#include "platform/graphics/ContentLayerDelegate.h"
 
 #include "platform/EventTracer.h"
 #include "platform/geometry/IntRect.h"
@@ -35,43 +35,38 @@
 
 namespace blink {
 
-OpaqueRectTrackingContentLayerDelegate::OpaqueRectTrackingContentLayerDelegate(GraphicsContextPainter* painter)
+ContentLayerDelegate::ContentLayerDelegate(GraphicsContextPainter* painter)
     : m_painter(painter)
     , m_opaque(false)
 {
 }
 
-OpaqueRectTrackingContentLayerDelegate::~OpaqueRectTrackingContentLayerDelegate()
+ContentLayerDelegate::~ContentLayerDelegate()
 {
 }
 
-void OpaqueRectTrackingContentLayerDelegate::paintContents(
-    SkCanvas* canvas, const WebRect& clip, bool canPaintLCDText, WebFloatRect& opaque,
+void ContentLayerDelegate::paintContents(
+    SkCanvas* canvas, const WebRect& clip, bool canPaintLCDText, WebFloatRect&,
+    WebContentLayerClient::GraphicsContextStatus contextStatus)
+{
+    paintContents(canvas, clip, canPaintLCDText, contextStatus);
+}
+
+void ContentLayerDelegate::paintContents(
+    SkCanvas* canvas, const WebRect& clip, bool canPaintLCDText,
     WebContentLayerClient::GraphicsContextStatus contextStatus)
 {
     static const unsigned char* annotationsEnabled = 0;
     if (UNLIKELY(!annotationsEnabled))
         annotationsEnabled = EventTracer::getTraceCategoryEnabledFlag(TRACE_DISABLED_BY_DEFAULT("blink.graphics_context_annotations"));
 
-    GraphicsContext context(canvas,
-        contextStatus == WebContentLayerClient::GraphicsContextEnabled ? GraphicsContext::NothingDisabled : GraphicsContext::FullyDisabled);
-    context.setRegionTrackingMode(m_opaque ? GraphicsContext::RegionTrackingDisabled : GraphicsContext::RegionTrackingOpaque);
+    GraphicsContext context(canvas, contextStatus == WebContentLayerClient::GraphicsContextEnabled ? GraphicsContext::NothingDisabled : GraphicsContext::FullyDisabled);
     context.setCertainlyOpaque(m_opaque);
     context.setShouldSmoothFonts(canPaintLCDText);
-
     if (*annotationsEnabled)
         context.setAnnotationMode(AnnotateAll);
 
-    // Record transform prior to painting, as all opaque tracking will be
-    // relative to this current value.
-    AffineTransform canvasToContentTransform = context.getCTM().inverse();
-
     m_painter->paint(context, clip);
-
-    // Transform tracked opaque paints back to our layer's content space.
-    ASSERT(canvasToContentTransform.isInvertible());
-    ASSERT(canvasToContentTransform.preservesAxisAlignment());
-    opaque = canvasToContentTransform.mapRect(context.opaqueRegion().asRect());
 }
 
 } // namespace blink