diff options
Diffstat (limited to 'Source/WebCore/platform/image-decoders/ImageDecoder.h')
| -rw-r--r-- | Source/WebCore/platform/image-decoders/ImageDecoder.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/WebCore/platform/image-decoders/ImageDecoder.h b/Source/WebCore/platform/image-decoders/ImageDecoder.h index 7d0d0d4..e07f4f2 100644 --- a/Source/WebCore/platform/image-decoders/ImageDecoder.h +++ b/Source/WebCore/platform/image-decoders/ImageDecoder.h @@ -180,11 +180,7 @@ namespace WebCore { g = static_cast<unsigned>(g * alphaPercent); b = static_cast<unsigned>(b * alphaPercent); } -<<<<<<< HEAD -#if PLATFORM(ANDROID) -======= #if PLATFORM(SKIA) ->>>>>>> webkit.org at r78450 *dest = SkPackARGB32(a, r, g, b); #else *dest = (a << 24 | r << 16 | g << 8 | b); |