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

Side by Side Diff: Source/core/html/canvas/CanvasStyle.h

Issue 196093002: Remove document param from parseSystemColor (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 18 matching lines...) Expand all
29 29
30 #include "platform/graphics/Color.h" 30 #include "platform/graphics/Color.h"
31 #include "wtf/Assertions.h" 31 #include "wtf/Assertions.h"
32 #include "wtf/RefCounted.h" 32 #include "wtf/RefCounted.h"
33 #include "wtf/text/WTFString.h" 33 #include "wtf/text/WTFString.h"
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 class CanvasGradient; 37 class CanvasGradient;
38 class CanvasPattern; 38 class CanvasPattern;
39 class Document;
40 class GraphicsContext; 39 class GraphicsContext;
41 class HTMLCanvasElement; 40 class HTMLCanvasElement;
42 41
43 class CanvasStyle : public RefCounted<CanvasStyle> { 42 class CanvasStyle : public RefCounted<CanvasStyle> {
44 public: 43 public:
45 static PassRefPtr<CanvasStyle> createFromRGBA(RGBA32 rgba) { return adop tRef(new CanvasStyle(rgba)); } 44 static PassRefPtr<CanvasStyle> createFromRGBA(RGBA32 rgba) { return adop tRef(new CanvasStyle(rgba)); }
46 static PassRefPtr<CanvasStyle> createFromString(const String& color, Doc ument* = 0); 45 static PassRefPtr<CanvasStyle> createFromString(const String& color);
47 static PassRefPtr<CanvasStyle> createFromStringWithOverrideAlpha(const S tring& color, float alpha); 46 static PassRefPtr<CanvasStyle> createFromStringWithOverrideAlpha(const S tring& color, float alpha);
48 static PassRefPtr<CanvasStyle> createFromGrayLevelWithAlpha(float grayLe vel, float alpha) { return adoptRef(new CanvasStyle(grayLevel, alpha)); } 47 static PassRefPtr<CanvasStyle> createFromGrayLevelWithAlpha(float grayLe vel, float alpha) { return adoptRef(new CanvasStyle(grayLevel, alpha)); }
49 static PassRefPtr<CanvasStyle> createFromRGBAChannels(float r, float g, float b, float a) { return adoptRef(new CanvasStyle(r, g, b, a)); } 48 static PassRefPtr<CanvasStyle> createFromRGBAChannels(float r, float g, float b, float a) { return adoptRef(new CanvasStyle(r, g, b, a)); }
50 static PassRefPtr<CanvasStyle> createFromCMYKAChannels(float c, float m, float y, float k, float a) { return adoptRef(new CanvasStyle(c, m, y, k, a)); } 49 static PassRefPtr<CanvasStyle> createFromCMYKAChannels(float c, float m, float y, float k, float a) { return adoptRef(new CanvasStyle(c, m, y, k, a)); }
51 static PassRefPtr<CanvasStyle> createFromGradient(PassRefPtr<CanvasGradi ent>); 50 static PassRefPtr<CanvasStyle> createFromGradient(PassRefPtr<CanvasGradi ent>);
52 static PassRefPtr<CanvasStyle> createFromPattern(PassRefPtr<CanvasPatter n>); 51 static PassRefPtr<CanvasStyle> createFromPattern(PassRefPtr<CanvasPatter n>);
53 52
54 bool isCurrentColor() const { return m_type == CurrentColor || m_type == CurrentColorWithOverrideAlpha; } 53 bool isCurrentColor() const { return m_type == CurrentColor || m_type == CurrentColorWithOverrideAlpha; }
55 bool hasOverrideAlpha() const { return m_type == CurrentColorWithOverrid eAlpha; } 54 bool hasOverrideAlpha() const { return m_type == CurrentColorWithOverrid eAlpha; }
56 float overrideAlpha() const { ASSERT(m_type == CurrentColorWithOverrideA lpha); return m_overrideAlpha; } 55 float overrideAlpha() const { ASSERT(m_type == CurrentColorWithOverrideA lpha); return m_overrideAlpha; }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 float a; 96 float a;
98 } m_cmyka; 97 } m_cmyka;
99 }; 98 };
100 99
101 RGBA32 currentColor(HTMLCanvasElement*); 100 RGBA32 currentColor(HTMLCanvasElement*);
102 bool parseColorOrCurrentColor(RGBA32& parsedColor, const String& colorString , HTMLCanvasElement*); 101 bool parseColorOrCurrentColor(RGBA32& parsedColor, const String& colorString , HTMLCanvasElement*);
103 102
104 } // namespace WebCore 103 } // namespace WebCore
105 104
106 #endif 105 #endif
OLDNEW
« no previous file with comments | « Source/core/html/canvas/CanvasRenderingContext2D.cpp ('k') | Source/core/html/canvas/CanvasStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698