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 181 matching lines @@
     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();
     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.
+        WebRect rect(0, 0, viewportWidth, viewportHeight);
         GraphicsContext graphicsContext(graphicsLayer->displayItemList());
         graphicsLayer->paint(graphicsContext, WebRect(0, 0, viewportWidth, viewportHeight));

[wkorman, 2015/06/06 05:02:46]

Looks like can use rect here.

 
-        OwnPtr<GraphicsContext> replayContext = GraphicsContext::deprecatedCreateWithCanvas(&canvas);
-        graphicsLayer->displayItemList()->commitNewDisplayItemsAndReplay(*replayContext);
+        graphicsContext.beginRecording(IntRect(rect));

[chrishtr, 2015/06/06 00:34:02]

These lines of code are identical to what is in SkPictureBuilder::endRecording.

[chrishtr, 2015/06/06 05:13:04]

Done.

+        graphicsLayer->displayItemList()->commitNewDisplayItemsAndReplay(graphicsContext);
+        graphicsContext.endRecording()->playback(&canvas);
     } else {
         OwnPtr<GraphicsContext> graphicsContext = GraphicsContext::deprecatedCreateWithCanvas(&canvas);
         graphicsLayer->paint(*graphicsContext, WebRect(0, 0, viewportWidth, viewportHeight));
     }
 }
 
 TEST_F(PageOverlayTest, SimpleCanvasOverlay_AcceleratedCompositing_NoSlimmingPaint)
 {
     SlimmingPaintScope slimmingPaintEnabled(false);
     runPageOverlayTestWithAcceleratedCompositing<SimpleCanvasOverlay>();
@@ skipping 12 matching lines @@
 }
 
 TEST_F(PageOverlayTest, PrivateGraphicsContextOverlay_AcceleratedCompositing_SlimmingPaint)
 {
     SlimmingPaintScope slimmingPaintEnabled(true);
     runPageOverlayTestWithAcceleratedCompositing<PrivateGraphicsContextOverlay>();
 }
 
 } // namespace
 } // namespace blink