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

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

Issue 597053003: Move color/gradient/pattern out of StrokeData (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/platform/graphics/GraphicsContext.cpp » ('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) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2008-2009 Torch Mobile, Inc. 3 * Copyright (C) 2008-2009 Torch Mobile, Inc.
4 * Copyright (C) 2013 Google Inc. All rights reserved. 4 * Copyright (C) 2013 Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 void restoreLayer(); 113 void restoreLayer();
114 114
115 bool hasStroke() const { return strokeStyle() != NoStroke && strokeThickness () > 0; } 115 bool hasStroke() const { return strokeStyle() != NoStroke && strokeThickness () > 0; }
116 116
117 float strokeThickness() const { return immutableState()->strokeData().thickn ess(); } 117 float strokeThickness() const { return immutableState()->strokeData().thickn ess(); }
118 void setStrokeThickness(float thickness) { mutableState()->setStrokeThicknes s(thickness); } 118 void setStrokeThickness(float thickness) { mutableState()->setStrokeThicknes s(thickness); }
119 119
120 StrokeStyle strokeStyle() const { return immutableState()->strokeData().styl e(); } 120 StrokeStyle strokeStyle() const { return immutableState()->strokeData().styl e(); }
121 void setStrokeStyle(StrokeStyle style) { mutableState()->setStrokeStyle(styl e); } 121 void setStrokeStyle(StrokeStyle style) { mutableState()->setStrokeStyle(styl e); }
122 122
123 Color strokeColor() const { return immutableState()->strokeData().color(); } 123 Color strokeColor() const { return immutableState()->strokeColor(); }
124 void setStrokeColor(const Color& color) { mutableState()->setStrokeColor(col or); } 124 void setStrokeColor(const Color& color) { mutableState()->setStrokeColor(col or); }
125 SkColor effectiveStrokeColor() const { return immutableState()->effectiveStr okeColor(); } 125 SkColor effectiveStrokeColor() const { return immutableState()->effectiveStr okeColor(); }
126 126
127 Pattern* strokePattern() const { return immutableState()->strokeData().patte rn(); } 127 Pattern* strokePattern() const { return immutableState()->strokePattern(); }
128 void setStrokePattern(PassRefPtr<Pattern>); 128 void setStrokePattern(PassRefPtr<Pattern>);
129 129
130 Gradient* strokeGradient() const { return immutableState()->strokeData().gra dient(); } 130 Gradient* strokeGradient() const { return immutableState()->strokeGradient() ; }
131 void setStrokeGradient(PassRefPtr<Gradient>); 131 void setStrokeGradient(PassRefPtr<Gradient>);
132 132
133 void setLineCap(LineCap cap) { mutableState()->setLineCap(cap); } 133 void setLineCap(LineCap cap) { mutableState()->setLineCap(cap); }
134 void setLineDash(const DashArray& dashes, float dashOffset) { mutableState() ->setLineDash(dashes, dashOffset); } 134 void setLineDash(const DashArray& dashes, float dashOffset) { mutableState() ->setLineDash(dashes, dashOffset); }
135 void setLineJoin(LineJoin join) { mutableState()->setLineJoin(join); } 135 void setLineJoin(LineJoin join) { mutableState()->setLineJoin(join); }
136 void setMiterLimit(float limit) { mutableState()->setMiterLimit(limit); } 136 void setMiterLimit(float limit) { mutableState()->setMiterLimit(limit); }
137 137
138 WindRule fillRule() const { return immutableState()->fillRule(); } 138 WindRule fillRule() const { return immutableState()->fillRule(); }
139 void setFillRule(WindRule fillRule) { mutableState()->setFillRule(fillRule); } 139 void setFillRule(WindRule fillRule) { mutableState()->setFillRule(fillRule); }
140 140
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 bool m_accelerated : 1; 541 bool m_accelerated : 1;
542 bool m_isCertainlyOpaque : 1; 542 bool m_isCertainlyOpaque : 1;
543 bool m_printing : 1; 543 bool m_printing : 1;
544 bool m_antialiasHairlineImages : 1; 544 bool m_antialiasHairlineImages : 1;
545 bool m_shouldSmoothFonts : 1; 545 bool m_shouldSmoothFonts : 1;
546 }; 546 };
547 547
548 } // namespace blink 548 } // namespace blink
549 549
550 #endif // GraphicsContext_h 550 #endif // GraphicsContext_h
OLDNEW
« no previous file with comments | « no previous file | Source/platform/graphics/GraphicsContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698