Stop using deprecatedCreateWithCanvas in SP mode in PageOverlayTest.

Source/web/PageOverlayTest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "web/PageOverlay.h"
 
 #include "core/frame/FrameView.h"
 #include "core/layout/LayoutView.h"
 #include "platform/graphics/Color.h"
@@ skipping 176 matching lines @@
 
     // Ideally, we would get results from the compositor that showed that this
     // page overlay actually winds up getting drawn on top of the rest.
     // For now, we just check that the GraphicsLayer will draw the right thing.
 
     MockCanvas canvas(viewportWidth, viewportHeight);
     EXPECT_CALL(canvas, onDrawRect(_, _)).Times(AtLeast(0));
     EXPECT_CALL(canvas, onDrawRect(SkRect::MakeWH(viewportWidth, viewportHeight), Property(&SkPaint::getColor, SK_ColorYELLOW)));
 
     GraphicsLayer* graphicsLayer = webViewImpl()->pageOverlays()->graphicsLayerForTesting();
+    WebRect rect(0, 0, viewportWidth, viewportHeight);
     if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
         // If slimming paint is on, we paint the layer with a null canvas to get
         // a display list, and then replay that onto the mock canvas for
         // examination. This is about as close to the real path as we can easily
         // get.
         GraphicsContext graphicsContext(graphicsLayer->displayItemList());
-        graphicsLayer->paint(graphicsContext, WebRect(0, 0, viewportWidth, viewportHeight));
+        graphicsLayer->paint(graphicsContext, rect);
 
-        OwnPtr<GraphicsContext> replayContext = GraphicsContext::deprecatedCreateWithCanvas(&canvas);
-        graphicsLayer->displayItemList()->commitNewDisplayItemsAndReplay(*replayContext);
+        graphicsContext.beginRecording(IntRect(rect));
+        graphicsLayer->displayItemList()->commitNewDisplayItemsAndReplay(graphicsContext);
+        graphicsContext.endRecording()->playback(&canvas);
     } else {
         OwnPtr<GraphicsContext> graphicsContext = GraphicsContext::deprecatedCreateWithCanvas(&canvas);
-        graphicsLayer->paint(*graphicsContext, WebRect(0, 0, viewportWidth, viewportHeight));
+        graphicsLayer->paint(*graphicsContext, rect);
     }
 }
 
 TEST_F(PageOverlayTest, SimpleCanvasOverlay_AcceleratedCompositing_NoSlimmingPaint)
 {
     SlimmingPaintScope slimmingPaintEnabled(false);
     runPageOverlayTestWithAcceleratedCompositing<SimpleCanvasOverlay>();
 }
 
 TEST_F(PageOverlayTest, SimpleCanvasOverlay_AcceleratedCompositing_SlimmingPaint)
 {
     SlimmingPaintScope slimmingPaintEnabled(true);
     runPageOverlayTestWithAcceleratedCompositing<SimpleCanvasOverlay>();
 }
 
 TEST_F(PageOverlayTest, PrivateGraphicsContextOverlay_AcceleratedCompositing_NoSlimmingPaint)
 {
     SlimmingPaintScope slimmingPaintEnabled(false);
     runPageOverlayTestWithAcceleratedCompositing<PrivateGraphicsContextOverlay>();
 }
 
 TEST_F(PageOverlayTest, PrivateGraphicsContextOverlay_AcceleratedCompositing_SlimmingPaint)
 {
     SlimmingPaintScope slimmingPaintEnabled(true);
     runPageOverlayTestWithAcceleratedCompositing<PrivateGraphicsContextOverlay>();
 }
 
 } // namespace
 } // namespace blink