Make sure the TransformRecorder is finished before replaying the SKPicture.

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 65 matching lines @@
     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();
     context->setDeviceScaleFactor(scaleFactor);
 
     AffineTransform scale;
     scale.scale(scaleFactor);
-    TransformRecorder scaleRecorder(*context, root, scale);
 
-    IntRect dirtyRect(rect);
-    FrameView* view = root.view();
-    if (view) {
-        ClipRecorder clipRecorder(*context, root, DisplayItem::PageWidgetDelegateClip, LayoutRect(dirtyRect));
+    {
+        TransformRecorder scaleRecorder(*context, root, scale);
 
-        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);
+        IntRect dirtyRect(rect);
+        FrameView* view = root.view();
+        if (view) {
+            ClipRecorder clipRecorder(*context, root, DisplayItem::PageWidgetDelegateClip, LayoutRect(dirtyRect));
+
+            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
@@ skipping 94 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