Switch PageWidgetDelegate to use an SkPictureBuilder.

Source/web/PageWidgetDelegate.cpp

 /*
  * Copyright (C) 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 24 matching lines @@
 #include "core/frame/LocalFrame.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
 #include "core/page/AutoscrollController.h"
 #include "core/page/EventHandler.h"
 #include "core/page/Page.h"
 #include "core/paint/TransformRecorder.h"
 #include "platform/Logging.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/ClipRecorder.h"
-#include "platform/graphics/paint/DisplayItemListContextRecorder.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
+#include "platform/graphics/paint/SkPictureBuilder.h"
 #include "platform/transforms/AffineTransform.h"
 #include "public/web/WebInputEvent.h"
 #include "web/PageOverlayList.h"
 #include "web/WebInputEventConversion.h"
 #include "wtf/CurrentTime.h"
 
 namespace blink {
 
 void PageWidgetDelegate::animate(Page& page, double monotonicFrameBeginTime, LocalFrame& root)
 {
     RefPtrWillBeRawPtr<FrameView> view = root.view();
     if (!view)
         return;
     page.autoscrollController().animate(monotonicFrameBeginTime);
     page.animator().serviceScriptedAnimations(monotonicFrameBeginTime);
 }
 
 void PageWidgetDelegate::layout(Page& page, LocalFrame& root)
 {
     page.animator().updateLayoutAndStyleForPainting(&root);
 }
 
 void PageWidgetDelegate::paint(Page& page, PageOverlayList* overlays, WebCanvas* canvas,
     const WebRect& rect, LocalFrame& root)
 {
     if (rect.isEmpty())
         return;
 
-    OwnPtr<GraphicsContext> context = GraphicsContext::deprecatedCreateWithCanvas(canvas);
-    {
-        DisplayItemListContextRecorder contextRecorder(*context);
-        GraphicsContext& paintContext = contextRecorder.context();
+    IntRect intRect(rect);
+    SkPictureBuilder builder(intRect);
+    GraphicsContext* context = &builder.context();
 
-        // FIXME: device scale factor settings are layering violations and should not
-        // be used within Blink paint code.
-        float scaleFactor = page.deviceScaleFactor();
-        paintContext.setDeviceScaleFactor(scaleFactor);
+    // FIXME: device scale factor settings are layering violations and should not
+    // be used within Blink paint code.
+    float scaleFactor = page.deviceScaleFactor();
+    context->setDeviceScaleFactor(scaleFactor);
 
-        AffineTransform scale;
-        scale.scale(scaleFactor);
-        TransformRecorder scaleRecorder(paintContext, root, scale);
+    AffineTransform scale;
+    scale.scale(scaleFactor);
+    TransformRecorder scaleRecorder(*context, root, scale);
 
-        IntRect dirtyRect(rect);
-        FrameView* view = root.view();
-        if (view) {
-            ClipRecorder clipRecorder(paintContext, root, DisplayItem::PageWidgetDelegateClip, LayoutRect(dirtyRect));
+    IntRect dirtyRect(rect);
+    FrameView* view = root.view();
+    if (view) {
+        ClipRecorder clipRecorder(*context, root, DisplayItem::PageWidgetDelegateClip, LayoutRect(dirtyRect));
 
-            view->paint(&paintContext, dirtyRect);
-            if (overlays)
-                overlays->paintWebFrame(paintContext);
-        } else {
-            DrawingRecorder drawingRecorder(paintContext, root, DisplayItem::PageWidgetDelegateBackgroundFallback, dirtyRect);
-            if (!drawingRecorder.canUseCachedDrawing())
-                paintContext.fillRect(dirtyRect, Color::white);
-        }
+        view->paint(context, dirtyRect);
+        if (overlays)
+            overlays->paintWebFrame(*context);
+    } else {
+        DrawingRecorder drawingRecorder(*context, root, DisplayItem::PageWidgetDelegateBackgroundFallback, dirtyRect);
+        if (!drawingRecorder.canUseCachedDrawing())
+            context->fillRect(dirtyRect, Color::white);
     }
+    builder.endRecording()->playback(canvas);
 }
 
 bool PageWidgetDelegate::handleInputEvent(PageWidgetEventHandler& handler, const WebInputEvent& event, LocalFrame* root)
 {
     switch (event.type) {
 
     // FIXME: WebKit seems to always return false on mouse events processing
     // methods. For now we'll assume it has processed them (as we are only
     // interested in whether keyboard events are processed).
     // FIXME: Why do we return true when there is no root or the root is
@@ skipping 92 matching lines @@
 {
     return mainFrame.eventHandler().handleWheelEvent(PlatformWheelEventBuilder(mainFrame.view(), event));
 }
 
 bool PageWidgetEventHandler::handleTouchEvent(LocalFrame& mainFrame, const WebTouchEvent& event)
 {
     return mainFrame.eventHandler().handleTouchEvent(PlatformTouchEventBuilder(mainFrame.view(), event));
 }
 
 } // namespace blink