Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(228)

Side by Side Diff: src/animator/SkDisplayType.cpp

Issue 1273813002: Add skstd::move and skstd::forward. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: No need to change the string. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« include/core/SkTemplates.h ('K') | « src/animator/SkDisplayType.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
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 #include "SkDisplayType.h" 10 #include "SkDisplayType.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 CASE_DEBUG_RETURN_NIL(Join); 139 CASE_DEBUG_RETURN_NIL(Join);
140 CASE_NEW(Line); 140 CASE_NEW(Line);
141 CASE_NEW(LineTo); 141 CASE_NEW(LineTo);
142 CASE_NEW(DrawLinearGradient); 142 CASE_NEW(DrawLinearGradient);
143 CASE_DRAW_NEW(MaskFilter); 143 CASE_DRAW_NEW(MaskFilter);
144 CASE_DEBUG_RETURN_NIL(MaskFilterBlurStyle); 144 CASE_DEBUG_RETURN_NIL(MaskFilterBlurStyle);
145 // maskfilterlight 145 // maskfilterlight
146 CASE_DRAW_NEW(Matrix); 146 CASE_DRAW_NEW(Matrix);
147 // memberfunction 147 // memberfunction
148 // memberproperty 148 // memberproperty
149 CASE_NEW(Move); 149 CASE_NEW(Relocate);
150 CASE_NEW(MoveTo); 150 CASE_NEW(MoveTo);
151 CASE_DISPLAY_NEW(Movie); 151 CASE_DISPLAY_NEW(Movie);
152 // msec 152 // msec
153 CASE_NEW(Oval); 153 CASE_NEW(Oval);
154 CASE_DRAW_NEW(Paint); 154 CASE_DRAW_NEW(Paint);
155 CASE_DRAW_NEW(Path); 155 CASE_DRAW_NEW(Path);
156 // pathdirection 156 // pathdirection
157 CASE_DRAW_NEW(PathEffect); 157 CASE_DRAW_NEW(PathEffect);
158 // point 158 // point
159 CASE_NEW(DrawPoint); 159 CASE_NEW(DrawPoint);
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 // join 293 // join
294 CASE_GET_INFO(Line); 294 CASE_GET_INFO(Line);
295 CASE_GET_INFO(LineTo); 295 CASE_GET_INFO(LineTo);
296 CASE_GET_INFO(DrawLinearGradient); 296 CASE_GET_INFO(DrawLinearGradient);
297 // maskfilter 297 // maskfilter
298 // maskfilterblurstyle 298 // maskfilterblurstyle
299 // maskfilterlight 299 // maskfilterlight
300 CASE_GET_DRAW_INFO(Matrix); 300 CASE_GET_DRAW_INFO(Matrix);
301 // memberfunction 301 // memberfunction
302 // memberproperty 302 // memberproperty
303 CASE_GET_INFO(Move); 303 CASE_GET_INFO(Relocate);
304 CASE_GET_INFO(MoveTo); 304 CASE_GET_INFO(MoveTo);
305 CASE_GET_DISPLAY_INFO(Movie); 305 CASE_GET_DISPLAY_INFO(Movie);
306 // msec 306 // msec
307 CASE_GET_INFO(Oval); 307 CASE_GET_INFO(Oval);
308 CASE_GET_DRAW_INFO(Path); 308 CASE_GET_DRAW_INFO(Path);
309 CASE_GET_DRAW_INFO(Paint); 309 CASE_GET_DRAW_INFO(Paint);
310 // pathdirection 310 // pathdirection
311 // patheffect 311 // patheffect
312 case SkType_Point: info = Sk_Point::fInfo; infoCount = Sk_Point::fInfoCo unt; break; // no virtual flavor 312 case SkType_Point: info = Sk_Point::fInfo; infoCount = Sk_Point::fInfoCo unt; break; // no virtual flavor
313 CASE_GET_INFO(DrawPoint); // virtual flavor 313 CASE_GET_INFO(DrawPoint); // virtual flavor
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 // join 459 // join
460 { "line", SkType_Line INIT_BOOL_FIELDS }, 460 { "line", SkType_Line INIT_BOOL_FIELDS },
461 { "lineTo", SkType_LineTo INIT_BOOL_FIELDS }, 461 { "lineTo", SkType_LineTo INIT_BOOL_FIELDS },
462 { "linearGradient", SkType_DrawLinearGradient INIT_BOOL_FIELDS }, 462 { "linearGradient", SkType_DrawLinearGradient INIT_BOOL_FIELDS },
463 { "maskFilter", SkType_MaskFilter INIT_BOOL_FIELDS }, 463 { "maskFilter", SkType_MaskFilter INIT_BOOL_FIELDS },
464 // maskfilterblurstyle 464 // maskfilterblurstyle
465 // maskfilterlight 465 // maskfilterlight
466 DRAW_NAME("matrix", SkType_Matrix), 466 DRAW_NAME("matrix", SkType_Matrix),
467 // memberfunction 467 // memberfunction
468 // memberproperty 468 // memberproperty
469 { "move", SkType_Move INIT_BOOL_FIELDS }, 469 { "move", SkType_Relocate INIT_BOOL_FIELDS },
470 { "moveTo", SkType_MoveTo INIT_BOOL_FIELDS }, 470 { "moveTo", SkType_MoveTo INIT_BOOL_FIELDS },
471 { "movie", SkType_Movie INIT_BOOL_FIELDS }, 471 { "movie", SkType_Movie INIT_BOOL_FIELDS },
472 // msec 472 // msec
473 { "oval", SkType_Oval INIT_BOOL_FIELDS }, 473 { "oval", SkType_Oval INIT_BOOL_FIELDS },
474 DRAW_NAME("paint", SkType_Paint), 474 DRAW_NAME("paint", SkType_Paint),
475 DRAW_NAME("path", SkType_Path), 475 DRAW_NAME("path", SkType_Path),
476 // pathdirection 476 // pathdirection
477 { "pathEffect", SkType_PathEffect INIT_BOOL_FIELDS }, 477 { "pathEffect", SkType_PathEffect INIT_BOOL_FIELDS },
478 // point 478 // point
479 DRAW_NAME("point", SkType_DrawPoint), 479 DRAW_NAME("point", SkType_DrawPoint),
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 case SkType_Event: 631 case SkType_Event:
632 case SkType_FromPath: 632 case SkType_FromPath:
633 case SkType_Full: 633 case SkType_Full:
634 case SkType_Group: 634 case SkType_Group:
635 case SkType_ImageBaseBitmap: 635 case SkType_ImageBaseBitmap:
636 case SkType_Input: 636 case SkType_Input:
637 case SkType_Line: 637 case SkType_Line:
638 case SkType_LineTo: 638 case SkType_LineTo:
639 case SkType_DrawLinearGradient: 639 case SkType_DrawLinearGradient:
640 case SkType_Matrix: 640 case SkType_Matrix:
641 case SkType_Move: 641 case SkType_Relocate:
642 case SkType_MoveTo: 642 case SkType_MoveTo:
643 case SkType_Movie: 643 case SkType_Movie:
644 case SkType_Oval: 644 case SkType_Oval:
645 case SkType_Paint: 645 case SkType_Paint:
646 case SkType_Path: 646 case SkType_Path:
647 case SkType_PolyToPoly: 647 case SkType_PolyToPoly:
648 case SkType_Polygon: 648 case SkType_Polygon:
649 case SkType_Polyline: 649 case SkType_Polyline:
650 case SkType_Post: 650 case SkType_Post:
651 case SkType_QuadTo: 651 case SkType_QuadTo:
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
752 continue; 752 continue;
753 SkASSERT(strcmp(info[inner].fName, info[inner + 1].fName) < 0); 753 SkASSERT(strcmp(info[inner].fName, info[inner + 1].fName) < 0);
754 } 754 }
755 #endif 755 #endif
756 } 756 }
757 #if defined SK_DEBUG || defined SK_BUILD_CONDENSED 757 #if defined SK_DEBUG || defined SK_BUILD_CONDENSED
758 BuildCondensedInfo(maker); 758 BuildCondensedInfo(maker);
759 #endif 759 #endif
760 } 760 }
761 #endif 761 #endif
OLDNEW
« include/core/SkTemplates.h ('K') | « src/animator/SkDisplayType.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698