summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/skia
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2009-10-08 11:13:05 +0100
committerSteve Block <steveblock@google.com>2009-10-14 16:51:25 +0100
commitd19c83b203e72c34b78a731c61d73c77ad99794e (patch)
treec6b214d4568504bbd761227647a64786a22635c2 /WebCore/platform/graphics/skia
parenta5f64bb29c5e0a6a5d59257da60d3bffba7819e7 (diff)
downloadexternal_webkit-d19c83b203e72c34b78a731c61d73c77ad99794e.zip
external_webkit-d19c83b203e72c34b78a731c61d73c77ad99794e.tar.gz
external_webkit-d19c83b203e72c34b78a731c61d73c77ad99794e.tar.bz2
Fixes a bunch of WebKit whitespace discrepancies between Android and webkit.org. Do not merge.
This will avoid noise in the diffs when upstreaming Android-specific changes to webkit.org. This has already been submitted to master branch.
Diffstat (limited to 'WebCore/platform/graphics/skia')
-rw-r--r--WebCore/platform/graphics/skia/SkiaUtils.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/skia/SkiaUtils.cpp b/WebCore/platform/graphics/skia/SkiaUtils.cpp
index 662ea5c..bb15aa2 100644
--- a/WebCore/platform/graphics/skia/SkiaUtils.cpp
+++ b/WebCore/platform/graphics/skia/SkiaUtils.cpp
@@ -131,10 +131,10 @@ SkColor SkPMColorToColor(SkPMColor pm)
{
if (0 == pm)
return 0;
-
+
unsigned a = SkGetPackedA32(pm);
uint32_t scale = (255 << 16) / a;
-
+
return SkColorSetARGB(a,
InvScaleByte(SkGetPackedR32(pm), scale),
InvScaleByte(SkGetPackedG32(pm), scale),