Attachment 142739 Details for Bug 81974 – Patch

[patch] Patch

bug-81974-20120518110111.patch (text/plain), 21.72 KB, created by Tony Payne on 2012-05-18 11:01:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tony Payne

Created: 2012-05-18 11:01:12 PDT

Size: 21.72 KB

patch

obsolete

>Subversion Revision: 117497
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 1898a2aa79c36c3d055e8f75949a5db542b5fddc..a86d22d5856ed4f12ac86ae1a615ad51e7c37f4c 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,10 @@
>+2012-05-17  Tony Payne  <tpayne@chromium.org>
>+
>+        https://bugs.webkit.org/show_bug.cgi?id=81974: Add iccjpeg and qcms to
>+        chromium port.
>+
>+        Reviewed by NOBODY (OOPS!).
>+
> 2012-05-16  Geoffrey Garen  <ggaren@apple.com>
> 
>         This is not a joke: 3.7X speedup from removing a call to sleep
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index f15b39fe3acac7166d0643ab8a0473687c8318ff..3ec70d488468b4ec750e0f933a0cea9af1835ada 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,49 @@
>+2012-05-17  Tony Payne  <tpayne@chromium.org>
>+
>+        https://bugs.webkit.org/show_bug.cgi?id=81974: Add iccjpeg and qcms to
>+        chromium port. crbug.com/143
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Covered by existing layout tests.
>+
>+        * WebCore.gyp/WebCore.gyp: Add qcms dependency.
>+
>+        * platform/image-decoders/ImageDecoder.h:
>+        (ImageFrame): Remove unused m_colorProfile member variable.
>+
>+        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
>+        (WebCore::JPEGImageReader::JPEGImageReader): Initialize new m_transform
>+        member variable.
>+        (WebCore::JPEGImageReader::close): Release m_transform.
>+        (WebCore::JPEGImageReader::decode): Set m_transform when image contains
>+        color profile.
>+        (JPEGImageReader):
>+        (WebCore::JPEGImageReader::colorTransform): Accessor for color
>+        transform.
>+        (WebCore::JPEGImageReader::createColorTransform): Decodes ICC color
>+        profile into m_transform.
>+        (WebCore::JPEGImageDecoder::outputScanlines): Apply transform line by
>+        line.
>+
>+        * platform/image-decoders/png/PNGImageDecoder.cpp:
>+        (WebCore::PNGImageReader::PNGImageReader): Initialize new m_transform
>+        and m_rowBuffer member variables.
>+        (WebCore::PNGImageReader::close): Release m_transform and m_rowBuffer.
>+        (WebCore::PNGImageReader::rowBuffer): Accessor for row buffer.
>+        (PNGImageReader):
>+        (WebCore::PNGImageReader::colorTransform): Accessor for color transform.
>+        (WebCore::PNGImageReader::createColorTransform): Decodes ICC color
>+        profile into m_transform.
>+        (WebCore::PNGImageReader::createRowBuffer): Allocates space for row
>+        buffer.
>+        (WebCore::PNGImageDecoder::headerAvailable): Set m_transform when image
>+        contains color profile.
>+        (WebCore::PNGImageDecoder::rowAvailable): Apply transform line by line.
>+        * platform/image-decoders/skia/ImageDecoderSkia.cpp:
>+        (WebCore::ImageFrame::setColorProfile): Remove color profile code.
>+        (WebCore::ImageFrame::setStatus): Remove color profile code.
>+
> 2012-05-17  Julien Chaffraix  <jchaffraix@webkit.org>
> 
>         Kill RenderLayer::relativePositionOffset(LayoutUnit& relX, LayoutUnit& relY) and cleanup RenderInline::clippedOverflowRectForRepaint
>diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
>index cfc77e95677f34d7f5878ac080266e1bb16a0285..1b4851120f07a1151859748408b0171a4099e877 100644
>--- a/Source/WTF/wtf/Platform.h
>+++ b/Source/WTF/wtf/Platform.h
>@@ -469,17 +469,22 @@
> #if OS(DARWIN)
> #if USE(SKIA_ON_MAC_CHROMIUM)
> #define WTF_USE_SKIA 1
>+#define WTF_USE_ICCJPEG 1
>+#define WTF_USE_QMCS 1
> #else
> #define WTF_USE_CG 1
> #endif
> #define WTF_USE_ATSUI 1
> #define WTF_USE_CORE_TEXT 1
> #define WTF_USE_ICCJPEG 1
>+#define WTF_USE_QCMS 1
> #elif OS(ANDROID)
> #define WTF_USE_SKIA 1
> #else
> #define WTF_USE_SKIA 1
> #define WTF_USE_CHROMIUM_NET 1
>+#define WTF_USE_ICCJPEG 1
>+#define WTF_USE_QCMS 1
> #endif
> #endif
> 
>diff --git a/Source/WebCore/WebCore.gyp/WebCore.gyp b/Source/WebCore/WebCore.gyp/WebCore.gyp
>index 44fe767a750a1bb4b0b5b14258ae864490f8633b..76304d490d666858d32f6ce8a99c12b0bf49c771 100644
>--- a/Source/WebCore/WebCore.gyp/WebCore.gyp
>+++ b/Source/WebCore/WebCore.gyp/WebCore.gyp
>@@ -1087,6 +1087,7 @@
>         '<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt',
>         '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp',
>         '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
>+        '<(chromium_src_dir)/third_party/qcms/qcms.gyp:qcms',
>         '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
>         '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
>         '<(libjpeg_gyp_path):libjpeg',
>@@ -1213,6 +1214,7 @@
>         '<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt',
>         '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
>         '<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
>+        '<(chromium_src_dir)/third_party/qcms/qcms.gyp:qcms',
>         '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
>         '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl',
>         '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib',
>@@ -1231,6 +1233,7 @@
>         '<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt',
>         '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
>         '<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
>+        '<(chromium_src_dir)/third_party/qcms/qcms.gyp:qcms',
>         '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
>         '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl',
>         '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib',
>@@ -1981,6 +1984,7 @@
>         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
>         '<(chromium_src_dir)/skia/skia.gyp:skia',
>         '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
>+        '<(chromium_src_dir)/third_party/qcms/qcms.gyp:qcms',
>         '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
>       ],
>       'export_dependent_settings': [
>@@ -1989,6 +1993,7 @@
>         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
>         '<(chromium_src_dir)/skia/skia.gyp:skia',
>         '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
>+        '<(chromium_src_dir)/third_party/qcms/qcms.gyp:qcms',
>         '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
>       ],
>       'direct_dependent_settings': {
>diff --git a/Source/WebCore/platform/image-decoders/ImageDecoder.h b/Source/WebCore/platform/image-decoders/ImageDecoder.h
>index 6ae738a3bf52b480766bd7238c0915c262f90f32..12a4b71bec00e4089b8ce64452248beb1f9154ae 100644
>--- a/Source/WebCore/platform/image-decoders/ImageDecoder.h
>+++ b/Source/WebCore/platform/image-decoders/ImageDecoder.h
>@@ -45,6 +45,10 @@
> #include <QImage>
> #endif
> 
>+#if USE(QCMS)
>+#include "qcms.h"
>+#endif
>+
> namespace WebCore {
> 
>     typedef Vector<char> ColorProfile;
>@@ -177,9 +181,6 @@ namespace WebCore {
> 
> #if USE(SKIA)
>         NativeImageSkia m_bitmap;
>-#if PLATFORM(CHROMIUM) && OS(DARWIN)
>-        ColorProfile m_colorProfile;
>-#endif
> #elif PLATFORM(QT) && USE(QT_IMAGE_DECODER)
>         mutable QPixmap m_pixmap;
>         mutable QImage m_image;
>@@ -306,6 +307,25 @@ namespace WebCore {
>             return !memcmp(&profileData[12], "mntr", 4) || !memcmp(&profileData[12], "scnr", 4);
>         }
> 
>+#if USE(QCMS)
>+        static qcms_profile* qcmsOutputDeviceProfile()
>+        {
>+            static qcms_profile* outputDeviceProfile = 0;
>+            static bool qcmsInitialized = false;
>+            if (!qcmsInitialized) {
>+                // FIXME: Add optional ICCv4 support.
>+                // FIXME: sRGB profiles don't add much value. Use the user's monitor profile.
>+                outputDeviceProfile = qcms_profile_sRGB();
>+                // FIXME: Check that the profile is valid and CRASH() if not.
>+                qcms_profile_precache_output_transform(outputDeviceProfile);
>+                qcmsInitialized = true;
>+            }
>+            ASSERT(outputDeviceProfile);
>+            return outputDeviceProfile;
>+        }
>+
>+#endif
>+
>         // Sets the "decode failure" flag.  For caller convenience (since so
>         // many callers want to return false after calling this), returns false
>         // to enable easy tailcalling.  Subclasses may override this to also
>@@ -337,6 +357,7 @@ namespace WebCore {
> 
>         RefPtr<SharedBuffer> m_data; // The encoded data.
>         Vector<ImageFrame> m_frameBufferCache;
>+        // FIXME: Do we need m_colorProfile any more, for any port?
>         ColorProfile m_colorProfile;
>         bool m_scaled;
>         Vector<int> m_scaledColumns;
>diff --git a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
>index bf3998bf8ff3e67f8c3c7bcb6bbca01046cfdb4b..8661f915e623233f9344e6be69144886d4ddf4bf 100644
>--- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
>+++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
>@@ -60,6 +60,10 @@ extern "C" {
> #if USE(ICCJPEG)
> #include "iccjpeg.h"
> #endif
>+#if USE(QCMS)
>+#include "qcms.h"
>+#endif
>+
> #include <setjmp.h>
> }
> 
>@@ -76,7 +80,7 @@ inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_RGBA; }
> #else
> inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_BGRA; }
> #endif
>-inline bool turboSwizzled(J_COLOR_SPACE colorSpace) { return colorSpace == rgbOutputColorSpace(); }
>+inline bool turboSwizzled(J_COLOR_SPACE colorSpace) { return colorSpace == JCS_EXT_RGBA || colorSpace == JCS_EXT_BGRA; }
> #else
> inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_RGB; }
> #endif
>@@ -159,6 +163,9 @@ class JPEGImageReader
> public:
>     JPEGImageReader(JPEGImageDecoder* decoder)
>         : m_decoder(decoder)
>+#if USE(QCMS)
>+        , m_transform(0)
>+#endif
>         , m_bufferLength(0)
>         , m_bytesToSkip(0)
>         , m_state(JPEG_HEADER)
>@@ -210,6 +217,13 @@ public:
>             fastFree(src);
>         m_info.src = 0;
> 
>+#if USE(QCMS)
>+        if (m_transform) {
>+            qcms_transform_release(m_transform);
>+            m_transform = 0;
>+        }
>+#endif
>+
>         jpeg_destroy_decompress(&m_info);
>     }
> 
>@@ -296,8 +310,16 @@ public:
>             // Allow color management of the decoded RGBA pixels if possible.
>             if (!m_decoder->ignoresGammaAndColorProfile()) {
>                 ColorProfile rgbInputDeviceColorProfile = readColorProfile(info());
>-                if (!rgbInputDeviceColorProfile.isEmpty())
>+                if (!rgbInputDeviceColorProfile.isEmpty()) {
>                     m_decoder->setColorProfile(rgbInputDeviceColorProfile);
>+                    bool swizzled = turboSwizzled(m_info.out_color_space);
>+                    createColorTransform(rgbInputDeviceColorProfile, swizzled);
>+#if USE(QCMS)
>+                    // If we're swizzling and applying a color profile, swizzle to RGBA for qcms
>+                    if (swizzled && m_transform)
>+                        m_info.out_color_space = JCS_EXT_RGBA;
>+#endif
>+                }
>             }
> 
>             if (m_decodingSizeOnly) {
>@@ -402,9 +424,37 @@ public:
>     jpeg_decompress_struct* info() { return &m_info; }
>     JSAMPARRAY samples() const { return m_samples; }
>     JPEGImageDecoder* decoder() { return m_decoder; }
>+#if USE(QCMS)
>+    qcms_transform* colorTransform() const { return m_transform; }
>+#endif
> 
> private:
>+    void createColorTransform(ColorProfile colorProfile, bool hasAlpha)
>+    {
>+#if USE(QCMS)
>+        if (colorProfile.isEmpty())
>+            return;
>+        qcms_profile* qcmsColorProfile = qcms_profile_from_memory(colorProfile.data(), colorProfile.size());
>+        if (!qcmsColorProfile)
>+            return;
>+        qcms_profile* outputProfile = WebCore::ImageDecoder::qcmsOutputDeviceProfile();
>+        if (outputProfile)
>+            m_transform = qcms_transform_create(qcmsColorProfile,
>+                                                hasAlpha ? QCMS_DATA_RGBA_8 : QCMS_DATA_RGB_8,
>+                                                outputProfile,
>+                                                hasAlpha ? QCMS_DATA_RGBA_8 : QCMS_DATA_RGB_8,
>+                                                QCMS_INTENT_PERCEPTUAL);
>+        qcms_profile_release(qcmsColorProfile);
>+#else
>+        UNUSED_PARAM(colorProfile);
>+        UNUSED_PARAM(hasAlpha);
>+#endif
>+    }
>+
>     JPEGImageDecoder* m_decoder;
>+#if USE(QCMS)
>+    qcms_transform* m_transform;
>+#endif
>     unsigned m_bufferLength;
>     int m_bytesToSkip;
>     bool m_decodingSizeOnly;
>@@ -527,6 +577,11 @@ bool JPEGImageDecoder::outputScanlines()
>              unsigned char* row = reinterpret_cast<unsigned char*>(buffer.getAddr(0, info->output_scanline));
>              if (jpeg_read_scanlines(info, &row, 1) != 1)
>                   return false;
>+#if USE(QCMS)
>+             if (qcms_transform* transform = m_reader->colorTransform())
>+                 qcms_transform_data_type(transform, row, row, info->output_width, rgbOutputColorSpace() == JCS_EXT_BGRA ? QCMS_OUTPUT_BGRX : QCMS_OUTPUT_RGBX);
>+#endif
>+
>          }
>          return true;
>      }
>@@ -545,6 +600,11 @@ bool JPEGImageDecoder::outputScanlines()
>         int destY = scaledY(sourceY);
>         if (destY < 0)
>             continue;
>+#if USE(QCMS)
>+        if (info->out_color_space == JCS_RGB)
>+            if (qcms_transform* transform = m_reader->colorTransform())
>+                qcms_transform_data(transform, *samples, *samples, info->output_width);
>+#endif
>         int width = m_scaled ? m_scaledColumns.size() : info->output_width;
>         for (int x = 0; x < width; ++x) {
>             JSAMPLE* jsample = *samples + (m_scaled ? m_scaledColumns[x] : x) * ((info->out_color_space == JCS_RGB) ? 3 : 4);
>diff --git a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp b/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
>index 815b0961d145b493ab7f1ff7d68e578d832d1a4b..94cae9104aeee25e049c577d8220df58160d4080 100644
>--- a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
>+++ b/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
>@@ -47,6 +47,10 @@
> #include "TraceEvent.h"
> #endif
> 
>+#if USE(QCMS)
>+#include "qcms.h"
>+#endif
>+
> #if defined(PNG_LIBPNG_VER_MAJOR) && defined(PNG_LIBPNG_VER_MINOR) && (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4))
> #define JMPBUF(png_ptr) png_jmpbuf(png_ptr)
> #else
>@@ -109,6 +113,10 @@ public:
>         : m_readOffset(0)
>         , m_decodingSizeOnly(false)
>         , m_interlaceBuffer(0)
>+        , m_rowBuffer(0)
>+#if USE(QCMS)
>+        , m_transform(0)
>+#endif
>         , m_hasAlpha(false)
>         , m_currentBufferSize(0)
>     {
>@@ -127,8 +135,16 @@ public:
>         if (m_png && m_info)
>             // This will zero the pointers.
>             png_destroy_read_struct(&m_png, &m_info, 0);
>+#if USE(QCMS)
>+        if (m_transform) {
>+            qcms_transform_release(m_transform);
>+            m_transform = 0;
>+        }
>+#endif
>         delete[] m_interlaceBuffer;
>         m_interlaceBuffer = 0;
>+        delete[] m_rowBuffer;
>+        m_rowBuffer = 0;
>         m_readOffset = 0;
>     }
> 
>@@ -161,12 +177,39 @@ public:
>     png_structp pngPtr() const { return m_png; }
>     png_infop infoPtr() const { return m_info; }
>     png_bytep interlaceBuffer() const { return m_interlaceBuffer; }
>+    png_bytep rowBuffer() const { return m_rowBuffer; }
>+#if USE(QCMS)
>+    qcms_transform* colorTransform() const { return m_transform; }
>+#endif
>     bool hasAlpha() const { return m_hasAlpha; }
> 
>     void setReadOffset(unsigned offset) { m_readOffset = offset; }
>     void setHasAlpha(bool b) { m_hasAlpha = b; }
> 
>     void createInterlaceBuffer(int size) { m_interlaceBuffer = new png_byte[size]; }
>+    void createRowBuffer(int size) { m_rowBuffer = new png_byte[size]; }
>+
>+    void createColorTransform(ColorProfile colorProfile, bool hasAlpha)
>+    {
>+#if USE(QCMS)
>+        if (colorProfile.isEmpty())
>+            return;
>+        qcms_profile* qcmsColorProfile = qcms_profile_from_memory(colorProfile.data(), colorProfile.size());
>+        if (!qcmsColorProfile)
>+            return;
>+        qcms_profile* outputProfile = WebCore::ImageDecoder::qcmsOutputDeviceProfile();
>+        if (outputProfile)
>+            m_transform = qcms_transform_create(qcmsColorProfile,
>+                                                hasAlpha ? QCMS_DATA_RGBA_8 : QCMS_DATA_RGB_8,
>+                                                outputProfile,
>+                                                hasAlpha ? QCMS_DATA_RGBA_8 : QCMS_DATA_RGB_8,
>+                                                QCMS_INTENT_PERCEPTUAL);
>+        qcms_profile_release(qcmsColorProfile);
>+#else
>+        UNUSED_PARAM(colorProfile);
>+        UNUSED_PARAM(hasAlpha);
>+#endif
>+    }
> 
> private:
>     unsigned m_readOffset;
>@@ -174,6 +217,10 @@ private:
>     png_structp m_png;
>     png_infop m_info;
>     png_bytep m_interlaceBuffer;
>+    png_bytep m_rowBuffer;
>+#if USE(QCMS)
>+    qcms_transform* m_transform;
>+#endif
>     bool m_hasAlpha;
>     unsigned m_currentBufferSize;
> };
>@@ -298,6 +345,7 @@ void PNGImageDecoder::headerAvailable()
>         // the color profile or we'd need to decode into a gray-scale image buffer and
>         // hand that to CoreGraphics.
>         readColorProfile(png, info, m_colorProfile);
>+        m_reader->createColorTransform(m_colorProfile, colorType & PNG_COLOR_MASK_ALPHA);
>     }
> 
>     // The options we set here match what Mozilla does.
>@@ -367,8 +415,8 @@ void PNGImageDecoder::rowAvailable(unsigned char* rowBuffer, unsigned rowIndex,
>             return;
>         }
> 
>+        unsigned colorChannels = m_reader->hasAlpha() ? 4 : 3;
>         if (PNG_INTERLACE_ADAM7 == png_get_interlace_type(png, m_reader->infoPtr())) {
>-            unsigned colorChannels = m_reader->hasAlpha() ? 4 : 3;
>             m_reader->createInterlaceBuffer(colorChannels * size().width() * size().height());
>             if (!m_reader->interlaceBuffer()) {
>                 longjmp(JMPBUF(png), 1);
>@@ -376,6 +424,16 @@ void PNGImageDecoder::rowAvailable(unsigned char* rowBuffer, unsigned rowIndex,
>             }
>         }
> 
>+#if USE(QCMS)
>+        if (m_reader->colorTransform()) {
>+            m_reader->createRowBuffer(colorChannels * size().width());
>+            if (!m_reader->rowBuffer()) {
>+                longjmp(JMPBUF(png), 1);
>+                return;
>+            }
>+        }
>+#endif
>+
>         buffer.setStatus(ImageFrame::FramePartial);
>         buffer.setHasAlpha(false);
>         buffer.setColorProfile(m_colorProfile);
>@@ -433,6 +491,13 @@ void PNGImageDecoder::rowAvailable(unsigned char* rowBuffer, unsigned rowIndex,
>         png_progressive_combine_row(m_reader->pngPtr(), row, rowBuffer);
>     }
> 
>+#if USE(QCMS)
>+    if (qcms_transform* transform = m_reader->colorTransform()) {
>+        qcms_transform_data(transform, row, m_reader->rowBuffer(), size().width());
>+        row = m_reader->rowBuffer();
>+    }
>+#endif
>+
>     // Write the decoded row pixels to the frame buffer.
>     int width = scaledSize().width();
>     bool nonTrivialAlpha = false;
>diff --git a/Source/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp b/Source/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp
>index d2f06d907c48a1c1992c02e6919260c7186e0450..5cc132c4d48400b8152ee5f4fef2242c429db6b6 100644
>--- a/Source/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp
>+++ b/Source/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp
>@@ -27,13 +27,6 @@
> #include "config.h"
> #include "ImageDecoder.h"
> 
>-#include "NotImplemented.h"
>-
>-#if PLATFORM(CHROMIUM) && OS(DARWIN)
>-#include "GraphicsContextCG.h"
>-#include "SkCGUtils.h"
>-#endif
>-
> namespace WebCore {
> 
> ImageFrame::ImageFrame()
>@@ -114,58 +107,17 @@ void ImageFrame::setHasAlpha(bool alpha)
>     m_bitmap.bitmap().setIsOpaque(!alpha);
> }
> 
>-#if PLATFORM(CHROMIUM) && OS(DARWIN)
>-static void resolveColorSpace(const SkBitmap& bitmap, CGColorSpaceRef colorSpace)
>-{
>-    int width = bitmap.width();
>-    int height = bitmap.height();
>-    RetainPtr<CGImageRef> srcImage(AdoptCF, SkCreateCGImageRefWithColorspace(bitmap, colorSpace));
>-    SkAutoLockPixels lock(bitmap);
>-    void* pixels = bitmap.getPixels();
>-    RetainPtr<CGContextRef> cgBitmap(AdoptCF, CGBitmapContextCreate(pixels, width, height, 8, width * 4, deviceRGBColorSpaceRef(), kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst));
>-    if (!cgBitmap)
>-        return;
>-    CGContextSetBlendMode(cgBitmap.get(), kCGBlendModeCopy);
>-    CGRect bounds = { {0, 0}, {width, height} };
>-    CGContextDrawImage(cgBitmap.get(), bounds, srcImage.get());
>-}
>-
>-static CGColorSpaceRef createColorSpace(const ColorProfile& colorProfile)
>-{
>-    RetainPtr<CFDataRef> data(AdoptCF, CFDataCreate(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(colorProfile.data()), colorProfile.size()));
>-#ifndef TARGETING_LEOPARD
>-    return CGColorSpaceCreateWithICCProfile(data.get());
>-#else
>-    RetainPtr<CGDataProviderRef> profileDataProvider(AdoptCF, CGDataProviderCreateWithCFData(data.get()));
>-    CGFloat ranges[] = {0.0, 255.0, 0.0, 255.0, 0.0, 255.0};
>-    return CGColorSpaceCreateICCBased(3, ranges, profileDataProvider.get(), deviceRGBColorSpaceRef());
>-#endif
>-}
>-#endif
>-
> void ImageFrame::setColorProfile(const ColorProfile& colorProfile)
> {
>-#if PLATFORM(CHROMIUM) && OS(DARWIN)
>-    m_colorProfile = colorProfile;
>-#else
>-    notImplemented();
>-#endif
>+    // FIXME: Do we need this ImageFrame function anymore, on any port?
>+    UNUSED_PARAM(colorProfile);
> }
> 
> void ImageFrame::setStatus(FrameStatus status)
> {
>     m_status = status;
>-    if (m_status == FrameComplete) {
>+    if (m_status == FrameComplete)
>         m_bitmap.setDataComplete();  // Tell the bitmap it's done.
>-#if PLATFORM(CHROMIUM) && OS(DARWIN)
>-        // resolveColorSpace() and callees assume that the alpha channel is
>-        // premultiplied, so don't apply the color profile if it isn't.
>-        if (m_colorProfile.isEmpty() || (!m_premultiplyAlpha && hasAlpha()))
>-            return;
>-        RetainPtr<CGColorSpaceRef> cgColorSpace(AdoptCF, createColorSpace(m_colorProfile));
>-        resolveColorSpace(m_bitmap.bitmap(), cgColorSpace.get());
>-#endif
>-    }
> }
> 
> int ImageFrame::width() const

Actions: View | Formatted Diff | Diff

Attachments on bug 81974: 134126 | 134127 | 135635 | 135636 | 135637 | 135891 | 135892 | 135893 | 136755 | 136785 | 137101 | 137569 | 137591 | 137608 | 138159 | 138181 | 138201 | 140624 | 140653 | 140659 | 140828 | 141813 | 142605 | 142739 | 143663 | 143694 | 144201 | 144202 | 144620 | 144809 | 144838 | 145158 | 145641 | 145715 | 145789 | 145942 | 146197 | 147080 | 147082 | 147219 | 147395 | 147642 | 147703 | 147860 | 148093 | 148094 | 148111 | 148113 | 148134