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

Side by Side Diff: tools/PictureRenderer.h

Issue 1306443004: Use static_assert instead of SK_COMPILE_ASSERT. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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
« no previous file with comments | « tests/ImageDecodingTest.cpp ('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 * 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 #ifndef PictureRenderer_DEFINED 8 #ifndef PictureRenderer_DEFINED
9 #define PictureRenderer_DEFINED 9 #define PictureRenderer_DEFINED
10 10
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 // this uses SkPaint::Flags as a base and adds additional flags 65 // this uses SkPaint::Flags as a base and adds additional flags
66 enum DrawFilterFlags { 66 enum DrawFilterFlags {
67 kNone_DrawFilterFlag = 0, 67 kNone_DrawFilterFlag = 0,
68 kHinting_DrawFilterFlag = 0x10000, // toggles between no hinting and nor mal hinting 68 kHinting_DrawFilterFlag = 0x10000, // toggles between no hinting and nor mal hinting
69 kSlightHinting_DrawFilterFlag = 0x20000, // toggles between slight and n ormal hinting 69 kSlightHinting_DrawFilterFlag = 0x20000, // toggles between slight and n ormal hinting
70 kAAClip_DrawFilterFlag = 0x40000, // toggles between soft and hard clip 70 kAAClip_DrawFilterFlag = 0x40000, // toggles between soft and hard clip
71 kMaskFilter_DrawFilterFlag = 0x80000, // toggles on/off mask filters (e. g., blurs) 71 kMaskFilter_DrawFilterFlag = 0x80000, // toggles on/off mask filters (e. g., blurs)
72 }; 72 };
73 73
74 SK_COMPILE_ASSERT(!(kMaskFilter_DrawFilterFlag & SkPaint::kAllFlags), maskfi lter_flag_must_be_greater); 74 static_assert(!(kMaskFilter_DrawFilterFlag & SkPaint::kAllFlags),
75 SK_COMPILE_ASSERT(!(kHinting_DrawFilterFlag & SkPaint::kAllFlags), 75 "maskfilter_flag_must_be_greater");
76 hinting_flag_must_be_greater); 76 static_assert(!(kHinting_DrawFilterFlag & SkPaint::kAllFlags),
77 SK_COMPILE_ASSERT(!(kSlightHinting_DrawFilterFlag & SkPaint::kAllFlags), 77 "hinting_flag_must_be_greater");
78 slight_hinting_flag_must_be_greater); 78 static_assert(!(kSlightHinting_DrawFilterFlag & SkPaint::kAllFlags),
79 "slight_hinting_flag_must_be_greater");
79 80
80 /** 81 /**
81 * Called with each new SkPicture to render. 82 * Called with each new SkPicture to render.
82 * 83 *
83 * @param pict The SkPicture to render. 84 * @param pict The SkPicture to render.
84 * @param writePath The output directory within which this renderer should w rite all images, 85 * @param writePath The output directory within which this renderer should w rite all images,
85 * or NULL if this renderer should not write all images. 86 * or NULL if this renderer should not write all images.
86 * @param mismatchPath The output directory within which this renderer shoul d write any images 87 * @param mismatchPath The output directory within which this renderer shoul d write any images
87 * which do not match expectations, or NULL if this renderer should not write mismatches. 88 * which do not match expectations, or NULL if this renderer should not write mismatches.
88 * @param inputFilename The name of the input file we are rendering. 89 * @param inputFilename The name of the input file we are rendering.
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 719
719 #if SK_SUPPORT_GPU 720 #if SK_SUPPORT_GPU
720 extern PictureRenderer* CreateGatherPixelRefsRenderer(const GrContextOptions& op ts); 721 extern PictureRenderer* CreateGatherPixelRefsRenderer(const GrContextOptions& op ts);
721 #else 722 #else
722 extern PictureRenderer* CreateGatherPixelRefsRenderer(); 723 extern PictureRenderer* CreateGatherPixelRefsRenderer();
723 #endif 724 #endif
724 725
725 } 726 }
726 727
727 #endif // PictureRenderer_DEFINED 728 #endif // PictureRenderer_DEFINED
OLDNEW
« no previous file with comments | « tests/ImageDecodingTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698