Attachment #283467 for bug #159679

View Details Raw Unified Return to Bug 159679

| Differences between



2016-07-12  Said Abou-Hallawa  <sabouhallawa@apple.com>

        Split the pixel data of ImageFrame to a separate class
        https://bugs.webkit.org/show_bug.cgi?id=159679

        Reviewed by NOBODY (OOPS!).

        Move the pixel data manipulation part in ImageFrame into a separate class
        and then make it optional (allocated on demand).

        * CMakeLists.txt:
        * PlatformEfl.cmake:
        * PlatformGTK.cmake:
        * PlatformWinCairo.cmake:
        * WebCore.xcodeproj/project.pbxproj:
        * platform/graphics/BitmapPixels.h: Added.
        (WebCore::BitmapPixels::create):
        (WebCore::BitmapPixels::BitmapPixels):
        (WebCore::BitmapPixels::width):
        (WebCore::BitmapPixels::height):
        (WebCore::BitmapPixels::setSize):
        (WebCore::BitmapPixels::at):
        (WebCore::BitmapPixels::clear):
        (WebCore::BitmapPixels::clearRect):
        (WebCore::BitmapPixels::repeatFirstRow):
        (WebCore::BitmapPixels::setRGBA):
        (WebCore::BitmapPixels::overRGBA):
        (WebCore::BitmapPixels::inBounds):
        * platform/graphics/Color.cpp:
        (WebCore::multiply255):
        (WebCore::divide255):
        (WebCore::divideCeil):
        (WebCore::premultipliedChannel):
        (WebCore::unpremultipliedChannel):
        (WebCore::makePremultipliedRGBA):
        (WebCore::makeUnPremultipliedRGBA):
        * platform/graphics/Color.h:
        * platform/graphics/ImageFrameData.h:
        (WebCore::ImageFrameData::pixels):
        (WebCore::ImageFrameData::hasPixels):
        * platform/image-decoders/ImageDecoder.cpp:
        (WebCore::ImageFrame::operator=):
        (WebCore::ImageFrame::clearPixelData):
        (WebCore::ImageFrame::zeroFillPixelData):
        (WebCore::ImageFrame::zeroFillFrameRect):
        (WebCore::ImageFrame::copyBitmapData):
        (WebCore::ImageFrame::setSize):
        (WebCore::ImageFrame::copyRowNTimes):
        * platform/image-decoders/ImageDecoder.h:
        (WebCore::ImageFrame::asNewNativeImage):
        (WebCore::ImageFrame::setRGBA):
        (WebCore::ImageFrame::getAddr):
        (WebCore::ImageFrame::hasPixelData):
        (WebCore::ImageFrame::overRGBA):
        (WebCore::ImageFrame::width):
        (WebCore::ImageFrame::height):
        (WebCore::ImageFrame::copyRowNTimes): Deleted.
        (WebCore::ImageFrame::fixPointUnsignedMultiply): Deleted.
        (WebCore::ImageFrame::divide255): Deleted.
        * platform/image-decoders/bmp/BMPImageReader.cpp:
        (WebCore::BMPImageReader::decodeBMP):
        * platform/image-decoders/cairo/BitmapPixelsCairo.cpp: Renamed from Source/WebCore/platform/image-decoders/cairo/ImageDecoderCairo.cpp.
        (WebCore::BitmapPixels::image):
        * platform/image-decoders/gif/GIFImageDecoder.cpp:
        (WebCore::GIFImageDecoder::haveDecodedRow):
        (WebCore::GIFImageDecoder::frameComplete):
        (WebCore::GIFImageDecoder::initFrameBuffer):
        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
        (WebCore::setPixel):
        (WebCore::JPEGImageDecoder::outputScanlines):
        * platform/image-decoders/png/PNGImageDecoder.cpp:
        (WebCore::setPixelRGB):
        (WebCore::setPixelRGBA):
        (WebCore::setPixelPremultipliedRGBA):
        (WebCore::PNGImageDecoder::rowAvailable):
        (WebCore::PNGImageDecoder::initFrameBuffer):
        (WebCore::PNGImageDecoder::frameComplete):
        * platform/image-decoders/webp/WEBPImageDecoder.cpp:
        (WebCore::WEBPImageDecoder::decode):

2016-07-11  Said Abou-Hallawa  <sabouhallawa@apple,com>

        Rename FrameData to ImageFrameData and move it to a separate file
        https://bugs.webkit.org/show_bug.cgi?id=155444

        Reviewed by NOBODY (OOPS!).

        Move ImageFrameData to a separate file so it can be cached by ImageSource
        and will still be consumed by BitmapImage. Make the data members of ImageFrameData
        be private and add getters to return their values.

        No new tests -- Code refactoring, no behavior change.

        * CMakeLists.txt:
        * WebCore.xcodeproj/project.pbxproj:
        * platform/graphics/BitmapImage.cpp:
        (WebCore::BitmapImage::BitmapImage):
        (WebCore::BitmapImage::haveFrameImageAtIndex):
        (WebCore::BitmapImage::destroyDecodedData):
        (WebCore::BitmapImage::destroyDecodedDataIfNecessary):
        (WebCore::BitmapImage::cacheFrame):
        (WebCore::BitmapImage::dataChanged):
        (WebCore::BitmapImage::ensureFrameIsCached):
        (WebCore::BitmapImage::frameImageAtIndex):
        (WebCore::BitmapImage::frameIsCompleteAtIndex):
        (WebCore::BitmapImage::frameDurationAtIndex):
        (WebCore::BitmapImage::frameHasAlphaAtIndex):
        (WebCore::BitmapImage::frameOrientationAtIndex):
        (WebCore::BitmapImage::singlePixelSolidColor):
        (WebCore::BitmapImage::isAlmostSolidColor):
        * platform/graphics/BitmapImage.h:
        (WebCore::FrameData::FrameData): Deleted.
        (WebCore::FrameData::~FrameData): Deleted.
        (WebCore::FrameData::usedFrameBytes): Deleted.
        * platform/graphics/ImageSource.cpp:
        (WebCore::ImageSource::createFrameDataAtIndex):
        * platform/graphics/ImageSource.h:
        * platform/graphics/imageFrameData.cpp: Added.
        (WebCore::ImageFrameData::ImageFrameData):
        (WebCore::ImageFrameData::~ImageFrameData):
        (WebCore::ImageFrameData::clearSubImages):
        (WebCore::ImageFrameData::clear):
        (WebCore::ImageFrameData::singlePixelSolidColor):
        (WebCore::ImageFrameData::isAlmostSolidColor):
        * platform/graphics/imageFrameData.h: Added.
        (WebCore::ImageFrameData::status):
        (WebCore::ImageFrameData::isComplete):
        (WebCore::ImageFrameData::size):
        (WebCore::ImageFrameData::frameBytes):
        (WebCore::ImageFrameData::image):
        (WebCore::ImageFrameData::orientation):
        (WebCore::ImageFrameData::subsamplingLevel):
        (WebCore::ImageFrameData::duration):
        (WebCore::ImageFrameData::hasAlpha):
        (WebCore::ImageFrameData::hasImage):
        (WebCore::ImageFrameData::hasMetadata):

2016-06-24  Said Abou-Hallawa  <sabouhallawa@apple,com>

        Introduce PlatformImage and make it is a wrapper for NativeImagePtr
        https://bugs.webkit.org/show_bug.cgi?id=158684

        Reviewed by NOBODY (OOPS!).

        The main purpose of this refactoring is to move the platform image dependent
        code from BitmapImage to PlatformImage. PlatformImage is responsible of 
        drawing the image and answering NativeImagePtr questions when an ImageDecoder
        is not available. Apart from drawing the image, the query functions will be
        called only when constructing a FrameData so we will keep everything as a
        NativeImagePtr. But we will cast the NativeImagePtr to PlatformImage when
        a platform dependent function is needed.

        No new tests -- Code refactoring, no behavior change.

        * PlatformAppleWin.cmake:
        * PlatformEfl.cmake:
        * PlatformGTK.cmake:
        * PlatformMac.cmake:
        * PlatformWinCairo.cmake:
        * WebCore.xcodeproj/project.pbxproj:
        * bindings/objc/DOM.mm:
        (-[DOMNode getPreviewSnapshotImage:andRects:]):
        * page/mac/TextIndicatorWindow.mm:
        (-[WebTextIndicatorView initWithFrame:textIndicator:margin:offset:]):
        (createContentCrossfadeAnimation):
        * platform/graphics/BitmapImage.cpp:
        (WebCore::BitmapImage::BitmapImage):
        (WebCore::BitmapImage::destroyDecodedData):
        (WebCore::BitmapImage::destroyDecodedDataIfNecessary):
        (WebCore::BitmapImage::dataChanged):
        (WebCore::BitmapImage::frameImageAtIndex):
        (WebCore::BitmapImage::nativeImage):
        (WebCore::BitmapImage::nativeImageOfSize):
        (WebCore::BitmapImage::nativeImageForCurrentFrame):
        (WebCore::BitmapImage::framesNativeImages):
        (WebCore::BitmapImage::singlePixelSolidColor):
        (WebCore::BitmapImage::isAlmostSolidColor):
        (WebCore::BitmapImage::draw):
        * platform/graphics/BitmapImage.h:
        (WebCore::FrameData::FrameData):
        m_hasAlpha can be initialized with false because it is accessed only in
        BitmapImage::frameHasAlphaAtIndex() and it is guarded by m_haveMetadata.
        Both m_haveMetadata and m_hasAlpha are set in BitmapImage constructor
        and in BitmapImage::cacheFrame().

        (WebCore::FrameData::~FrameData):
        (WebCore::FrameData::clear):
        * platform/graphics/Image.h:
        (WebCore::Image::nativeImage):
        (WebCore::Image::nativeImageOfSize):
        (WebCore::Image::framesNativeImages):
        (WebCore::Image::getCGImageRef): Deleted.
        (WebCore::Image::getFirstCGImageRefOfSize): Deleted.
        (WebCore::Image::getCGImageArray): Deleted.
        * platform/graphics/PlatformImage.h: Added.
        (WebCore::PlatformImage::PlatformImage):
        (WebCore::PlatformImage::isNil):
        (WebCore::PlatformImage::cgImageRef):
        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateDisplayMode):
        * platform/graphics/cairo/PlatformImageCairo.cpp: Renamed from Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp.
        (WebCore::PlatformImage::clearSubImages):
        (WebCore::PlatformImage::size):
        (WebCore::PlatformImage::hasAlpha):
        (WebCore::PlatformImage::singlePixelSolidColor):
        (WebCore::PlatformImage::isAlmostSolidColor):
        (WebCore::PlatformImage::subsamplingScale):
        (WebCore::PlatformImage::draw):
        * platform/graphics/cg/BitmapImageCG.cpp: Removed.
        * platform/graphics/cg/PatternCG.cpp:
        (WebCore::Pattern::createPlatformPattern):
        * platform/graphics/cg/PlatformImageCG.cpp: Added.
        (WebCore::PlatformImage::clearSubImages):
        (WebCore::PlatformImage::size):
        (WebCore::PlatformImage::hasAlpha):
        (WebCore::PlatformImage::singlePixelSolidColor):
        (WebCore::PlatformImage::isAlmostSolidColor): Moved from PluginView.cpp since PlatformImage is what this function belongs to.
        (WebCore::PlatformImage::subsamplingScale): Returns the sub-sampling scale based on the context scaling.
        (WebCore::PlatformImage::draw):
        * platform/graphics/cocoa/TextTrackRepresentationCocoa.mm:
        (TextTrackRepresentationCocoa::update):
        * platform/graphics/mac/ImageMac.mm:
        (WebCore::BitmapImage::getTIFFRepresentation):
        * platform/mediastream/mac/MockRealtimeVideoSourceMac.mm:
        (WebCore::MockRealtimeVideoSourceMac::updatePlatformLayer):
        * platform/win/DragImageCGWin.cpp:
        (WebCore::createDragImageFromImage):

2016-07-11  Sam Weinig  <sam@webkit.org>

        Speech Synthesis: getting list of voices no longer works



2016-07-11  Said Abou-Hallawa  <sabouhallawa@apple,com>

        Introduce PlatformImage and make it is a wrapper for NativeImagePtr
        https://bugs.webkit.org/show_bug.cgi?id=158684

        Reviewed by NOBODY (OOPS!).

        * Misc/WebCache.mm:
        (+[WebCache imageForURL:]):

2016-07-11  Enrica Casucci  <enrica@apple.com>

        Add synthetic click origin to WKNavigationAction.



2016-07-11  Said Abou-Hallawa  <sabouhallawa@apple,com>

        Introduce PlatformImage and make it is a wrapper for NativeImagePtr
        https://bugs.webkit.org/show_bug.cgi?id=158684

        Reviewed by NOBODY (OOPS!).

        * UIProcess/API/C/cg/WKIconDatabaseCG.cpp:
        (WKIconDatabaseTryGetCGImageForURL):
        (WKIconDatabaseTryCopyCGImageArrayForURL):
        It was the only place in the code which uses BitmapImage::getCGImageArray().
        Call BitmapImage::framesNativeImages() instead and form the returned
        Vector<NativeImagePtr> build the CFArrayRef.
        
        * UIProcess/ios/WKContentViewInteraction.mm:
        (-[WKContentView _presentationSnapshotForPreviewItemController:]):
        * WebProcess/Plugins/PluginView.cpp:
        (WebKit::PluginView::pluginSnapshotTimerFired):
        
        (WebKit::isAlmostSolidColor): Deleted.
        Move the static function isAlmostSolidColor to PlatformImage::isAlmostSolidColor().

2016-07-11  Chris Dumez  <cdumez@apple.com>

        [WK2][iOS] Intermittent crash in [UIApplication beginBackgroundTaskWithName] expiration handler

Lines 2226-2231 set(WebCore_SOURCES a/Source/WebCore/CMakeLists.txt_sec1
- a/Source/WebCore/CMakeLists.txt +1 lines
2226	platform/graphics/ISOVTTCue.cpp	2226	platform/graphics/ISOVTTCue.cpp
2227	platform/graphics/Image.cpp	2227	platform/graphics/Image.cpp
2228	platform/graphics/ImageBuffer.cpp	2228	platform/graphics/ImageBuffer.cpp
		2229	platform/graphics/ImageFrameData.cpp
2229	platform/graphics/ImageOrientation.cpp	2230	platform/graphics/ImageOrientation.cpp
2230	platform/graphics/ImageSource.cpp	2231	platform/graphics/ImageSource.cpp
2231	platform/graphics/IntPoint.cpp	2232	platform/graphics/IntPoint.cpp



    platform/graphics/ca/win/WebTiledBackingLayerWin.cpp
    platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp

    platform/graphics/cg/BitmapImageCG.cpp
    platform/graphics/cg/ColorCG.cpp
    platform/graphics/cg/FloatPointCG.cpp
    platform/graphics/cg/FloatRectCG.cpp

    platform/graphics/cg/PDFDocumentImage.cpp
    platform/graphics/cg/PathCG.cpp
    platform/graphics/cg/PatternCG.cpp
    platform/graphics/cg/PlatformImageCG.cpp
    platform/graphics/cg/SubimageCacheWithTimer.cpp
    platform/graphics/cg/TransformationMatrixCG.cpp




    platform/graphics/PlatformDisplay.cpp

    platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp
    platform/graphics/cairo/BitmapImageCairo.cpp
    platform/graphics/cairo/CairoUtilities.cpp
    platform/graphics/cairo/FontCairo.cpp
    platform/graphics/cairo/FontCairoHarfbuzzNG.cpp

    platform/graphics/cairo/PathCairo.cpp
    platform/graphics/cairo/PatternCairo.cpp
    platform/graphics/cairo/PlatformContextCairo.cpp
    platform/graphics/cairo/PlatformImageCairo.cpp
    platform/graphics/cairo/PlatformPathCairo.cpp
    platform/graphics/cairo/RefPtrCairo.cpp
    platform/graphics/cairo/TransformationMatrixCairo.cpp

    platform/graphics/x11/PlatformDisplayX11.cpp
    platform/graphics/x11/XUniqueResource.cpp

    platform/image-decoders/cairo/BitmapPixelsCairo.cpp

    platform/image-encoders/JPEGImageEncoder.cpp

    platform/network/efl/NetworkStateNotifierEfl.cpp





    platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp
    platform/graphics/cairo/BackingStoreBackendCairoX11.cpp
    platform/graphics/cairo/BitmapImageCairo.cpp
    platform/graphics/cairo/CairoUtilities.cpp
    platform/graphics/cairo/FloatRectCairo.cpp
    platform/graphics/cairo/FontCairo.cpp

    platform/graphics/cairo/PathCairo.cpp
    platform/graphics/cairo/PatternCairo.cpp
    platform/graphics/cairo/PlatformContextCairo.cpp
    platform/graphics/cairo/PlatformImageCairo.cpp
    platform/graphics/cairo/PlatformPathCairo.cpp
    platform/graphics/cairo/RefPtrCairo.cpp
    platform/graphics/cairo/TransformationMatrixCairo.cpp

    platform/gtk/TemporaryLinkStubs.cpp
    platform/gtk/UserAgentGtk.cpp

    platform/image-decoders/cairo/BitmapPixelsCairo.cpp

    platform/mediastream/gtk/SDPProcessorScriptResourceGtk.cpp




    platform/graphics/ca/cocoa/WebSystemBackdropLayer.mm
    platform/graphics/ca/cocoa/WebTiledBackingLayer.mm

    platform/graphics/cg/BitmapImageCG.cpp
    platform/graphics/cg/ColorCG.cpp
    platform/graphics/cg/FloatPointCG.cpp
    platform/graphics/cg/FloatRectCG.cpp

    platform/graphics/cg/PDFDocumentImage.cpp
    platform/graphics/cg/PathCG.cpp
    platform/graphics/cg/PatternCG.cpp
    platform/graphics/cg/PlatformImageCG.cpp
    platform/graphics/cg/SubimageCacheWithTimer.cpp
    platform/graphics/cg/TransformationMatrixCG.cpp




    platform/graphics/GLContext.cpp
    platform/graphics/PlatformDisplay.cpp

    platform/graphics/cairo/BitmapImageCairo.cpp
    platform/graphics/cairo/CairoUtilities.cpp
    platform/graphics/cairo/FloatRectCairo.cpp
    platform/graphics/cairo/FontCairo.cpp

    platform/graphics/cairo/PathCairo.cpp
    platform/graphics/cairo/PatternCairo.cpp
    platform/graphics/cairo/PlatformContextCairo.cpp
    platform/graphics/cairo/PlatformImageCairo.cpp
    platform/graphics/cairo/PlatformPathCairo.cpp
    platform/graphics/cairo/RefPtrCairo.cpp
    platform/graphics/cairo/TransformationMatrixCairo.cpp

    platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp
    platform/graphics/win/SimpleFontDataCairoWin.cpp

    platform/image-decoders/cairo/BitmapPixelsCairo.cpp

    platform/network/NetworkStorageSessionStub.cpp


Lines 606-612 - (void)getPreviewSnapshotImage:(CGImageRef)cgImage andRects:(NSArray *)rects a/Source/WebCore/bindings/objc/DOM.mm_sec1
- a/Source/WebCore/bindings/objc/DOM.mm -1 / +1 lines
606		606
607	if (textIndicator) {	607	if (textIndicator) {
608	if (Image* image = textIndicator->contentImage())	608	if (Image* image = textIndicator->contentImage())
609	*cgImage = (CGImageRef)CFAutorelease(CGImageRetain(image->getCGImageRef()));	609	*cgImage = image->nativeImage().autorelease();
610	}	610	}
611		611
612	RetainPtr<NSMutableArray> rectArray = adoptNS([[NSMutableArray alloc] init]);	612	RetainPtr<NSMutableArray> rectArray = adoptNS([[NSMutableArray alloc] init]);



    contentsImageLogicalSize.scale(1 / _textIndicator->contentImageScaleFactor());
    RetainPtr<CGImageRef> contentsImage;
    if (indicatorWantsContentCrossfade(*_textIndicator))
        contentsImage = _textIndicator->contentImageWithHighlight()->nativeImage();
    else
        contentsImage = _textIndicator->contentImage()->nativeImage();

    RetainPtr<NSMutableArray> bounceLayers = adoptNS([[NSMutableArray alloc] init]);


static RetainPtr<CABasicAnimation> createContentCrossfadeAnimation(CFTimeInterval duration, TextIndicator& textIndicator)
{
    RetainPtr<CABasicAnimation> crossfadeAnimation = [CABasicAnimation animationWithKeyPath:@"contents"];
    RetainPtr<CGImageRef> contentsImage = textIndicator.contentImage()->nativeImage();
    [crossfadeAnimation setToValue:(id)contentsImage.get()];
    [crossfadeAnimation setFillMode:kCAFillModeForwards];
    [crossfadeAnimation setRemovedOnCompletion:NO];



    , m_haveFrameCount(true)
    , m_animationFinishedWhenCatchingUp(false)
{
    m_frames.reserveInitialCapacity(1);
    m_frames.uncheckedAppend(WTFMove(image));
    
    // Since we don't have a decoder, we can't figure out the image orientation.
    // Set m_sizeRespectingOrientation to be the same as m_size so it's not 0x0.
    m_sizeRespectingOrientation = m_size = m_frames[0].size();
    m_decodedSize = m_size.area() * 4;
    
    m_frames.grow(1);
    m_frames[0].m_hasAlpha = NativeImage::hasAlpha(image);
    m_frames[0].m_haveMetadata = true;
    m_frames[0].m_image = WTFMove(image);
}

BitmapImage::~BitmapImage()

    if (index >= m_frames.size())
        return false;

    return m_frames[index].hasImage();
}

bool BitmapImage::hasSingleSecurityOrigin() const

        // The underlying frame isn't actually changing (we're just trying to
        // save the memory for the framebuffer data), so we don't need to clear
        // the metadata.
        frameBytesCleared += m_frames[i].clear(ImageFrameData::Caching::Metadata);
        if (m_frames[i].clear(false))
            frameBytesCleared += frameBytes;
    }

    m_source.clear(destroyAll, clearBeforeFrame, data(), m_allDataReceived);

        return;

    unsigned allFrameBytes = 0;
    for (auto& frame : m_frames)
        allFrameBytes += frame.frameBytes();

    if (allFrameBytes > largeAnimationCutoff) {
        LOG(Images, "BitmapImage %p destroyDecodedDataIfNecessary destroyingData: allFrameBytes=%u cutoff=%u", this, allFrameBytes, largeAnimationCutoff);

        imageObserver()->decodedSizeChanged(this, -safeCast<int>(frameBytesCleared));
}

void BitmapImage::cacheFrame(size_t index, SubsamplingLevel subsamplingLevel, ImageFrameData::Caching caching)
{
    size_t numFrames = frameCount();
    ASSERT(m_decodedSize == 0 || numFrames > 1);

    if (m_frames.size() < numFrames)
        m_frames.grow(numFrames);

    m_frames[index] = m_source.createFrameDataAtIndex(index, subsamplingLevel, caching);
        m_frames[index].m_image = m_source.createFrameImageAtIndex(index, subsamplingLevel);
        m_frames[index].m_subsamplingLevel = subsamplingLevel;
    }

    m_frames[index].m_orientation = m_source.orientationAtIndex(index);
    m_frames[index].m_haveMetadata = true;
    m_frames[index].m_isComplete = m_source.frameIsCompleteAtIndex(index);

    LOG(Images, "BitmapImage %p cacheFrame %lu (%s%u bytes, complete %d)", this, index, caching == ImageFrameData::Caching::Metadata ? "metadata only, " : "", m_frames[index].frameBytes(), m_frames[index].isComplete());
        m_frames[index].m_duration = m_source.frameDurationAtIndex(index);

    if (m_frames[index].hasImage()) {
        int deltaBytes = safeCast<int>(m_frames[index].frameBytes());

    LOG(Images, "BitmapImage %p cacheFrame %lu (%s%u bytes, complete %d)", this, index, frameCaching == CacheMetadataOnly ? "metadata only, " : "", m_frames[index].m_frameBytes, m_frames[index].m_isComplete);

    if (m_frames[index].m_image) {
        int deltaBytes = safeCast<int>(m_frames[index].m_frameBytes);
        m_decodedSize += deltaBytes;
        // The fully-decoded frame will subsume the partially decoded data used
        // to determine image properties.

    // frame affected by appending new data here. Thus we have to clear all the
    // incomplete frames to be safe.
    unsigned frameBytesCleared = 0;
    for (auto& frame : m_frames) {
        // NOTE: Don't call frameIsCompleteAtIndex() here, that will try to
        // decode any uncached (i.e. never-decoded or
        // cleared-on-a-previous-pass) frames!
        if (frame.hasMetadata() && !frame.isComplete())
            frameBytesCleared += frame.clear(ImageFrameData::Caching::Empty);
            frameBytesCleared += (m_frames[i].clear(true) ? frameBytes : 0);
    }
    destroyMetadataAndNotify(frameBytesCleared, ClearedSource::No);
#else
    // FIXME: why is this different for iOS?
    int deltaBytes = 0;
    if (!m_frames.isEmpty()) {
        if (int bytes = m_frames[m_frames.size() - 1].clear(ImageFrameData::Caching::Empty)) {
        if (m_frames[m_frames.size() - 1].clear(true)) {
            deltaBytes += bytes;
            deltaBytes += m_decodedPropertiesSize;
            m_decodedPropertiesSize = 0;

    return m_sizeAvailable;
}

bool BitmapImage::ensureFrameIsCached(size_t index, ImageFrameData::Caching caching)
{
    if (index >= frameCount())
        return false;

    if (index >= m_frames.size()
        || (caching == ImageFrameData::Caching::MetadataAndImage && !m_frames[index].hasImage())
        || (caching == ImageFrameData::Caching::Metadata && !m_frames[index].hasMetadata()))
        cacheFrame(index, 0, caching);

    return true;
}


    // We may have cached a frame with a higher subsampling level, in which case we need to
    // re-decode with a lower level.
    if (index < m_frames.size() && m_frames[index].hasImage() && subsamplingLevel < m_frames[index].subsamplingLevel()) {
        // If the image is already cached, but at too small a size, re-decode a larger version.
        int sizeChange = -m_frames[index].clear(ImageFrameData::Caching::Empty);
        m_frames[index].clear(true);
        invalidatePlatformData();
        m_decodedSize += sizeChange;
        if (imageObserver())

    }

    // If we haven't fetched a frame yet, do so.
    if (index >= m_frames.size() || !m_frames[index].hasImage())
        cacheFrame(index, subsamplingLevel, ImageFrameData::Caching::MetadataAndImage);

    return m_frames[index].image();
}
    
NativeImagePtr BitmapImage::nativeImage()
{
    return frameImageAtIndex(0);
}
    
NativeImagePtr BitmapImage::nativeImageOfSize(const IntSize& size)
{
    size_t count = frameCount();
    
    for (size_t i = 0; i < count; ++i) {
        auto image = frameImageAtIndex(i);
        if (image && PlatformImage(image).size() == size)
            return image;
    }
    
    // Fallback to the first frame image if we can't find the right size
    return frameImageAtIndex(0);
}
    
NativeImagePtr BitmapImage::nativeImageForCurrentFrame()
{
    return frameImageAtIndex(m_currentFrame);
}

Vector<NativeImagePtr> BitmapImage::framesNativeImages()
{
    Vector<NativeImagePtr> images;
    size_t count = frameCount();
    
    for (size_t i = 0; i < count; ++i) {
        if (auto image = frameImageAtIndex(i))
            images.append(image);
    }
    
    return images;
}

bool BitmapImage::frameIsCompleteAtIndex(size_t index)
{
    if (!ensureFrameIsCached(index, ImageFrameData::Caching::Metadata))
        return false;

    return m_frames[index].isComplete();
}

float BitmapImage::frameDurationAtIndex(size_t index)
{
    if (!ensureFrameIsCached(index, ImageFrameData::Caching::Metadata))
        return 0;

    return m_frames[index].duration();
}

NativeImagePtr BitmapImage::nativeImageForCurrentFrame()
{
    return frameImageAtIndex(currentFrame());
}

bool BitmapImage::frameHasAlphaAtIndex(size_t index)
{
    if (!ensureFrameIsCached(index, ImageFrameData::Caching::Metadata))
        return true;

    if (m_frames[index].hasMetadata())
        return m_frames[index].hasAlpha();

    return m_source.frameHasAlphaAtIndex(index);
}


ImageOrientation BitmapImage::frameOrientationAtIndex(size_t index)
{
    if (!ensureFrameIsCached(index, ImageFrameData::Caching::Metadata))
        return ImageOrientation();

    if (m_frames[index].hasMetadata())
        return m_frames[index].orientation();

    return m_source.orientationAtIndex(index);
}

        return Color();
    
    ASSERT(m_frames.size());
    m_solidColor = m_frames[0].singlePixelSolidColor();
    
    ASSERT(m_solidColor);
    return m_solidColor.value();
}
    
bool BitmapImage::isAlmostSolidColor()
{
    if (frameCount() != 1)
        return false;

    return ensureFrameIsCached(0) && m_frames[0].isAlmostSolidColor();
}
    
bool BitmapImage::canAnimate()
{
    return shouldAnimate() && frameCount() > 1;
}

void BitmapImage::draw(GraphicsContext& context, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator op, BlendMode mode, ImageOrientationDescription description)
{
    if (destRect.isEmpty() || srcRect.isEmpty())
        return;

#if PLATFORM(IOS)
    startAnimation(DoNotCatchUp);
#else
    startAnimation();
#endif
    
    Color color = singlePixelSolidColor();
    if (color.isValid()) {
        fillWithSolidColor(context, destRect, color, op);
        return;
    }
    
    auto image = frameImageAtIndex(m_currentFrame, PlatformImage::subsamplingScale(context, destRect, srcRect));
    if (!image) // If it's too early we won't have an image yet.
        return;
    
    ImageOrientation orientation(description.imageOrientation());
    if (description.respectImageOrientation() == RespectImageOrientation)
        orientation = frameOrientationAtIndex(m_currentFrame);
    
    PlatformImage(image).draw(context, destRect, srcRect, m_size, op, mode, orientation);
    
    if (imageObserver())
        imageObserver()->didDraw(this);
}
    
void BitmapImage::dump(TextStream& ts) const
{
    Image::dump(ts);



#ifndef BitmapImage_h
#define BitmapImage_h

#include "Image.h"
#include "Color.h"
#include "Image.h"
#include "ImageFrameData.h"
#include "ImageOrientation.h"
#include "ImageSource.h"
#include "IntSize.h"
#include "PlatformImage.h"

#if USE(CG) || USE(APPKIT)
#include <wtf/RetainPtr.h>

#endif

namespace WebCore {
    struct FrameData;
}

namespace WTF {
    template<> struct VectorTraits<WebCore::FrameData> : public SimpleClassVectorTraits {
        static const bool canInitializeWithMemset = false; // Not all FrameData members initialize to 0.
    };
}

namespace WebCore {

class Timer;

namespace NativeImage {
    IntSize size(const NativeImagePtr&);
    bool hasAlpha(const NativeImagePtr&);
    Color singlePixelSolidColor(const NativeImagePtr&);
}

// ================================================
// FrameData Class
// ================================================

struct FrameData {
public:
    FrameData()
        : m_haveMetadata(false)
        , m_isComplete(false)
        , m_hasAlpha(true)
    {
    }

    ~FrameData()
    { 
        clear(true);
    }

    // Clear the cached image data on the frame, and (optionally) the metadata.
    // Returns whether there was cached image data to clear.
    bool clear(bool clearMetadata);
    
    unsigned usedFrameBytes() const { return m_image ? m_frameBytes : 0; }

    NativeImagePtr m_image;
    ImageOrientation m_orientation { DefaultImageOrientation };
    SubsamplingLevel m_subsamplingLevel { 0 };
    float m_duration { 0 };
    bool m_haveMetadata : 1;
    bool m_isComplete : 1;
    bool m_hasAlpha : 1;
    unsigned m_frameBytes { 0 };
};

// =================================================
// BitmapImage Class
// =================================================

class BitmapImage final : public Image {
    friend class GeneratedImage;
    friend class CrossfadeGeneratedImage;

    CFDataRef getTIFFRepresentation() override;
#endif

#if USE(CG)
    WEBCORE_EXPORT CGImageRef getCGImageRef() override;
    CGImageRef getFirstCGImageRefOfSize(const IntSize&) override;
    RetainPtr<CFArrayRef> getCGImageArray() override;
#endif

#if PLATFORM(WIN)
    bool getHBITMAP(HBITMAP) override;
    bool getHBITMAPOfSize(HBITMAP, const IntSize*) override;

    Evas_Object* getEvasObject(Evas*) override;
#endif

    WEBCORE_EXPORT NativeImagePtr nativeImage() override;
    NativeImagePtr nativeImageOfSize(const IntSize&) override;
    NativeImagePtr nativeImageForCurrentFrame() override;
    ImageOrientation orientationForCurrentFrame() override { return frameOrientationAtIndex(currentFrame()); }
    Vector<NativeImagePtr> framesNativeImages() override;
    
    WEBCORE_EXPORT bool isAlmostSolidColor();

    bool currentFrameKnownToBeOpaque() override;


    size_t frameCount();

    NativeImagePtr frameImageAtIndex(size_t, float presentationScaleHint = 1);
    NativeImagePtr copyUnscaledFrameImageAtIndex(size_t);

    bool haveFrameImageAtIndex(size_t);


    ImageOrientation frameOrientationAtIndex(size_t);

    // Decodes and caches a frame. Never accessed except internally.
    void cacheFrame(size_t index, SubsamplingLevel, ImageFrameData::Caching = ImageFrameData::Caching::MetadataAndImage);
    void cacheFrame(size_t index, SubsamplingLevel, ImageFrameCaching = CacheMetadataAndFrame);

    // Called before accessing m_frames[index] for info without decoding. Returns false on index out of bounds.
    bool ensureFrameIsCached(size_t index, ImageFrameData::Caching = ImageFrameData::Caching::MetadataAndImage);

    // Called to invalidate cached data. When |destroyAll| is true, we wipe out
    // the entire frame buffer cache and tell the image source to destroy

    mutable IntSize m_sizeRespectingOrientation;

    size_t m_currentFrame { 0 }; // The index of the current frame of animation.
    Vector<ImageFrameData, 1> m_frames; // An array of the cached frames of the animation. We have to ref frames to pin them in the cache.

    std::unique_ptr<Timer> m_frameTimer;
    int m_repetitionCount { cAnimationNone }; // How many total animation loops we should do. This will be cAnimationNone if this image type is incapable of animation.



/*
 * Copyright (C) 2016 Apple Inc.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

#include "Color.h"
#include "IntRect.h"
#include "IntSize.h"
#include "NativeImagePtr.h"

#include <wtf/Vector.h>

namespace WebCore {

class BitmapPixels {
public:
    static std::unique_ptr<BitmapPixels> create(const IntSize& size, bool premultiplyAlpha)
    {
        return std::make_unique<BitmapPixels>(size, premultiplyAlpha);
    }

    static std::unique_ptr<BitmapPixels> create(const BitmapPixels& other)
    {
        return std::make_unique<BitmapPixels>(other);
    }

    BitmapPixels(const IntSize& size, bool premultiplyAlpha = true)
        : m_premultiplyAlpha(premultiplyAlpha)
    {
        ASSERT(!size.isEmpty());
        setSize(size);
    }

    BitmapPixels(const BitmapPixels& other)
    {
        if (this == &other)
            return;
        
        m_backingStore = other.m_backingStore;
        m_pixels = m_backingStore.data();
        m_size = other.m_size;
        m_rect = other.m_rect;
        m_premultiplyAlpha = other.m_premultiplyAlpha;
    }

    NativeImagePtr image() const;

    bool setSize(const IntSize& size)
    {
        if (!m_backingStore.tryReserveCapacity(size.area()))
            return false;
        
        m_backingStore.resize(size.area());
        m_pixels = m_backingStore.data();
        m_size = size;
        m_rect = IntRect(IntPoint(), m_size);
        clear();
        return true;
    }
    
    void setRect(const IntRect& rect)
    {
        ASSERT(!m_size.isEmpty());
        ASSERT(inBounds(rect));
        m_rect = rect;
    }
    
    IntSize size() const { return m_size; }
    IntRect rect() const { return m_rect; }

    RGBA32* at(int x, int y) const
    {
        return m_pixels + y * m_size.width() + x;
    }

    void clear()
    {
        memset(m_pixels, 0, m_size.area() * sizeof(RGBA32));
    }

    void clearRect(const IntRect& rect)
    {
        if (rect.isEmpty() || inBounds(rect))
            return;
        
        size_t rectWidthInBytes = rect.width() * sizeof(RGBA32);
        RGBA32* start = at(rect.x(), rect.y());
        for (int i = 0; i < rect.height(); ++i) {
            memset(start, 0, rectWidthInBytes);
            start += m_size.width();
        }
    }

    void repeatFirstRow(const IntRect& rect)
    {
        if (rect.isEmpty() || inBounds(rect))
            return;
        
        size_t rectWidthInBytes = rect.width() * sizeof(RGBA32);
        RGBA32* src = at(rect.x(), rect.y());
        RGBA32* dest = src + m_size.width();
        for (int i = 1; i < rect.height(); ++i) {
            memcpy(dest, src, rectWidthInBytes);
            dest += m_size.width();
        }
    }

    void setRGBA(int x, int y, unsigned r, unsigned g, unsigned b, unsigned a)
    {
        setRGBA(at(x, y), r, g, b, a);
    }

    void setRGBA(RGBA32* dest, unsigned r, unsigned g, unsigned b, unsigned a)
    {
        if (!m_premultiplyAlpha || a >= 255)
            *dest = makeRGBA(r, g, b, a);
        else if (!a)
            *dest = 0;
        else
            *dest = makePremultipliedRGBA(r, g, b, a);
    }

    void overRGBA(RGBA32* dest, unsigned r, unsigned g, unsigned b, unsigned a)
    {
        if (!a)
            return;
        
        if (a >= 255 || !alphaChannel(*dest)) {
            setRGBA(dest, r, g, b, a);
            return;
        }
        
        if (!m_premultiplyAlpha)
            *dest = makePremultipliedRGBA(redChannel(*dest), greenChannel(*dest), blueChannel(*dest), alphaChannel(*dest));
        
        RGBA32 src = makeRGBA(r, g, b, a);
        *dest = Color(*dest).blend(src).rgb();
        
        if (!m_premultiplyAlpha)
            *dest = makeUnPremultipliedRGBA(redChannel(*dest), greenChannel(*dest), blueChannel(*dest), alphaChannel(*dest));
    }

    bool inBounds(const IntPoint& point) const
    {
        return IntRect(IntPoint(), m_size).contains(point);
    }

    bool inBounds(const IntRect& rect) const
    {
        return IntRect(IntPoint(), m_size).contains(rect);
    }

private:
    Vector<RGBA32> m_backingStore;
    RGBA32* m_pixels { nullptr };
    IntSize m_size;
    IntRect m_rect; // This will always just be the entire buffer except for GIF and PNG frames
    bool m_premultiplyAlpha { true };
};

}



static const RGBA32 lightenedBlack = 0xFF545454;
static const RGBA32 darkenedWhite = 0xFFABABAB;

static inline unsigned multiply255(unsigned c)
{
    // c * 255
    //   = c * (256 - 1)
    //   = c * 256 - c
    return (c << 8) - c;
}

static inline unsigned divide255(unsigned c)
{
    // c / 255
    //   = c / 256 * (1 + 1 / 255)
    //   = (c + c / 255) / 256
    //   = (c + (c + c / 255) / 256) / 256
    //   = (c + c / 256 + c / (255 x 256)) / 256
    //  ~= (c + c / 256 + 1) / 256
    return (c + (c >> 8) + 1) >> 8;
}
    
static inline unsigned divideCeil(unsigned c, unsigned d)
{
    return (c + d - 1) / d;
}
    
static inline unsigned premultipliedChannel(unsigned c, unsigned a)
{
    return divide255(c * a);
}

static inline unsigned unpremultipliedChannel(unsigned c, unsigned a)
{
    return divideCeil(multiply255(c), a);
}
    
RGBA32 makeRGB(int r, int g, int b)
{
    return 0xFF000000 | std::max(0, std::min(r, 255)) << 16 | std::max(0, std::min(g, 255)) << 8 | std::max(0, std::min(b, 255));

    return std::max(0, std::min(a, 255)) << 24 | std::max(0, std::min(r, 255)) << 16 | std::max(0, std::min(g, 255)) << 8 | std::max(0, std::min(b, 255));
}

RGBA32 makePremultipliedRGBA(int r, int g, int b, int a)
{
    return makeRGBA(premultipliedChannel(r, a), premultipliedChannel(g, a), premultipliedChannel(b, a), a);
}
    
RGBA32 makeUnPremultipliedRGBA(int r, int g, int b, int a)
{
    return makeRGBA(unpremultipliedChannel(r, a), unpremultipliedChannel(g, a), unpremultipliedChannel(b, a), a);
}
    
static int colorFloatToRGBAByte(float f)
{
    // We use lroundf and 255 instead of nextafterf(256, 0) to match CG's rounding

Lines 54-59 typedef unsigned RGBA32; // Deprecated: Type for an RGBA quadruplet. Use RGBA cl a/Source/WebCore/platform/graphics/Color.h_sec1
- a/Source/WebCore/platform/graphics/Color.h +2 lines
54		54
55	WEBCORE_EXPORT RGBA32 makeRGB(int r, int g, int b);	55	WEBCORE_EXPORT RGBA32 makeRGB(int r, int g, int b);
56	WEBCORE_EXPORT RGBA32 makeRGBA(int r, int g, int b, int a);	56	WEBCORE_EXPORT RGBA32 makeRGBA(int r, int g, int b, int a);
		57	WEBCORE_EXPORT RGBA32 makePremultipliedRGBA(int r, int g, int b, int a);
		58	WEBCORE_EXPORT RGBA32 makeUnPremultipliedRGBA(int r, int g, int b, int a);
57		59
58	WEBCORE_EXPORT RGBA32 colorWithOverrideAlpha(RGBA32 color, float overrideAlpha);	60	WEBCORE_EXPORT RGBA32 colorWithOverrideAlpha(RGBA32 color, float overrideAlpha);
59	WEBCORE_EXPORT RGBA32 colorWithOverrideAlpha(RGBA32 color, Optional<float> overrideAlpha);	61	WEBCORE_EXPORT RGBA32 colorWithOverrideAlpha(RGBA32 color, Optional<float> overrideAlpha);

Lines 137-144 public: a/Source/WebCore/platform/graphics/Image.h_sec1
- a/Source/WebCore/platform/graphics/Image.h -6 / +5 lines
137		137
138	enum TileRule { StretchTile, RoundTile, SpaceTile, RepeatTile };	138	enum TileRule { StretchTile, RoundTile, SpaceTile, RepeatTile };
139		139
		140	virtual NativeImagePtr nativeImage() { return nullptr; }
		141	virtual NativeImagePtr nativeImageOfSize(const IntSize&) { return nullptr; }
140	virtual NativeImagePtr nativeImageForCurrentFrame() { return nullptr; }	142	virtual NativeImagePtr nativeImageForCurrentFrame() { return nullptr; }
141	virtual ImageOrientation orientationForCurrentFrame() { return ImageOrientation(); }	143	virtual ImageOrientation orientationForCurrentFrame() { return ImageOrientation(); }
		144	virtual Vector<NativeImagePtr> framesNativeImages() { return { }; }
142		145
143	// Accessors for native image formats.	146	// Accessors for native image formats.
144		147
Lines 150-161 public: a/Source/WebCore/platform/graphics/Image.h_sec2
150	virtual CFDataRef getTIFFRepresentation() { return nullptr; }	153	virtual CFDataRef getTIFFRepresentation() { return nullptr; }
151	#endif	154	#endif
152		155
153	#if USE(CG)
154	virtual CGImageRef getCGImageRef() { return nullptr; }
155	virtual CGImageRef getFirstCGImageRefOfSize(const IntSize&) { return nullptr; }
156	virtual RetainPtr<CFArrayRef> getCGImageArray() { return nullptr; }
157	#endif
158
159	#if PLATFORM(WIN)	156	#if PLATFORM(WIN)
160	virtual bool getHBITMAP(HBITMAP) { return false; }	157	virtual bool getHBITMAP(HBITMAP) { return false; }
161	virtual bool getHBITMAPOfSize(HBITMAP, const IntSize*) { return false; }	158	virtual bool getHBITMAPOfSize(HBITMAP, const IntSize*) { return false; }
Lines 179-184 public: a/Source/WebCore/platform/graphics/Image.h_sec3
179	#if !ASSERT_DISABLED	176	#if !ASSERT_DISABLED
180	virtual bool notSolidColor() { return true; }	177	virtual bool notSolidColor() { return true; }
181	#endif	178	#endif
		179
		180	virtual void layoutIfNeeded() { }
182		181
183	virtual void dump(TextStream&) const;	182	virtual void dump(TextStream&) const;
184		183



/*
 * Copyright (C) 2016 Apple Inc.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"
#include "ImageFrameData.h"

#include "Color.h"

#if USE(CG)
#include "ImageDecoderCG.h"
#else
#include "ImageDecoder.h"
#endif

#include "PlatformImage.h"

namespace WebCore {

ImageFrameData::ImageFrameData()
{
}

ImageFrameData::ImageFrameData(NativeImagePtr&& image)
    : m_status(DecodingStatus::Complete)
    , m_image(WTFMove(image))
{
    m_size = PlatformImage(m_image).size();
    m_hasAlpha = PlatformImage(m_image).hasAlpha();
}

ImageFrameData::ImageFrameData(ImageDecoder& decoder, size_t index, SubsamplingLevel subsamplingLevel, Caching frameCaching)
{
    ASSERT(frameCaching == Caching::Metadata || frameCaching == Caching::MetadataAndImage);
    
    if (frameCaching == Caching::Image || frameCaching == Caching::MetadataAndImage) {
        m_image = decoder.createFrameImageAtIndex(index, subsamplingLevel);
        m_subsamplingLevel = subsamplingLevel;
    }
    
    if (frameCaching == Caching::Metadata || frameCaching == Caching::MetadataAndImage) {
        m_orientation = decoder.orientationAtIndex(index);
        m_status = decoder.frameIsCompleteAtIndex(index) ? DecodingStatus::Complete : DecodingStatus::Partial;
        
        if (decoder.repetitionCount() != cAnimationNone)
            m_duration = decoder.frameDurationAtIndex(index);
        
        m_hasAlpha = decoder.frameHasAlphaAtIndex(index);
        m_size = decoder.frameSizeAtIndex(index, subsamplingLevel);
    }
}

ImageFrameData::~ImageFrameData()
{
    clearSubImages();
}
    
ImageFrameData& ImageFrameData::operator=(const ImageFrameData& other)
{
    if (this == &other)
        return *this;

    m_status = other.m_status;
    m_size = other.m_size;
    m_image = other.m_image;
    
    m_pixels = other.pixels() ? BitmapPixels::create(*other.pixels()) : nullptr;
    
    m_orientation = other.m_orientation;
    m_subsamplingLevel = other.m_subsamplingLevel;
    m_duration = other.m_duration;
    m_hasAlpha = other.m_hasAlpha;
    return *this;
}

void ImageFrameData::clearSubImages()
{
    if (!m_image)
        return;
    
    PlatformImage(m_image).clearSubImages();
}

unsigned ImageFrameData::clear(Caching frameCaching)
{
    ASSERT(frameCaching == Caching::Empty || frameCaching == Caching::Metadata);
    
    unsigned frameBytes = this->frameBytes();
    
    clearSubImages();
    
    if (frameCaching == Caching::Empty)
        *this = ImageFrameData();
    else
        m_image = nullptr;
    
    return frameBytes;
}

Color ImageFrameData::singlePixelSolidColor() const
{
    if (!hasImage() || m_size != IntSize(1, 1))
        return Color();
    
    return PlatformImage(m_image).singlePixelSolidColor();
}

bool ImageFrameData::isAlmostSolidColor() const
{
    if (!hasImage())
        return false;
    
    return PlatformImage(m_image).isAlmostSolidColor();
}
    
}



/*
 * Copyright (C) 2016 Apple Inc.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

#include "BitmapPixels.h"
#include "ImageOrientation.h"
#include "IntSize.h"
#include "NativeImagePtr.h"

namespace WebCore {

class Color;
class ImageDecoder;

// SubsamplingLevel. 0 is no subsampling, 1 is half dimensions on each axis etc.
using SubsamplingLevel = uint8_t;

enum : SubsamplingLevel {
    MinSubsamplingLevel = 0,
    MaxSubsamplingLevel = 3,
    DefaultSubsamplingLevel = MinSubsamplingLevel
};

class ImageFrameData {
    friend class ImageDecoder;
public:
    enum class Caching { Empty, Metadata, Image, MetadataAndImage };
    enum class DecodingStatus { Empty, Partial, Complete };
    
    ImageFrameData();
    ImageFrameData(NativeImagePtr&&);
    ImageFrameData(ImageDecoder&, size_t index, SubsamplingLevel = DefaultSubsamplingLevel, Caching = Caching::MetadataAndImage);
    ImageFrameData(const ImageFrameData& other) { operator=(other); }

    ~ImageFrameData();

    ImageFrameData& operator=(const ImageFrameData& other);
    
    unsigned clear(Caching);
    Color singlePixelSolidColor() const;
    bool isAlmostSolidColor() const;
    
    DecodingStatus status() const { return m_status; }
    bool isComplete() const { return m_status == DecodingStatus::Complete; }
    IntSize size() const { return hasPixels() ? pixels()->size() : m_size; }
    unsigned frameBytes() const { return hasImage() ? m_size.area() * sizeof(RGBA32) : 0; }
    NativeImagePtr image() const { return m_image; }
    BitmapPixels* pixels() const { return m_pixels ? m_pixels.get() : nullptr; }
    
    ImageOrientation orientation() const { return m_orientation; }
    SubsamplingLevel subsamplingLevel() const { return m_subsamplingLevel; }
    float duration() const { return m_duration; }
    
    bool hasAlpha() const { return m_hasAlpha; }
    bool hasImage() const { return m_image; }
    bool hasMetadata() const { return !m_size.isEmpty(); }
    bool hasPixels() const { return pixels(); }
    
private:
    void clearSubImages();

    void setStatus(DecodingStatus status) { m_status = status; }
    void setOrientation(ImageOrientation orientation) { m_orientation = orientation; };
    void setDuration(unsigned duration) { m_duration = duration; }
    void setHasAlpha(bool hasAlpha) { m_hasAlpha = hasAlpha; }
    
    DecodingStatus m_status { DecodingStatus::Empty };
    IntSize m_size;
    NativeImagePtr m_image;
    std::unique_ptr<BitmapPixels> m_pixels;
    
    ImageOrientation m_orientation { DefaultImageOrientation };
    SubsamplingLevel m_subsamplingLevel { 0 };
    float m_duration { 0 };
    bool m_hasAlpha { true };
};
    
}

Lines 224-229 NativeImagePtr ImageSource::createFrameImageAtIndex(size_t index, SubsamplingLev a/Source/WebCore/platform/graphics/ImageSource.cpp_sec1
- a/Source/WebCore/platform/graphics/ImageSource.cpp +5 lines
224	return initialized() ? m_decoder->createFrameImageAtIndex(index, subsamplingLevel) : nullptr;	224	return initialized() ? m_decoder->createFrameImageAtIndex(index, subsamplingLevel) : nullptr;
225	}	225	}
226		226
		227	ImageFrameData ImageSource::createFrameDataAtIndex(size_t index, SubsamplingLevel subsamplingLevel, ImageFrameData::Caching caching)
		228	{
		229	return initialized() ? ImageFrameData(*m_decoder, index, subsamplingLevel, caching) : ImageFrameData();
		230	}
		231
227	void ImageSource::dump(TextStream& ts) const	232	void ImageSource::dump(TextStream& ts) const
228	{	233	{
229	if (m_allowSubsampling)	234	if (m_allowSubsampling)



#ifndef ImageSource_h
#define ImageSource_h

#include "ImageFrameData.h"
#include "ImageOrientation.h"
#include "IntPoint.h"
#include "NativeImagePtr.h"

const int cAnimationLoopInfinite = -1;
const int cAnimationNone = -2;

// SubsamplingLevel. 0 is no subsampling, 1 is half dimensions on each axis etc.
typedef short SubsamplingLevel;

class ImageSource {
    WTF_MAKE_NONCOPYABLE(ImageSource);
    friend class BitmapImage;

    bool allowSubsamplingOfFrameAtIndex(size_t) const;
    
    // Size of optionally subsampled frame.
    IntSize frameSizeAtIndex(size_t, SubsamplingLevel = DefaultSubsamplingLevel, RespectImageOrientationEnum = DoNotRespectImageOrientation) const;
    
    // Return the number of bytes in the decoded frame. If the frame is not yet
    // decoded then return 0.
    unsigned frameBytesAtIndex(size_t, SubsamplingLevel = DefaultSubsamplingLevel) const;
    
    float frameDurationAtIndex(size_t);
    ImageOrientation orientationAtIndex(size_t) const; // EXIF image orientation
    
    // Callers should not call this after calling clear() with a higher index;
    // see comments on clear() above.
    NativeImagePtr createFrameImageAtIndex(size_t, SubsamplingLevel = DefaultSubsamplingLevel);
    ImageFrameData createFrameDataAtIndex(size_t, SubsamplingLevel = DefaultSubsamplingLevel, ImageFrameData::Caching = ImageFrameData::Caching::MetadataAndImage);
    
private:
    void clearFrameBufferCache(size_t);



/*
 * Copyright (C) 2016 Apple Inc.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

#include "GraphicsTypes.h"
#include "ImageOrientation.h"
#include "NativeImagePtr.h"

namespace WebCore {

class Color;
class FloatRect;
class IntSize;
class GraphicsContext;

class PlatformImage {
public:
    PlatformImage(const NativeImagePtr& image)
        : m_image(image)
    {
    }

    bool isNil() const { return !m_image; }
    void clearSubImages();

    IntSize size() const;
    bool hasAlpha() const;
    Color singlePixelSolidColor() const;
    bool isAlmostSolidColor() const;
    void draw(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect, const IntSize& srcSize, CompositeOperator, BlendMode, const ImageOrientation&) const;

    static float subsamplingScale(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect);

private:
#if USE(CG)
    CGImageRef cgImageRef() const { return m_image ? m_image.get() : nullptr; }
#endif
    NativeImagePtr m_image;
};

}

Lines 212-218 void MediaPlayerPrivateMediaStreamAVFObjC::updateDisplayMode() a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm_sec1
- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm -1 / +1 lines
212	continue;	212	continue;
213	}	213	}
214		214
215	m_pausedImage = image->getCGImageRef();	215	m_pausedImage = image->nativeImageForCurrentFrame();
216	if (!m_pausedImage) {	216	if (!m_pausedImage) {
217	m_displayMode = PaintItBlack;	217	m_displayMode = PaintItBlack;
218	continue;	218	continue;



/*
 * Copyright (C) 2004, 2005, 2006 Apple Inc.  All rights reserved.
 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"
#include "BitmapImage.h"

#if USE(CAIRO)

#include "CairoUtilities.h"
#include "ImageObserver.h"
#include "PlatformContextCairo.h"
#include "Timer.h"
#include <cairo.h>

namespace WebCore {

namespace NativeImage {

IntSize size(const RefPtr<cairo_surface_t>& image)
{
    return cairoSurfaceSize(image.get());
}

bool hasAlpha(const RefPtr<cairo_surface_t>& image)
{
    return cairo_surface_get_content(image.get()) != CAIRO_CONTENT_COLOR;
}

Color singlePixelSolidColor(const RefPtr<cairo_surface_t>& image)
{
    ASSERT(image);
    
    if (NativeImage::size(image) != IntSize(1, 1))
        return Color();

    if (cairo_surface_get_type(image.get()) != CAIRO_SURFACE_TYPE_IMAGE)
        return Color();

    RGBA32* pixel = reinterpret_cast_ptr<RGBA32*>(cairo_image_surface_get_data(image.get()));
    return colorFromPremultipliedARGB(*pixel);
}

}

void BitmapImage::draw(GraphicsContext& context, const FloatRect& dst, const FloatRect& src, CompositeOperator op,
    BlendMode blendMode, ImageOrientationDescription description)
{
    if (!dst.width() || !dst.height() || !src.width() || !src.height())
        return;

    startAnimation();

    auto surface = frameImageAtIndex(m_currentFrame);
    if (!surface) // If it's too early we won't have an image yet.
        return;

    Color color = singlePixelSolidColor();
    if (color.isValid()) {
        fillWithSolidColor(context, dst, color, op);
        return;
    }

    context.save();

    // Set the compositing operation.
    if (op == CompositeSourceOver && blendMode == BlendModeNormal && !frameHasAlphaAtIndex(m_currentFrame))
        context.setCompositeOperation(CompositeCopy);
    else
        context.setCompositeOperation(op, blendMode);

#if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
    IntSize scaledSize = cairoSurfaceSize(surface.get());
    FloatRect adjustedSrcRect = adjustSourceRectForDownSampling(src, scaledSize);
#else
    FloatRect adjustedSrcRect(src);
#endif

    ImageOrientation frameOrientation(description.imageOrientation());
    if (description.respectImageOrientation() == RespectImageOrientation)
        frameOrientation = frameOrientationAtIndex(m_currentFrame);

    FloatRect dstRect = dst;

    if (frameOrientation != DefaultImageOrientation) {
        // ImageOrientation expects the origin to be at (0, 0).
        context.translate(dstRect.x(), dstRect.y());
        dstRect.setLocation(FloatPoint());
        context.concatCTM(frameOrientation.transformFromDefault(dstRect.size()));
        if (frameOrientation.usesWidthAsHeight()) {
            // The destination rectangle will have it's width and height already reversed for the orientation of
            // the image, as it was needed for page layout, so we need to reverse it back here.
            dstRect = FloatRect(dstRect.x(), dstRect.y(), dstRect.height(), dstRect.width());
        }
    }

    context.platformContext()->drawSurfaceToContext(surface.get(), dstRect, adjustedSrcRect, context);

    context.restore();

    if (imageObserver())
        imageObserver()->didDraw(this);
}

bool FrameData::clear(bool clearMetadata)
{
    if (clearMetadata)
        m_haveMetadata = false;

    if (m_image) {
        m_image = nullptr;
        return true;
    }
    return false;
}

} // namespace WebCore

#endif // USE(CAIRO)



/*
 * Copyright (C) 2016 Apple Inc.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"
#include "PlatformImage.h"

#if USE(CAIRO)

#include "CairoUtilities.h"
#include "PlatformContextCairo.h"
#include <cairo.h>

namespace WebCore {

void PlatformImage::clearSubImages()
{
}

IntSize PlatformImage::size() const
{
    return isNil() ? IntSize() : cairoSurfaceSize(m_image.get());
}

bool PlatformImage::hasAlpha() const
{
    return isNil() || cairo_surface_get_content(m_image.get()) != CAIRO_CONTENT_COLOR;
}

Color PlatformImage::singlePixelSolidColor() const
{
    if (isNil() || size() != IntSize(1, 1))
        return Color();

    if (cairo_surface_get_type(m_image.get()) != CAIRO_SURFACE_TYPE_IMAGE)
        return Color();

    RGBA32* pixel = reinterpret_cast_ptr<RGBA32*>(cairo_image_surface_get_data(m_image.get()));
    return colorFromPremultipliedARGB(*pixel);
}

bool PlatformImage::isAlmostSolidColor() const
{
    return false;
}

float PlatformImage::subsamplingScale(GraphicsContext&, const FloatRect&, const FloatRect&)
{
    return 1;
}

void PlatformImage::draw(GraphicsContext& context, const FloatRect& destRect, const FloatRect& srcRect, const IntSize&, CompositeOperator op, BlendMode mode, const ImageOrientation& orientation) const
{
    context.save();
    
    // Set the compositing operation.
    if (op == CompositeSourceOver && mode == BlendModeNormal && !hasAlpha())
        context.setCompositeOperation(CompositeCopy);
    else
        context.setCompositeOperation(op, mode);
        
#if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
    IntSize scaledSize = cairoSurfaceSize(m_image.get());
    FloatRect adjustedSrcRect = adjustSourceRectForDownSampling(srcRect, scaledSize);
#else
    FloatRect adjustedSrcRect(srcRect);
#endif
        
    FloatRect adjustedDestRect = destRect;
        
    if (orientation != DefaultImageOrientation) {
        // ImageOrientation expects the origin to be at (0, 0).
        context.translate(destRect.x(), destRect.y());
        adjustedDestRect.setLocation(FloatPoint());
        context.concatCTM(orientation.transformFromDefault(adjustedDestRect.size()));
        if (orientation.usesWidthAsHeight()) {
            // The destination rectangle will have it's width and height already reversed for the orientation of
            // the image, as it was needed for page layout, so we need to reverse it back here.
            adjustedDestRect.setSize(adjustedDestRect.size().transposedSize());
        }
    }

    context.platformContext()->drawSurfaceToContext(m_image.get(), adjustedDestRect, adjustedSrcRect, context);

    context.restore();
}

} // namespace WebCore

#endif // USE(CAIRO)



/*
 * Copyright (C) 2004, 2005, 2006 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 */

#include "config.h"
#include "BitmapImage.h"

#if USE(CG)

#include "CoreGraphicsSPI.h"
#include "FloatConversion.h"
#include "GeometryUtilities.h"
#include "GraphicsContextCG.h"
#include "ImageObserver.h"
#include "SubimageCacheWithTimer.h"
#include <wtf/RetainPtr.h>

#if USE(APPKIT)
#include <ApplicationServices/ApplicationServices.h>
#endif

#if PLATFORM(COCOA)
#include "WebCoreSystemInterface.h"
#endif

#if PLATFORM(WIN)
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#endif

namespace WebCore {

namespace NativeImage {

IntSize size(const RetainPtr<CGImageRef>& image)
{
    ASSERT(image);
    return IntSize(CGImageGetWidth(image.get()), CGImageGetHeight(image.get()));
}

bool hasAlpha(const RetainPtr<CGImageRef>&)
{
    // FIXME: Answer correctly the question: does the CGImageRef have alpha channnel?
    return true;
}
    
Color singlePixelSolidColor(const RetainPtr<CGImageRef>& image)
{
    ASSERT(image);
    
    if (NativeImage::size(image) != IntSize(1, 1))
        return Color();
    
    unsigned char pixel[4]; // RGBA
    auto bitmapContext = adoptCF(CGBitmapContextCreate(pixel, 1, 1, 8, sizeof(pixel), sRGBColorSpaceRef(),
        kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder32Big));

    if (!bitmapContext)
        return Color();
    
    CGContextSetBlendMode(bitmapContext.get(), kCGBlendModeCopy);
    CGContextDrawImage(bitmapContext.get(), CGRectMake(0, 0, 1, 1), image.get());
    
    if (!pixel[3])
        return Color(0, 0, 0, 0);

    return Color(pixel[0] * 255 / pixel[3], pixel[1] * 255 / pixel[3], pixel[2] * 255 / pixel[3], pixel[3]);
}

}

bool FrameData::clear(bool clearMetadata)
{
    if (clearMetadata)
        m_haveMetadata = false;

    m_subsamplingLevel = 0;

    if (m_image) {
#if CACHE_SUBIMAGES
        subimageCache().clearImage(m_image.get());
#endif
        m_image = nullptr;
        return true;
    }
    return false;
}

CGImageRef BitmapImage::getCGImageRef()
{
    return frameImageAtIndex(0).get();
}

CGImageRef BitmapImage::getFirstCGImageRefOfSize(const IntSize& size)
{
    size_t count = frameCount();
    for (size_t i = 0; i < count; ++i) {
        CGImageRef cgImage = frameImageAtIndex(i).get();
        if (cgImage && IntSize(CGImageGetWidth(cgImage), CGImageGetHeight(cgImage)) == size)
            return cgImage;
    }

    // Fallback to the default CGImageRef if we can't find the right size
    return getCGImageRef();
}

RetainPtr<CFArrayRef> BitmapImage::getCGImageArray()
{
    size_t count = frameCount();
    if (!count)
        return nullptr;
    
    CFMutableArrayRef array = CFArrayCreateMutable(NULL, count, &kCFTypeArrayCallBacks);
    for (size_t i = 0; i < count; ++i) {
        if (CGImageRef currFrame = frameImageAtIndex(i).get())
            CFArrayAppendValue(array, currFrame);
    }
    return adoptCF(array);
}

void BitmapImage::draw(GraphicsContext& ctxt, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription description)
{
#if PLATFORM(IOS)
    startAnimation(DoNotCatchUp);
#else
    startAnimation();
#endif

    RetainPtr<CGImageRef> image;
    // Never use subsampled images for drawing into PDF contexts.
    if (wkCGContextIsPDFContext(ctxt.platformContext()))
        image = copyUnscaledFrameImageAtIndex(m_currentFrame);
    else {
        CGRect transformedDestinationRect = CGRectApplyAffineTransform(destRect, CGContextGetCTM(ctxt.platformContext()));
        float subsamplingScale = std::min<float>(1, std::max(transformedDestinationRect.size.width / srcRect.width(), transformedDestinationRect.size.height / srcRect.height()));

        image = frameImageAtIndex(m_currentFrame, subsamplingScale);
    }

    if (!image) // If it's too early we won't have an image yet.
        return;
    
    Color color = singlePixelSolidColor();
    if (color.isValid()) {
        fillWithSolidColor(ctxt, destRect, color, compositeOp);
        return;
    }

    // Subsampling may have given us an image that is smaller than size().
    IntSize imageSize(CGImageGetWidth(image.get()), CGImageGetHeight(image.get()));
    
    // srcRect is in the coordinates of the unsubsampled image, so we have to map it to the subsampled image.
    FloatRect scaledSrcRect = srcRect;
    if (imageSize != m_size) {
        FloatRect originalImageBounds(FloatPoint(), m_size);
        FloatRect subsampledImageBounds(FloatPoint(), imageSize);
        scaledSrcRect = mapRect(srcRect, originalImageBounds, subsampledImageBounds);
    }
    
    ImageOrientation orientation;
    if (description.respectImageOrientation() == RespectImageOrientation)
        orientation = frameOrientationAtIndex(m_currentFrame);

    ctxt.drawNativeImage(image, imageSize, destRect, scaledSrcRect, compositeOp, blendMode, orientation);

    if (imageObserver())
        imageObserver()->didDraw(this);
}

RetainPtr<CGImageRef> BitmapImage::copyUnscaledFrameImageAtIndex(size_t index)
{
    if (index >= frameCount())
        return nullptr;

    if (index >= m_frames.size() || !m_frames[index].m_image)
        cacheFrame(index, 0);

    if (!m_frames[index].m_subsamplingLevel)
        return m_frames[index].m_image;

    return m_source.createFrameImageAtIndex(index);
}

}

#endif // USE(CG)



    // If we're repeating in both directions, we can use image-backed patterns
    // instead of custom patterns, and avoid tiling-edge pixel cracks.
    if (m_repeatX && m_repeatY)
        return wkCGPatternCreateWithImageAndTransform(tileImage()->nativeImage().get(), patternTransform, wkPatternTilingConstantSpacing);

    // If FLT_MAX should also be used for xStep or yStep, nothing is rendered. Using fractions of FLT_MAX also
    // result in nothing being rendered.

    CGFloat yStep = m_repeatY ? tileRect.height() : (1 << 22);

    // The pattern will release the CGImageRef when it's done rendering in patternReleaseCallback
    CGImageRef platformImage = tileImage()->nativeImage().leakRef();

    const CGPatternCallbacks patternCallbacks = { 0, patternCallback, patternReleaseCallback };
    return CGPatternCreate(platformImage, tileRect, patternTransform, xStep, yStep, kCGPatternTilingConstantSpacing, TRUE, &patternCallbacks);



/*
 * Copyright (C) 2016 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"
#include "PlatformImage.h"

#if USE(CG)

#include "Color.h"
#include "CoreGraphicsSPI.h"
#include "FloatRect.h"
#include "GeometryUtilities.h"
#include "GraphicsContextCG.h"
#include "IntSize.h"
#include "SubimageCacheWithTimer.h"

#if PLATFORM(WIN)
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#endif

namespace WebCore {
    
void PlatformImage::clearSubImages()
{
#if CACHE_SUBIMAGES
    if (!isNil())
        subimageCache().clearImage(cgImageRef());
#endif
}

IntSize PlatformImage::size() const
{
    return isNil() ? IntSize() : IntSize(CGImageGetWidth(cgImageRef()), CGImageGetHeight(cgImageRef()));
}

bool PlatformImage::hasAlpha() const
{
    // FIXME: Answer correctly the question: does the CGImageRef have alpha channnel?
    return true;
}

Color PlatformImage::singlePixelSolidColor() const
{
    if (isNil() || size() != IntSize(1, 1))
        return Color();
    
    unsigned char pixel[4]; // RGBA
    auto bitmapContext = adoptCF(CGBitmapContextCreate(pixel, 1, 1, 8, sizeof(pixel), sRGBColorSpaceRef(),
        kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder32Big));
    
    if (!bitmapContext)
        return Color();
    
    CGContextSetBlendMode(bitmapContext.get(), kCGBlendModeCopy);
    CGContextDrawImage(bitmapContext.get(), CGRectMake(0, 0, 1, 1), cgImageRef());
    
    if (!pixel[3])
        return Color(0, 0, 0, 0);
    
    return Color(pixel[0] * 255 / pixel[3], pixel[1] * 255 / pixel[3], pixel[2] * 255 / pixel[3], pixel[3]);
}
    
bool PlatformImage::isAlmostSolidColor() const
{
    CGImageRef image = cgImageRef();
    ASSERT(CGImageGetBitsPerComponent(image) == 8);
    
    CGBitmapInfo imageInfo = CGImageGetBitmapInfo(image);
    if (!(imageInfo & kCGBitmapByteOrder32Little) || (imageInfo & kCGBitmapAlphaInfoMask) != kCGImageAlphaPremultipliedFirst) {
        // FIXME: Consider being able to handle other pixel formats.
        ASSERT_NOT_REACHED();
        return false;
    }
    
    size_t width = CGImageGetWidth(image);
    size_t height = CGImageGetHeight(image);
    size_t bytesPerRow = CGImageGetBytesPerRow(image);
    
    RetainPtr<CFDataRef> provider = adoptCF(CGDataProviderCopyData(CGImageGetDataProvider(image)));
    const UInt8* data = CFDataGetBytePtr(provider.get());
    
    // Overlay a grid of sampling dots on top of a grayscale version of the image.
    // For the interior points, calculate the difference in luminance among the sample point
    // and its surrounds points, scaled by transparency.
    const unsigned sampleRows = 7;
    const unsigned sampleCols = 7;
    // FIXME: Refine the proper number of samples, and accommodate different aspect ratios.
    if (width < sampleCols || height < sampleRows)
        return false;
    
    // Ensure that the last row/column land on the image perimeter.
    const float strideWidth = static_cast<float>(width - 1) / (sampleCols - 1);
    const float strideHeight = static_cast<float>(height - 1) / (sampleRows - 1);
    float samples[sampleRows][sampleCols];
    
    // Find the luminance of the sample points.
    float y = 0;
    const UInt8* row = data;
    for (unsigned i = 0; i < sampleRows; ++i) {
        float x = 0;
        for (unsigned j = 0; j < sampleCols; ++j) {
            const UInt8* p0 = row + (static_cast<int>(x + .5)) * 4;
            // R G B A
            samples[i][j] = (0.2125 * *p0 + 0.7154 * *(p0+1) + 0.0721 * *(p0+2)) * *(p0+3) / 255;
            x += strideWidth;
        }
        y += strideHeight;
        row = data + (static_cast<int>(y + .5)) * bytesPerRow;
    }
    
    // Determine the image score.
    float accumScore = 0;
    for (unsigned i = 1; i < sampleRows - 1; ++i) {
        for (unsigned j = 1; j < sampleCols - 1; ++j) {
            float diff = samples[i - 1][j] + samples[i + 1][j] + samples[i][j - 1] + samples[i][j + 1] - 4 * samples[i][j];
            accumScore += diff * diff;
        }
    }
    
    // The score for a given sample can be within the range of 0 and 255^2.
    return accumScore < 2500 * (sampleRows - 2) * (sampleCols - 2);
}

float PlatformImage::subsamplingScale(GraphicsContext& context, const FloatRect& destRect, const FloatRect& srcRect)
{
    // Never use subsampled images for drawing into PDF contexts.
    if (wkCGContextIsPDFContext(context.platformContext()))
        return 1;
    
    CGRect transformedDestinationRect = CGRectApplyAffineTransform(destRect, CGContextGetCTM(context.platformContext()));
    return std::min<float>(1, std::max(transformedDestinationRect.size.width / srcRect.width(), transformedDestinationRect.size.height / srcRect.height()));
}

void PlatformImage::draw(GraphicsContext& context, const FloatRect& destRect, const FloatRect& srcRect, const IntSize& srcSize, CompositeOperator op, BlendMode mode, const ImageOrientation& orientation) const
{
    // Subsampling may have given us an image that is smaller than size().
    IntSize subsampledImageSize = size();
    
    // srcRect is in the coordinates of the unsubsampled image, so we have to map it to the subsampled image.
    FloatRect adjustedSrcRect = srcRect;
    if (subsampledImageSize != srcSize)
        adjustedSrcRect = mapRect(srcRect, FloatRect({ }, srcSize), FloatRect({ }, subsampledImageSize));
    
    context.drawNativeImage(m_image, subsampledImageSize, destRect, adjustedSrcRect, op, mode, orientation);
}
    
}

#endif // USE(CG)

Lines 129-135 TextTrackRepresentationCocoa::~TextTrackRepresentationCocoa() a/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm_sec1
- a/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm -1 / +1 lines
129	void TextTrackRepresentationCocoa::update()	129	void TextTrackRepresentationCocoa::update()
130	{	130	{
131	if (auto representation = m_client.createTextTrackRepresentationImage())	131	if (auto representation = m_client.createTextTrackRepresentationImage())
132	[m_layer.get() setContents:(id)representation->getCGImageRef()];	132	[m_layer.get() setContents:(id)representation->nativeImage().get()];
133	}	133	}
134		134
135	void TextTrackRepresentationCocoa::setContentScale(float scale)	135	void TextTrackRepresentationCocoa::setContentScale(float scale)



    if (m_tiffRep)
        return m_tiffRep.get();

    auto nativeImages = this->framesNativeImages();

    // If framesImages.size() is zero, we know for certain this image doesn't have valid data
    // Even though the call to CGImageDestinationCreateWithData will fail and we'll handle it gracefully,
    // in certain circumstances that call will spam the console with an error message
    if (!nativeImages.size())
        return nullptr;

    Vector<CGImageRef> images;
    for (unsigned i = 0; i < numFrames; ++i ) {
        CGImageRef cgImage = frameImageAtIndex(i).get();
        if (cgImage)
            images.append(cgImage);
    }

    unsigned numValidFrames = images.size();

    RetainPtr<CFMutableDataRef> data = adoptCF(CFDataCreateMutable(0, 0));
    RetainPtr<CGImageDestinationRef> destination = adoptCF(CGImageDestinationCreateWithData(data.get(), kUTTypeTIFF, nativeImages.size(), 0));

    if (!destination)
        return nullptr;

    for (auto nativeImage : nativeImages)
        CGImageDestinationAddImage(destination.get(), nativeImage.get(), 0);

    CGImageDestinationFinalize(destination.get());




        return *this;

    copyBitmapData(other);
    setHasAlpha(other.m_hasAlpha);
    setStatus(other.status());
    setDuration(other.duration());
    setDisposalMethod(other.disposalMethod());


void ImageFrame::clearPixelData()
{
    m_pixels = nullptr;
    m_bytes = 0;
    m_status = FrameEmpty;
    // NOTE: Do not reset other members here; clearFrameBufferCache() calls this
    // to free the bitmap data, but other functions like initFrameBuffer() and


void ImageFrame::zeroFillPixelData()
{
    m_pixels->clear();
    m_hasAlpha = true;
}

void ImageFrame::zeroFillFrameRect(const IntRect& rect)
{
    ASSERT(IntRect(IntPoint(), m_size).contains(rect));

    if (rect.isEmpty())
        return;

    m_pixels->clearRect(rect);
    PixelData* start = m_bytes + (rect.y() * width()) + rect.x();
    for (int i = 0; i < rect.height(); ++i) {
        memset(start, 0, rectWidthInBytes);
        start += width();
    }

    setHasAlpha(true);
}


    if (this == &other)
        return true;

    if (other.m_pixels)
        m_pixels = BitmapPixels::create(*other.m_pixels.get());
    else
        m_pixels = nullptr;
    return true;
}

bool ImageFrame::setSize(int newWidth, int newHeight)
{
    ASSERT(!m_pixels);
    m_pixels = BitmapPixels::create(IntSize(newWidth, newHeight), m_premultiplyAlpha);
    return m_pixels != nullptr;
}
    m_backingStore.resize(backingStoreSize);
    m_bytes = m_backingStore.data();
    m_size = IntSize(newWidth, newHeight);

void ImageFrame::copyRowNTimes(int startX, int endX, int startY, int endY)
{
    m_pixels->repeatFirstRow(IntRect(startX, startY, endX -startX , endY - startY));
}

bool ImageFrame::hasAlpha() const

    if (m_frameBufferCache.size() <= index)
        return 0;
    // FIXME: Use the dimension of the requested frame.
    return m_size.area() * sizeof(RGBA32);
}

float ImageDecoder::frameDurationAtIndex(size_t index)




#pragma once

#include "BitmapPixels.h"
#include "IntRect.h"
#include "ImageSource.h"
#include "PlatformScreen.h"

            DisposeOverwritePrevious  // Clear frame to previous framebuffer
                                      // contents
        };
        typedef unsigned PixelData;

        ImageFrame();


        // Copies the pixel data at [(startX, startY), (endX, startY)) to the
        // same X-coordinates on each subsequent row up to but not including
        // endY.
        void copyRowNTimes(int startX, int endX, int startY, int endY);
        {
            ASSERT(startX < width());
            ASSERT(endX <= width());
            ASSERT(startY < height());
            ASSERT(endY <= height());
            const int rowBytes = (endX - startX) * sizeof(PixelData);
            const PixelData* const startAddr = getAddr(startX, startY);
            for (int destY = startY + 1; destY < endY; ++destY)
                memcpy(getAddr(startX, destY), startAddr, rowBytes);
        }

        // Allocates space for the pixel data.  Must be called before any pixels
        // are written.  Must only be called once.  Returns whether allocation
        // succeeded.
        bool setSize(int newWidth, int newHeight);
        
        IntSize size() const { return m_pixels->size(); }

        // Returns a caller-owned pointer to the underlying native image data.
        // (Actual use: This pointer will be owned by BitmapImage and freed in
        // FrameData::clear()).
        NativeImagePtr asNewNativeImage() const { return m_pixels->image(); }

        inline BitmapPixels* pixels() const { return m_pixels ? m_pixels.get() : nullptr; }
        inline bool hasPixels() const { return pixels(); }

        bool hasAlpha() const;
        const IntRect& originalFrameRect() const { return m_originalFrameRect; }
        FrameStatus status() const { return m_status; }
        unsigned duration() const { return m_duration; }
        FrameDisposalMethod disposalMethod() const { return m_disposalMethod; }


        void setHasAlpha(bool alpha);
        void setColorProfile(const ColorProfile&);
        void setOriginalFrameRect(const IntRect& r) { m_originalFrameRect = r; }
        void setStatus(FrameStatus status);
        void setDuration(unsigned duration) { m_duration = duration; }
        void setDisposalMethod(FrameDisposalMethod method) { m_disposalMethod = method; }


        inline void setRGBA(int x, int y, unsigned r, unsigned g, unsigned b, unsigned a)
        {
            m_pixels->setRGBA(x, y, r, g, b, a);
        }

        inline RGBA32* getAddr(int x, int y)
        {
            return m_pixels->at(x, y);
        }

        inline void setRGBA(RGBA32* dest, unsigned r, unsigned g, unsigned b, unsigned a)
        {
            m_pixels->setRGBA(dest, r, g, b, a);
        }

        // Use fix point multiplier instead of integer division or floating point math.
        // This multipler produces exactly the same result for all values in range 0 - 255.
        static const unsigned fixPointShift = 24;
        static const unsigned fixPointMult = static_cast<unsigned>(1.0 / 255.0 * (1 << fixPointShift)) + 1;
        // Multiplies unsigned value by fixpoint value and converts back to unsigned.
        static unsigned fixPointUnsignedMultiply(unsigned fixed, unsigned v)
        {
            return  (fixed * v) >> fixPointShift;
        }

        inline void setRGBA(PixelData* dest, unsigned r, unsigned g, unsigned b, unsigned a)
        {
            if (m_premultiplyAlpha && a < 255) {
                if (!a) {
                    *dest = 0;
                    return;
                }

                unsigned alphaMult = a * fixPointMult;
                r = fixPointUnsignedMultiply(r, alphaMult);
                g = fixPointUnsignedMultiply(g, alphaMult);
                b = fixPointUnsignedMultiply(b, alphaMult);
            }
            *dest = (a << 24 | r << 16 | g << 8 | b);
        }

#if ENABLE(APNG)
        inline void overRGBA(RGBA32* dest, unsigned r, unsigned g, unsigned b, unsigned a)
        {
            m_pixels->overRGBA(dest, r, g, b, a);
        }

        inline void overRGBA(PixelData* dest, unsigned r, unsigned g, unsigned b, unsigned a)
        {
            if (!a)
                return;

            if (a < 255) {
                unsigned aDest = ((*dest) >> 24) & 255;
                if (aDest) {
                    unsigned rDest = ((*dest) >> 16) & 255;
                    unsigned gDest = ((*dest) >> 8) & 255;
                    unsigned bDest = (*dest) & 255;
                    unsigned aAux = 255 - a;
                    if (!m_premultiplyAlpha) {
                        rDest = divide255(rDest * aDest);
                        gDest = divide255(gDest * aDest);
                        bDest = divide255(bDest * aDest);
                    }
                    r = divide255(r * a + rDest * aAux);
                    g = divide255(g * a + gDest * aAux);
                    b = divide255(b * a + bDest * aAux);
                    a += divide255(aDest * aAux);
                    if (!m_premultiplyAlpha) {
                        r = (r * 255 + a - 1) / a;
                        g = (g * 255 + a - 1) / a;
                        b = (b * 255 + a - 1) / a;
                    }
                } else if (m_premultiplyAlpha) {
                    r = divide255(r * a);
                    g = divide255(g * a);
                    b = divide255(b * a);
                }
            }
            *dest = (a << 24 | r << 16 | g << 8 | b);
        }
#endif

    private:
        std::unique_ptr<BitmapPixels> m_pixels;
        {
            return m_size.width();
        }

        int height() const
        {
            return m_size.height();
        }

        Vector<PixelData> m_backingStore;
        PixelData* m_bytes; // The memory is backed by m_backingStore.
        IntSize m_size;
        // FIXME: Do we need m_colorProfile anymore?
        ColorProfile m_colorProfile;
        bool m_hasAlpha;
        IntRect m_originalFrameRect; // This will always just be the entire
                                     // buffer except for GIF frames whose
                                     // original rect was smaller than the
                                     // overall image size.
        FrameStatus m_status;
        unsigned m_duration;
        FrameDisposalMethod m_disposalMethod;



        // these 0s could actually show through.
        m_buffer->setHasAlpha(false);

        // For BMPs, the frame always fills the entire image.
        m_buffer->setOriginalFrameRect(IntRect(IntPoint(), m_parent->size()));

        if (!m_isTopDown)
            m_coord.setY(m_parent->size().height() - 1);
    }



/*
 * Copyright (C) 2016 Apple Inc.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 */

#include "config.h"
#include "BitmapPixels.h"

#include <cairo.h>

namespace WebCore {

NativeImagePtr BitmapPixels::image() const
{
    return adoptRef(cairo_image_surface_create_for_data(
        reinterpret_cast<unsigned char*>(const_cast<RGBA32*>(m_pixels)),
        CAIRO_FORMAT_ARGB32, size().width(), size().height(), size().width() * sizeof(RGBA32)));
}

} // namespace WebCore



/*
 * Copyright (C) 2006 Apple Inc.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 */

#include "config.h"
#include "ImageDecoder.h"

#include <cairo.h>

namespace WebCore {

NativeImagePtr ImageFrame::asNewNativeImage() const
{
    return adoptRef(cairo_image_surface_create_for_data(
        reinterpret_cast<unsigned char*>(const_cast<PixelData*>(m_bytes)),
        CAIRO_FORMAT_ARGB32, width(), height(), width() * sizeof(PixelData)));
}

} // namespace WebCore




    // Initialize the frame if necessary.
    ImageFrame& buffer = m_frameBufferCache[frameIndex];
    if (((buffer.status() == ImageFrame::FrameEmpty) && !initFrameBuffer(frameIndex)) || !buffer.hasPixels())
        return false;

    RGBA32* currentAddress = buffer.getAddr(xBegin, yBegin);
    // Write one row's worth of data into the frame.  
    for (int x = xBegin; x < xEnd; ++x) {
        const unsigned char sourceValue = rowBuffer[(m_scaled ? m_scaledColumns[x] : x) - frameContext->xOffset];

    if (!m_currentBufferSawAlpha) {
        // The whole frame was non-transparent, so it's possible that the entire
        // resulting buffer was non-transparent, and we can setHasAlpha(false).
        if (buffer.pixels()->rect().contains(IntRect(IntPoint(), scaledSize())))
            buffer.setHasAlpha(false);
        else if (frameIndex) {
            // Tricky case.  This frame does not have alpha only if everywhere

            // The only remaining case is a DisposeOverwriteBgcolor frame.  If
            // it had no alpha, and its rect is contained in the current frame's
            // rect, we know the current frame has no alpha.
            if ((prevBuffer->disposalMethod() == ImageFrame::DisposeOverwriteBgcolor) && !prevBuffer->hasAlpha() && buffer.pixels()->rect().contains(prevBuffer->pixels()->rect()))
                buffer.setHasAlpha(false);
        }
    }

        frameRect.setHeight(size().height() - frameContext->yOffset);

    ImageFrame* const buffer = &m_frameBufferCache[frameIndex];
    int left = upperBoundScaledX(frameRect.x());
    int right = lowerBoundScaledX(frameRect.maxX(), left);
    int top = upperBoundScaledY(frameRect.y());
    int bottom = lowerBoundScaledY(frameRect.maxY(), top);
    buffer->setOriginalFrameRect(IntRect(left, top, right - left, bottom - top));

    if (!frameIndex) {
        // This is the first frame, so we're not relying on any previous data.

        } else {
            // We want to clear the previous frame to transparent, without
            // affecting pixels in the image outside of the frame.
            const IntRect& prevRect = prevBuffer->pixels()->rect();
            const IntSize& bufferSize = scaledSize();
            if (!frameIndex || prevRect.contains(IntRect(IntPoint(), scaledSize()))) {
                // Clearing the first frame, or a frame the size of the whole

            }
        }
    }
    
    int left = upperBoundScaledX(frameRect.x());
    int right = lowerBoundScaledX(frameRect.maxX(), left);
    int top = upperBoundScaledY(frameRect.y());
    int bottom = lowerBoundScaledY(frameRect.maxY(), top);
    buffer->pixels()->setRect(IntRect(left, top, right - left, bottom - top));

    // Update our status to be partially complete.
    buffer->setStatus(ImageFrame::FramePartial);



}

template <J_COLOR_SPACE colorSpace>
void setPixel(ImageFrame& buffer, RGBA32* currentAddress, JSAMPARRAY samples, int column)
{
    JSAMPLE* jsample = *samples + column * (colorSpace == JCS_RGB ? 3 : 4);


        if (destY < 0)
            continue;

        RGBA32* currentAddress = buffer.getAddr(0, destY);
        for (int x = 0; x < width; ++x) {
            setPixel<colorSpace>(buffer, currentAddress, samples, isScaled ? m_scaledColumns[x] : x);
            ++currentAddress;

        // loading. The completed image will be marked fully opaque in jpegComplete().
        buffer.setHasAlpha(true);
        buffer.setColorProfile(m_colorProfile);

        // For JPEGs, the frame always fills the entire image.
        buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
    }

    jpeg_decompress_struct* info = m_reader->info();



    }
}

static inline void setPixelRGB(RGBA32* dest, png_bytep pixel)
{
    *dest = 0xFF000000U | pixel[0] << 16 | pixel[1] << 8 | pixel[2];
}

static inline void setPixelRGBA(RGBA32* dest, png_bytep pixel, unsigned char& nonTrivialAlphaMask)
{
    unsigned char a = pixel[3];
    *dest = a << 24 | pixel[0] << 16 | pixel[1] << 8 | pixel[2];
    nonTrivialAlphaMask |= (255 - a);
}

static inline void setPixelPremultipliedRGBA(RGBA32* dest, png_bytep pixel, unsigned char& nonTrivialAlphaMask)
{
    unsigned char a = pixel[3];
    unsigned char r = fastDivideBy255(pixel[0] * a);

#if ENABLE(APNG)
        if (m_currentFrame)
            initFrameBuffer(m_currentFrame);
        else
#endif
        // For PNGs, the frame always fills the entire image.
        buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
    }

    /* libpng comments (here to explain what follows).

    }

    // Write the decoded row pixels to the frame buffer.
    RGBA32* address = buffer.getAddr(0, y);
    int width = scaledSize().width();
    unsigned char nonTrivialAlphaMask = 0;


        frameRect.setHeight(size().height() - m_yOffset);

    ImageFrame& buffer = m_frameBufferCache[frameIndex];
    int left = upperBoundScaledX(frameRect.x());
    int right = lowerBoundScaledX(frameRect.maxX(), left);
    int top = upperBoundScaledY(frameRect.y());
    int bottom = lowerBoundScaledY(frameRect.maxY(), top);
    buffer.setOriginalFrameRect(IntRect(left, top, right - left, bottom - top));

    // The starting state for this frame depends on the previous frame's
    // disposal method.

    } else {
        // We want to clear the previous frame to transparent, without
        // affecting pixels in the image outside of the frame.
        const IntRect& prevRect = prevBuffer->pixels()->rect();
        if (!frameIndex || prevRect.contains(IntRect(IntPoint(), scaledSize()))) {
            // Clearing the first frame, or a frame the size of the whole
            // image, results in a completely empty image.

            buffer.zeroFillFrameRect(prevRect);
        }
    }
    
    int left = upperBoundScaledX(frameRect.x());
    int right = lowerBoundScaledX(frameRect.maxX(), left);
    int top = upperBoundScaledY(frameRect.y());
    int bottom = lowerBoundScaledY(frameRect.maxY(), top);
    buffer.pixels()->setRect(IntRect(left, top, right - left, bottom - top));
}

void PNGImageDecoder::frameComplete()

    png_bytep interlaceBuffer = m_reader->interlaceBuffer();

    if (m_currentFrame && interlaceBuffer) {
        const IntRect& rect = buffer.pixels()->rect();
        bool hasAlpha = m_reader->hasAlpha();
        unsigned colorChannels = hasAlpha ? 4 : 3;
        bool nonTrivialAlpha = false;

#if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
        for (int y = 0; y < rect.maxY() - rect.y(); ++y) {
            png_bytep row = interlaceBuffer + (m_scaled ? m_scaledRows[y] : y) * colorChannels * size().width();
            RGBA32* address = buffer.getAddr(rect.x(), y + rect.y());
            for (int x = 0; x < rect.maxX() - rect.x(); ++x) {
                png_bytep pixel = row + (m_scaled ? m_scaledColumns[x] : x) * colorChannels;
                unsigned alpha = hasAlpha ? pixel[3] : 255;

        png_bytep row = interlaceBuffer;
        for (int y = rect.y(); y < rect.maxY(); ++y, row += colorChannels * size().width()) {
            png_bytep pixel = row;
            RGBA32* address = buffer.getAddr(rect.x(), y);
            for (int x = rect.x(); x < rect.maxX(); ++x, pixel += colorChannels) {
                unsigned alpha = hasAlpha ? pixel[3] : 255;
                nonTrivialAlpha |= alpha < 255;

#endif

        if (!nonTrivialAlpha) {
            if (buffer.pixels()->rect().contains(IntRect(IntPoint(), scaledSize())))
                buffer.setHasAlpha(false);
            else {
                size_t frameIndex = m_currentFrame;

                while (frameIndex && (prevBuffer->disposalMethod() == ImageFrame::DisposeOverwritePrevious))
                    prevBuffer = &m_frameBufferCache[--frameIndex];
                if ((prevBuffer->disposalMethod() == ImageFrame::DisposeOverwriteBgcolor)
                    && !prevBuffer->hasAlpha() && buffer.pixels()->rect().contains(prevBuffer->pixels()->rect()))
                    buffer.setHasAlpha(false);
            }
        } else if (!m_blend && !buffer.hasAlpha())



            return setFailed();
        buffer.setStatus(ImageFrame::FramePartial);
        buffer.setHasAlpha(m_hasAlpha);
        buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
    }

    if (!m_decoder) {
        WEBP_CSP_MODE mode = outputMode(m_hasAlpha);
        if (!m_premultiplyAlpha)
            mode = outputMode(false);
        int rowStride = size().width() * sizeof(RGBA32);
        uint8_t* output = reinterpret_cast<uint8_t*>(buffer.getAddr(0, 0));
        int outputSize = size().height() * rowStride;
        m_decoder = WebPINewRGB(mode, output, outputSize, rowStride);

Lines 87-93 void MockRealtimeVideoSourceMac::updatePlatformLayer() const a/Source/WebCore/platform/mediastream/mac/MockRealtimeVideoSourceMac.mm_sec1
- a/Source/WebCore/platform/mediastream/mac/MockRealtimeVideoSourceMac.mm -1 / +1 lines
87	if (!image)	87	if (!image)
88	break;	88	break;
89		89
90	m_previewImage = image->getCGImageRef();	90	m_previewImage = image->nativeImage();
91	if (!m_previewImage)	91	if (!m_previewImage)
92	break;	92	break;
93		93



    CGContextScaleCTM(drawContext, 1, -1);
    CGContextSetFillColor(drawContext, white);
    CGContextFillRect(drawContext, rect);
    if (auto srcImage = img->nativeImage()) {
        CGContextSetBlendMode(drawContext, kCGBlendModeNormal);
        CGContextDrawImage(drawContext, rect, srcImage.get());
    }
    CGContextRelease(drawContext);


Lines 204-210 + (CGImageRef)imageForURL:(NSURL *)url a/Source/WebKit/mac/Misc/WebCache.mm_sec1
- a/Source/WebKit/mac/Misc/WebCache.mm -1 / +1 lines
204	WebCore::CachedImage& cachedImage = downcast<WebCore::CachedImage>(*cachedResource);	204	WebCore::CachedImage& cachedImage = downcast<WebCore::CachedImage>(*cachedResource);
205	if (!cachedImage.hasImage())	205	if (!cachedImage.hasImage())
206	return nullptr;	206	return nullptr;
207	return cachedImage.image()->getCGImageRef();	207	return cachedImage.image()->nativeImage().get();
208	}	208	}
209		209
210	#endif // PLATFORM(IOS)	210	#endif // PLATFORM(IOS)



CGImageRef WKIconDatabaseTryGetCGImageForURL(WKIconDatabaseRef iconDatabaseRef, WKURLRef urlRef, WKSize size)
{
    Image* image = toImpl(iconDatabaseRef)->imageForPageURL(toWTFString(urlRef));
    return image ? image->nativeImageOfSize(IntSize(static_cast<int>(size.width), static_cast<int>(size.height))).get() : nullptr;
}

CFArrayRef WKIconDatabaseTryCopyCGImageArrayForURL(WKIconDatabaseRef iconDatabaseRef, WKURLRef urlRef)
{
    Image* image = toImpl(iconDatabaseRef)->imageForPageURL(toWTFString(urlRef));
    if (!image)
        return nullptr;

    auto nativeImages = image->framesNativeImages();
    if (!nativeImages.size())
        return nullptr;
    
    CFMutableArrayRef array = CFArrayCreateMutable(nullptr, nativeImages.size(), &kCFTypeArrayCallBacks);
    for (auto nativeImage : nativeImages)
        CFArrayAppendValue(array, nativeImage.get());
    
    return static_cast<CFArrayRef>(CFRetain(array));
}


Lines 4071-4077 - (UIImage *)_presentationSnapshotForPreviewItemController:(UIPreviewItemControl a/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm_sec1
- a/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm -1 / +1 lines
4071	{	4071	{
4072	if (!_positionInformation.linkIndicator.contentImage)	4072	if (!_positionInformation.linkIndicator.contentImage)
4073	return nullptr;	4073	return nullptr;
4074	return [[[UIImage alloc] initWithCGImage:_positionInformation.linkIndicator.contentImage->getCGImageRef()] autorelease];	4074	return [[[UIImage alloc] initWithCGImage:_positionInformation.linkIndicator.contentImage->nativeImage().get()] autorelease];
4075	}	4075	}
4076		4076
4077	- (NSArray )_presentationRectsForPreviewItemController:(UIPreviewItemController )controller	4077	- (NSArray )_presentationRectsForPreviewItemController:(UIPreviewItemController )controller



}
#endif

#if PLATFORM(COCOA)
static bool isAlmostSolidColor(BitmapImage* bitmap)
{
    CGImageRef image = bitmap->getCGImageRef();
    ASSERT(CGImageGetBitsPerComponent(image) == 8);

    CGBitmapInfo imageInfo = CGImageGetBitmapInfo(image);
    if (!(imageInfo & kCGBitmapByteOrder32Little) || (imageInfo & kCGBitmapAlphaInfoMask) != kCGImageAlphaPremultipliedFirst) {
        // FIXME: Consider being able to handle other pixel formats.
        ASSERT_NOT_REACHED();
        return false;
    }

    size_t width = CGImageGetWidth(image);
    size_t height = CGImageGetHeight(image);
    size_t bytesPerRow = CGImageGetBytesPerRow(image);

    RetainPtr<CFDataRef> provider = adoptCF(CGDataProviderCopyData(CGImageGetDataProvider(image)));
    const UInt8* data = CFDataGetBytePtr(provider.get());

    // Overlay a grid of sampling dots on top of a grayscale version of the image.
    // For the interior points, calculate the difference in luminance among the sample point
    // and its surrounds points, scaled by transparency.
    const unsigned sampleRows = 7;
    const unsigned sampleCols = 7;
    // FIXME: Refine the proper number of samples, and accommodate different aspect ratios.
    if (width < sampleCols || height < sampleRows)
        return false;

    // Ensure that the last row/column land on the image perimeter.
    const float strideWidth = static_cast<float>(width - 1) / (sampleCols - 1);
    const float strideHeight = static_cast<float>(height - 1) / (sampleRows - 1);
    float samples[sampleRows][sampleCols];

    // Find the luminance of the sample points.
    float y = 0;
    const UInt8* row = data;
    for (unsigned i = 0; i < sampleRows; ++i) {
        float x = 0;
        for (unsigned j = 0; j < sampleCols; ++j) {
            const UInt8* p0 = row + (static_cast<int>(x + .5)) * 4;
            // R G B A
            samples[i][j] = (0.2125 * *p0 + 0.7154 * *(p0+1) + 0.0721 * *(p0+2)) * *(p0+3) / 255;
            x += strideWidth;
        }
        y += strideHeight;
        row = data + (static_cast<int>(y + .5)) * bytesPerRow;
    }

    // Determine the image score.
    float accumScore = 0;
    for (unsigned i = 1; i < sampleRows - 1; ++i) {
        for (unsigned j = 1; j < sampleCols - 1; ++j) {
            float diff = samples[i - 1][j] + samples[i + 1][j] + samples[i][j - 1] + samples[i][j + 1] - 4 * samples[i][j];
            accumScore += diff * diff;
        }
    }

    // The score for a given sample can be within the range of 0 and 255^2.
    return accumScore < 2500 * (sampleRows - 2) * (sampleCols - 2);
}
#endif

void PluginView::pluginSnapshotTimerFired()
{
#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)


        if (snapshotImage) {
#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
            bool snapshotIsAlmostSolidColor = static_pointer_cast<BitmapImage>(snapshotImage)->isAlmostSolidColor();
            snapshotFound = !snapshotIsAlmostSolidColor;
#endif


Return to Bug 159679

Lines 1727-1795 void PluginView::windowedPluginVisibilityDidChange(bool isVisible, uint64_t wind a/Source/WebKit2/WebProcess/Plugins/PluginView.cpp_sec1
- a/Source/WebKit2/WebProcess/Plugins/PluginView.cpp -64 / +1 lines
1727	}	1727	}
1728	#endif	1728	#endif
1729		1729
1730	#if PLATFORM(COCOA)
1731	static bool isAlmostSolidColor(BitmapImage* bitmap)
1732	{
1733	CGImageRef image = bitmap->getCGImageRef();
1734	ASSERT(CGImageGetBitsPerComponent(image) == 8);
1735
1736	CGBitmapInfo imageInfo = CGImageGetBitmapInfo(image);
1737	if (!(imageInfo & kCGBitmapByteOrder32Little) \|\| (imageInfo & kCGBitmapAlphaInfoMask) != kCGImageAlphaPremultipliedFirst) {
1738	// FIXME: Consider being able to handle other pixel formats.
1739	ASSERT_NOT_REACHED();
1740	return false;
1741	}
1742
1743	size_t width = CGImageGetWidth(image);
1744	size_t height = CGImageGetHeight(image);
1745	size_t bytesPerRow = CGImageGetBytesPerRow(image);
1746
1747	RetainPtr<CFDataRef> provider = adoptCF(CGDataProviderCopyData(CGImageGetDataProvider(image)));
1748	const UInt8* data = CFDataGetBytePtr(provider.get());
1749
1750	// Overlay a grid of sampling dots on top of a grayscale version of the image.
1751	// For the interior points, calculate the difference in luminance among the sample point
1752	// and its surrounds points, scaled by transparency.
1753	const unsigned sampleRows = 7;
1754	const unsigned sampleCols = 7;
1755	// FIXME: Refine the proper number of samples, and accommodate different aspect ratios.
1756	if (width < sampleCols \|\| height < sampleRows)
1757	return false;
1758
1759	// Ensure that the last row/column land on the image perimeter.
1760	const float strideWidth = static_cast<float>(width - 1) / (sampleCols - 1);
1761	const float strideHeight = static_cast<float>(height - 1) / (sampleRows - 1);
1762	float samples[sampleRows][sampleCols];
1763
1764	// Find the luminance of the sample points.
1765	float y = 0;
1766	const UInt8* row = data;
1767	for (unsigned i = 0; i < sampleRows; ++i) {
1768	float x = 0;
1769	for (unsigned j = 0; j < sampleCols; ++j) {
1770	const UInt8* p0 = row + (static_cast<int>(x + .5)) * 4;
1771	// R G B A
1772	samples[i][j] = (0.2125 * p0 + 0.7154 (p0+1) + 0.0721 (p0+2)) *(p0+3) / 255;
1773	x += strideWidth;
1774	}
1775	y += strideHeight;
1776	row = data + (static_cast<int>(y + .5)) * bytesPerRow;
1777	}
1778
1779	// Determine the image score.
1780	float accumScore = 0;
1781	for (unsigned i = 1; i < sampleRows - 1; ++i) {
1782	for (unsigned j = 1; j < sampleCols - 1; ++j) {
1783	float diff = samples[i - 1][j] + samples[i + 1][j] + samples[i][j - 1] + samples[i][j + 1] - 4 * samples[i][j];
1784	accumScore += diff * diff;
1785	}
1786	}
1787
1788	// The score for a given sample can be within the range of 0 and 255^2.
1789	return accumScore < 2500 * (sampleRows - 2) * (sampleCols - 2);
1790	}
1791	#endif
1792
1793	void PluginView::pluginSnapshotTimerFired()	1730	void PluginView::pluginSnapshotTimerFired()
1794	{	1731	{
1795	#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)	1732	#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
Lines 1809-1815 void PluginView::pluginSnapshotTimerFired() a/Source/WebKit2/WebProcess/Plugins/PluginView.cpp_sec2
1809		1746
1810	if (snapshotImage) {	1747	if (snapshotImage) {
1811	#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)	1748	#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
1812	bool snapshotIsAlmostSolidColor = isAlmostSolidColor(downcast<BitmapImage>(snapshotImage.get()));	1749	bool snapshotIsAlmostSolidColor = static_pointer_cast<BitmapImage>(snapshotImage)->isAlmostSolidColor();
1813	snapshotFound = !snapshotIsAlmostSolidColor;	1750	snapshotFound = !snapshotIsAlmostSolidColor;
1814	#endif	1751	#endif
1815		1752

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +228 lines
		1	2016-07-12 Said Abou-Hallawa <sabouhallawa@apple.com>
		2
		3	Split the pixel data of ImageFrame to a separate class
		4	https://bugs.webkit.org/show_bug.cgi?id=159679
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Move the pixel data manipulation part in ImageFrame into a separate class
		9	and then make it optional (allocated on demand).
		10
		11	* CMakeLists.txt:
		12	* PlatformEfl.cmake:
		13	* PlatformGTK.cmake:
		14	* PlatformWinCairo.cmake:
		15	* WebCore.xcodeproj/project.pbxproj:
		16	* platform/graphics/BitmapPixels.h: Added.
		17	(WebCore::BitmapPixels::create):
		18	(WebCore::BitmapPixels::BitmapPixels):
		19	(WebCore::BitmapPixels::width):
		20	(WebCore::BitmapPixels::height):
		21	(WebCore::BitmapPixels::setSize):
		22	(WebCore::BitmapPixels::at):
		23	(WebCore::BitmapPixels::clear):
		24	(WebCore::BitmapPixels::clearRect):
		25	(WebCore::BitmapPixels::repeatFirstRow):
		26	(WebCore::BitmapPixels::setRGBA):
		27	(WebCore::BitmapPixels::overRGBA):
		28	(WebCore::BitmapPixels::inBounds):
		29	* platform/graphics/Color.cpp:
		30	(WebCore::multiply255):
		31	(WebCore::divide255):
		32	(WebCore::divideCeil):
		33	(WebCore::premultipliedChannel):
		34	(WebCore::unpremultipliedChannel):
		35	(WebCore::makePremultipliedRGBA):
		36	(WebCore::makeUnPremultipliedRGBA):
		37	* platform/graphics/Color.h:
		38	* platform/graphics/ImageFrameData.h:
		39	(WebCore::ImageFrameData::pixels):
		40	(WebCore::ImageFrameData::hasPixels):
		41	* platform/image-decoders/ImageDecoder.cpp:
		42	(WebCore::ImageFrame::operator=):
		43	(WebCore::ImageFrame::clearPixelData):
		44	(WebCore::ImageFrame::zeroFillPixelData):
		45	(WebCore::ImageFrame::zeroFillFrameRect):
		46	(WebCore::ImageFrame::copyBitmapData):
		47	(WebCore::ImageFrame::setSize):
		48	(WebCore::ImageFrame::copyRowNTimes):
		49	* platform/image-decoders/ImageDecoder.h:
		50	(WebCore::ImageFrame::asNewNativeImage):
		51	(WebCore::ImageFrame::setRGBA):
		52	(WebCore::ImageFrame::getAddr):
		53	(WebCore::ImageFrame::hasPixelData):
		54	(WebCore::ImageFrame::overRGBA):
		55	(WebCore::ImageFrame::width):
		56	(WebCore::ImageFrame::height):
		57	(WebCore::ImageFrame::copyRowNTimes): Deleted.
		58	(WebCore::ImageFrame::fixPointUnsignedMultiply): Deleted.
		59	(WebCore::ImageFrame::divide255): Deleted.
		60	* platform/image-decoders/bmp/BMPImageReader.cpp:
		61	(WebCore::BMPImageReader::decodeBMP):
		62	* platform/image-decoders/cairo/BitmapPixelsCairo.cpp: Renamed from Source/WebCore/platform/image-decoders/cairo/ImageDecoderCairo.cpp.
		63	(WebCore::BitmapPixels::image):
		64	* platform/image-decoders/gif/GIFImageDecoder.cpp:
65	(WebCore::GIFImageDecoder::haveDecodedRow):
66	(WebCore::GIFImageDecoder::frameComplete):
67	(WebCore::GIFImageDecoder::initFrameBuffer):
68	* platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
69	(WebCore::setPixel):
70	(WebCore::JPEGImageDecoder::outputScanlines):
71	* platform/image-decoders/png/PNGImageDecoder.cpp:
72	(WebCore::setPixelRGB):
73	(WebCore::setPixelRGBA):
74	(WebCore::setPixelPremultipliedRGBA):
75	(WebCore::PNGImageDecoder::rowAvailable):
76	(WebCore::PNGImageDecoder::initFrameBuffer):
77	(WebCore::PNGImageDecoder::frameComplete):
78	* platform/image-decoders/webp/WEBPImageDecoder.cpp:
79	(WebCore::WEBPImageDecoder::decode):
80
81	2016-07-11 Said Abou-Hallawa <sabouhallawa@apple,com>
82
83	Rename FrameData to ImageFrameData and move it to a separate file
84	https://bugs.webkit.org/show_bug.cgi?id=155444
85
86	Reviewed by NOBODY (OOPS!).
87
88	Move ImageFrameData to a separate file so it can be cached by ImageSource
89	and will still be consumed by BitmapImage. Make the data members of ImageFrameData
90	be private and add getters to return their values.
91
92	No new tests -- Code refactoring, no behavior change.
93
94	* CMakeLists.txt:
95	* WebCore.xcodeproj/project.pbxproj:
96	* platform/graphics/BitmapImage.cpp:
97	(WebCore::BitmapImage::BitmapImage):
98	(WebCore::BitmapImage::haveFrameImageAtIndex):
99	(WebCore::BitmapImage::destroyDecodedData):
100	(WebCore::BitmapImage::destroyDecodedDataIfNecessary):
101	(WebCore::BitmapImage::cacheFrame):
102	(WebCore::BitmapImage::dataChanged):
103	(WebCore::BitmapImage::ensureFrameIsCached):
104	(WebCore::BitmapImage::frameImageAtIndex):
105	(WebCore::BitmapImage::frameIsCompleteAtIndex):
106	(WebCore::BitmapImage::frameDurationAtIndex):
107	(WebCore::BitmapImage::frameHasAlphaAtIndex):
108	(WebCore::BitmapImage::frameOrientationAtIndex):
109	(WebCore::BitmapImage::singlePixelSolidColor):
110	(WebCore::BitmapImage::isAlmostSolidColor):
111	* platform/graphics/BitmapImage.h:
112	(WebCore::FrameData::FrameData): Deleted.
113	(WebCore::FrameData::~FrameData): Deleted.
114	(WebCore::FrameData::usedFrameBytes): Deleted.
115	* platform/graphics/ImageSource.cpp:
116	(WebCore::ImageSource::createFrameDataAtIndex):
117	* platform/graphics/ImageSource.h:
118	* platform/graphics/imageFrameData.cpp: Added.
119	(WebCore::ImageFrameData::ImageFrameData):
120	(WebCore::ImageFrameData::~ImageFrameData):
121	(WebCore::ImageFrameData::clearSubImages):
122	(WebCore::ImageFrameData::clear):
123	(WebCore::ImageFrameData::singlePixelSolidColor):
124	(WebCore::ImageFrameData::isAlmostSolidColor):
125	* platform/graphics/imageFrameData.h: Added.
126	(WebCore::ImageFrameData::status):
127	(WebCore::ImageFrameData::isComplete):
128	(WebCore::ImageFrameData::size):
129	(WebCore::ImageFrameData::frameBytes):
130	(WebCore::ImageFrameData::image):
131	(WebCore::ImageFrameData::orientation):
132	(WebCore::ImageFrameData::subsamplingLevel):
133	(WebCore::ImageFrameData::duration):
134	(WebCore::ImageFrameData::hasAlpha):
135	(WebCore::ImageFrameData::hasImage):
136	(WebCore::ImageFrameData::hasMetadata):
137
138	2016-06-24 Said Abou-Hallawa <sabouhallawa@apple,com>
139
140	Introduce PlatformImage and make it is a wrapper for NativeImagePtr
141	https://bugs.webkit.org/show_bug.cgi?id=158684
142
143	Reviewed by NOBODY (OOPS!).
144
145	The main purpose of this refactoring is to move the platform image dependent
146	code from BitmapImage to PlatformImage. PlatformImage is responsible of
147	drawing the image and answering NativeImagePtr questions when an ImageDecoder
148	is not available. Apart from drawing the image, the query functions will be
149	called only when constructing a FrameData so we will keep everything as a
150	NativeImagePtr. But we will cast the NativeImagePtr to PlatformImage when
151	a platform dependent function is needed.
152
153	No new tests -- Code refactoring, no behavior change.
154
155	* PlatformAppleWin.cmake:
156	* PlatformEfl.cmake:
157	* PlatformGTK.cmake:
158	* PlatformMac.cmake:
159	* PlatformWinCairo.cmake:
160	* WebCore.xcodeproj/project.pbxproj:
161	* bindings/objc/DOM.mm:
162	(-[DOMNode getPreviewSnapshotImage:andRects:]):
163	* page/mac/TextIndicatorWindow.mm:
164	(-[WebTextIndicatorView initWithFrame:textIndicator:margin:offset:]):
165	(createContentCrossfadeAnimation):
166	* platform/graphics/BitmapImage.cpp:
167	(WebCore::BitmapImage::BitmapImage):
168	(WebCore::BitmapImage::destroyDecodedData):
169	(WebCore::BitmapImage::destroyDecodedDataIfNecessary):
170	(WebCore::BitmapImage::dataChanged):
171	(WebCore::BitmapImage::frameImageAtIndex):
172	(WebCore::BitmapImage::nativeImage):
173	(WebCore::BitmapImage::nativeImageOfSize):
174	(WebCore::BitmapImage::nativeImageForCurrentFrame):
175	(WebCore::BitmapImage::framesNativeImages):
176	(WebCore::BitmapImage::singlePixelSolidColor):
177	(WebCore::BitmapImage::isAlmostSolidColor):
178	(WebCore::BitmapImage::draw):
179	* platform/graphics/BitmapImage.h:
180	(WebCore::FrameData::FrameData):
181	m_hasAlpha can be initialized with false because it is accessed only in
182	BitmapImage::frameHasAlphaAtIndex() and it is guarded by m_haveMetadata.
183	Both m_haveMetadata and m_hasAlpha are set in BitmapImage constructor
184	and in BitmapImage::cacheFrame().
185
186	(WebCore::FrameData::~FrameData):
187	(WebCore::FrameData::clear):
188	* platform/graphics/Image.h:
189	(WebCore::Image::nativeImage):
190	(WebCore::Image::nativeImageOfSize):
191	(WebCore::Image::framesNativeImages):
192	(WebCore::Image::getCGImageRef): Deleted.
193	(WebCore::Image::getFirstCGImageRefOfSize): Deleted.
194	(WebCore::Image::getCGImageArray): Deleted.
195	* platform/graphics/PlatformImage.h: Added.
196	(WebCore::PlatformImage::PlatformImage):
197	(WebCore::PlatformImage::isNil):
198	(WebCore::PlatformImage::cgImageRef):
199	* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
200	(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateDisplayMode):
201	* platform/graphics/cairo/PlatformImageCairo.cpp: Renamed from Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp.
202	(WebCore::PlatformImage::clearSubImages):
203	(WebCore::PlatformImage::size):
204	(WebCore::PlatformImage::hasAlpha):
205	(WebCore::PlatformImage::singlePixelSolidColor):
206	(WebCore::PlatformImage::isAlmostSolidColor):
207	(WebCore::PlatformImage::subsamplingScale):
208	(WebCore::PlatformImage::draw):
209	* platform/graphics/cg/BitmapImageCG.cpp: Removed.
210	* platform/graphics/cg/PatternCG.cpp:
211	(WebCore::Pattern::createPlatformPattern):
212	* platform/graphics/cg/PlatformImageCG.cpp: Added.
213	(WebCore::PlatformImage::clearSubImages):
214	(WebCore::PlatformImage::size):
215	(WebCore::PlatformImage::hasAlpha):
216	(WebCore::PlatformImage::singlePixelSolidColor):
217	(WebCore::PlatformImage::isAlmostSolidColor): Moved from PluginView.cpp since PlatformImage is what this function belongs to.
218	(WebCore::PlatformImage::subsamplingScale): Returns the sub-sampling scale based on the context scaling.
219	(WebCore::PlatformImage::draw):
220	* platform/graphics/cocoa/TextTrackRepresentationCocoa.mm:
221	(TextTrackRepresentationCocoa::update):
222	* platform/graphics/mac/ImageMac.mm:
223	(WebCore::BitmapImage::getTIFFRepresentation):
224	* platform/mediastream/mac/MockRealtimeVideoSourceMac.mm:
225	(WebCore::MockRealtimeVideoSourceMac::updatePlatformLayer):
226	* platform/win/DragImageCGWin.cpp:
227	(WebCore::createDragImageFromImage):
228
1	2016-07-11 Sam Weinig <sam@webkit.org>	229	2016-07-11 Sam Weinig <sam@webkit.org>
2		230
3	Speech Synthesis: getting list of voices no longer works	231	Speech Synthesis: getting list of voices no longer works

Lines 1-3 a/Source/WebKit/mac/ChangeLog_sec1
- a/Source/WebKit/mac/ChangeLog +10 lines
		1	2016-07-11 Said Abou-Hallawa <sabouhallawa@apple,com>
		2
		3	Introduce PlatformImage and make it is a wrapper for NativeImagePtr
		4	https://bugs.webkit.org/show_bug.cgi?id=158684
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* Misc/WebCache.mm:
		9	(+[WebCache imageForURL:]):
		10
1	2016-07-11 Enrica Casucci <enrica@apple.com>	11	2016-07-11 Enrica Casucci <enrica@apple.com>
2		12
3	Add synthetic click origin to WKNavigationAction.	13	Add synthetic click origin to WKNavigationAction.

Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
- a/Source/WebKit2/ChangeLog +22 lines
		1	2016-07-11 Said Abou-Hallawa <sabouhallawa@apple,com>
		2
		3	Introduce PlatformImage and make it is a wrapper for NativeImagePtr
		4	https://bugs.webkit.org/show_bug.cgi?id=158684
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* UIProcess/API/C/cg/WKIconDatabaseCG.cpp:
		9	(WKIconDatabaseTryGetCGImageForURL):
		10	(WKIconDatabaseTryCopyCGImageArrayForURL):
		11	It was the only place in the code which uses BitmapImage::getCGImageArray().
		12	Call BitmapImage::framesNativeImages() instead and form the returned
		13	Vector<NativeImagePtr> build the CFArrayRef.
		14
		15	* UIProcess/ios/WKContentViewInteraction.mm:
		16	(-[WKContentView _presentationSnapshotForPreviewItemController:]):
		17	* WebProcess/Plugins/PluginView.cpp:
		18	(WebKit::PluginView::pluginSnapshotTimerFired):
		19
		20	(WebKit::isAlmostSolidColor): Deleted.
		21	Move the static function isAlmostSolidColor to PlatformImage::isAlmostSolidColor().
		22
1	2016-07-11 Chris Dumez <cdumez@apple.com>	23	2016-07-11 Chris Dumez <cdumez@apple.com>
2		24
3	[WK2][iOS] Intermittent crash in [UIApplication beginBackgroundTaskWithName] expiration handler	25	[WK2][iOS] Intermittent crash in [UIApplication beginBackgroundTaskWithName] expiration handler

Lines 55-61 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformAppleWin.cmake_sec1
- a/Source/WebCore/PlatformAppleWin.cmake -1 / +1 lines
55	platform/graphics/ca/win/WebTiledBackingLayerWin.cpp	55	platform/graphics/ca/win/WebTiledBackingLayerWin.cpp
56	platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp	56	platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp
57		57
58	platform/graphics/cg/BitmapImageCG.cpp
59	platform/graphics/cg/ColorCG.cpp	58	platform/graphics/cg/ColorCG.cpp
60	platform/graphics/cg/FloatPointCG.cpp	59	platform/graphics/cg/FloatPointCG.cpp
61	platform/graphics/cg/FloatRectCG.cpp	60	platform/graphics/cg/FloatRectCG.cpp
Lines 75-80 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformAppleWin.cmake_sec2
75	platform/graphics/cg/PDFDocumentImage.cpp	74	platform/graphics/cg/PDFDocumentImage.cpp
76	platform/graphics/cg/PathCG.cpp	75	platform/graphics/cg/PathCG.cpp
77	platform/graphics/cg/PatternCG.cpp	76	platform/graphics/cg/PatternCG.cpp
		77	platform/graphics/cg/PlatformImageCG.cpp
78	platform/graphics/cg/SubimageCacheWithTimer.cpp	78	platform/graphics/cg/SubimageCacheWithTimer.cpp
79	platform/graphics/cg/TransformationMatrixCG.cpp	79	platform/graphics/cg/TransformationMatrixCG.cpp
80		80

Lines 122-128 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformEfl.cmake_sec1
- a/Source/WebCore/PlatformEfl.cmake -3 / +3 lines
122	platform/graphics/PlatformDisplay.cpp	122	platform/graphics/PlatformDisplay.cpp
123		123
124	platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp	124	platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp
125	platform/graphics/cairo/BitmapImageCairo.cpp
126	platform/graphics/cairo/CairoUtilities.cpp	125	platform/graphics/cairo/CairoUtilities.cpp
127	platform/graphics/cairo/FontCairo.cpp	126	platform/graphics/cairo/FontCairo.cpp
128	platform/graphics/cairo/FontCairoHarfbuzzNG.cpp	127	platform/graphics/cairo/FontCairoHarfbuzzNG.cpp
Lines 134-139 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformEfl.cmake_sec2
134	platform/graphics/cairo/PathCairo.cpp	133	platform/graphics/cairo/PathCairo.cpp
135	platform/graphics/cairo/PatternCairo.cpp	134	platform/graphics/cairo/PatternCairo.cpp
136	platform/graphics/cairo/PlatformContextCairo.cpp	135	platform/graphics/cairo/PlatformContextCairo.cpp
		136	platform/graphics/cairo/PlatformImageCairo.cpp
137	platform/graphics/cairo/PlatformPathCairo.cpp	137	platform/graphics/cairo/PlatformPathCairo.cpp
138	platform/graphics/cairo/RefPtrCairo.cpp	138	platform/graphics/cairo/RefPtrCairo.cpp
139	platform/graphics/cairo/TransformationMatrixCairo.cpp	139	platform/graphics/cairo/TransformationMatrixCairo.cpp
Lines 179-187 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformEfl.cmake_sec3
179	platform/graphics/x11/PlatformDisplayX11.cpp	179	platform/graphics/x11/PlatformDisplayX11.cpp
180	platform/graphics/x11/XUniqueResource.cpp	180	platform/graphics/x11/XUniqueResource.cpp
181		181
182	platform/image-encoders/JPEGImageEncoder.cpp	182	platform/image-decoders/cairo/BitmapPixelsCairo.cpp
183		183
184	platform/image-decoders/cairo/ImageDecoderCairo.cpp	184	platform/image-encoders/JPEGImageEncoder.cpp
185		185
186	platform/network/efl/NetworkStateNotifierEfl.cpp	186	platform/network/efl/NetworkStateNotifierEfl.cpp
187		187

Lines 101-107 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformGTK.cmake_sec1
- a/Source/WebCore/PlatformGTK.cmake -2 / +2 lines
101		101
102	platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp	102	platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp
103	platform/graphics/cairo/BackingStoreBackendCairoX11.cpp	103	platform/graphics/cairo/BackingStoreBackendCairoX11.cpp
104	platform/graphics/cairo/BitmapImageCairo.cpp
105	platform/graphics/cairo/CairoUtilities.cpp	104	platform/graphics/cairo/CairoUtilities.cpp
106	platform/graphics/cairo/FloatRectCairo.cpp	105	platform/graphics/cairo/FloatRectCairo.cpp
107	platform/graphics/cairo/FontCairo.cpp	106	platform/graphics/cairo/FontCairo.cpp
Lines 115-120 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformGTK.cmake_sec2
115	platform/graphics/cairo/PathCairo.cpp	114	platform/graphics/cairo/PathCairo.cpp
116	platform/graphics/cairo/PatternCairo.cpp	115	platform/graphics/cairo/PatternCairo.cpp
117	platform/graphics/cairo/PlatformContextCairo.cpp	116	platform/graphics/cairo/PlatformContextCairo.cpp
		117	platform/graphics/cairo/PlatformImageCairo.cpp
118	platform/graphics/cairo/PlatformPathCairo.cpp	118	platform/graphics/cairo/PlatformPathCairo.cpp
119	platform/graphics/cairo/RefPtrCairo.cpp	119	platform/graphics/cairo/RefPtrCairo.cpp
120	platform/graphics/cairo/TransformationMatrixCairo.cpp	120	platform/graphics/cairo/TransformationMatrixCairo.cpp
Lines 149-155 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformGTK.cmake_sec3
149	platform/gtk/TemporaryLinkStubs.cpp	149	platform/gtk/TemporaryLinkStubs.cpp
150	platform/gtk/UserAgentGtk.cpp	150	platform/gtk/UserAgentGtk.cpp
151		151
152	platform/image-decoders/cairo/ImageDecoderCairo.cpp	152	platform/image-decoders/cairo/BitmapPixelsCairo.cpp
153		153
154	platform/mediastream/gtk/SDPProcessorScriptResourceGtk.cpp	154	platform/mediastream/gtk/SDPProcessorScriptResourceGtk.cpp
155		155

Lines 397-403 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformMac.cmake_sec1
- a/Source/WebCore/PlatformMac.cmake -1 / +1 lines
397	platform/graphics/ca/cocoa/WebSystemBackdropLayer.mm	397	platform/graphics/ca/cocoa/WebSystemBackdropLayer.mm
398	platform/graphics/ca/cocoa/WebTiledBackingLayer.mm	398	platform/graphics/ca/cocoa/WebTiledBackingLayer.mm
399		399
400	platform/graphics/cg/BitmapImageCG.cpp
401	platform/graphics/cg/ColorCG.cpp	400	platform/graphics/cg/ColorCG.cpp
402	platform/graphics/cg/FloatPointCG.cpp	401	platform/graphics/cg/FloatPointCG.cpp
403	platform/graphics/cg/FloatRectCG.cpp	402	platform/graphics/cg/FloatRectCG.cpp
Lines 417-422 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformMac.cmake_sec2
417	platform/graphics/cg/PDFDocumentImage.cpp	416	platform/graphics/cg/PDFDocumentImage.cpp
418	platform/graphics/cg/PathCG.cpp	417	platform/graphics/cg/PathCG.cpp
419	platform/graphics/cg/PatternCG.cpp	418	platform/graphics/cg/PatternCG.cpp
		419	platform/graphics/cg/PlatformImageCG.cpp
420	platform/graphics/cg/SubimageCacheWithTimer.cpp	420	platform/graphics/cg/SubimageCacheWithTimer.cpp
421	platform/graphics/cg/TransformationMatrixCG.cpp	421	platform/graphics/cg/TransformationMatrixCG.cpp
422		422

Lines 21-27 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformWinCairo.cmake_sec1
- a/Source/WebCore/PlatformWinCairo.cmake -2 / +2 lines
21	platform/graphics/GLContext.cpp	21	platform/graphics/GLContext.cpp
22	platform/graphics/PlatformDisplay.cpp	22	platform/graphics/PlatformDisplay.cpp
23		23
24	platform/graphics/cairo/BitmapImageCairo.cpp
25	platform/graphics/cairo/CairoUtilities.cpp	24	platform/graphics/cairo/CairoUtilities.cpp
26	platform/graphics/cairo/FloatRectCairo.cpp	25	platform/graphics/cairo/FloatRectCairo.cpp
27	platform/graphics/cairo/FontCairo.cpp	26	platform/graphics/cairo/FontCairo.cpp
Lines 34-39 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformWinCairo.cmake_sec2
34	platform/graphics/cairo/PathCairo.cpp	33	platform/graphics/cairo/PathCairo.cpp
35	platform/graphics/cairo/PatternCairo.cpp	34	platform/graphics/cairo/PatternCairo.cpp
36	platform/graphics/cairo/PlatformContextCairo.cpp	35	platform/graphics/cairo/PlatformContextCairo.cpp
		36	platform/graphics/cairo/PlatformImageCairo.cpp
37	platform/graphics/cairo/PlatformPathCairo.cpp	37	platform/graphics/cairo/PlatformPathCairo.cpp
38	platform/graphics/cairo/RefPtrCairo.cpp	38	platform/graphics/cairo/RefPtrCairo.cpp
39	platform/graphics/cairo/TransformationMatrixCairo.cpp	39	platform/graphics/cairo/TransformationMatrixCairo.cpp
Lines 46-52 list(APPEND WebCore_SOURCES a/Source/WebCore/PlatformWinCairo.cmake_sec3
46	platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp	46	platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp
47	platform/graphics/win/SimpleFontDataCairoWin.cpp	47	platform/graphics/win/SimpleFontDataCairoWin.cpp
48		48
49	platform/image-decoders/cairo/ImageDecoderCairo.cpp	49	platform/image-decoders/cairo/BitmapPixelsCairo.cpp
50		50
51	platform/network/NetworkStorageSessionStub.cpp	51	platform/network/NetworkStorageSessionStub.cpp
52		52

Lines 162-170 - (instancetype)initWithFrame:(NSRect)frame textIndicator:(PassRefPtr<TextIndica a/Source/WebCore/page/mac/TextIndicatorWindow.mm_sec1
- a/Source/WebCore/page/mac/TextIndicatorWindow.mm -3 / +3 lines
162	contentsImageLogicalSize.scale(1 / _textIndicator->contentImageScaleFactor());	162	contentsImageLogicalSize.scale(1 / _textIndicator->contentImageScaleFactor());
163	RetainPtr<CGImageRef> contentsImage;	163	RetainPtr<CGImageRef> contentsImage;
164	if (indicatorWantsContentCrossfade(*_textIndicator))	164	if (indicatorWantsContentCrossfade(*_textIndicator))
165	contentsImage = _textIndicator->contentImageWithHighlight()->getCGImageRef();	165	contentsImage = _textIndicator->contentImageWithHighlight()->nativeImage();
166	else	166	else
167	contentsImage = _textIndicator->contentImage()->getCGImageRef();	167	contentsImage = _textIndicator->contentImage()->nativeImage();
168		168
169	RetainPtr<NSMutableArray> bounceLayers = adoptNS([[NSMutableArray alloc] init]);	169	RetainPtr<NSMutableArray> bounceLayers = adoptNS([[NSMutableArray alloc] init]);
170		170
Lines 265-271 static RetainPtr<CAKeyframeAnimation> createBounceAnimation(CFTimeInterval durat a/Source/WebCore/page/mac/TextIndicatorWindow.mm_sec2
265	static RetainPtr<CABasicAnimation> createContentCrossfadeAnimation(CFTimeInterval duration, TextIndicator& textIndicator)	265	static RetainPtr<CABasicAnimation> createContentCrossfadeAnimation(CFTimeInterval duration, TextIndicator& textIndicator)
266	{	266	{
267	RetainPtr<CABasicAnimation> crossfadeAnimation = [CABasicAnimation animationWithKeyPath:@"contents"];	267	RetainPtr<CABasicAnimation> crossfadeAnimation = [CABasicAnimation animationWithKeyPath:@"contents"];
268	RetainPtr<CGImageRef> contentsImage = textIndicator.contentImage()->getCGImageRef();	268	RetainPtr<CGImageRef> contentsImage = textIndicator.contentImage()->nativeImage();
269	[crossfadeAnimation setToValue:(id)contentsImage.get()];	269	[crossfadeAnimation setToValue:(id)contentsImage.get()];
270	[crossfadeAnimation setFillMode:kCAFillModeForwards];	270	[crossfadeAnimation setFillMode:kCAFillModeForwards];
271	[crossfadeAnimation setRemovedOnCompletion:NO];	271	[crossfadeAnimation setRemovedOnCompletion:NO];

Lines 68-82 BitmapImage::BitmapImage(NativeImagePtr&& image, ImageObserver* observer) a/Source/WebCore/platform/graphics/BitmapImage.cpp_sec1
- a/Source/WebCore/platform/graphics/BitmapImage.cpp -62 / +113 lines
68	, m_haveFrameCount(true)	68	, m_haveFrameCount(true)
69	, m_animationFinishedWhenCatchingUp(false)	69	, m_animationFinishedWhenCatchingUp(false)
70	{	70	{
		71	m_frames.reserveInitialCapacity(1);
		72	m_frames.uncheckedAppend(WTFMove(image));
		73
71	// Since we don't have a decoder, we can't figure out the image orientation.	74	// Since we don't have a decoder, we can't figure out the image orientation.
72	// Set m_sizeRespectingOrientation to be the same as m_size so it's not 0x0.	75	// Set m_sizeRespectingOrientation to be the same as m_size so it's not 0x0.
73	m_sizeRespectingOrientation = m_size = NativeImage::size(image);	76	m_sizeRespectingOrientation = m_size = m_frames[0].size();
74	m_decodedSize = m_size.area() * 4;	77	m_decodedSize = m_size.area() * 4;
75
76	m_frames.grow(1);
77	m_frames[0].m_hasAlpha = NativeImage::hasAlpha(image);
78	m_frames[0].m_haveMetadata = true;
79	m_frames[0].m_image = WTFMove(image);
80	}	78	}
81		79
82	BitmapImage::~BitmapImage()	80	BitmapImage::~BitmapImage()
Lines 105-111 bool BitmapImage::haveFrameImageAtIndex(size_t index) a/Source/WebCore/platform/graphics/BitmapImage.cpp_sec2
105	if (index >= m_frames.size())	103	if (index >= m_frames.size())
106	return false;	104	return false;
107		105
108	return m_frames[index].m_image;	106	return m_frames[index].hasImage();
109	}	107	}
110		108
111	bool BitmapImage::hasSingleSecurityOrigin() const	109	bool BitmapImage::hasSingleSecurityOrigin() const
Lines 125-133 void BitmapImage::destroyDecodedData(bool destroyAll) a/Source/WebCore/platform/graphics/BitmapImage.cpp_sec3
125	// The underlying frame isn't actually changing (we're just trying to	123	// The underlying frame isn't actually changing (we're just trying to
126	// save the memory for the framebuffer data), so we don't need to clear	124	// save the memory for the framebuffer data), so we don't need to clear
127	// the metadata.	125	// the metadata.
128	unsigned frameBytes = m_frames[i].m_frameBytes;	126	frameBytesCleared += m_frames[i].clear(ImageFrameData::Caching::Metadata);
129	if (m_frames[i].clear(false))
130	frameBytesCleared += frameBytes;
131	}	127	}
132		128
133	m_source.clear(destroyAll, clearBeforeFrame, data(), m_allDataReceived);	129	m_source.clear(destroyAll, clearBeforeFrame, data(), m_allDataReceived);
Lines 150-157 void BitmapImage::destroyDecodedDataIfNecessary(bool destroyAll) a/Source/WebCore/platform/graphics/BitmapImage.cpp_sec4
150	return;	146	return;
151		147
152	unsigned allFrameBytes = 0;	148	unsigned allFrameBytes = 0;
153	for (size_t i = 0; i < m_frames.size(); ++i)	149	for (auto& frame : m_frames)
154	allFrameBytes += m_frames[i].usedFrameBytes();	150	allFrameBytes += frame.frameBytes();
155		151
156	if (allFrameBytes > largeAnimationCutoff) {	152	if (allFrameBytes > largeAnimationCutoff) {
157	LOG(Images, "BitmapImage %p destroyDecodedDataIfNecessary destroyingData: allFrameBytes=%u cutoff=%u", this, allFrameBytes, largeAnimationCutoff);	153	LOG(Images, "BitmapImage %p destroyDecodedDataIfNecessary destroyingData: allFrameBytes=%u cutoff=%u", this, allFrameBytes, largeAnimationCutoff);
Lines 177-183 void BitmapImage::destroyMetadataAndNotify(unsigned frameBytesCleared, ClearedSo a/Source/WebCore/platform/graphics/BitmapImage.cpp_sec5
177	imageObserver()->decodedSizeChanged(this, -safeCast<int>(frameBytesCleared));	173	imageObserver()->decodedSizeChanged(this, -safeCast<int>(frameBytesCleared));
178	}	174	}
179		175
180	void BitmapImage::cacheFrame(size_t index, SubsamplingLevel subsamplingLevel, ImageFrameCaching frameCaching)	176	void BitmapImage::cacheFrame(size_t index, SubsamplingLevel subsamplingLevel, ImageFrameData::Caching caching)
181	{	177	{
182	size_t numFrames = frameCount();	178	size_t numFrames = frameCount();
183	ASSERT(m_decodedSize == 0 \|\| numFrames > 1);	179	ASSERT(m_decodedSize == 0 \|\| numFrames > 1);
Lines 185-209 void BitmapImage::cacheFrame(size_t index, SubsamplingLevel subsamplingLevel, Im a/Source/WebCore/platform/graphics/BitmapImage.cpp_sec6
185	if (m_frames.size() < numFrames)	181	if (m_frames.size() < numFrames)
186	m_frames.grow(numFrames);	182	m_frames.grow(numFrames);
187		183
188	if (frameCaching == CacheMetadataAndFrame) {	184	m_frames[index] = m_source.createFrameDataAtIndex(index, subsamplingLevel, caching);
189	m_frames[index].m_image = m_source.createFrameImageAtIndex(index, subsamplingLevel);
190	m_frames[index].m_subsamplingLevel = subsamplingLevel;
191	}
192
193	m_frames[index].m_orientation = m_source.orientationAtIndex(index);
194	m_frames[index].m_haveMetadata = true;
195	m_frames[index].m_isComplete = m_source.frameIsCompleteAtIndex(index);
196		185
197	if (repetitionCount(false) != cAnimationNone)	186	LOG(Images, "BitmapImage %p cacheFrame %lu (%s%u bytes, complete %d)", this, index, caching == ImageFrameData::Caching::Metadata ? "metadata only, " : "", m_frames[index].frameBytes(), m_frames[index].isComplete());
198	m_frames[index].m_duration = m_source.frameDurationAtIndex(index);
199		187
200	m_frames[index].m_hasAlpha = m_source.frameHasAlphaAtIndex(index);	188	if (m_frames[index].hasImage()) {
201	m_frames[index].m_frameBytes = m_source.frameBytesAtIndex(index, subsamplingLevel);	189	int deltaBytes = safeCast<int>(m_frames[index].frameBytes());
202
203	LOG(Images, "BitmapImage %p cacheFrame %lu (%s%u bytes, complete %d)", this, index, frameCaching == CacheMetadataOnly ? "metadata only, " : "", m_frames[index].m_frameBytes, m_frames[index].m_isComplete);
204
205	if (m_frames[index].m_image) {
206	int deltaBytes = safeCast<int>(m_frames[index].m_frameBytes);
207	m_decodedSize += deltaBytes;	190	m_decodedSize += deltaBytes;
208	// The fully-decoded frame will subsume the partially decoded data used	191	// The fully-decoded frame will subsume the partially decoded data used
209	// to determine image properties.	192	// to determine image properties.
Lines 288-308 bool BitmapImage::dataChanged(bool allDataReceived) a/Source/WebCore/platform/graphics/BitmapImage.cpp_sec7
288	// frame affected by appending new data here. Thus we have to clear all the	271	// frame affected by appending new data here. Thus we have to clear all the
289	// incomplete frames to be safe.	272	// incomplete frames to be safe.
290	unsigned frameBytesCleared = 0;	273	unsigned frameBytesCleared = 0;
291	for (size_t i = 0; i < m_frames.size(); ++i) {	274	for (auto& frame : m_frames) {
292	// NOTE: Don't call frameIsCompleteAtIndex() here, that will try to	275	// NOTE: Don't call frameIsCompleteAtIndex() here, that will try to
293	// decode any uncached (i.e. never-decoded or	276	// decode any uncached (i.e. never-decoded or
294	// cleared-on-a-previous-pass) frames!	277	// cleared-on-a-previous-pass) frames!
295	unsigned frameBytes = m_frames[i].m_frameBytes;	278	if (frame.hasMetadata() && !frame.isComplete())
296	if (m_frames[i].m_haveMetadata && !m_frames[i].m_isComplete)	279	frameBytesCleared += frame.clear(ImageFrameData::Caching::Empty);
297	frameBytesCleared += (m_frames[i].clear(true) ? frameBytes : 0);
298	}	280	}
299	destroyMetadataAndNotify(frameBytesCleared, ClearedSource::No);	281	destroyMetadataAndNotify(frameBytesCleared, ClearedSource::No);
300	#else	282	#else
301	// FIXME: why is this different for iOS?	283	// FIXME: why is this different for iOS?
302	int deltaBytes = 0;	284	int deltaBytes = 0;
303	if (!m_frames.isEmpty()) {	285	if (!m_frames.isEmpty()) {
304	int bytes = m_frames[m_frames.size() - 1].m_frameBytes;	286	if (int bytes = m_frames[m_frames.size() - 1].clear(ImageFrameData::Caching::Empty)) {
305	if (m_frames[m_frames.size() - 1].clear(true)) {
306	deltaBytes += bytes;	287	deltaBytes += bytes;
307	deltaBytes += m_decodedPropertiesSize;	288	deltaBytes += m_decodedPropertiesSize;
308	m_decodedPropertiesSize = 0;	289	m_decodedPropertiesSize = 0;
Lines 366-380 bool BitmapImage::isSizeAvailable() a/Source/WebCore/platform/graphics/BitmapImage.cpp_sec8
366	return m_sizeAvailable;	347	return m_sizeAvailable;
367	}	348	}
368		349
369	bool BitmapImage::ensureFrameIsCached(size_t index, ImageFrameCaching frameCaching)	350	bool BitmapImage::ensureFrameIsCached(size_t index, ImageFrameData::Caching caching)
370	{	351	{
371	if (index >= frameCount())	352	if (index >= frameCount())
372	return false;	353	return false;
373		354
374	if (index >= m_frames.size()	355	if (index >= m_frames.size()
375	\|\| (frameCaching == CacheMetadataAndFrame && !m_frames[index].m_image)	356	\|\| (caching == ImageFrameData::Caching::MetadataAndImage && !m_frames[index].hasImage())
376	\|\| (frameCaching == CacheMetadataOnly && !m_frames[index].m_haveMetadata))	357	\|\| (caching == ImageFrameData::Caching::Metadata && !m_frames[index].hasMetadata()))
377	cacheFrame(index, 0, frameCaching);	358	cacheFrame(index, 0, caching);
378		359
379	return true;	360	return true;
380	}	361	}
Lines 388-397 NativeImagePtr BitmapImage::frameImageAtIndex(size_t index, float presentationSc a/Source/WebCore/platform/graphics/BitmapImage.cpp_sec9
388		369
389	// We may have cached a frame with a higher subsampling level, in which case we need to	370	// We may have cached a frame with a higher subsampling level, in which case we need to
390	// re-decode with a lower level.	371	// re-decode with a lower level.
391	if (index < m_frames.size() && m_frames[index].m_image && subsamplingLevel < m_frames[index].m_subsamplingLevel) {	372	if (index < m_frames.size() && m_frames[index].hasImage() && subsamplingLevel < m_frames[index].subsamplingLevel()) {
392	// If the image is already cached, but at too small a size, re-decode a larger version.	373	// If the image is already cached, but at too small a size, re-decode a larger version.
393	int sizeChange = -m_frames[index].m_frameBytes;	374	int sizeChange = -m_frames[index].clear(ImageFrameData::Caching::Empty);
394	m_frames[index].clear(true);
395	invalidatePlatformData();	375	invalidatePlatformData();
396	m_decodedSize += sizeChange;	376	m_decodedSize += sizeChange;
397	if (imageObserver())	377	if (imageObserver())
Lines 399-438 NativeImagePtr BitmapImage::frameImageAtIndex(size_t index, float presentationSc a/Source/WebCore/platform/graphics/BitmapImage.cpp_sec10
399	}	379	}
400		380
401	// If we haven't fetched a frame yet, do so.	381	// If we haven't fetched a frame yet, do so.
402	if (index >= m_frames.size() \|\| !m_frames[index].m_image)	382	if (index >= m_frames.size() \|\| !m_frames[index].hasImage())
403	cacheFrame(index, subsamplingLevel, CacheMetadataAndFrame);	383	cacheFrame(index, subsamplingLevel, ImageFrameData::Caching::MetadataAndImage);
		384
		385	return m_frames[index].image();
		386	}
		387
		388	NativeImagePtr BitmapImage::nativeImage()
		389	{
		390	return frameImageAtIndex(0);
		391	}
		392
		393	NativeImagePtr BitmapImage::nativeImageOfSize(const IntSize& size)
		394	{
		395	size_t count = frameCount();
		396
		397	for (size_t i = 0; i < count; ++i) {
		398	auto image = frameImageAtIndex(i);
		399	if (image && PlatformImage(image).size() == size)
		400	return image;
		401	}
		402
		403	// Fallback to the first frame image if we can't find the right size
		404	return frameImageAtIndex(0);
		405	}
		406
		407	NativeImagePtr BitmapImage::nativeImageForCurrentFrame()
		408	{
		409	return frameImageAtIndex(m_currentFrame);
		410	}
404		411
405	return m_frames[index].m_image;	412	Vector<NativeImagePtr> BitmapImage::framesNativeImages()
		413	{
		414	Vector<NativeImagePtr> images;
		415	size_t count = frameCount();
		416
		417	for (size_t i = 0; i < count; ++i) {
		418	if (auto image = frameImageAtIndex(i))
		419	images.append(image);
		420	}
		421
		422	return images;
406	}	423	}
407		424
408	bool BitmapImage::frameIsCompleteAtIndex(size_t index)	425	bool BitmapImage::frameIsCompleteAtIndex(size_t index)
409	{	426	{
410	if (!ensureFrameIsCached(index, CacheMetadataOnly))	427	if (!ensureFrameIsCached(index, ImageFrameData::Caching::Metadata))
411	return false;	428	return false;
412		429
413	return m_frames[index].m_isComplete;	430	return m_frames[index].isComplete();
414	}	431	}
415		432
416	float BitmapImage::frameDurationAtIndex(size_t index)	433	float BitmapImage::frameDurationAtIndex(size_t index)
417	{	434	{
418	if (!ensureFrameIsCached(index, CacheMetadataOnly))	435	if (!ensureFrameIsCached(index, ImageFrameData::Caching::Metadata))
419	return 0;	436	return 0;
420		437
421	return m_frames[index].m_duration;	438	return m_frames[index].duration();
422	}
423
424	NativeImagePtr BitmapImage::nativeImageForCurrentFrame()
425	{
426	return frameImageAtIndex(currentFrame());
427	}	439	}
428		440
429	bool BitmapImage::frameHasAlphaAtIndex(size_t index)	441	bool BitmapImage::frameHasAlphaAtIndex(size_t index)
430	{	442	{
431	if (!ensureFrameIsCached(index, CacheMetadataOnly))	443	if (!ensureFrameIsCached(index, ImageFrameData::Caching::Metadata))
432	return true;	444	return true;
433		445
434	if (m_frames[index].m_haveMetadata)	446	if (m_frames[index].hasMetadata())
435	return m_frames[index].m_hasAlpha;	447	return m_frames[index].hasAlpha();
436		448
437	return m_source.frameHasAlphaAtIndex(index);	449	return m_source.frameHasAlphaAtIndex(index);
438	}	450	}
Lines 444-454 bool BitmapImage::currentFrameKnownToBeOpaque() a/Source/WebCore/platform/graphics/BitmapImage.cpp_sec11
444		456
445	ImageOrientation BitmapImage::frameOrientationAtIndex(size_t index)	457	ImageOrientation BitmapImage::frameOrientationAtIndex(size_t index)
446	{	458	{
447	if (!ensureFrameIsCached(index, CacheMetadataOnly))	459	if (!ensureFrameIsCached(index, ImageFrameData::Caching::Metadata))
448	return ImageOrientation();	460	return ImageOrientation();
449		461
450	if (m_frames[index].m_haveMetadata)	462	if (m_frames[index].hasMetadata())
451	return m_frames[index].m_orientation;	463	return m_frames[index].orientation();
452		464
453	return m_source.orientationAtIndex(index);	465	return m_source.orientationAtIndex(index);
454	}	466	}
Lines 700-716 Color BitmapImage::singlePixelSolidColor() a/Source/WebCore/platform/graphics/BitmapImage.cpp_sec12
700	return Color();	712	return Color();
701		713
702	ASSERT(m_frames.size());	714	ASSERT(m_frames.size());
703	m_solidColor = NativeImage::singlePixelSolidColor(m_frames[0].m_image.get());	715	m_solidColor = m_frames[0].singlePixelSolidColor();
704		716
705	ASSERT(m_solidColor);	717	ASSERT(m_solidColor);
706	return m_solidColor.value();	718	return m_solidColor.value();
707	}	719	}
708		720
		721	bool BitmapImage::isAlmostSolidColor()
		722	{
		723	if (frameCount() != 1)
		724	return false;
		725
		726	return ensureFrameIsCached(0) && m_frames[0].isAlmostSolidColor();
		727	}
		728
709	bool BitmapImage::canAnimate()	729	bool BitmapImage::canAnimate()
710	{	730	{
711	return shouldAnimate() && frameCount() > 1;	731	return shouldAnimate() && frameCount() > 1;
712	}	732	}
713		733
		734	void BitmapImage::draw(GraphicsContext& context, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator op, BlendMode mode, ImageOrientationDescription description)
		735	{
		736	if (destRect.isEmpty() \|\| srcRect.isEmpty())
		737	return;
		738
		739	#if PLATFORM(IOS)
		740	startAnimation(DoNotCatchUp);
		741	#else
		742	startAnimation();
		743	#endif
		744
		745	Color color = singlePixelSolidColor();
		746	if (color.isValid()) {
		747	fillWithSolidColor(context, destRect, color, op);
		748	return;
		749	}
		750
		751	auto image = frameImageAtIndex(m_currentFrame, PlatformImage::subsamplingScale(context, destRect, srcRect));
		752	if (!image) // If it's too early we won't have an image yet.
		753	return;
		754
		755	ImageOrientation orientation(description.imageOrientation());
		756	if (description.respectImageOrientation() == RespectImageOrientation)
		757	orientation = frameOrientationAtIndex(m_currentFrame);
		758
		759	PlatformImage(image).draw(context, destRect, srcRect, m_size, op, mode, orientation);
		760
		761	if (imageObserver())
		762	imageObserver()->didDraw(this);
		763	}
		764
714	void BitmapImage::dump(TextStream& ts) const	765	void BitmapImage::dump(TextStream& ts) const
715	{	766	{
716	Image::dump(ts);	767	Image::dump(ts);

Lines 1484-1490 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec1
- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj -4 / +20 lines
1484	375CD232119D43C800A2A859 /* Hyphenation.h in Headers / = {isa = PBXBuildFile; fileRef = 375CD231119D43C800A2A859 / Hyphenation.h */; };	1484	375CD232119D43C800A2A859 /* Hyphenation.h in Headers / = {isa = PBXBuildFile; fileRef = 375CD231119D43C800A2A859 / Hyphenation.h */; };
1485	376DCCE113B4F966002EBEFC /* TextRun.cpp in Sources / = {isa = PBXBuildFile; fileRef = 376DCCE013B4F966002EBEFC / TextRun.cpp */; };	1485	376DCCE113B4F966002EBEFC /* TextRun.cpp in Sources / = {isa = PBXBuildFile; fileRef = 376DCCE013B4F966002EBEFC / TextRun.cpp */; };
1486	3774ABA50FA21EB400AD7DE9 /* OverlapTestRequestClient.h in Headers / = {isa = PBXBuildFile; fileRef = 3774ABA30FA21EB400AD7DE9 / OverlapTestRequestClient.h */; settings = {ATTRIBUTES = (Private, ); }; };	1486	3774ABA50FA21EB400AD7DE9 /* OverlapTestRequestClient.h in Headers / = {isa = PBXBuildFile; fileRef = 3774ABA30FA21EB400AD7DE9 / OverlapTestRequestClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
1487	377A3A9015EFCE9B0059F5C7 /* BitmapImageCG.cpp in Sources / = {isa = PBXBuildFile; fileRef = 377A3A8F15EFCE9A0059F5C7 / BitmapImageCG.cpp */; };	1487	377A3A9015EFCE9B0059F5C7 /* PlatformImageCG.cpp in Sources / = {isa = PBXBuildFile; fileRef = 377A3A8F15EFCE9A0059F5C7 / PlatformImageCG.cpp */; };
1488	37919C230B7D188600A56998 /* PositionIterator.cpp in Sources / = {isa = PBXBuildFile; fileRef = 37919C210B7D188600A56998 / PositionIterator.cpp */; };	1488	37919C230B7D188600A56998 /* PositionIterator.cpp in Sources / = {isa = PBXBuildFile; fileRef = 37919C210B7D188600A56998 / PositionIterator.cpp */; };
1489	37919C240B7D188600A56998 /* PositionIterator.h in Headers / = {isa = PBXBuildFile; fileRef = 37919C220B7D188600A56998 / PositionIterator.h */; settings = {ATTRIBUTES = (); }; };	1489	37919C240B7D188600A56998 /* PositionIterator.h in Headers / = {isa = PBXBuildFile; fileRef = 37919C220B7D188600A56998 / PositionIterator.h */; settings = {ATTRIBUTES = (); }; };
1490	3792917A1985EF3900F4B661 /* CredentialBase.h in Headers / = {isa = PBXBuildFile; fileRef = 379291781985EF3900F4B661 / CredentialBase.h */; settings = {ATTRIBUTES = (Private, ); }; };	1490	3792917A1985EF3900F4B661 /* CredentialBase.h in Headers / = {isa = PBXBuildFile; fileRef = 379291781985EF3900F4B661 / CredentialBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
Lines 2325-2334 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec2
2325	53ED3FDF167A88E7006762E6 /* JSInternalSettingsGenerated.h in Headers / = {isa = PBXBuildFile; fileRef = 53ED3FDD167A88E7006762E6 / JSInternalSettingsGenerated.h */; };	2325	53ED3FDF167A88E7006762E6 /* JSInternalSettingsGenerated.h in Headers / = {isa = PBXBuildFile; fileRef = 53ED3FDD167A88E7006762E6 / JSInternalSettingsGenerated.h */; };
2326	53EF766B16530A61004CBE49 /* SettingsMacros.h in Headers / = {isa = PBXBuildFile; fileRef = 53EF766A16530A61004CBE49 / SettingsMacros.h */; };	2326	53EF766B16530A61004CBE49 /* SettingsMacros.h in Headers / = {isa = PBXBuildFile; fileRef = 53EF766A16530A61004CBE49 / SettingsMacros.h */; };
2327	53EF766C16531994004CBE49 /* SettingsMacros.h in Copy Generated Headers / = {isa = PBXBuildFile; fileRef = 53EF766A16530A61004CBE49 / SettingsMacros.h */; };	2327	53EF766C16531994004CBE49 /* SettingsMacros.h in Copy Generated Headers / = {isa = PBXBuildFile; fileRef = 53EF766A16530A61004CBE49 / SettingsMacros.h */; };
		2328	5504E4CB1D3557B200FE5088 /* BitmapPixels.h in Headers / = {isa = PBXBuildFile; fileRef = 5504E4CA1D35532D00FE5088 / BitmapPixels.h */; settings = {ATTRIBUTES = (Private, ); }; };
2328	550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources / = {isa = PBXBuildFile; fileRef = 550A0BC7085F6039007353D6 / QualifiedName.cpp */; };	2329	550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources / = {isa = PBXBuildFile; fileRef = 550A0BC7085F6039007353D6 / QualifiedName.cpp */; };
2329	550A0BCA085F6039007353D6 /* QualifiedName.h in Headers / = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 / QualifiedName.h */; settings = {ATTRIBUTES = (Private, ); }; };	2330	550A0BCA085F6039007353D6 /* QualifiedName.h in Headers / = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 / QualifiedName.h */; settings = {ATTRIBUTES = (Private, ); }; };
2330	555B87EC1CAAF0AB00349425 /* ImageDecoderCG.cpp in Sources / = {isa = PBXBuildFile; fileRef = 555B87EA1CAAF0AB00349425 / ImageDecoderCG.cpp */; };	2331	555B87EC1CAAF0AB00349425 /* ImageDecoderCG.cpp in Sources / = {isa = PBXBuildFile; fileRef = 555B87EA1CAAF0AB00349425 / ImageDecoderCG.cpp */; };
2331	555B87ED1CAAF0AB00349425 /* ImageDecoderCG.h in Headers / = {isa = PBXBuildFile; fileRef = 555B87EB1CAAF0AB00349425 / ImageDecoderCG.h */; };	2332	555B87ED1CAAF0AB00349425 /* ImageDecoderCG.h in Headers / = {isa = PBXBuildFile; fileRef = 555B87EB1CAAF0AB00349425 / ImageDecoderCG.h */; };
		2333	5574F0871D02790900B9F14C /* PlatformImage.h in Headers / = {isa = PBXBuildFile; fileRef = 5574F0851D02744400B9F14C / PlatformImage.h */; settings = {ATTRIBUTES = (Private, ); }; };
		2334	55CBA6A11D1DF2E100451860 /* ImageFrameData.cpp in Sources / = {isa = PBXBuildFile; fileRef = 55CBA69F1D1DF2E100451860 / ImageFrameData.cpp */; };
		2335	55CBA6A21D1DF2E100451860 /* ImageFrameData.h in Headers / = {isa = PBXBuildFile; fileRef = 55CBA6A01D1DF2E100451860 / ImageFrameData.h */; settings = {ATTRIBUTES = (Private, ); }; };
2332	572A7F211C6E5719009C6149 /* SimulatedClick.h in Headers / = {isa = PBXBuildFile; fileRef = 572A7F201C6E5719009C6149 / SimulatedClick.h */; };	2336	572A7F211C6E5719009C6149 /* SimulatedClick.h in Headers / = {isa = PBXBuildFile; fileRef = 572A7F201C6E5719009C6149 / SimulatedClick.h */; };
2333	572A7F231C6E5A66009C6149 /* SimulatedClick.cpp in Sources / = {isa = PBXBuildFile; fileRef = 572A7F221C6E5A66009C6149 / SimulatedClick.cpp */; };	2337	572A7F231C6E5A66009C6149 /* SimulatedClick.cpp in Sources / = {isa = PBXBuildFile; fileRef = 572A7F221C6E5A66009C6149 / SimulatedClick.cpp */; };
2334	57EF5E601D20C83900171E60 /* TextCodecReplacement.h in Headers / = {isa = PBXBuildFile; fileRef = 57EF5E5F1D20C83900171E60 / TextCodecReplacement.h */; };	2338	57EF5E601D20C83900171E60 /* TextCodecReplacement.h in Headers / = {isa = PBXBuildFile; fileRef = 57EF5E5F1D20C83900171E60 / TextCodecReplacement.h */; };
Lines 9061-9067 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec3
9061	376DCCE013B4F966002EBEFC /* TextRun.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextRun.cpp; sourceTree = "<group>"; };	9065	376DCCE013B4F966002EBEFC /* TextRun.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextRun.cpp; sourceTree = "<group>"; };
9062	3772B09516535856000A49CA /* PopupOpeningObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopupOpeningObserver.h; sourceTree = "<group>"; };	9066	3772B09516535856000A49CA /* PopupOpeningObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopupOpeningObserver.h; sourceTree = "<group>"; };
9063	3774ABA30FA21EB400AD7DE9 /* OverlapTestRequestClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverlapTestRequestClient.h; sourceTree = "<group>"; };	9067	3774ABA30FA21EB400AD7DE9 /* OverlapTestRequestClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverlapTestRequestClient.h; sourceTree = "<group>"; };
9064	377A3A8F15EFCE9A0059F5C7 /* BitmapImageCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BitmapImageCG.cpp; sourceTree = "<group>"; };	9068	377A3A8F15EFCE9A0059F5C7 /* PlatformImageCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformImageCG.cpp; sourceTree = "<group>"; };
9065	37919C210B7D188600A56998 /* PositionIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PositionIterator.cpp; sourceTree = "<group>"; };	9069	37919C210B7D188600A56998 /* PositionIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PositionIterator.cpp; sourceTree = "<group>"; };
9066	37919C220B7D188600A56998 /* PositionIterator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PositionIterator.h; sourceTree = "<group>"; };	9070	37919C220B7D188600A56998 /* PositionIterator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PositionIterator.h; sourceTree = "<group>"; };
9067	379291781985EF3900F4B661 /* CredentialBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CredentialBase.h; sourceTree = "<group>"; };	9071	379291781985EF3900F4B661 /* CredentialBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CredentialBase.h; sourceTree = "<group>"; };
Lines 9989-9998 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec4
9989	53ED3FDC167A88E7006762E6 /* JSInternalSettingsGenerated.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInternalSettingsGenerated.cpp; sourceTree = "<group>"; };	9993	53ED3FDC167A88E7006762E6 /* JSInternalSettingsGenerated.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInternalSettingsGenerated.cpp; sourceTree = "<group>"; };
9990	53ED3FDD167A88E7006762E6 /* JSInternalSettingsGenerated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInternalSettingsGenerated.h; sourceTree = "<group>"; };	9994	53ED3FDD167A88E7006762E6 /* JSInternalSettingsGenerated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInternalSettingsGenerated.h; sourceTree = "<group>"; };
9991	53EF766A16530A61004CBE49 /* SettingsMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsMacros.h; sourceTree = "<group>"; };	9995	53EF766A16530A61004CBE49 /* SettingsMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsMacros.h; sourceTree = "<group>"; };
		9996	5504E4CA1D35532D00FE5088 /* BitmapPixels.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BitmapPixels.h; sourceTree = "<group>"; };
9992	550A0BC7085F6039007353D6 /* QualifiedName.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QualifiedName.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };	9997	550A0BC7085F6039007353D6 /* QualifiedName.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QualifiedName.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
9993	550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };	9998	550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
9994	555B87EA1CAAF0AB00349425 /* ImageDecoderCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageDecoderCG.cpp; sourceTree = "<group>"; };	9999	555B87EA1CAAF0AB00349425 /* ImageDecoderCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageDecoderCG.cpp; sourceTree = "<group>"; };
9995	555B87EB1CAAF0AB00349425 /* ImageDecoderCG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageDecoderCG.h; sourceTree = "<group>"; };	10000	555B87EB1CAAF0AB00349425 /* ImageDecoderCG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageDecoderCG.h; sourceTree = "<group>"; };

Lines 28-38 a/Source/WebCore/platform/graphics/BitmapImage.h_sec1
- a/Source/WebCore/platform/graphics/BitmapImage.h -66 / +11 lines
28	#ifndef BitmapImage_h	28	#ifndef BitmapImage_h
29	#define BitmapImage_h	29	#define BitmapImage_h
30		30
31	#include "Image.h"
32	#include "Color.h"	31	#include "Color.h"
		32	#include "Image.h"
		33	#include "ImageFrameData.h"
33	#include "ImageOrientation.h"	34	#include "ImageOrientation.h"
34	#include "ImageSource.h"	35	#include "ImageSource.h"
35	#include "IntSize.h"	36	#include "IntSize.h"
		37	#include "PlatformImage.h"
36		38
37	#if USE(CG) \|\| USE(APPKIT)	39	#if USE(CG) \|\| USE(APPKIT)
38	#include <wtf/RetainPtr.h>	40	#include <wtf/RetainPtr.h>
Lines 47-109 typedef struct HBITMAP__ *HBITMAP; a/Source/WebCore/platform/graphics/BitmapImage.h_sec2
47	#endif	49	#endif
48		50
49	namespace WebCore {	51	namespace WebCore {
50	struct FrameData;
51	}
52
53	namespace WTF {
54	template<> struct VectorTraits<WebCore::FrameData> : public SimpleClassVectorTraits {
55	static const bool canInitializeWithMemset = false; // Not all FrameData members initialize to 0.
56	};
57	}
58
59	namespace WebCore {
60		52
61	class Timer;	53	class Timer;
62		54
63	namespace NativeImage {
64	IntSize size(const NativeImagePtr&);
65	bool hasAlpha(const NativeImagePtr&);
66	Color singlePixelSolidColor(const NativeImagePtr&);
67	}
68
69	// ================================================
70	// FrameData Class
71	// ================================================
72
73	struct FrameData {
74	public:
75	FrameData()
76	: m_haveMetadata(false)
77	, m_isComplete(false)
78	, m_hasAlpha(true)
79	{
80	}
81
82	~FrameData()
83	{
84	clear(true);
85	}
86
87	// Clear the cached image data on the frame, and (optionally) the metadata.
88	// Returns whether there was cached image data to clear.
89	bool clear(bool clearMetadata);
90
91	unsigned usedFrameBytes() const { return m_image ? m_frameBytes : 0; }
92
93	NativeImagePtr m_image;
94	ImageOrientation m_orientation { DefaultImageOrientation };
95	SubsamplingLevel m_subsamplingLevel { 0 };
96	float m_duration { 0 };
97	bool m_haveMetadata : 1;
98	bool m_isComplete : 1;
99	bool m_hasAlpha : 1;
100	unsigned m_frameBytes { 0 };
101	};
102
103	// =================================================
104	// BitmapImage Class
105	// =================================================
106
107	class BitmapImage final : public Image {	55	class BitmapImage final : public Image {
108	friend class GeneratedImage;	56	friend class GeneratedImage;
109	friend class CrossfadeGeneratedImage;	57	friend class CrossfadeGeneratedImage;
Lines 155-166 public: a/Source/WebCore/platform/graphics/BitmapImage.h_sec3
155	CFDataRef getTIFFRepresentation() override;	103	CFDataRef getTIFFRepresentation() override;
156	#endif	104	#endif
157		105
158	#if USE(CG)
159	WEBCORE_EXPORT CGImageRef getCGImageRef() override;
160	CGImageRef getFirstCGImageRefOfSize(const IntSize&) override;
161	RetainPtr<CFArrayRef> getCGImageArray() override;
162	#endif
163
164	#if PLATFORM(WIN)	106	#if PLATFORM(WIN)
165	bool getHBITMAP(HBITMAP) override;	107	bool getHBITMAP(HBITMAP) override;
166	bool getHBITMAPOfSize(HBITMAP, const IntSize*) override;	108	bool getHBITMAPOfSize(HBITMAP, const IntSize*) override;
Lines 174-181 public: a/Source/WebCore/platform/graphics/BitmapImage.h_sec4
174	Evas_Object* getEvasObject(Evas*) override;	116	Evas_Object* getEvasObject(Evas*) override;
175	#endif	117	#endif
176		118
		119	WEBCORE_EXPORT NativeImagePtr nativeImage() override;
		120	NativeImagePtr nativeImageOfSize(const IntSize&) override;
177	NativeImagePtr nativeImageForCurrentFrame() override;	121	NativeImagePtr nativeImageForCurrentFrame() override;
178	ImageOrientation orientationForCurrentFrame() override { return frameOrientationAtIndex(currentFrame()); }	122	ImageOrientation orientationForCurrentFrame() override { return frameOrientationAtIndex(currentFrame()); }
		123	Vector<NativeImagePtr> framesNativeImages() override;
		124
		125	WEBCORE_EXPORT bool isAlmostSolidColor();
179		126
180	bool currentFrameKnownToBeOpaque() override;	127	bool currentFrameKnownToBeOpaque() override;
181		128
Lines 215-221 protected: a/Source/WebCore/platform/graphics/BitmapImage.h_sec5
215	size_t frameCount();	162	size_t frameCount();
216		163
217	NativeImagePtr frameImageAtIndex(size_t, float presentationScaleHint = 1);	164	NativeImagePtr frameImageAtIndex(size_t, float presentationScaleHint = 1);
218	NativeImagePtr copyUnscaledFrameImageAtIndex(size_t);
219		165
220	bool haveFrameImageAtIndex(size_t);	166	bool haveFrameImageAtIndex(size_t);
221		167
Lines 225-235 protected: a/Source/WebCore/platform/graphics/BitmapImage.h_sec6
225	ImageOrientation frameOrientationAtIndex(size_t);	171	ImageOrientation frameOrientationAtIndex(size_t);
226		172
227	// Decodes and caches a frame. Never accessed except internally.	173	// Decodes and caches a frame. Never accessed except internally.
228	enum ImageFrameCaching { CacheMetadataOnly, CacheMetadataAndFrame };	174	void cacheFrame(size_t index, SubsamplingLevel, ImageFrameData::Caching = ImageFrameData::Caching::MetadataAndImage);
229	void cacheFrame(size_t index, SubsamplingLevel, ImageFrameCaching = CacheMetadataAndFrame);
230		175
231	// Called before accessing m_frames[index] for info without decoding. Returns false on index out of bounds.	176	// Called before accessing m_frames[index] for info without decoding. Returns false on index out of bounds.
232	bool ensureFrameIsCached(size_t index, ImageFrameCaching = CacheMetadataAndFrame);	177	bool ensureFrameIsCached(size_t index, ImageFrameData::Caching = ImageFrameData::Caching::MetadataAndImage);
233		178
234	// Called to invalidate cached data. When \|destroyAll\| is true, we wipe out	179	// Called to invalidate cached data. When \|destroyAll\| is true, we wipe out
235	// the entire frame buffer cache and tell the image source to destroy	180	// the entire frame buffer cache and tell the image source to destroy
Lines 292-298 private: a/Source/WebCore/platform/graphics/BitmapImage.h_sec7
292	mutable IntSize m_sizeRespectingOrientation;	237	mutable IntSize m_sizeRespectingOrientation;
293		238
294	size_t m_currentFrame { 0 }; // The index of the current frame of animation.	239	size_t m_currentFrame { 0 }; // The index of the current frame of animation.
295	Vector<FrameData, 1> m_frames; // An array of the cached frames of the animation. We have to ref frames to pin them in the cache.	240	Vector<ImageFrameData, 1> m_frames; // An array of the cached frames of the animation. We have to ref frames to pin them in the cache.
296		241
297	std::unique_ptr<Timer> m_frameTimer;	242	std::unique_ptr<Timer> m_frameTimer;
298	int m_repetitionCount { cAnimationNone }; // How many total animation loops we should do. This will be cAnimationNone if this image type is incapable of animation.	243	int m_repetitionCount { cAnimationNone }; // How many total animation loops we should do. This will be cAnimationNone if this image type is incapable of animation.

Line 0 a/Source/WebCore/platform/graphics/BitmapPixels.h_sec1
- a/Source/WebCore/platform/graphics/BitmapPixels.h +183 lines
		1	/*
		2	* Copyright (C) 2016 Apple Inc. All rights reserved.
		3	*
		4	* Redistribution and use in source and binary forms, with or without
		5	* modification, are permitted provided that the following conditions
		6	* are met:
		7	* 1. Redistributions of source code must retain the above copyright
		8	* notice, this list of conditions and the following disclaimer.
		9	* 2. Redistributions in binary form must reproduce the above copyright
		10	* notice, this list of conditions and the following disclaimer in the
		11	* documentation and/or other materials provided with the distribution.
		12	*
		13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
		14	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		15	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
		16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
		17	* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
		18	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
		19	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
		20	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
		21	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		23	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		24	*/
		25
		26	#pragma once
		27
		28	#include "Color.h"
		29	#include "IntRect.h"
		30	#include "IntSize.h"
		31	#include "NativeImagePtr.h"
		32
		33	#include <wtf/Vector.h>
		34
		35	namespace WebCore {
		36
		37	class BitmapPixels {
		38	public:
		39	static std::unique_ptr<BitmapPixels> create(const IntSize& size, bool premultiplyAlpha)
		40	{
		41	return std::make_unique<BitmapPixels>(size, premultiplyAlpha);
		42	}
		43
		44	static std::unique_ptr<BitmapPixels> create(const BitmapPixels& other)
		45	{
		46	return std::make_unique<BitmapPixels>(other);
		47	}
		48
		49	BitmapPixels(const IntSize& size, bool premultiplyAlpha = true)
		50	: m_premultiplyAlpha(premultiplyAlpha)
		51	{
		52	ASSERT(!size.isEmpty());
		53	setSize(size);
		54	}
		55
		56	BitmapPixels(const BitmapPixels& other)
		57	{
		58	if (this == &other)
		59	return;
		60
		61	m_backingStore = other.m_backingStore;
		62	m_pixels = m_backingStore.data();
		63	m_size = other.m_size;
		64	m_rect = other.m_rect;
65	m_premultiplyAlpha = other.m_premultiplyAlpha;
66	}
67
68	NativeImagePtr image() const;
69
70	bool setSize(const IntSize& size)
71	{
72	if (!m_backingStore.tryReserveCapacity(size.area()))
73	return false;
74
75	m_backingStore.resize(size.area());
76	m_pixels = m_backingStore.data();
77	m_size = size;
78	m_rect = IntRect(IntPoint(), m_size);
79	clear();
80	return true;
81	}
82
83	void setRect(const IntRect& rect)
84	{
85	ASSERT(!m_size.isEmpty());
86	ASSERT(inBounds(rect));
87	m_rect = rect;
88	}
89
90	IntSize size() const { return m_size; }
91	IntRect rect() const { return m_rect; }
92
93	RGBA32* at(int x, int y) const
94	{
95	return m_pixels + y * m_size.width() + x;
96	}
97
98	void clear()
99	{
100	memset(m_pixels, 0, m_size.area() * sizeof(RGBA32));
101	}
102
103	void clearRect(const IntRect& rect)
104	{
105	if (rect.isEmpty() \|\| inBounds(rect))
106	return;
107
108	size_t rectWidthInBytes = rect.width() * sizeof(RGBA32);
109	RGBA32* start = at(rect.x(), rect.y());
110	for (int i = 0; i < rect.height(); ++i) {
111	memset(start, 0, rectWidthInBytes);
112	start += m_size.width();
113	}
114	}
115
116	void repeatFirstRow(const IntRect& rect)
117	{
118	if (rect.isEmpty() \|\| inBounds(rect))
119	return;
120
121	size_t rectWidthInBytes = rect.width() * sizeof(RGBA32);
122	RGBA32* src = at(rect.x(), rect.y());
123	RGBA32* dest = src + m_size.width();
124	for (int i = 1; i < rect.height(); ++i) {
125	memcpy(dest, src, rectWidthInBytes);
126	dest += m_size.width();
127	}
128	}
129
130	void setRGBA(int x, int y, unsigned r, unsigned g, unsigned b, unsigned a)
131	{
132	setRGBA(at(x, y), r, g, b, a);
133	}
134
135	void setRGBA(RGBA32* dest, unsigned r, unsigned g, unsigned b, unsigned a)
136	{
137	if (!m_premultiplyAlpha \|\| a >= 255)
138	*dest = makeRGBA(r, g, b, a);
139	else if (!a)
140	*dest = 0;
141	else
142	*dest = makePremultipliedRGBA(r, g, b, a);
143	}
144
145	void overRGBA(RGBA32* dest, unsigned r, unsigned g, unsigned b, unsigned a)
146	{
147	if (!a)
148	return;
149
150	if (a >= 255 \|\| !alphaChannel(*dest)) {
151	setRGBA(dest, r, g, b, a);
152	return;
153	}
154
155	if (!m_premultiplyAlpha)
156	dest = makePremultipliedRGBA(redChannel(dest), greenChannel(dest), blueChannel(dest), alphaChannel(*dest));
157
158	RGBA32 src = makeRGBA(r, g, b, a);
159	dest = Color(dest).blend(src).rgb();
160
161	if (!m_premultiplyAlpha)
162	dest = makeUnPremultipliedRGBA(redChannel(dest), greenChannel(dest), blueChannel(dest), alphaChannel(*dest));
163	}
164
165	bool inBounds(const IntPoint& point) const
166	{
167	return IntRect(IntPoint(), m_size).contains(point);
168	}
169
170	bool inBounds(const IntRect& rect) const
171	{
172	return IntRect(IntPoint(), m_size).contains(rect);
173	}
174
175	private:
176	Vector<RGBA32> m_backingStore;
177	RGBA32* m_pixels { nullptr };
178	IntSize m_size;
179	IntRect m_rect; // This will always just be the entire buffer except for GIF and PNG frames
180	bool m_premultiplyAlpha { true };
181	};
182
183	}

Lines 49-54 const RGBA32 Color::transparent; a/Source/WebCore/platform/graphics/Color.cpp_sec1
- a/Source/WebCore/platform/graphics/Color.cpp +44 lines
49	static const RGBA32 lightenedBlack = 0xFF545454;	49	static const RGBA32 lightenedBlack = 0xFF545454;
50	static const RGBA32 darkenedWhite = 0xFFABABAB;	50	static const RGBA32 darkenedWhite = 0xFFABABAB;
51		51
		52	static inline unsigned multiply255(unsigned c)
		53	{
		54	// c * 255
		55	// = c * (256 - 1)
		56	// = c * 256 - c
		57	return (c << 8) - c;
		58	}
		59
		60	static inline unsigned divide255(unsigned c)
		61	{
		62	// c / 255
		63	// = c / 256 * (1 + 1 / 255)
		64	// = (c + c / 255) / 256
		65	// = (c + (c + c / 255) / 256) / 256
		66	// = (c + c / 256 + c / (255 x 256)) / 256
		67	// ~= (c + c / 256 + 1) / 256
		68	return (c + (c >> 8) + 1) >> 8;
		69	}
		70
		71	static inline unsigned divideCeil(unsigned c, unsigned d)
		72	{
		73	return (c + d - 1) / d;
		74	}
		75
		76	static inline unsigned premultipliedChannel(unsigned c, unsigned a)
		77	{
		78	return divide255(c * a);
		79	}
		80
		81	static inline unsigned unpremultipliedChannel(unsigned c, unsigned a)
		82	{
		83	return divideCeil(multiply255(c), a);
		84	}
		85
52	RGBA32 makeRGB(int r, int g, int b)	86	RGBA32 makeRGB(int r, int g, int b)
53	{	87	{
54	return 0xFF000000 \| std::max(0, std::min(r, 255)) << 16 \| std::max(0, std::min(g, 255)) << 8 \| std::max(0, std::min(b, 255));	88	return 0xFF000000 \| std::max(0, std::min(r, 255)) << 16 \| std::max(0, std::min(g, 255)) << 8 \| std::max(0, std::min(b, 255));
Lines 59-64 RGBA32 makeRGBA(int r, int g, int b, int a) a/Source/WebCore/platform/graphics/Color.cpp_sec2
59	return std::max(0, std::min(a, 255)) << 24 \| std::max(0, std::min(r, 255)) << 16 \| std::max(0, std::min(g, 255)) << 8 \| std::max(0, std::min(b, 255));	93	return std::max(0, std::min(a, 255)) << 24 \| std::max(0, std::min(r, 255)) << 16 \| std::max(0, std::min(g, 255)) << 8 \| std::max(0, std::min(b, 255));
60	}	94	}
61		95
		96	RGBA32 makePremultipliedRGBA(int r, int g, int b, int a)
		97	{
		98	return makeRGBA(premultipliedChannel(r, a), premultipliedChannel(g, a), premultipliedChannel(b, a), a);
		99	}
		100
		101	RGBA32 makeUnPremultipliedRGBA(int r, int g, int b, int a)
		102	{
		103	return makeRGBA(unpremultipliedChannel(r, a), unpremultipliedChannel(g, a), unpremultipliedChannel(b, a), a);
		104	}
		105
62	static int colorFloatToRGBAByte(float f)	106	static int colorFloatToRGBAByte(float f)
63	{	107	{
64	// We use lroundf and 255 instead of nextafterf(256, 0) to match CG's rounding	108	// We use lroundf and 255 instead of nextafterf(256, 0) to match CG's rounding

Lines 27-32 a/Source/WebCore/platform/graphics/ImageSource.h_sec1
- a/Source/WebCore/platform/graphics/ImageSource.h -6 / +5 lines
27	#ifndef ImageSource_h	27	#ifndef ImageSource_h
28	#define ImageSource_h	28	#define ImageSource_h
29		29
		30	#include "ImageFrameData.h"
30	#include "ImageOrientation.h"	31	#include "ImageOrientation.h"
31	#include "IntPoint.h"	32	#include "IntPoint.h"
32	#include "NativeImagePtr.h"	33	#include "NativeImagePtr.h"
Lines 63-71 const int cAnimationLoopOnce = 0; a/Source/WebCore/platform/graphics/ImageSource.h_sec2
63	const int cAnimationLoopInfinite = -1;	64	const int cAnimationLoopInfinite = -1;
64	const int cAnimationNone = -2;	65	const int cAnimationNone = -2;
65		66
66	// SubsamplingLevel. 0 is no subsampling, 1 is half dimensions on each axis etc.
67	typedef short SubsamplingLevel;
68
69	class ImageSource {	67	class ImageSource {
70	WTF_MAKE_NONCOPYABLE(ImageSource);	68	WTF_MAKE_NONCOPYABLE(ImageSource);
71	friend class BitmapImage;	69	friend class BitmapImage;
Lines 132-149 public: a/Source/WebCore/platform/graphics/ImageSource.h_sec3
132	bool allowSubsamplingOfFrameAtIndex(size_t) const;	130	bool allowSubsamplingOfFrameAtIndex(size_t) const;
133		131
134	// Size of optionally subsampled frame.	132	// Size of optionally subsampled frame.
135	IntSize frameSizeAtIndex(size_t, SubsamplingLevel = 0, RespectImageOrientationEnum = DoNotRespectImageOrientation) const;	133	IntSize frameSizeAtIndex(size_t, SubsamplingLevel = DefaultSubsamplingLevel, RespectImageOrientationEnum = DoNotRespectImageOrientation) const;
136		134
137	// Return the number of bytes in the decoded frame. If the frame is not yet	135	// Return the number of bytes in the decoded frame. If the frame is not yet
138	// decoded then return 0.	136	// decoded then return 0.
139	unsigned frameBytesAtIndex(size_t, SubsamplingLevel = 0) const;	137	unsigned frameBytesAtIndex(size_t, SubsamplingLevel = DefaultSubsamplingLevel) const;
140		138
141	float frameDurationAtIndex(size_t);	139	float frameDurationAtIndex(size_t);
142	ImageOrientation orientationAtIndex(size_t) const; // EXIF image orientation	140	ImageOrientation orientationAtIndex(size_t) const; // EXIF image orientation
143		141
144	// Callers should not call this after calling clear() with a higher index;	142	// Callers should not call this after calling clear() with a higher index;
145	// see comments on clear() above.	143	// see comments on clear() above.
146	NativeImagePtr createFrameImageAtIndex(size_t, SubsamplingLevel = 0);	144	NativeImagePtr createFrameImageAtIndex(size_t, SubsamplingLevel = DefaultSubsamplingLevel);
		145	ImageFrameData createFrameDataAtIndex(size_t, SubsamplingLevel = DefaultSubsamplingLevel, ImageFrameData::Caching = ImageFrameData::Caching::MetadataAndImage);
147		146
148	private:	147	private:
149	void clearFrameBufferCache(size_t);	148	void clearFrameBufferCache(size_t);

Line 0 a/Source/WebCore/platform/graphics/PlatformImage.h_sec1
- a/Source/WebCore/platform/graphics/PlatformImage.h +64 lines
	1	/*
	2	* Copyright (C) 2016 Apple Inc. All rights reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions
	6	* are met:
	7	* 1. Redistributions of source code must retain the above copyright
	8	* notice, this list of conditions and the following disclaimer.
	9	* 2. Redistributions in binary form must reproduce the above copyright
	10	* notice, this list of conditions and the following disclaimer in the
	11	* documentation and/or other materials provided with the distribution.
	12	*
	13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
	14	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	15	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
	16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
	17	* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
	18	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
	19	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
	20	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
	21	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
	23	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	24	*/
	25
	26	#pragma once
	27
	28	#include "GraphicsTypes.h"
	29	#include "ImageOrientation.h"
	30	#include "NativeImagePtr.h"
	31
	32	namespace WebCore {
	33
	34	class Color;
	35	class FloatRect;
	36	class IntSize;
	37	class GraphicsContext;
	38
	39	class PlatformImage {
	40	public:
	41	PlatformImage(const NativeImagePtr& image)
	42	: m_image(image)
	43	{
	44	}
	45
	46	bool isNil() const { return !m_image; }
	47	void clearSubImages();
	48
	49	IntSize size() const;
	50	bool hasAlpha() const;
	51	Color singlePixelSolidColor() const;
	52	bool isAlmostSolidColor() const;
	53	void draw(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect, const IntSize& srcSize, CompositeOperator, BlendMode, const ImageOrientation&) const;
	54
	55	static float subsamplingScale(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect);
	56
	57	private:
	58	#if USE(CG)
	59	CGImageRef cgImageRef() const { return m_image ? m_image.get() : nullptr; }
	60	#endif
	61	NativeImagePtr m_image;
	62	};
	63
	64	}

Lines 1-142 a/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp_sec1
- a/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp -142 lines
1	/*
2	* Copyright (C) 2004, 2005, 2006 Apple Inc. All rights reserved.
3	* Copyright (C) 2007 Alp Toker <alp@atoker.com>
4	* Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
5	*
6	* Redistribution and use in source and binary forms, with or without
7	* modification, are permitted provided that the following conditions
8	* are met:
9	* 1. Redistributions of source code must retain the above copyright
10	* notice, this list of conditions and the following disclaimer.
11	* 2. Redistributions in binary form must reproduce the above copyright
12	* notice, this list of conditions and the following disclaimer in the
13	* documentation and/or other materials provided with the distribution.
14	*
15	* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
16	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
18	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
19	* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
20	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
22	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
23	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*/
27
28	#include "config.h"
29	#include "BitmapImage.h"
30
31	#if USE(CAIRO)
32
33	#include "CairoUtilities.h"
34	#include "ImageObserver.h"
35	#include "PlatformContextCairo.h"
36	#include "Timer.h"
37	#include <cairo.h>
38
39	namespace WebCore {
40
41	namespace NativeImage {
42
43	IntSize size(const RefPtr<cairo_surface_t>& image)
44	{
45	return cairoSurfaceSize(image.get());
46	}
47
48	bool hasAlpha(const RefPtr<cairo_surface_t>& image)
49	{
50	return cairo_surface_get_content(image.get()) != CAIRO_CONTENT_COLOR;
51	}
52
53	Color singlePixelSolidColor(const RefPtr<cairo_surface_t>& image)
54	{
55	ASSERT(image);
56
57	if (NativeImage::size(image) != IntSize(1, 1))
58	return Color();
59
60	if (cairo_surface_get_type(image.get()) != CAIRO_SURFACE_TYPE_IMAGE)
61	return Color();
62
63	RGBA32* pixel = reinterpret_cast_ptr<RGBA32*>(cairo_image_surface_get_data(image.get()));
64	return colorFromPremultipliedARGB(*pixel);
65	}
66
67	}
68
69	void BitmapImage::draw(GraphicsContext& context, const FloatRect& dst, const FloatRect& src, CompositeOperator op,
70	BlendMode blendMode, ImageOrientationDescription description)
71	{
72	if (!dst.width() \|\| !dst.height() \|\| !src.width() \|\| !src.height())
73	return;
74
75	startAnimation();
76
77	auto surface = frameImageAtIndex(m_currentFrame);
78	if (!surface) // If it's too early we won't have an image yet.
79	return;
80
81	Color color = singlePixelSolidColor();
82	if (color.isValid()) {
83	fillWithSolidColor(context, dst, color, op);
84	return;
85	}
86
87	context.save();
88
89	// Set the compositing operation.
90	if (op == CompositeSourceOver && blendMode == BlendModeNormal && !frameHasAlphaAtIndex(m_currentFrame))
91	context.setCompositeOperation(CompositeCopy);
92	else
93	context.setCompositeOperation(op, blendMode);
94
95	#if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
96	IntSize scaledSize = cairoSurfaceSize(surface.get());
97	FloatRect adjustedSrcRect = adjustSourceRectForDownSampling(src, scaledSize);
98	#else
99	FloatRect adjustedSrcRect(src);
100	#endif
101
102	ImageOrientation frameOrientation(description.imageOrientation());
103	if (description.respectImageOrientation() == RespectImageOrientation)
104	frameOrientation = frameOrientationAtIndex(m_currentFrame);
105
106	FloatRect dstRect = dst;
107
108	if (frameOrientation != DefaultImageOrientation) {
109	// ImageOrientation expects the origin to be at (0, 0).
110	context.translate(dstRect.x(), dstRect.y());
111	dstRect.setLocation(FloatPoint());
112	context.concatCTM(frameOrientation.transformFromDefault(dstRect.size()));
113	if (frameOrientation.usesWidthAsHeight()) {
114	// The destination rectangle will have it's width and height already reversed for the orientation of
115	// the image, as it was needed for page layout, so we need to reverse it back here.
116	dstRect = FloatRect(dstRect.x(), dstRect.y(), dstRect.height(), dstRect.width());
117	}
118	}
119
120	context.platformContext()->drawSurfaceToContext(surface.get(), dstRect, adjustedSrcRect, context);
121
122	context.restore();
123
124	if (imageObserver())
125	imageObserver()->didDraw(this);
126	}
127
128	bool FrameData::clear(bool clearMetadata)
129	{
130	if (clearMetadata)
131	m_haveMetadata = false;
132
133	if (m_image) {
134	m_image = nullptr;
135	return true;
136	}
137	return false;
138	}
139
140	} // namespace WebCore
141
142	#endif // USE(CAIRO)

Lines 1-206 a/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp_sec1
- a/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp -206 lines
1	/*
2	* Copyright (C) 2004, 2005, 2006 Apple Inc. All rights reserved.
3	*
4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions
6	* are met:
7	* 1. Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.
9	* 2. Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.
12	*
13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17	* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24	*/
25
26	#include "config.h"
27	#include "BitmapImage.h"
28
29	#if USE(CG)
30
31	#include "CoreGraphicsSPI.h"
32	#include "FloatConversion.h"
33	#include "GeometryUtilities.h"
34	#include "GraphicsContextCG.h"
35	#include "ImageObserver.h"
36	#include "SubimageCacheWithTimer.h"
37	#include <wtf/RetainPtr.h>
38
39	#if USE(APPKIT)
40	#include <ApplicationServices/ApplicationServices.h>
41	#endif
42
43	#if PLATFORM(COCOA)
44	#include "WebCoreSystemInterface.h"
45	#endif
46
47	#if PLATFORM(WIN)
48	#include <WebKitSystemInterface/WebKitSystemInterface.h>
49	#endif
50
51	namespace WebCore {
52
53	namespace NativeImage {
54
55	IntSize size(const RetainPtr<CGImageRef>& image)
56	{
57	ASSERT(image);
58	return IntSize(CGImageGetWidth(image.get()), CGImageGetHeight(image.get()));
59	}
60
61	bool hasAlpha(const RetainPtr<CGImageRef>&)
62	{
63	// FIXME: Answer correctly the question: does the CGImageRef have alpha channnel?
64	return true;
65	}
66
67	Color singlePixelSolidColor(const RetainPtr<CGImageRef>& image)
68	{
69	ASSERT(image);
70
71	if (NativeImage::size(image) != IntSize(1, 1))
72	return Color();
73
74	unsigned char pixel[4]; // RGBA
75	auto bitmapContext = adoptCF(CGBitmapContextCreate(pixel, 1, 1, 8, sizeof(pixel), sRGBColorSpaceRef(),
76	kCGImageAlphaPremultipliedLast \| kCGBitmapByteOrder32Big));
77
78	if (!bitmapContext)
79	return Color();
80
81	CGContextSetBlendMode(bitmapContext.get(), kCGBlendModeCopy);
82	CGContextDrawImage(bitmapContext.get(), CGRectMake(0, 0, 1, 1), image.get());
83
84	if (!pixel[3])
85	return Color(0, 0, 0, 0);
86
87	return Color(pixel[0] * 255 / pixel[3], pixel[1] * 255 / pixel[3], pixel[2] * 255 / pixel[3], pixel[3]);
88	}
89
90	}
91
92	bool FrameData::clear(bool clearMetadata)
93	{
94	if (clearMetadata)
95	m_haveMetadata = false;
96
97	m_subsamplingLevel = 0;
98
99	if (m_image) {
100	#if CACHE_SUBIMAGES
101	subimageCache().clearImage(m_image.get());
102	#endif
103	m_image = nullptr;
104	return true;
105	}
106	return false;
107	}
108
109	CGImageRef BitmapImage::getCGImageRef()
110	{
111	return frameImageAtIndex(0).get();
112	}
113
114	CGImageRef BitmapImage::getFirstCGImageRefOfSize(const IntSize& size)
115	{
116	size_t count = frameCount();
117	for (size_t i = 0; i < count; ++i) {
118	CGImageRef cgImage = frameImageAtIndex(i).get();
119	if (cgImage && IntSize(CGImageGetWidth(cgImage), CGImageGetHeight(cgImage)) == size)
120	return cgImage;
121	}
122
123	// Fallback to the default CGImageRef if we can't find the right size
124	return getCGImageRef();
125	}
126
127	RetainPtr<CFArrayRef> BitmapImage::getCGImageArray()
128	{
129	size_t count = frameCount();
130	if (!count)
131	return nullptr;
132
133	CFMutableArrayRef array = CFArrayCreateMutable(NULL, count, &kCFTypeArrayCallBacks);
134	for (size_t i = 0; i < count; ++i) {
135	if (CGImageRef currFrame = frameImageAtIndex(i).get())
136	CFArrayAppendValue(array, currFrame);
137	}
138	return adoptCF(array);
139	}
140
141	void BitmapImage::draw(GraphicsContext& ctxt, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription description)
142	{
143	#if PLATFORM(IOS)
144	startAnimation(DoNotCatchUp);
145	#else
146	startAnimation();
147	#endif
148
149	RetainPtr<CGImageRef> image;
150	// Never use subsampled images for drawing into PDF contexts.
151	if (wkCGContextIsPDFContext(ctxt.platformContext()))
152	image = copyUnscaledFrameImageAtIndex(m_currentFrame);
153	else {
154	CGRect transformedDestinationRect = CGRectApplyAffineTransform(destRect, CGContextGetCTM(ctxt.platformContext()));
155	float subsamplingScale = std::min<float>(1, std::max(transformedDestinationRect.size.width / srcRect.width(), transformedDestinationRect.size.height / srcRect.height()));
156
157	image = frameImageAtIndex(m_currentFrame, subsamplingScale);
158	}
159
160	if (!image) // If it's too early we won't have an image yet.
161	return;
162
163	Color color = singlePixelSolidColor();
164	if (color.isValid()) {
165	fillWithSolidColor(ctxt, destRect, color, compositeOp);
166	return;
167	}
168
169	// Subsampling may have given us an image that is smaller than size().
170	IntSize imageSize(CGImageGetWidth(image.get()), CGImageGetHeight(image.get()));
171
172	// srcRect is in the coordinates of the unsubsampled image, so we have to map it to the subsampled image.
173	FloatRect scaledSrcRect = srcRect;
174	if (imageSize != m_size) {
175	FloatRect originalImageBounds(FloatPoint(), m_size);
176	FloatRect subsampledImageBounds(FloatPoint(), imageSize);
177	scaledSrcRect = mapRect(srcRect, originalImageBounds, subsampledImageBounds);
178	}
179
180	ImageOrientation orientation;
181	if (description.respectImageOrientation() == RespectImageOrientation)
182	orientation = frameOrientationAtIndex(m_currentFrame);
183
184	ctxt.drawNativeImage(image, imageSize, destRect, scaledSrcRect, compositeOp, blendMode, orientation);
185
186	if (imageObserver())
187	imageObserver()->didDraw(this);
188	}
189
190	RetainPtr<CGImageRef> BitmapImage::copyUnscaledFrameImageAtIndex(size_t index)
191	{
192	if (index >= frameCount())
193	return nullptr;
194
195	if (index >= m_frames.size() \|\| !m_frames[index].m_image)
196	cacheFrame(index, 0);
197
198	if (!m_frames[index].m_subsamplingLevel)
199	return m_frames[index].m_image;
200
201	return m_source.createFrameImageAtIndex(index);
202	}
203
204	}
205
206	#endif // USE(CG)

Lines 72-78 CGPatternRef Pattern::createPlatformPattern(const AffineTransform& userSpaceTran a/Source/WebCore/platform/graphics/cg/PatternCG.cpp_sec1
- a/Source/WebCore/platform/graphics/cg/PatternCG.cpp -2 / +2 lines
72	// If we're repeating in both directions, we can use image-backed patterns	72	// If we're repeating in both directions, we can use image-backed patterns
73	// instead of custom patterns, and avoid tiling-edge pixel cracks.	73	// instead of custom patterns, and avoid tiling-edge pixel cracks.
74	if (m_repeatX && m_repeatY)	74	if (m_repeatX && m_repeatY)
75	return wkCGPatternCreateWithImageAndTransform(tileImage()->getCGImageRef(), patternTransform, wkPatternTilingConstantSpacing);	75	return wkCGPatternCreateWithImageAndTransform(tileImage()->nativeImage().get(), patternTransform, wkPatternTilingConstantSpacing);
76		76
77	// If FLT_MAX should also be used for xStep or yStep, nothing is rendered. Using fractions of FLT_MAX also	77	// If FLT_MAX should also be used for xStep or yStep, nothing is rendered. Using fractions of FLT_MAX also
78	// result in nothing being rendered.	78	// result in nothing being rendered.
Lines 83-89 CGPatternRef Pattern::createPlatformPattern(const AffineTransform& userSpaceTran a/Source/WebCore/platform/graphics/cg/PatternCG.cpp_sec2
83	CGFloat yStep = m_repeatY ? tileRect.height() : (1 << 22);	83	CGFloat yStep = m_repeatY ? tileRect.height() : (1 << 22);
84		84
85	// The pattern will release the CGImageRef when it's done rendering in patternReleaseCallback	85	// The pattern will release the CGImageRef when it's done rendering in patternReleaseCallback
86	CGImageRef platformImage = CGImageRetain(tileImage()->getCGImageRef());	86	CGImageRef platformImage = tileImage()->nativeImage().leakRef();
87		87
88	const CGPatternCallbacks patternCallbacks = { 0, patternCallback, patternReleaseCallback };	88	const CGPatternCallbacks patternCallbacks = { 0, patternCallback, patternReleaseCallback };
89	return CGPatternCreate(platformImage, tileRect, patternTransform, xStep, yStep, kCGPatternTilingConstantSpacing, TRUE, &patternCallbacks);	89	return CGPatternCreate(platformImage, tileRect, patternTransform, xStep, yStep, kCGPatternTilingConstantSpacing, TRUE, &patternCallbacks);

Lines 85-115 CFDataRef BitmapImage::getTIFFRepresentation() a/Source/WebCore/platform/graphics/mac/ImageMac.mm_sec1
- a/Source/WebCore/platform/graphics/mac/ImageMac.mm -17 / +8 lines
85	if (m_tiffRep)	85	if (m_tiffRep)
86	return m_tiffRep.get();	86	return m_tiffRep.get();
87		87
88	unsigned numFrames = frameCount();	88	auto nativeImages = this->framesNativeImages();
89		89
90	// If numFrames is zero, we know for certain this image doesn't have valid data	90	// If framesImages.size() is zero, we know for certain this image doesn't have valid data
91	// Even though the call to CGImageDestinationCreateWithData will fail and we'll handle it gracefully,	91	// Even though the call to CGImageDestinationCreateWithData will fail and we'll handle it gracefully,
92	// in certain circumstances that call will spam the console with an error message	92	// in certain circumstances that call will spam the console with an error message
93	if (!numFrames)	93	if (!nativeImages.size())
94	return 0;	94	return nullptr;
95
96	Vector<CGImageRef> images;
97	for (unsigned i = 0; i < numFrames; ++i ) {
98	CGImageRef cgImage = frameImageAtIndex(i).get();
99	if (cgImage)
100	images.append(cgImage);
101	}
102
103	unsigned numValidFrames = images.size();
104		95
105	RetainPtr<CFMutableDataRef> data = adoptCF(CFDataCreateMutable(0, 0));	96	RetainPtr<CFMutableDataRef> data = adoptCF(CFDataCreateMutable(0, 0));
106	RetainPtr<CGImageDestinationRef> destination = adoptCF(CGImageDestinationCreateWithData(data.get(), kUTTypeTIFF, numValidFrames, 0));	97	RetainPtr<CGImageDestinationRef> destination = adoptCF(CGImageDestinationCreateWithData(data.get(), kUTTypeTIFF, nativeImages.size(), 0));
107		98
108	if (!destination)	99	if (!destination)
109	return 0;	100	return nullptr;
110		101
111	for (unsigned i = 0; i < numValidFrames; ++i)	102	for (auto nativeImage : nativeImages)
112	CGImageDestinationAddImage(destination.get(), images[i], 0);	103	CGImageDestinationAddImage(destination.get(), nativeImage.get(), 0);
113		104
114	CGImageDestinationFinalize(destination.get());	105	CGImageDestinationFinalize(destination.get());
115		106

Lines 142-148 ImageFrame& ImageFrame::operator=(const ImageFrame& other) a/Source/WebCore/platform/image-decoders/ImageDecoder.cpp_sec1
- a/Source/WebCore/platform/image-decoders/ImageDecoder.cpp -27 / +16 lines
142	return *this;	142	return *this;
143		143
144	copyBitmapData(other);	144	copyBitmapData(other);
145	setOriginalFrameRect(other.originalFrameRect());	145	setHasAlpha(other.m_hasAlpha);
146	setStatus(other.status());	146	setStatus(other.status());
147	setDuration(other.duration());	147	setDuration(other.duration());
148	setDisposalMethod(other.disposalMethod());	148	setDisposalMethod(other.disposalMethod());
Lines 152-159 ImageFrame& ImageFrame::operator=(const ImageFrame& other) a/Source/WebCore/platform/image-decoders/ImageDecoder.cpp_sec2
152		152
153	void ImageFrame::clearPixelData()	153	void ImageFrame::clearPixelData()
154	{	154	{
155	m_backingStore.clear();	155	m_pixels = nullptr;
156	m_bytes = 0;
157	m_status = FrameEmpty;	156	m_status = FrameEmpty;
158	// NOTE: Do not reset other members here; clearFrameBufferCache() calls this	157	// NOTE: Do not reset other members here; clearFrameBufferCache() calls this
159	// to free the bitmap data, but other functions like initFrameBuffer() and	158	// to free the bitmap data, but other functions like initFrameBuffer() and
Lines 163-186 void ImageFrame::clearPixelData() a/Source/WebCore/platform/image-decoders/ImageDecoder.cpp_sec3
163		162
164	void ImageFrame::zeroFillPixelData()	163	void ImageFrame::zeroFillPixelData()
165	{	164	{
166	memset(m_bytes, 0, m_size.width() * m_size.height() * sizeof(PixelData));	165	m_pixels->clear();
167	m_hasAlpha = true;	166	m_hasAlpha = true;
168	}	167	}
169		168
170	void ImageFrame::zeroFillFrameRect(const IntRect& rect)	169	void ImageFrame::zeroFillFrameRect(const IntRect& rect)
171	{	170	{
172	ASSERT(IntRect(IntPoint(), m_size).contains(rect));
173
174	if (rect.isEmpty())	171	if (rect.isEmpty())
175	return;	172	return;
176		173
177	size_t rectWidthInBytes = rect.width() * sizeof(PixelData);	174	m_pixels->clearRect(rect);
178	PixelData* start = m_bytes + (rect.y() * width()) + rect.x();
179	for (int i = 0; i < rect.height(); ++i) {
180	memset(start, 0, rectWidthInBytes);
181	start += width();
182	}
183
184	setHasAlpha(true);	175	setHasAlpha(true);
185	}	176	}
186		177
Lines 189-213 bool ImageFrame::copyBitmapData(const ImageFrame& other) a/Source/WebCore/platform/image-decoders/ImageDecoder.cpp_sec4
189	if (this == &other)	180	if (this == &other)
190	return true;	181	return true;
191		182
192	m_backingStore = other.m_backingStore;	183	if (other.m_pixels)
193	m_bytes = m_backingStore.data();	184	m_pixels = BitmapPixels::create(*other.m_pixels.get());
194	m_size = other.m_size;	185	else
195	setHasAlpha(other.m_hasAlpha);	186	m_pixels = nullptr;
196	return true;	187	return true;
197	}	188	}
198		189
199	bool ImageFrame::setSize(int newWidth, int newHeight)	190	bool ImageFrame::setSize(int newWidth, int newHeight)
200	{	191	{
201	ASSERT(!width() && !height());	192	ASSERT(!m_pixels);
202	size_t backingStoreSize = newWidth * newHeight;	193	m_pixels = BitmapPixels::create(IntSize(newWidth, newHeight), m_premultiplyAlpha);
203	if (!m_backingStore.tryReserveCapacity(backingStoreSize))	194	return m_pixels != nullptr;
204	return false;	195	}
205	m_backingStore.resize(backingStoreSize);
206	m_bytes = m_backingStore.data();
207	m_size = IntSize(newWidth, newHeight);
208		196
209	zeroFillPixelData();	197	void ImageFrame::copyRowNTimes(int startX, int endX, int startY, int endY)
210	return true;	198	{
		199	m_pixels->repeatFirstRow(IntRect(startX, startY, endX -startX , endY - startY));
211	}	200	}
212		201
213	bool ImageFrame::hasAlpha() const	202	bool ImageFrame::hasAlpha() const
Lines 291-297 unsigned ImageDecoder::frameBytesAtIndex(size_t index) const a/Source/WebCore/platform/image-decoders/ImageDecoder.cpp_sec5
291	if (m_frameBufferCache.size() <= index)	280	if (m_frameBufferCache.size() <= index)
292	return 0;	281	return 0;
293	// FIXME: Use the dimension of the requested frame.	282	// FIXME: Use the dimension of the requested frame.
294	return m_size.area() * sizeof(ImageFrame::PixelData);	283	return m_size.area() * sizeof(RGBA32);
295	}	284	}
296		285
297	float ImageDecoder::frameDurationAtIndex(size_t index)	286	float ImageDecoder::frameDurationAtIndex(size_t index)

Lines 86-94 bool BMPImageReader::decodeBMP(bool onlySize) a/Source/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp_sec1
- a/Source/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp -3 lines
86	// these 0s could actually show through.	86	// these 0s could actually show through.
87	m_buffer->setHasAlpha(false);	87	m_buffer->setHasAlpha(false);
88		88
89	// For BMPs, the frame always fills the entire image.
90	m_buffer->setOriginalFrameRect(IntRect(IntPoint(), m_parent->size()));
91
92	if (!m_isTopDown)	89	if (!m_isTopDown)
93	m_coord.setY(m_parent->size().height() - 1);	90	m_coord.setY(m_parent->size().height() - 1);
94	}	91	}

Lines 1-40 a/Source/WebCore/platform/image-decoders/cairo/ImageDecoderCairo.cpp_sec1
- a/Source/WebCore/platform/image-decoders/cairo/ImageDecoderCairo.cpp -40 lines
1	/*
2	* Copyright (C) 2006 Apple Inc. All rights reserved.
3	*
4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions
6	* are met:
7	* 1. Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.
9	* 2. Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.
12	*
13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17	* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24	*/
25
26	#include "config.h"
27	#include "ImageDecoder.h"
28
29	#include <cairo.h>
30
31	namespace WebCore {
32
33	NativeImagePtr ImageFrame::asNewNativeImage() const
34	{
35	return adoptRef(cairo_image_surface_create_for_data(
36	reinterpret_cast<unsigned char>(const_cast<PixelData>(m_bytes)),
37	CAIRO_FORMAT_ARGB32, width(), height(), width() * sizeof(PixelData)));
38	}
39
40	} // namespace WebCore

Lines 213-222 bool GIFImageDecoder::haveDecodedRow(unsigned frameIndex, const Vector<unsigned a/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp_sec1
- a/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp -10 / +11 lines
213		213
214	// Initialize the frame if necessary.	214	// Initialize the frame if necessary.
215	ImageFrame& buffer = m_frameBufferCache[frameIndex];	215	ImageFrame& buffer = m_frameBufferCache[frameIndex];
216	if (((buffer.status() == ImageFrame::FrameEmpty) && !initFrameBuffer(frameIndex)) \|\| !buffer.hasPixelData())	216	if (((buffer.status() == ImageFrame::FrameEmpty) && !initFrameBuffer(frameIndex)) \|\| !buffer.hasPixels())
217	return false;	217	return false;
218		218
219	ImageFrame::PixelData* currentAddress = buffer.getAddr(xBegin, yBegin);	219	RGBA32* currentAddress = buffer.getAddr(xBegin, yBegin);
220	// Write one row's worth of data into the frame.	220	// Write one row's worth of data into the frame.
221	for (int x = xBegin; x < xEnd; ++x) {	221	for (int x = xBegin; x < xEnd; ++x) {
222	const unsigned char sourceValue = rowBuffer[(m_scaled ? m_scaledColumns[x] : x) - frameContext->xOffset];	222	const unsigned char sourceValue = rowBuffer[(m_scaled ? m_scaledColumns[x] : x) - frameContext->xOffset];
Lines 260-266 bool GIFImageDecoder::frameComplete(unsigned frameIndex, unsigned frameDuration, a/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp_sec2
260	if (!m_currentBufferSawAlpha) {	260	if (!m_currentBufferSawAlpha) {
261	// The whole frame was non-transparent, so it's possible that the entire	261	// The whole frame was non-transparent, so it's possible that the entire
262	// resulting buffer was non-transparent, and we can setHasAlpha(false).	262	// resulting buffer was non-transparent, and we can setHasAlpha(false).
263	if (buffer.originalFrameRect().contains(IntRect(IntPoint(), scaledSize())))	263	if (buffer.pixels()->rect().contains(IntRect(IntPoint(), scaledSize())))
264	buffer.setHasAlpha(false);	264	buffer.setHasAlpha(false);
265	else if (frameIndex) {	265	else if (frameIndex) {
266	// Tricky case. This frame does not have alpha only if everywhere	266	// Tricky case. This frame does not have alpha only if everywhere
Lines 283-289 bool GIFImageDecoder::frameComplete(unsigned frameIndex, unsigned frameDuration, a/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp_sec3
283	// The only remaining case is a DisposeOverwriteBgcolor frame. If	283	// The only remaining case is a DisposeOverwriteBgcolor frame. If
284	// it had no alpha, and its rect is contained in the current frame's	284	// it had no alpha, and its rect is contained in the current frame's
285	// rect, we know the current frame has no alpha.	285	// rect, we know the current frame has no alpha.
286	if ((prevBuffer->disposalMethod() == ImageFrame::DisposeOverwriteBgcolor) && !prevBuffer->hasAlpha() && buffer.originalFrameRect().contains(prevBuffer->originalFrameRect()))	286	if ((prevBuffer->disposalMethod() == ImageFrame::DisposeOverwriteBgcolor) && !prevBuffer->hasAlpha() && buffer.pixels()->rect().contains(prevBuffer->pixels()->rect()))
287	buffer.setHasAlpha(false);	287	buffer.setHasAlpha(false);
288	}	288	}
289	}	289	}
Lines 353-363 bool GIFImageDecoder::initFrameBuffer(unsigned frameIndex) a/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp_sec4
353	frameRect.setHeight(size().height() - frameContext->yOffset);	353	frameRect.setHeight(size().height() - frameContext->yOffset);
354		354
355	ImageFrame* const buffer = &m_frameBufferCache[frameIndex];	355	ImageFrame* const buffer = &m_frameBufferCache[frameIndex];
356	int left = upperBoundScaledX(frameRect.x());
357	int right = lowerBoundScaledX(frameRect.maxX(), left);
358	int top = upperBoundScaledY(frameRect.y());
359	int bottom = lowerBoundScaledY(frameRect.maxY(), top);
360	buffer->setOriginalFrameRect(IntRect(left, top, right - left, bottom - top));
361		356
362	if (!frameIndex) {	357	if (!frameIndex) {
363	// This is the first frame, so we're not relying on any previous data.	358	// This is the first frame, so we're not relying on any previous data.
Lines 387-393 bool GIFImageDecoder::initFrameBuffer(unsigned frameIndex) a/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp_sec5
387	} else {	382	} else {
388	// We want to clear the previous frame to transparent, without	383	// We want to clear the previous frame to transparent, without
389	// affecting pixels in the image outside of the frame.	384	// affecting pixels in the image outside of the frame.
390	const IntRect& prevRect = prevBuffer->originalFrameRect();	385	const IntRect& prevRect = prevBuffer->pixels()->rect();
391	const IntSize& bufferSize = scaledSize();	386	const IntSize& bufferSize = scaledSize();
392	if (!frameIndex \|\| prevRect.contains(IntRect(IntPoint(), scaledSize()))) {	387	if (!frameIndex \|\| prevRect.contains(IntRect(IntPoint(), scaledSize()))) {
393	// Clearing the first frame, or a frame the size of the whole	388	// Clearing the first frame, or a frame the size of the whole
Lines 402-407 bool GIFImageDecoder::initFrameBuffer(unsigned frameIndex) a/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp_sec6
402	}	397	}
403	}	398	}
404	}	399	}
		400
		401	int left = upperBoundScaledX(frameRect.x());
		402	int right = lowerBoundScaledX(frameRect.maxX(), left);
		403	int top = upperBoundScaledY(frameRect.y());
		404	int bottom = lowerBoundScaledY(frameRect.maxY(), top);
		405	buffer->pixels()->setRect(IntRect(left, top, right - left, bottom - top));
405		406
406	// Update our status to be partially complete.	407	// Update our status to be partially complete.
407	buffer->setStatus(ImageFrame::FramePartial);	408	buffer->setStatus(ImageFrame::FramePartial);

Lines 588-594 bool JPEGImageDecoder::setFailed() a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp_sec1
- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp -5 / +2 lines
588	}	588	}
589		589
590	template <J_COLOR_SPACE colorSpace>	590	template <J_COLOR_SPACE colorSpace>
591	void setPixel(ImageFrame& buffer, ImageFrame::PixelData* currentAddress, JSAMPARRAY samples, int column)	591	void setPixel(ImageFrame& buffer, RGBA32* currentAddress, JSAMPARRAY samples, int column)
592	{	592	{
593	JSAMPLE* jsample = samples + column (colorSpace == JCS_RGB ? 3 : 4);	593	JSAMPLE* jsample = samples + column (colorSpace == JCS_RGB ? 3 : 4);
594		594
Lines 631-637 bool JPEGImageDecoder::outputScanlines(ImageFrame& buffer) a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp_sec2
631	if (destY < 0)	631	if (destY < 0)
632	continue;	632	continue;
633		633
634	ImageFrame::PixelData* currentAddress = buffer.getAddr(0, destY);	634	RGBA32* currentAddress = buffer.getAddr(0, destY);
635	for (int x = 0; x < width; ++x) {	635	for (int x = 0; x < width; ++x) {
636	setPixel<colorSpace>(buffer, currentAddress, samples, isScaled ? m_scaledColumns[x] : x);	636	setPixel<colorSpace>(buffer, currentAddress, samples, isScaled ? m_scaledColumns[x] : x);
637	++currentAddress;	637	++currentAddress;
Lines 661-669 bool JPEGImageDecoder::outputScanlines() a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp_sec3
661	// loading. The completed image will be marked fully opaque in jpegComplete().	661	// loading. The completed image will be marked fully opaque in jpegComplete().
662	buffer.setHasAlpha(true);	662	buffer.setHasAlpha(true);
663	buffer.setColorProfile(m_colorProfile);	663	buffer.setColorProfile(m_colorProfile);
664
665	// For JPEGs, the frame always fills the entire image.
666	buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
667	}	664	}
668		665
669	jpeg_decompress_struct* info = m_reader->info();	666	jpeg_decompress_struct* info = m_reader->info();

Lines 452-470 void PNGImageDecoder::headerAvailable() a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp_sec1
- a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp -18 / +16 lines
452	}	452	}
453	}	453	}
454		454
455	static inline void setPixelRGB(ImageFrame::PixelData* dest, png_bytep pixel)	455	static inline void setPixelRGB(RGBA32* dest, png_bytep pixel)
456	{	456	{
457	*dest = 0xFF000000U \| pixel[0] << 16 \| pixel[1] << 8 \| pixel[2];	457	*dest = 0xFF000000U \| pixel[0] << 16 \| pixel[1] << 8 \| pixel[2];
458	}	458	}
459		459
460	static inline void setPixelRGBA(ImageFrame::PixelData* dest, png_bytep pixel, unsigned char& nonTrivialAlphaMask)	460	static inline void setPixelRGBA(RGBA32* dest, png_bytep pixel, unsigned char& nonTrivialAlphaMask)
461	{	461	{
462	unsigned char a = pixel[3];	462	unsigned char a = pixel[3];
463	*dest = a << 24 \| pixel[0] << 16 \| pixel[1] << 8 \| pixel[2];	463	*dest = a << 24 \| pixel[0] << 16 \| pixel[1] << 8 \| pixel[2];
464	nonTrivialAlphaMask \|= (255 - a);	464	nonTrivialAlphaMask \|= (255 - a);
465	}	465	}
466		466
467	static inline void setPixelPremultipliedRGBA(ImageFrame::PixelData* dest, png_bytep pixel, unsigned char& nonTrivialAlphaMask)	467	static inline void setPixelPremultipliedRGBA(RGBA32* dest, png_bytep pixel, unsigned char& nonTrivialAlphaMask)
468	{	468	{
469	unsigned char a = pixel[3];	469	unsigned char a = pixel[3];
470	unsigned char r = fastDivideBy255(pixel[0] * a);	470	unsigned char r = fastDivideBy255(pixel[0] * a);
Lines 511-520 void PNGImageDecoder::rowAvailable(unsigned char* rowBuffer, unsigned rowIndex, a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp_sec2
511	#if ENABLE(APNG)	511	#if ENABLE(APNG)
512	if (m_currentFrame)	512	if (m_currentFrame)
513	initFrameBuffer(m_currentFrame);	513	initFrameBuffer(m_currentFrame);
514	else
515	#endif	514	#endif
516	// For PNGs, the frame always fills the entire image.
517	buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
518	}	515	}
519		516
520	/* libpng comments (here to explain what follows).	517	/* libpng comments (here to explain what follows).
Lines 573-579 void PNGImageDecoder::rowAvailable(unsigned char* rowBuffer, unsigned rowIndex, a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp_sec3
573	}	570	}
574		571
575	// Write the decoded row pixels to the frame buffer.	572	// Write the decoded row pixels to the frame buffer.
576	ImageFrame::PixelData* address = buffer.getAddr(0, y);	573	RGBA32* address = buffer.getAddr(0, y);
577	int width = scaledSize().width();	574	int width = scaledSize().width();
578	unsigned char nonTrivialAlphaMask = 0;	575	unsigned char nonTrivialAlphaMask = 0;
579		576
Lines 834-844 void PNGImageDecoder::initFrameBuffer(size_t frameIndex) a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp_sec4
834	frameRect.setHeight(size().height() - m_yOffset);	831	frameRect.setHeight(size().height() - m_yOffset);
835		832
836	ImageFrame& buffer = m_frameBufferCache[frameIndex];	833	ImageFrame& buffer = m_frameBufferCache[frameIndex];
837	int left = upperBoundScaledX(frameRect.x());
838	int right = lowerBoundScaledX(frameRect.maxX(), left);
839	int top = upperBoundScaledY(frameRect.y());
840	int bottom = lowerBoundScaledY(frameRect.maxY(), top);
841	buffer.setOriginalFrameRect(IntRect(left, top, right - left, bottom - top));
842		834
843	// The starting state for this frame depends on the previous frame's	835	// The starting state for this frame depends on the previous frame's
844	// disposal method.	836	// disposal method.
Lines 862-868 void PNGImageDecoder::initFrameBuffer(size_t frameIndex) a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp_sec5
862	} else {	854	} else {
863	// We want to clear the previous frame to transparent, without	855	// We want to clear the previous frame to transparent, without
864	// affecting pixels in the image outside of the frame.	856	// affecting pixels in the image outside of the frame.
865	const IntRect& prevRect = prevBuffer->originalFrameRect();	857	const IntRect& prevRect = prevBuffer->pixels()->rect();
866	if (!frameIndex \|\| prevRect.contains(IntRect(IntPoint(), scaledSize()))) {	858	if (!frameIndex \|\| prevRect.contains(IntRect(IntPoint(), scaledSize()))) {
867	// Clearing the first frame, or a frame the size of the whole	859	// Clearing the first frame, or a frame the size of the whole
868	// image, results in a completely empty image.	860	// image, results in a completely empty image.
Lines 873-878 void PNGImageDecoder::initFrameBuffer(size_t frameIndex) a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp_sec6
873	buffer.zeroFillFrameRect(prevRect);	865	buffer.zeroFillFrameRect(prevRect);
874	}	866	}
875	}	867	}
		868
		869	int left = upperBoundScaledX(frameRect.x());
		870	int right = lowerBoundScaledX(frameRect.maxX(), left);
		871	int top = upperBoundScaledY(frameRect.y());
		872	int bottom = lowerBoundScaledY(frameRect.maxY(), top);
		873	buffer.pixels()->setRect(IntRect(left, top, right - left, bottom - top));
876	}	874	}
877		875
878	void PNGImageDecoder::frameComplete()	876	void PNGImageDecoder::frameComplete()
Lines 886-892 void PNGImageDecoder::frameComplete() a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp_sec7
886	png_bytep interlaceBuffer = m_reader->interlaceBuffer();	884	png_bytep interlaceBuffer = m_reader->interlaceBuffer();
887		885
888	if (m_currentFrame && interlaceBuffer) {	886	if (m_currentFrame && interlaceBuffer) {
889	const IntRect& rect = buffer.originalFrameRect();	887	const IntRect& rect = buffer.pixels()->rect();
890	bool hasAlpha = m_reader->hasAlpha();	888	bool hasAlpha = m_reader->hasAlpha();
891	unsigned colorChannels = hasAlpha ? 4 : 3;	889	unsigned colorChannels = hasAlpha ? 4 : 3;
892	bool nonTrivialAlpha = false;	890	bool nonTrivialAlpha = false;
Lines 896-902 void PNGImageDecoder::frameComplete() a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp_sec8
896	#if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)	894	#if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
897	for (int y = 0; y < rect.maxY() - rect.y(); ++y) {	895	for (int y = 0; y < rect.maxY() - rect.y(); ++y) {
898	png_bytep row = interlaceBuffer + (m_scaled ? m_scaledRows[y] : y) * colorChannels * size().width();	896	png_bytep row = interlaceBuffer + (m_scaled ? m_scaledRows[y] : y) * colorChannels * size().width();
899	ImageFrame::PixelData* address = buffer.getAddr(rect.x(), y + rect.y());	897	RGBA32* address = buffer.getAddr(rect.x(), y + rect.y());
900	for (int x = 0; x < rect.maxX() - rect.x(); ++x) {	898	for (int x = 0; x < rect.maxX() - rect.x(); ++x) {
901	png_bytep pixel = row + (m_scaled ? m_scaledColumns[x] : x) * colorChannels;	899	png_bytep pixel = row + (m_scaled ? m_scaledColumns[x] : x) * colorChannels;
902	unsigned alpha = hasAlpha ? pixel[3] : 255;	900	unsigned alpha = hasAlpha ? pixel[3] : 255;
Lines 912-918 void PNGImageDecoder::frameComplete() a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp_sec9
912	png_bytep row = interlaceBuffer;	910	png_bytep row = interlaceBuffer;
913	for (int y = rect.y(); y < rect.maxY(); ++y, row += colorChannels * size().width()) {	911	for (int y = rect.y(); y < rect.maxY(); ++y, row += colorChannels * size().width()) {
914	png_bytep pixel = row;	912	png_bytep pixel = row;
915	ImageFrame::PixelData* address = buffer.getAddr(rect.x(), y);	913	RGBA32* address = buffer.getAddr(rect.x(), y);
916	for (int x = rect.x(); x < rect.maxX(); ++x, pixel += colorChannels) {	914	for (int x = rect.x(); x < rect.maxX(); ++x, pixel += colorChannels) {
917	unsigned alpha = hasAlpha ? pixel[3] : 255;	915	unsigned alpha = hasAlpha ? pixel[3] : 255;
918	nonTrivialAlpha \|= alpha < 255;	916	nonTrivialAlpha \|= alpha < 255;
Lines 925-931 void PNGImageDecoder::frameComplete() a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp_sec10
925	#endif	923	#endif
926		924
927	if (!nonTrivialAlpha) {	925	if (!nonTrivialAlpha) {
928	if (buffer.originalFrameRect().contains(IntRect(IntPoint(), scaledSize())))	926	if (buffer.pixels()->rect().contains(IntRect(IntPoint(), scaledSize())))
929	buffer.setHasAlpha(false);	927	buffer.setHasAlpha(false);
930	else {	928	else {
931	size_t frameIndex = m_currentFrame;	929	size_t frameIndex = m_currentFrame;
Lines 933-939 void PNGImageDecoder::frameComplete() a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp_sec11
933	while (frameIndex && (prevBuffer->disposalMethod() == ImageFrame::DisposeOverwritePrevious))	931	while (frameIndex && (prevBuffer->disposalMethod() == ImageFrame::DisposeOverwritePrevious))
934	prevBuffer = &m_frameBufferCache[--frameIndex];	932	prevBuffer = &m_frameBufferCache[--frameIndex];
935	if ((prevBuffer->disposalMethod() == ImageFrame::DisposeOverwriteBgcolor)	933	if ((prevBuffer->disposalMethod() == ImageFrame::DisposeOverwriteBgcolor)
936	&& !prevBuffer->hasAlpha() && buffer.originalFrameRect().contains(prevBuffer->originalFrameRect()))	934	&& !prevBuffer->hasAlpha() && buffer.pixels()->rect().contains(prevBuffer->pixels()->rect()))
937	buffer.setHasAlpha(false);	935	buffer.setHasAlpha(false);
938	}	936	}
939	} else if (!m_blend && !buffer.hasAlpha())	937	} else if (!m_blend && !buffer.hasAlpha())

Lines 132-145 bool WEBPImageDecoder::decode(bool onlySize) a/Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp_sec1
- a/Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp -2 / +1 lines
132	return setFailed();	132	return setFailed();
133	buffer.setStatus(ImageFrame::FramePartial);	133	buffer.setStatus(ImageFrame::FramePartial);
134	buffer.setHasAlpha(m_hasAlpha);	134	buffer.setHasAlpha(m_hasAlpha);
135	buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
136	}	135	}
137		136
138	if (!m_decoder) {	137	if (!m_decoder) {
139	WEBP_CSP_MODE mode = outputMode(m_hasAlpha);	138	WEBP_CSP_MODE mode = outputMode(m_hasAlpha);
140	if (!m_premultiplyAlpha)	139	if (!m_premultiplyAlpha)
141	mode = outputMode(false);	140	mode = outputMode(false);
142	int rowStride = size().width() * sizeof(ImageFrame::PixelData);	141	int rowStride = size().width() * sizeof(RGBA32);
143	uint8_t* output = reinterpret_cast<uint8_t*>(buffer.getAddr(0, 0));	142	uint8_t* output = reinterpret_cast<uint8_t*>(buffer.getAddr(0, 0));
144	int outputSize = size().height() * rowStride;	143	int outputSize = size().height() * rowStride;
145	m_decoder = WebPINewRGB(mode, output, outputSize, rowStride);	144	m_decoder = WebPINewRGB(mode, output, outputSize, rowStride);

Lines 136-144 DragImageRef createDragImageFromImage(Image* img, ImageOrientationDescription) a/Source/WebCore/platform/win/DragImageCGWin.cpp_sec1
- a/Source/WebCore/platform/win/DragImageCGWin.cpp -2 / +2 lines
136	CGContextScaleCTM(drawContext, 1, -1);	136	CGContextScaleCTM(drawContext, 1, -1);
137	CGContextSetFillColor(drawContext, white);	137	CGContextSetFillColor(drawContext, white);
138	CGContextFillRect(drawContext, rect);	138	CGContextFillRect(drawContext, rect);
139	if (auto srcImage = img->getCGImageRef()) {	139	if (auto srcImage = img->nativeImage()) {
140	CGContextSetBlendMode(drawContext, kCGBlendModeNormal);	140	CGContextSetBlendMode(drawContext, kCGBlendModeNormal);
141	CGContextDrawImage(drawContext, rect, srcImage);	141	CGContextDrawImage(drawContext, rect, srcImage.get());
142	}	142	}
143	CGContextRelease(drawContext);	143	CGContextRelease(drawContext);
144		144

Lines 37-48 using namespace WebCore; a/Source/WebKit2/UIProcess/API/C/cg/WKIconDatabaseCG.cpp_sec1
- a/Source/WebKit2/UIProcess/API/C/cg/WKIconDatabaseCG.cpp -2 / +13 lines
37	CGImageRef WKIconDatabaseTryGetCGImageForURL(WKIconDatabaseRef iconDatabaseRef, WKURLRef urlRef, WKSize size)	37	CGImageRef WKIconDatabaseTryGetCGImageForURL(WKIconDatabaseRef iconDatabaseRef, WKURLRef urlRef, WKSize size)
38	{	38	{
39	Image* image = toImpl(iconDatabaseRef)->imageForPageURL(toWTFString(urlRef));	39	Image* image = toImpl(iconDatabaseRef)->imageForPageURL(toWTFString(urlRef));
40	return image ? image->getFirstCGImageRefOfSize(IntSize(static_cast<int>(size.width), static_cast<int>(size.height))) : 0;	40	return image ? image->nativeImageOfSize(IntSize(static_cast<int>(size.width), static_cast<int>(size.height))).get() : nullptr;
41	}	41	}
42		42
43	CFArrayRef WKIconDatabaseTryCopyCGImageArrayForURL(WKIconDatabaseRef iconDatabaseRef, WKURLRef urlRef)	43	CFArrayRef WKIconDatabaseTryCopyCGImageArrayForURL(WKIconDatabaseRef iconDatabaseRef, WKURLRef urlRef)
44	{	44	{
45	Image* image = toImpl(iconDatabaseRef)->imageForPageURL(toWTFString(urlRef));	45	Image* image = toImpl(iconDatabaseRef)->imageForPageURL(toWTFString(urlRef));
46	return image ? image->getCGImageArray().leakRef() : 0;	46	if (!image)
		47	return nullptr;
		48
		49	auto nativeImages = image->framesNativeImages();
		50	if (!nativeImages.size())
		51	return nullptr;
		52
		53	CFMutableArrayRef array = CFArrayCreateMutable(nullptr, nativeImages.size(), &kCFTypeArrayCallBacks);
		54	for (auto nativeImage : nativeImages)
		55	CFArrayAppendValue(array, nativeImage.get());
		56
		57	return static_cast<CFArrayRef>(CFRetain(array));
47	}	58	}
48		59