OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 Google Inc. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 #include "SkDrawCommand.h" | 8 #include "SkDrawCommand.h" |
9 | 9 |
10 #include "SkBlurMaskFilter.h" | 10 #include "SkBlurMaskFilter.h" |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 #define SKDEBUGCANVAS_ATTRIBUTE_RUNS "runs" | 84 #define SKDEBUGCANVAS_ATTRIBUTE_RUNS "runs" |
85 #define SKDEBUGCANVAS_ATTRIBUTE_POSITIONS "positions" | 85 #define SKDEBUGCANVAS_ATTRIBUTE_POSITIONS "positions" |
86 #define SKDEBUGCANVAS_ATTRIBUTE_GLYPHS "glyphs" | 86 #define SKDEBUGCANVAS_ATTRIBUTE_GLYPHS "glyphs" |
87 #define SKDEBUGCANVAS_ATTRIBUTE_FONT "font" | 87 #define SKDEBUGCANVAS_ATTRIBUTE_FONT "font" |
88 #define SKDEBUGCANVAS_ATTRIBUTE_TYPEFACE "typeface" | 88 #define SKDEBUGCANVAS_ATTRIBUTE_TYPEFACE "typeface" |
89 #define SKDEBUGCANVAS_ATTRIBUTE_CUBICS "cubics" | 89 #define SKDEBUGCANVAS_ATTRIBUTE_CUBICS "cubics" |
90 #define SKDEBUGCANVAS_ATTRIBUTE_COLORS "colors" | 90 #define SKDEBUGCANVAS_ATTRIBUTE_COLORS "colors" |
91 #define SKDEBUGCANVAS_ATTRIBUTE_TEXTURECOORDS "textureCoords" | 91 #define SKDEBUGCANVAS_ATTRIBUTE_TEXTURECOORDS "textureCoords" |
92 #define SKDEBUGCANVAS_ATTRIBUTE_FILTERQUALITY "filterQuality" | 92 #define SKDEBUGCANVAS_ATTRIBUTE_FILTERQUALITY "filterQuality" |
93 | 93 |
94 #define SKDEBUGCANVAS_ATTRIBUTE_SHORTDESC "short-desc" | 94 #define SKDEBUGCANVAS_ATTRIBUTE_SHORTDESC "shortDesc" |
95 | 95 |
96 #define SKDEBUGCANVAS_VERB_MOVE "move" | 96 #define SKDEBUGCANVAS_VERB_MOVE "move" |
97 #define SKDEBUGCANVAS_VERB_LINE "line" | 97 #define SKDEBUGCANVAS_VERB_LINE "line" |
98 #define SKDEBUGCANVAS_VERB_QUAD "quad" | 98 #define SKDEBUGCANVAS_VERB_QUAD "quad" |
99 #define SKDEBUGCANVAS_VERB_CUBIC "cubic" | 99 #define SKDEBUGCANVAS_VERB_CUBIC "cubic" |
100 #define SKDEBUGCANVAS_VERB_CONIC "conic" | 100 #define SKDEBUGCANVAS_VERB_CONIC "conic" |
101 #define SKDEBUGCANVAS_VERB_CLOSE "close" | 101 #define SKDEBUGCANVAS_VERB_CLOSE "close" |
102 | 102 |
103 #define SKDEBUGCANVAS_STYLE_FILL "fill" | 103 #define SKDEBUGCANVAS_STYLE_FILL "fill" |
104 #define SKDEBUGCANVAS_STYLE_STROKE "stroke" | 104 #define SKDEBUGCANVAS_STYLE_STROKE "stroke" |
(...skipping 3101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3206 result[SKDEBUGCANVAS_ATTRIBUTE_MATRIX] = MakeJsonMatrix(fMatrix); | 3206 result[SKDEBUGCANVAS_ATTRIBUTE_MATRIX] = MakeJsonMatrix(fMatrix); |
3207 return result; | 3207 return result; |
3208 } | 3208 } |
3209 | 3209 |
3210 SkSetMatrixCommand* SkSetMatrixCommand::fromJSON(Json::Value& command, | 3210 SkSetMatrixCommand* SkSetMatrixCommand::fromJSON(Json::Value& command, |
3211 UrlDataManager& urlDataManager)
{ | 3211 UrlDataManager& urlDataManager)
{ |
3212 SkMatrix matrix; | 3212 SkMatrix matrix; |
3213 extract_json_matrix(command[SKDEBUGCANVAS_ATTRIBUTE_MATRIX], &matrix); | 3213 extract_json_matrix(command[SKDEBUGCANVAS_ATTRIBUTE_MATRIX], &matrix); |
3214 return new SkSetMatrixCommand(matrix); | 3214 return new SkSetMatrixCommand(matrix); |
3215 } | 3215 } |
OLD | NEW |