Remove dependency on SkJsonCanvas.h

tools/debugger/SkDrawCommand.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SKDRAWCOMMAND_H_
 #define SKDRAWCOMMAND_H_
 
@@ skipping 95 matching lines @@
                                      int opIndex) const;
 
     /* Converts a JSON representation of a command into a newly-allocated SkDrawCommand object. It
      * is the caller's responsibility to delete this object. This method may return null if an error
      * occurs.
      */
     static SkDrawCommand* fromJSON(Json::Value& command, UrlDataManager& urlDataManager);
 
     static const char* GetCommandString(OpType type);
 
+    // Helper methods for converting things to JSON
+    static Json::Value MakeJsonIRect(const SkIRect&);
+    static Json::Value MakeJsonMatrix(const SkMatrix&);
+
 protected:
     SkTDArray<SkString*> fInfo;
 
 private:
     OpType fOpType;
     bool   fVisible;
 };
 
 class SkRestoreCommand : public SkDrawCommand {
 public:
@@ skipping 539 matching lines @@
     static SkSetMatrixCommand* fromJSON(Json::Value& command, UrlDataManager& urlDataManager);
 
 private:
     SkMatrix fUserMatrix;
     SkMatrix fMatrix;
 
     typedef SkDrawCommand INHERITED;
 };
 
 #endif