diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 17:58:00 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:32 +0100 |
| commit | 312a1f86fb2e3afb0948da0b2915fae853fbc54e (patch) | |
| tree | 31f4d2af58fde0c4b2186cfeee7545c9df48a36c /WebCore/platform/graphics | |
| parent | df3c51fc6c7320d24a7b34e231acdca1dbf75329 (diff) | |
| download | external_webkit-312a1f86fb2e3afb0948da0b2915fae853fbc54e.zip external_webkit-312a1f86fb2e3afb0948da0b2915fae853fbc54e.tar.gz external_webkit-312a1f86fb2e3afb0948da0b2915fae853fbc54e.tar.bz2 | |
Merge WebKit at r74534: Fix FontAndroid.cpp (getShadow)
Update GraphicsContext::getShadow callsite with new
parameter.
See http://trac.webkit.org/changeset/74463
Change-Id: Ibfb36831800a57968963a5619c8425f5551829f5
Diffstat (limited to 'WebCore/platform/graphics')
| -rw-r--r-- | WebCore/platform/graphics/android/FontAndroid.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/FontAndroid.cpp b/WebCore/platform/graphics/android/FontAndroid.cpp index 520af5d..64d6aca 100644 --- a/WebCore/platform/graphics/android/FontAndroid.cpp +++ b/WebCore/platform/graphics/android/FontAndroid.cpp @@ -83,7 +83,8 @@ static bool setupForText(SkPaint* paint, GraphicsContext* gc, FloatSize shadowOffset; float shadowBlur; Color shadowColor; - bool hasShadow = gc->getShadow(shadowOffset, shadowBlur, shadowColor); + ColorSpace shadowColorSpace; + bool hasShadow = gc->getShadow(shadowOffset, shadowBlur, shadowColor, shadowColorSpace); bool hasBothStrokeAndFill = (mode & (cTextStroke | cTextFill)) == (cTextStroke | cTextFill); if (hasShadow || hasBothStrokeAndFill) { |