blink: Fix cc/paint skia type mismatches

third_party/WebKit/Source/web/tests/WebViewTest.cpp

 /*
  * Copyright (C) 2011, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 442 matching lines @@
 
   // Set WebView background to green with alpha.
   webView->setBaseBackgroundColor(kAlphaGreen);
   webView->settings()->setShouldClearDocumentBackground(false);
   webView->resize(WebSize(kWidth, kHeight));
   webView->updateAllLifecyclePhases();
 
   // Set canvas background to red with alpha.
   SkBitmap bitmap;
   bitmap.allocN32Pixels(kWidth, kHeight);
-  SkCanvas bitmapCanvas(bitmap);
-  bitmapCanvas.clear(kAlphaRed);
-
-  PaintCanvasPassThrough canvas(&bitmapCanvas);
+  SkCanvas canvas(bitmap);
+  canvas.clear(kAlphaRed);
 
   PaintRecordBuilder builder(FloatRect(0, 0, kWidth, kHeight));
 
   // Paint the root of the main frame in the way that CompositedLayerMapping
   // would.
   FrameView* view = m_webViewHelper.webView()->mainFrameImpl()->frameView();
   PaintLayer* rootLayer = view->layoutViewItem().layer();
   LayoutRect paintRect(0, 0, kWidth, kHeight);
   PaintLayerPaintingInfo paintingInfo(rootLayer, paintRect,
                                       GlobalPaintNormalPhase, LayoutSize());
@@ skipping 3858 matching lines @@
   EXPECT_FALSE(frameView->visualViewportSuppliesScrollbars());
   if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
     EXPECT_NE(nullptr,
               frameView->layoutViewportScrollableArea()->verticalScrollbar());
   } else {
     EXPECT_NE(nullptr, frameView->verticalScrollbar());
   }
 }
 
 }  // namespace blink