Changeset 202877 in webkit


Ignore:
Timestamp:
Jul 6, 2016, 2:10:28 PM (9 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, rolling out r202867.
​https://bugs.webkit.org/show_bug.cgi?id=159491

This change caused an existing LayoutTest to crash on ios-
simulator (Requested by ryanhaddad on #webkit).

Reverted changeset:

"<img> with a wide gamut PDF does not display using a wide
gamut color space"
​https://bugs.webkit.org/show_bug.cgi?id=158983
​http://trac.webkit.org/changeset/202867

Patch by Commit Queue <​commit-queue@webkit.org> on 2016-07-06

Location:
trunk/Source
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r202873 r202877  
     12016-07-06  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r202867.
     4        https://bugs.webkit.org/show_bug.cgi?id=159491
     5
     6        This change caused an existing LayoutTest to crash on ios-
     7        simulator (Requested by ryanhaddad on #webkit).
     8
     9        Reverted changeset:
     10
     11        "<img> with a wide gamut PDF does not display using a wide
     12        gamut color space"
     13        https://bugs.webkit.org/show_bug.cgi?id=158983
     14        http://trac.webkit.org/changeset/202867
     15
    1162016-07-06  Chris Dumez  <cdumez@apple.com>
    217

  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

    r202867 r202877  
    24582458        }
    24592459
    2460         auto maskImage = ImageBuffer::createCompatibleBuffer(maskRect.size(), ColorSpaceSRGB, *c);
     2460        auto maskImage = ImageBuffer::createCompatibleBuffer(maskRect.size(), *c);
    24612461        if (!maskImage)
    24622462            return;

  • trunk/Source/WebCore/platform/graphics/GradientImage.cpp

    r202867 r202877  
    7676
    7777    if (!m_cachedImageBuffer || m_cachedGeneratorHash != generatorHash || m_cachedAdjustedSize != adjustedSize || !m_cachedImageBuffer->isCompatibleWithContext(destContext)) {
    78         m_cachedImageBuffer = ImageBuffer::createCompatibleBuffer(adjustedSize, ColorSpaceSRGB, destContext);
     78        m_cachedImageBuffer = ImageBuffer::createCompatibleBuffer(adjustedSize, destContext, m_gradient->hasAlpha());
    7979        if (!m_cachedImageBuffer)
    8080            return;

  • trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp

    r202867 r202877  
    165165#endif
    166166
    167 std::unique_ptr<ImageBuffer> ImageBuffer::createCompatibleBuffer(const FloatSize& size, ColorSpace colorSpace, const GraphicsContext& context)
     167std::unique_ptr<ImageBuffer> ImageBuffer::createCompatibleBuffer(const FloatSize& size, const GraphicsContext& context, bool hasAlpha)
    168168{
    169169    if (size.isEmpty())
    … …  
    172172    IntSize scaledSize = ImageBuffer::compatibleBufferSize(size, context);
    173173
    174     auto buffer = ImageBuffer::createCompatibleBuffer(scaledSize, 1, colorSpace, context);
     174    auto buffer = ImageBuffer::createCompatibleBuffer(scaledSize, 1, ColorSpaceSRGB, context, hasAlpha);
    175175    if (!buffer)
    176176        return nullptr;
    … …  
    181181}
    182182
    183 std::unique_ptr<ImageBuffer> ImageBuffer::createCompatibleBuffer(const FloatSize& size, float resolutionScale, ColorSpace colorSpace, const GraphicsContext& context)
     183std::unique_ptr<ImageBuffer> ImageBuffer::createCompatibleBuffer(const FloatSize& size, float resolutionScale, ColorSpace colorSpace, const GraphicsContext& context, bool)
    184184{
    185185    return create(size, context.renderingMode(), resolutionScale, colorSpace);

  • trunk/Source/WebCore/platform/graphics/ImageBuffer.h

    r202867 r202877  
    8181
    8282    // Create an image buffer compatible with the context, with suitable resolution for drawing into the buffer and then into this context.
    83     static std::unique_ptr<ImageBuffer> createCompatibleBuffer(const FloatSize&, const GraphicsContext&);
    84     static std::unique_ptr<ImageBuffer> createCompatibleBuffer(const FloatSize&, ColorSpace, const GraphicsContext&);
    85     static std::unique_ptr<ImageBuffer> createCompatibleBuffer(const FloatSize&, float resolutionScale, ColorSpace, const GraphicsContext&);
     83    static std::unique_ptr<ImageBuffer> createCompatibleBuffer(const FloatSize&, const GraphicsContext&, bool hasAlpha = true);
     84    static std::unique_ptr<ImageBuffer> createCompatibleBuffer(const FloatSize&, float resolutionScale, ColorSpace, const GraphicsContext&, bool hasAlpha);
    8685
    8786    static IntSize compatibleBufferSize(const FloatSize&, const GraphicsContext&);
    … …  
    174173    // so that create() knows when it should return failure.
    175174    WEBCORE_EXPORT ImageBuffer(const FloatSize&, float resolutionScale, ColorSpace, RenderingMode, bool& success);
    176 #if USE(CG)
    177     ImageBuffer(const FloatSize&, float resolutionScale, CGColorSpaceRef, RenderingMode, bool& success);
    178 #endif
    179175};
    180176

  • trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp

    r202867 r202877  
    6565{
    6666#if USE(NEW_THEME)
    67     auto imageBuffer = ImageBuffer::createCompatibleBuffer(size(), context);
     67    auto imageBuffer = ImageBuffer::createCompatibleBuffer(size(), context, true);
    6868    if (!imageBuffer)
    6969        return;

  • trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp

    r202867 r202877  
    233233}
    234234
    235 std::unique_ptr<ImageBuffer> ImageBuffer::createCompatibleBuffer(const FloatSize& size, const GraphicsContext& context)
    236 {
    237     return createCompatibleBuffer(size, ColorSpaceSRGB, context);
    238 }
    239 
    240235GraphicsContext& ImageBuffer::context() const
    241236{

  • trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp

    r202867 r202877  
    6565}
    6666
    67 static bool surfaceMatchesParameters(IOSurface& surface, IntSize requestedSize, CGColorSpaceRef colorSpace, IOSurface::Format format)
     67static bool surfaceMatchesParameters(IOSurface& surface, IntSize requestedSize, ColorSpace colorSpace, IOSurface::Format format)
    6868{
    6969    if (format != surface.format())
    … …  
    108108}
    109109
    110 std::unique_ptr<IOSurface> IOSurfacePool::takeSurface(IntSize size, CGColorSpaceRef colorSpace, IOSurface::Format format)
     110std::unique_ptr<IOSurface> IOSurfacePool::takeSurface(IntSize size, ColorSpace colorSpace, IOSurface::Format format)
    111111{
    112112    CachedSurfaceMap::iterator mapIter = m_cachedSurfaces.find(size);

  • trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.h

    r202867 r202877  
    2929#if USE(IOSURFACE)
    3030
     31#include "ColorSpace.h"
    3132#include "IOSurface.h"
    3233#include "IntSize.h"
    … …  
    4849    WEBCORE_EXPORT static IOSurfacePool& sharedPool();
    4950
    50     std::unique_ptr<IOSurface> takeSurface(IntSize, CGColorSpaceRef, IOSurface::Format);
     51    std::unique_ptr<IOSurface> takeSurface(IntSize, ColorSpace, IOSurface::Format);
    5152    WEBCORE_EXPORT void addSurface(std::unique_ptr<IOSurface>);
    5253

  • trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp

    r202867 r202877  
    7171}
    7272
    73 std::unique_ptr<ImageBuffer> ImageBuffer::createCompatibleBuffer(const FloatSize& size, const GraphicsContext& context)
    74 {
    75     if (size.isEmpty())
    76         return nullptr;
    77 
    78     IntSize scaledSize = ImageBuffer::compatibleBufferSize(size, context);
    79     float resolutionScale = context.scaleFactor().width();
    80     RetainPtr<CGColorSpaceRef> colorSpace;
    81 #if PLATFORM(COCOA)
    82     colorSpace = adoptCF(CGContextCopyDeviceColorSpace(context.platformContext()));
    83 #else
    84     colorSpace = sRGBColorSpaceRef();
    85 #endif
    86     RenderingMode renderingMode = context.renderingMode();
    87     bool success = false;
    88     std::unique_ptr<ImageBuffer> buffer(new ImageBuffer(scaledSize, resolutionScale, colorSpace.get(), renderingMode, success));
    89 
    90     if (!success)
    91         return nullptr;
    92 
    93     // Set up a corresponding scale factor on the graphics context.
    94     buffer->context().scale(FloatSize(scaledSize.width() / size.width(), scaledSize.height() / size.height()));
    95     return buffer;
    96 }
    97 
    98 ImageBuffer::ImageBuffer(const FloatSize& size, float resolutionScale, CGColorSpaceRef colorSpace, RenderingMode renderingMode, bool& success)
     73ImageBuffer::ImageBuffer(const FloatSize& size, float resolutionScale, ColorSpace imageColorSpace, RenderingMode renderingMode, bool& success)
    9974    : m_logicalSize(size)
    10075    , m_resolutionScale(resolutionScale)
    … …  
    134109#endif
    135110
    136     m_data.colorSpace = colorSpace;
     111    m_data.colorSpace = cachedCGColorSpace(imageColorSpace);
    137112
    138113    RetainPtr<CGContextRef> cgContext;
    … …  
    140115#if USE(IOSURFACE_CANVAS_BACKING_STORE)
    141116        FloatSize userBounds = sizeForDestinationSize(FloatSize(width.unsafeGet(), height.unsafeGet()));
    142         m_data.surface = IOSurface::create(m_data.backingStoreSize, IntSize(userBounds), colorSpace);
     117        m_data.surface = IOSurface::create(m_data.backingStoreSize, IntSize(userBounds), imageColorSpace);
    143118        cgContext = m_data.surface->ensurePlatformContext();
    144119        if (cgContext)
    … …  
    175150
    176151    success = true;
    177 }
    178 
    179 ImageBuffer::ImageBuffer(const FloatSize& size, float resolutionScale, ColorSpace imageColorSpace, RenderingMode renderingMode, bool& success)
    180     : ImageBuffer(size, resolutionScale, cachedCGColorSpace(imageColorSpace), renderingMode, success)
    181 {
    182152}
    183153

  • trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h

    r202867 r202877  
    4646    };
    4747
    48     WEBCORE_EXPORT static std::unique_ptr<IOSurface> create(IntSize, CGColorSpaceRef, Format = Format::RGBA);
    49     WEBCORE_EXPORT static std::unique_ptr<IOSurface> create(IntSize, IntSize contextSize, CGColorSpaceRef, Format = Format::RGBA);
    50     WEBCORE_EXPORT static std::unique_ptr<IOSurface> createFromSendRight(const MachSendRight&, CGColorSpaceRef);
    51     static std::unique_ptr<IOSurface> createFromSurface(IOSurfaceRef, CGColorSpaceRef);
     48    WEBCORE_EXPORT static std::unique_ptr<IOSurface> create(IntSize, ColorSpace, Format = Format::RGBA);
     49    WEBCORE_EXPORT static std::unique_ptr<IOSurface> create(IntSize, IntSize contextSize, ColorSpace, Format = Format::RGBA);
     50    WEBCORE_EXPORT static std::unique_ptr<IOSurface> createFromSendRight(const MachSendRight&, ColorSpace);
     51    static std::unique_ptr<IOSurface> createFromSurface(IOSurfaceRef, ColorSpace);
    5252    WEBCORE_EXPORT static std::unique_ptr<IOSurface> createFromImage(CGImageRef);
    5353   
    … …  
    8686    IntSize size() const { return m_size; }
    8787    size_t totalBytes() const { return m_totalBytes; }
    88     CGColorSpaceRef colorSpace() const { return m_colorSpace.get(); }
     88    ColorSpace colorSpace() const { return m_colorSpace; }
    8989    WEBCORE_EXPORT Format format() const;
    9090
    … …  
    101101
    102102private:
    103     IOSurface(IntSize, CGColorSpaceRef, Format);
    104     IOSurface(IntSize, IntSize contextSize, CGColorSpaceRef, Format);
    105     IOSurface(IOSurfaceRef, CGColorSpaceRef);
     103    IOSurface(IntSize, ColorSpace, Format);
     104    IOSurface(IntSize, IntSize contextSize, ColorSpace, Format);
     105    IOSurface(IOSurfaceRef, ColorSpace);
    106106
    107     static std::unique_ptr<IOSurface> surfaceFromPool(IntSize, IntSize contextSize, CGColorSpaceRef, Format);
     107    static std::unique_ptr<IOSurface> surfaceFromPool(IntSize, IntSize contextSize, ColorSpace, Format);
    108108    IntSize contextSize() const { return m_contextSize; }
    109109    void setContextSize(IntSize);
    110110
    111     RetainPtr<CGColorSpaceRef> m_colorSpace;
     111    ColorSpace m_colorSpace;
    112112    IntSize m_size;
    113113    IntSize m_contextSize;

  • trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm

    r202867 r202877  
    4646using namespace WebCore;
    4747
    48 inline std::unique_ptr<WebCore::IOSurface> WebCore::IOSurface::surfaceFromPool(IntSize size, IntSize contextSize, CGColorSpaceRef colorSpace, Format pixelFormat)
     48inline std::unique_ptr<WebCore::IOSurface> WebCore::IOSurface::surfaceFromPool(IntSize size, IntSize contextSize, ColorSpace colorSpace, Format pixelFormat)
    4949{
    5050    auto cachedSurface = IOSurfacePool::sharedPool().takeSurface(size, colorSpace, pixelFormat);
    … …  
    5656}
    5757
    58 std::unique_ptr<WebCore::IOSurface> WebCore::IOSurface::create(IntSize size, CGColorSpaceRef colorSpace, Format pixelFormat)
     58std::unique_ptr<WebCore::IOSurface> WebCore::IOSurface::create(IntSize size, ColorSpace colorSpace, Format pixelFormat)
    5959{
    6060    if (auto cachedSurface = surfaceFromPool(size, size, colorSpace, pixelFormat))
    … …  
    6464}
    6565
    66 std::unique_ptr<WebCore::IOSurface> WebCore::IOSurface::create(IntSize size, IntSize contextSize, CGColorSpaceRef colorSpace, Format pixelFormat)
     66std::unique_ptr<WebCore::IOSurface> WebCore::IOSurface::create(IntSize size, IntSize contextSize, ColorSpace colorSpace, Format pixelFormat)
    6767{
    6868    if (auto cachedSurface = surfaceFromPool(size, contextSize, colorSpace, pixelFormat))
    … …  
    7171}
    7272
    73 std::unique_ptr<WebCore::IOSurface> WebCore::IOSurface::createFromSendRight(const MachSendRight& sendRight, CGColorSpaceRef colorSpace)
     73std::unique_ptr<WebCore::IOSurface> WebCore::IOSurface::createFromSendRight(const MachSendRight& sendRight, ColorSpace colorSpace)
    7474{
    7575    auto surface = adoptCF(IOSurfaceLookupFromMachPort(sendRight.sendRight()));
    … …  
    7777}
    7878
    79 std::unique_ptr<WebCore::IOSurface> WebCore::IOSurface::createFromSurface(IOSurfaceRef surface, CGColorSpaceRef colorSpace)
     79std::unique_ptr<WebCore::IOSurface> WebCore::IOSurface::createFromSurface(IOSurfaceRef surface, ColorSpace colorSpace)
    8080{
    8181    return std::unique_ptr<IOSurface>(new IOSurface(surface, colorSpace));
    … …  
    9090    size_t height = CGImageGetHeight(image);
    9191
    92     auto surface = IOSurface::create(IntSize(width, height), sRGBColorSpaceRef());
     92    auto surface = IOSurface::create(IntSize(width, height), ColorSpaceSRGB);
    9393    auto surfaceContext = surface->ensurePlatformContext();
    9494    CGContextDrawImage(surfaceContext, CGRectMake(0, 0, width, height), image);
    … …  
    180180}
    181181
    182 WebCore::IOSurface::IOSurface(IntSize size, CGColorSpaceRef colorSpace, Format format)
     182WebCore::IOSurface::IOSurface(IntSize size, ColorSpace colorSpace, Format format)
    183183    : m_colorSpace(colorSpace)
    184184    , m_size(size)
    … …  
    208208}
    209209
    210 WebCore::IOSurface::IOSurface(IntSize size, IntSize contextSize, CGColorSpaceRef colorSpace, Format pixelFormat)
     210WebCore::IOSurface::IOSurface(IntSize size, IntSize contextSize, ColorSpace colorSpace, Format pixelFormat)
    211211    : IOSurface(size, colorSpace, pixelFormat)
    212212{
    … …  
    216216}
    217217
    218 WebCore::IOSurface::IOSurface(IOSurfaceRef surface, CGColorSpaceRef colorSpace)
     218WebCore::IOSurface::IOSurface(IOSurfaceRef surface, ColorSpace colorSpace)
    219219    : m_colorSpace(colorSpace)
    220220    , m_surface(surface)
    … …  
    298298    }
    299299   
    300     m_cgContext = adoptCF(CGIOSurfaceContextCreate(m_surface.get(), m_contextSize.width(), m_contextSize.height(), bitsPerComponent, bitsPerPixel, m_colorSpace.get(), bitmapInfo));
     300    m_cgContext = adoptCF(CGIOSurfaceContextCreate(m_surface.get(), m_contextSize.width(), m_contextSize.height(), bitsPerComponent, bitsPerPixel, cachedCGColorSpace(m_colorSpace), bitmapInfo));
    301301
    302302    return m_cgContext.get();

  • trunk/Source/WebCore/platform/mac/ThemeMac.mm

    r202867 r202877  
    680680    if (useImageBuffer) {
    681681        NSRect imageBufferDrawRect = NSRect(FloatRect(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth, rect.width(), rect.height()));
    682         auto imageBuffer = ImageBuffer::createCompatibleBuffer(rect.size() + 2 * FloatSize(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth), deviceScaleFactor, ColorSpaceSRGB, context);
     682        auto imageBuffer = ImageBuffer::createCompatibleBuffer(rect.size() + 2 * FloatSize(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth), deviceScaleFactor, ColorSpaceSRGB, context, false);
    683683        if (!imageBuffer)
    684684            return needsRepaint;

  • trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h

    r202867 r202877  
    189189CGRect* CGSNextRect(const CGSRegionEnumeratorObj);
    190190CGError CGSReleaseRegionEnumerator(const CGSRegionEnumeratorObj);
    191 CGColorSpaceRef CGContextCopyDeviceColorSpace(CGContextRef);
    192191#endif
    193192

  • trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

    r202867 r202877  
    757757
    758758        // Now create the mask.
    759         maskImage = ImageBuffer::createCompatibleBuffer(maskRect.size(), ColorSpaceSRGB, context);
     759        maskImage = ImageBuffer::createCompatibleBuffer(maskRect.size(), context);
    760760        if (!maskImage)
    761761            return;

  • trunk/Source/WebCore/rendering/RenderThemeMac.mm

    r202867 r202877  
    11451145    trackInfo.filler1 = 0;
    11461146
    1147     std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::createCompatibleBuffer(inflatedRect.size(), deviceScaleFactor, ColorSpaceSRGB, paintInfo.context());
     1147    std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::createCompatibleBuffer(inflatedRect.size(), deviceScaleFactor, ColorSpaceSRGB, paintInfo.context(), true);
    11481148    if (!imageBuffer)
    11491149        return true;

  • trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp

    r202867 r202877  
    352352    // Create a new buffer and paint the foreground into it.
    353353    if (!imageBuffer) {
    354         if ((imageBuffer = ImageBuffer::createCompatibleBuffer(expandedIntSize(boundingBox.size()), ColorSpaceSRGB, m_paintInfo->context()))) {
     354        if ((imageBuffer = ImageBuffer::createCompatibleBuffer(expandedIntSize(boundingBox.size()), m_paintInfo->context(), true))) {
    355355            GraphicsContext& bufferedRenderingContext = imageBuffer->context();
    356356            bufferedRenderingContext.translate(-boundingBox.x(), -boundingBox.y());

  • trunk/Source/WebCore/svg/graphics/SVGImage.cpp

    r202867 r202877  
    220220    imageBufferSize.scale(imageBufferScale.width(), imageBufferScale.height());
    221221
    222     std::unique_ptr<ImageBuffer> buffer = ImageBuffer::createCompatibleBuffer(expandedIntSize(imageBufferSize.size()), 1, ColorSpaceSRGB, context);
     222    std::unique_ptr<ImageBuffer> buffer = ImageBuffer::createCompatibleBuffer(expandedIntSize(imageBufferSize.size()), 1, ColorSpaceSRGB, context, true);
    223223    if (!buffer) // Failed to allocate buffer.
    224224        return;

  • trunk/Source/WebKit2/ChangeLog

    r202868 r202877  
     12016-07-06  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r202867.
     4        https://bugs.webkit.org/show_bug.cgi?id=159491
     5
     6        This change caused an existing LayoutTest to crash on ios-
     7        simulator (Requested by ryanhaddad on #webkit).
     8
     9        Reverted changeset:
     10
     11        "<img> with a wide gamut PDF does not display using a wide
     12        gamut color space"
     13        https://bugs.webkit.org/show_bug.cgi?id=158983
     14        http://trac.webkit.org/changeset/202867
     15
    1162016-07-06  Enrica Casucci  <enrica@apple.com>
    217

  • trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm

    r202867 r202877  
    151151        if (!decoder.decode(sendRight))
    152152            return false;
    153         result.m_frontBuffer.surface = WebCore::IOSurface::createFromSendRight(sendRight, sRGBColorSpaceRef());
     153        result.m_frontBuffer.surface = WebCore::IOSurface::createFromSendRight(sendRight, ColorSpaceSRGB);
    154154        return true;
    155155    }
    … …  
    211211
    212212        if (!m_frontBuffer.surface)
    213             m_frontBuffer.surface = WebCore::IOSurface::create(expandedScaledSize, sRGBColorSpaceRef(), bufferFormat(m_isOpaque));
     213            m_frontBuffer.surface = WebCore::IOSurface::create(expandedScaledSize, ColorSpaceSRGB, bufferFormat(m_isOpaque));
    214214
    215215        setBufferVolatility(BufferType::Front, false);

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r202867 r202877  
    8383#import "_WKSessionStateInternal.h"
    8484#import "_WKVisitedLinkStoreInternal.h"
    85 #import <WebCore/GraphicsContextCG.h>
    8685#import <WebCore/IOSurface.h>
    8786#import <WebCore/JSDOMBinding.h>
    … …  
    13931392#if USE(IOSURFACE)
    13941393    WebCore::IOSurface::Format snapshotFormat = WebCore::screenSupportsExtendedColor() ? WebCore::IOSurface::Format::RGB10 : WebCore::IOSurface::Format::RGBA;
    1395     auto surface = WebCore::IOSurface::create(WebCore::expandedIntSize(snapshotSize), WebCore::sRGBColorSpaceRef(), snapshotFormat);
     1394    auto surface = WebCore::IOSurface::create(WebCore::expandedIntSize(snapshotSize), WebCore::ColorSpaceSRGB, snapshotFormat);
    13961395    CARenderServerRenderLayerWithTransform(MACH_PORT_NULL, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform);
    13971396
    … …  
    42304229    // If we are parented and thus won't incur a significant penalty from paging in tiles, snapshot the view hierarchy directly.
    42314230    if (CADisplay *display = self.window.screen._display) {
    4232         auto surface = WebCore::IOSurface::create(WebCore::expandedIntSize(WebCore::FloatSize(imageSize)), WebCore::sRGBColorSpaceRef());
     4231        auto surface = WebCore::IOSurface::create(WebCore::expandedIntSize(WebCore::FloatSize(imageSize)), WebCore::ColorSpaceSRGB);
    42334232        CGFloat imageScaleInViewCoordinates = imageWidth / rectInViewCoordinates.size.width;
    42344233        CATransform3D transform = CATransform3DMakeScale(imageScaleInViewCoordinates, imageScaleInViewCoordinates, 1);
Note: See TracChangeset for help on using the changeset viewer.