DevTools: Clean up snapshot command log.

Source/platform/graphics/GraphicsContextRecorder.cpp

 /*
  * Copyright (C) 2013 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 146 matching lines @@
         return false;
     }
 
     const GraphicsContextSnapshot::Timings& timingsVector() const { return *m_timingsVector; }
 
 private:
     GraphicsContextSnapshot::Timings* m_timingsVector;
     Vector<double>* m_currentTimings;
 };
 
-class LoggingSnapshotPlayer : public SnapshotPlayer {
-public:
-    LoggingSnapshotPlayer(PassRefPtr<SkPicture> picture, SkCanvas* canvas)
-        : SnapshotPlayer(picture, canvas)
-    {
-    }
-
-    virtual bool abortDrawing() OVERRIDE
-    {
-        return false;
-    }
-};
-
 class LoggingCanvas : public SkCanvas {
 public:
-    LoggingCanvas()
+    LoggingCanvas(int width, int height) : SkCanvas(width, height)
     {
         m_log = JSONArray::create();
     }
 
     void clear(SkColor color) OVERRIDE
     {
         addItemWithParams("clear")->setString("color", stringForSkColor(color));
     }
 
     void drawPaint(const SkPaint& paint) OVERRIDE
@@ skipping 228 matching lines @@
 
     void willRestore() OVERRIDE
     {
         addItem("restore");
         this->SkCanvas::willRestore();
     }
 
     SaveLayerStrategy willSaveLayer(const SkRect* bounds, const SkPaint* paint, SaveFlags flags) OVERRIDE
     {
         RefPtr<JSONObject> params = addItemWithParams("saveLayer");
-        params->setObject("bounds", objectForSkRect(*bounds));
+        if (bounds)
+            params->setObject("bounds", objectForSkRect(*bounds));
         params->setObject("paint", objectForSkPaint(*paint));
         params->setString("saveFlags", saveFlagsToString(flags));
         this->SkCanvas::willSaveLayer(bounds, paint, flags);
         return kNoLayer_SaveLayerStrategy;
     }
 
     void willSave(SaveFlags flags) OVERRIDE
     {
         RefPtr<JSONObject> params = addItemWithParams("save");
         params->setString("saveFlags", saveFlagsToString(flags));
@@ skipping 586 matching lines @@
     return timings.release();
 }
 
 PassOwnPtr<ImageBuffer> GraphicsContextSnapshot::createImageBuffer() const
 {
     return ImageBuffer::create(IntSize(m_picture->width(), m_picture->height()), m_isCertainlyOpaque ? Opaque : NonOpaque);
 }
 
 PassRefPtr<JSONArray> GraphicsContextSnapshot::snapshotCommandLog() const
 {
-    LoggingCanvas canvas;
+    LoggingCanvas canvas(m_picture->width(), m_picture->height());
     FragmentSnapshotPlayer player(m_picture, &canvas);
     player.play(0, 0);
     return canvas.log();
 }
 
 }