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

Side by Side Diff: Source/platform/graphics/GraphicsTypes.h

Issue 446543002: Removing WindRule.h completely (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updated according to comments Created 6 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 | « Source/platform/graphics/GraphicsContext.cpp ('k') | Source/platform/graphics/Path.h » ('j') | 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 (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 11 matching lines...) Expand all
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef GraphicsTypes_h 26 #ifndef GraphicsTypes_h
27 #define GraphicsTypes_h 27 #define GraphicsTypes_h
28 28
29 #include "platform/PlatformExport.h" 29 #include "platform/PlatformExport.h"
30 #include "public/platform/WebBlendMode.h" 30 #include "public/platform/WebBlendMode.h"
31 #include "third_party/skia/include/core/SkPaint.h" 31 #include "third_party/skia/include/core/SkPaint.h"
32 #include "third_party/skia/include/core/SkPath.h"
32 #include "wtf/Forward.h" 33 #include "wtf/Forward.h"
33 34
34 namespace blink { 35 namespace blink {
35 36
36 enum StrokeStyle { 37 enum StrokeStyle {
37 NoStroke, 38 NoStroke,
38 SolidStroke, 39 SolidStroke,
39 DottedStroke, 40 DottedStroke,
40 DashedStroke, 41 DashedStroke,
41 DoubleStroke, 42 DoubleStroke,
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 }; 102 };
102 typedef unsigned TextDrawingModeFlags; 103 typedef unsigned TextDrawingModeFlags;
103 104
104 enum ColorFilter { 105 enum ColorFilter {
105 ColorFilterNone, 106 ColorFilterNone,
106 ColorFilterLuminanceToAlpha, 107 ColorFilterLuminanceToAlpha,
107 ColorFilterSRGBToLinearRGB, 108 ColorFilterSRGBToLinearRGB,
108 ColorFilterLinearRGBToSRGB 109 ColorFilterLinearRGBToSRGB
109 }; 110 };
110 111
112 enum WindRule {
113 RULE_NONZERO = SkPath::kWinding_FillType,
114 RULE_EVENODD = SkPath::kEvenOdd_FillType
115 };
116
111 PLATFORM_EXPORT String compositeOperatorName(CompositeOperator, blink::WebBlendM ode); 117 PLATFORM_EXPORT String compositeOperatorName(CompositeOperator, blink::WebBlendM ode);
112 PLATFORM_EXPORT bool parseCompositeAndBlendOperator(const String&, CompositeOper ator&, blink::WebBlendMode&); 118 PLATFORM_EXPORT bool parseCompositeAndBlendOperator(const String&, CompositeOper ator&, blink::WebBlendMode&);
113 119
114 PLATFORM_EXPORT String lineCapName(LineCap); 120 PLATFORM_EXPORT String lineCapName(LineCap);
115 PLATFORM_EXPORT bool parseLineCap(const String&, LineCap&); 121 PLATFORM_EXPORT bool parseLineCap(const String&, LineCap&);
116 122
117 PLATFORM_EXPORT String lineJoinName(LineJoin); 123 PLATFORM_EXPORT String lineJoinName(LineJoin);
118 PLATFORM_EXPORT bool parseLineJoin(const String&, LineJoin&); 124 PLATFORM_EXPORT bool parseLineJoin(const String&, LineJoin&);
119 125
120 PLATFORM_EXPORT String textAlignName(TextAlign); 126 PLATFORM_EXPORT String textAlignName(TextAlign);
121 PLATFORM_EXPORT bool parseTextAlign(const String&, TextAlign&); 127 PLATFORM_EXPORT bool parseTextAlign(const String&, TextAlign&);
122 128
123 PLATFORM_EXPORT String textBaselineName(TextBaseline); 129 PLATFORM_EXPORT String textBaselineName(TextBaseline);
124 PLATFORM_EXPORT bool parseTextBaseline(const String&, TextBaseline&); 130 PLATFORM_EXPORT bool parseTextBaseline(const String&, TextBaseline&);
125 131
126 } // namespace blink 132 } // namespace blink
127 133
128 #endif 134 #endif
OLDNEW
« no previous file with comments | « Source/platform/graphics/GraphicsContext.cpp ('k') | Source/platform/graphics/Path.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698