Rename paint data structures

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 443 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 canvas(bitmap);
-  canvas.clear(kAlphaRed);
+  SkCanvas bitmapCanvas(bitmap);
+  bitmapCanvas.clear(kAlphaRed);
+
+  PaintCanvasPassThrough canvas(&bitmapCanvas);
 
   SkPictureBuilder pictureBuilder(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());
   PaintLayerPainter(*rootLayer)
       .paintLayerContents(pictureBuilder.context(), paintingInfo,
                           PaintLayerPaintingCompositingAllPhases);
-
   pictureBuilder.endRecording()->playback(&canvas);
 
   // The result should be a blend of red and green.
   SkColor color = bitmap.getColor(kWidth / 2, kHeight / 2);
   EXPECT_TRUE(redChannel(color));
   EXPECT_TRUE(greenChannel(color));
 }
 
 TEST_P(WebViewTest, FocusIsInactive) {
   URLTestHelpers::registerMockedURLFromBaseURL(
@@ skipping 3892 matching lines @@
   EXPECT_EQ(expectedWidth, vwElement->offsetWidth());
   EXPECT_EQ(expectedHeight, vwElement->offsetHeight());
 
   webView->resize(WebSize(800, 600));
   frame->printEnd();
 
   EXPECT_EQ(800, vwElement->offsetWidth());
 }
 
 }  // namespace blink