| OLD | NEW | 
|    1  |    1  | 
|    2 /* |    2 /* | 
|    3  * Copyright 2012 Google Inc. |    3  * Copyright 2012 Google Inc. | 
|    4  * |    4  * | 
|    5  * Use of this source code is governed by a BSD-style license that can be |    5  * Use of this source code is governed by a BSD-style license that can be | 
|    6  * found in the LICENSE file. |    6  * found in the LICENSE file. | 
|    7  */ |    7  */ | 
|    8  |    8  | 
|    9  |    9  | 
|   10 #ifndef SKDEBUGCANVAS_H_ |   10 #ifndef SKDEBUGCANVAS_H_ | 
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  144         fUserMatrix = matrix; |  144         fUserMatrix = matrix; | 
|  145     } |  145     } | 
|  146  |  146  | 
|  147     SkString clipStackData() const { return fClipStackData; } |  147     SkString clipStackData() const { return fClipStackData; } | 
|  148  |  148  | 
|  149     /** |  149     /** | 
|  150         Returns a JSON object representing up to the Nth draw, where N is less t
     han |  150         Returns a JSON object representing up to the Nth draw, where N is less t
     han | 
|  151         SkDebugCanvas::getSize(). The encoder may use the UrlDataManager to stor
     e binary data such  |  151         SkDebugCanvas::getSize(). The encoder may use the UrlDataManager to stor
     e binary data such  | 
|  152         as images, referring to them via URLs embedded in the JSON. |  152         as images, referring to them via URLs embedded in the JSON. | 
|  153      */ |  153      */ | 
|  154     Json::Value toJSON(UrlDataManager& urlDataManager, int n); |  154     Json::Value toJSON(UrlDataManager& urlDataManager, int n, SkCanvas*); | 
|  155  |  155  | 
|  156 //////////////////////////////////////////////////////////////////////////////// |  156 //////////////////////////////////////////////////////////////////////////////// | 
|  157 // Inherited from SkCanvas |  157 // Inherited from SkCanvas | 
|  158 //////////////////////////////////////////////////////////////////////////////// |  158 //////////////////////////////////////////////////////////////////////////////// | 
|  159  |  159  | 
|  160     static const int kVizImageHeight = 256; |  160     static const int kVizImageHeight = 256; | 
|  161     static const int kVizImageWidth = 256; |  161     static const int kVizImageWidth = 256; | 
|  162  |  162  | 
|  163     bool isClipEmpty() const override { return false; } |  163     bool isClipEmpty() const override { return false; } | 
|  164     bool isClipRect() const override { return true; } |  164     bool isClipRect() const override { return true; } | 
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  275     void outputPoints(const SkPoint* pts, int count); |  275     void outputPoints(const SkPoint* pts, int count); | 
|  276     void outputPointsCommon(const SkPoint* pts, int count); |  276     void outputPointsCommon(const SkPoint* pts, int count); | 
|  277     void outputScalar(SkScalar num); |  277     void outputScalar(SkScalar num); | 
|  278  |  278  | 
|  279     void updatePaintFilterCanvas(); |  279     void updatePaintFilterCanvas(); | 
|  280  |  280  | 
|  281     typedef SkCanvas INHERITED; |  281     typedef SkCanvas INHERITED; | 
|  282 }; |  282 }; | 
|  283  |  283  | 
|  284 #endif |  284 #endif | 
| OLD | NEW |