blink: Fix cc/paint skia type mismatches

third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp

Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
index d2e25128ac7772c8c9745be734316a470ceae592..044aea6ff9c8f225328a9954caabe897f4b7f89d 100644
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
@@ -1250,8 +1250,7 @@ void GraphicsLayer::checkPaintUnderInvalidations(const PaintRecord& newRecord) {
   oldBitmap.allocPixels(
       SkImageInfo::MakeN32Premul(rect.width(), rect.height()));
   {
-    SkCanvas bitmapCanvas(oldBitmap);
-    PaintCanvasPassThrough canvas(&bitmapCanvas);
+    PaintCanvas canvas(oldBitmap);
     canvas.clear(SK_ColorTRANSPARENT);
     canvas.translate(-rect.x(), -rect.y());
     canvas.drawPicture(tracking->lastPaintedRecord.get());
@@ -1261,8 +1260,7 @@ void GraphicsLayer::checkPaintUnderInvalidations(const PaintRecord& newRecord) {
   newBitmap.allocPixels(
       SkImageInfo::MakeN32Premul(rect.width(), rect.height()));
   {
-    SkCanvas bitmapCanvas(newBitmap);
-    PaintCanvasPassThrough canvas(&bitmapCanvas);
+    PaintCanvas canvas(newBitmap);
     canvas.clear(SK_ColorTRANSPARENT);
     canvas.translate(-rect.x(), -rect.y());
     canvas.drawPicture(&newRecord);