diff options
author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/platform/image-decoders/openvg/ImageDecoderOpenVG.cpp | |
parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/platform/image-decoders/openvg/ImageDecoderOpenVG.cpp')
-rw-r--r-- | Source/WebCore/platform/image-decoders/openvg/ImageDecoderOpenVG.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/image-decoders/openvg/ImageDecoderOpenVG.cpp b/Source/WebCore/platform/image-decoders/openvg/ImageDecoderOpenVG.cpp index 061c5ab..d29317a 100644 --- a/Source/WebCore/platform/image-decoders/openvg/ImageDecoderOpenVG.cpp +++ b/Source/WebCore/platform/image-decoders/openvg/ImageDecoderOpenVG.cpp @@ -34,7 +34,7 @@ namespace WebCore { -NativeImagePtr RGBA32Buffer::asNewNativeImage() const +NativeImagePtr ImageFrame::asNewNativeImage() const { static const VGImageFormat bufferFormat = VG_sARGB_8888_PRE; // Save memory by using 16-bit images for fully opaque images. |