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

Unified Diff: third_party/WebKit/Source/platform/graphics/GraphicsContextState.cpp

Issue 1331533002: [poc] curve-filter Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix CanvasRenderingContext2D::createPattern crash for #40 Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/graphics/GraphicsContextState.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsContextState.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsContextState.cpp
index 4db36e0669fb1abb4f15f38d44a536775735ece4..5e5a71f8bc246974ea4732a13ff1aa0aaead7211 100644
--- a/third_party/WebKit/Source/platform/graphics/GraphicsContextState.cpp
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsContextState.cpp
@@ -87,9 +87,9 @@ void GraphicsContextState::setStrokeThickness(float thickness)
void GraphicsContextState::setStrokeColor(const Color& color)
{
- m_strokeGradient.clear();
m_strokeColor = color;
- m_strokePaint.setColor(color.rgb());
+ m_strokePaint.setColor(Color::toDeviceColor(color).rgb());
+ m_strokeGradient.clear();
m_strokePaint.setShader(0);
}
@@ -97,7 +97,8 @@ void GraphicsContextState::setStrokeGradient(const PassRefPtr<Gradient> gradient
{
m_strokeColor = Color::black;
m_strokeGradient = gradient;
- m_strokePaint.setColor(scaleAlpha(SK_ColorBLACK, alpha));
+ SkColor strokeColor = scaleAlpha(Color::black, alpha);
+ m_strokePaint.setColor(Color::toDeviceColor(strokeColor).rgb());
m_strokeGradient->applyToPaint(m_strokePaint);
}
@@ -122,8 +123,8 @@ void GraphicsContextState::setMiterLimit(float miterLimit)
void GraphicsContextState::setFillColor(const Color& color)
{
m_fillColor = color;
+ m_fillPaint.setColor(Color::toDeviceColor(color).rgb());
m_fillGradient.clear();
- m_fillPaint.setColor(color.rgb());
m_fillPaint.setShader(0);
}
@@ -131,7 +132,8 @@ void GraphicsContextState::setFillGradient(const PassRefPtr<Gradient> gradient,
{
m_fillColor = Color::black;
m_fillGradient = gradient;
- m_fillPaint.setColor(scaleAlpha(SK_ColorBLACK, alpha));
+ SkColor fillColor = scaleAlpha(Color::black, alpha);
+ m_fillPaint.setColor(Color::toDeviceColor(fillColor).rgb());
m_fillGradient->applyToPaint(m_fillPaint);
}

Powered by Google App Engine
This is Rietveld 408576698