ChangeLog

2018-01-25  Said Abou-Hallawa  <sabouhallawa@apple.com>

        REGRESSION(r217236): [iOS] PDFDocumentImage does not update its cached ImageBuffer if it has a sub-rectangle of the image

        https://bugs.webkit.org/show_bug.cgi?id=182083

        Reviewed by NOBODY (OOPS!).

        Revert the change r217236 back and fix the issue of throwing the cached

        ImageBuffer of the PDF document because of moving its rectangle.

        Test: fast/images/pdf-as-image-dest-rect-change.html

        * platform/graphics/cg/PDFDocumentImage.cpp:

        (WebCore::PDFDocumentImage::cacheParametersMatch const):

        (WebCore::PDFDocumentImage::updateCachedImageIfNeeded):

        * platform/graphics/cg/PDFDocumentImage.h:

        * testing/Internals.cpp:

        (WebCore::pdfDocumentImageFromImageElement):

        (WebCore::Internals::pdfDocumentCachingCount):

        * testing/Internals.h:

        * testing/Internals.idl:

2018-01-25  Zan Dobersek  <zdobersek@igalia.com>

        [Cairo] Use GraphicsContextImplCairo in Nicosia::PaintingContextCairo

227610

Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp

@@bool PDFDocumentImage::cacheParametersMa

    if (srcRect != m_cachedSourceRect)

        return false;

    if (dstRect != m_cachedImageRect && !m_cachedImageRect.contains(context.clipBounds()))

        return false;

    AffineTransform::DecomposedType decomposedTransform;

    context.getCTM(GraphicsContext::DefinitelyIncludeDeviceScale).decompose(decomposedTransform);

@@void PDFDocumentImage::updateCachedImage

    bool repaintIfNecessary = interpolationQuality != InterpolationNone && interpolationQuality != InterpolationLow;

#endif

    // Clipped option is for testing only. Force recaching the PDF with each draw.

    if (m_pdfImageCachingPolicy != PDFImageCachingClipBoundsOnly) {

        // The whole dstRect is cached so it does not matter where it will be displayed.

        if (dstRect.size() == m_cachedImageRect.size())

            m_cachedImageRect = dstRect;

        if (m_cachedImageBuffer && (!repaintIfNecessary || cacheParametersMatch(context, dstRect, srcRect)))

            return;

    }

    switch (m_pdfImageCachingPolicy) {

    case PDFImageCachingDisabled:

        return;

@@void PDFDocumentImage::updateCachedImage

        break;

    }

    // Clipped option is for testing only. Force recaching the PDF with each draw.

    if (m_pdfImageCachingPolicy != PDFImageCachingClipBoundsOnly) {

        if (m_cachedImageBuffer && (!repaintIfNecessary || cacheParametersMatch(context, dstRect, srcRect)))

            return;

    }

    FloatSize cachedImageSize = FloatRect(enclosingIntRect(m_cachedImageRect)).size();

    // Cache the PDF image only if the size of the new image won't exceed the cache threshold.

@@void PDFDocumentImage::updateCachedImage

    m_cachedTransform = context.getCTM(GraphicsContext::DefinitelyIncludeDeviceScale);

    m_cachedDestinationSize = dstRect.size();

    m_cachedSourceRect = srcRect;

259 ++m_cachingCountForTesting;

    IntSize internalSize = m_cachedImageBuffer->internalSize();

    decodedSizeChanged(internalSize.unclampedArea() * 4);

227422

Source/WebCore/platform/graphics/cg/PDFDocumentImage.h

@@public:

    WEBCORE_EXPORT static RetainPtr<CFMutableDataRef> convertPostScriptDataToPDF(RetainPtr<CFDataRef>&& postScriptData);

#endif

62 unsigned cachingCountForTesting() const { return m_cachingCountForTesting; }

63

private:

    PDFDocumentImage(ImageObserver*);

    virtual ~PDFDocumentImage();

@@private:

    FloatSize m_cachedDestinationSize;

    FloatRect m_cachedSourceRect;

    size_t m_cachedBytes { 0 };

111 unsigned m_cachingCountForTesting { 0 };

    FloatRect m_cropBox;

    int m_rotationDegrees { 0 }; // Can only be 0, 90, 180, or 270 degrees.

227422

Source/WebCore/testing/Internals.cpp

#include "MockLibWebRTCPeerConnection.h"

#include "MockPageOverlay.h"

#include "MockPageOverlayClient.h"

#if USE(CG)

#include "PDFDocumentImage.h"

#endif

#include "Page.h"

#include "PageCache.h"

#include "PageOverlay.h"

@@static BitmapImage* bitmapImageFromImage

    return image && is<BitmapImage>(image) ? &downcast<BitmapImage>(*image) : nullptr;

}

#if USE(CG)

static PDFDocumentImage* pdfDocumentImageFromImageElement(HTMLImageElement& element)

{

    auto* image = imageFromImageElement(element);

    return image && is<PDFDocumentImage>(image) ? &downcast<PDFDocumentImage>(*image) : nullptr;

}

#endif

unsigned Internals::imageFrameIndex(HTMLImageElement& element)

{

    auto* bitmapImage = bitmapImageFromImageElement(element);

@@unsigned Internals::imageDecodeCount(HTM

    return bitmapImage ? bitmapImage->decodeCountForTesting() : 0;

}

unsigned Internals::pdfDocumentCachingCount(HTMLImageElement& element)

{

#if USE(CG)

    auto* pdfDocumentImage = pdfDocumentImageFromImageElement(element);

    return pdfDocumentImage ? pdfDocumentImage->cachingCountForTesting() : 0;

#else

    UNUSED_PARAM(element);

    return 0;

#endif

}

void Internals::setLargeImageAsyncDecodingEnabledForTesting(HTMLImageElement& element, bool enabled)

{

    if (auto* bitmapImage = bitmapImageFromImageElement(element))

227422

Source/WebCore/testing/Internals.h

@@public:

    bool isImageAnimating(HTMLImageElement&);

    void setClearDecoderAfterAsyncFrameRequestForTesting(HTMLImageElement&, bool enabled);

    unsigned imageDecodeCount(HTMLImageElement&);

142 unsigned pdfDocumentCachingCount(HTMLImageElement&);

    void setLargeImageAsyncDecodingEnabledForTesting(HTMLImageElement&, bool enabled);

    void setGridMaxTracksLimit(unsigned);

227422

Source/WebCore/testing/Internals.idl

@@enum EventThrottlingBehavior {

    boolean isImageAnimating(HTMLImageElement element);

    void setClearDecoderAfterAsyncFrameRequestForTesting(HTMLImageElement element, boolean enabled);

    unsigned long imageDecodeCount(HTMLImageElement element);

265 unsigned long pdfDocumentCachingCount(HTMLImageElement element);

    void setLargeImageAsyncDecodingEnabledForTesting(HTMLImageElement element, boolean enabled);

    void setGridMaxTracksLimit(unsigned long maxTracksLimit);

227422

LayoutTests/ChangeLog

2018-01-25  Said Abou-Hallawa  <sabouhallawa@apple.com>

        REGRESSION(r217236): [iOS] PDFDocumentImage does not update its cached ImageBuffer if it has a sub-rectangle of the image

        https://bugs.webkit.org/show_bug.cgi?id=182083

        Reviewed by NOBODY (OOPS!).

        PDFDocumentImage renders only on CG platforms. Also on Mac, caching the 

        PDF drawing might be disbaled for low quality image interpolation context.

        So enable the new test for iOS only.

        * TestExpectations:

        * fast/images/pdf-as-image-dest-rect-change-expected.txt: Added.

        * fast/images/pdf-as-image-dest-rect-change.html: Added.

        * platform/ios/TestExpectations:

2018-01-23  Andy Estes  <aestes@apple.com>

        Follow-up layout test fix after r227260.

227422

LayoutTests/TestExpectations

@@fast/attachment/attachment-borderless.ht

editing/selection/character-granularity-selected-range-after-dismissing-selection.html [ Skip ]

editing/selection/character-granularity-select-text-with-click-handler.html [ Skip ]

editing/selection/caret-after-tap-in-editable-selection.html [ Skip ]

113fast/images/pdf-as-image-dest-rect-change.html [ Skip ]

# Only iOS has selection UI drawn by UIKit

editing/selection/character-granularity-rect.html [ Skip ]

227422

LayoutTests/fast/images/pdf-as-image-dest-rect-change-expected.txt

Test the cached ImageBuffer of a PDF docoument image won't be thrown away if the image moves.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

PASS internals.pdfDocumentCachingCount(window.image) is 1

PASS successfullyParsed is true

TEST COMPLETE

nonexistent

LayoutTests/fast/images/pdf-as-image-dest-rect-change.html

<head>

    <style>

        img {

            width: 100px;

            height: 100px;

            position: absolute;

            top: 200px;

            }

    </style>

    <script src="../../resources/js-test-pre.js"></script>

</head>

<body>

    <img src="resources/annotation.pdf">

    <script>

        description("Test the cached ImageBuffer of a PDF docoument image won't be thrown away if the image moves.");

        jsTestIsAsync = true;

        function moveImageLoop(image, stepDistance, stepCount) {

            var step = 0;

            function loop() {

                image.style.left = step * stepDistance + 'px';

                if (++step < stepCount) {

                    requestAnimationFrame(loop);

                    return;

                }

                if (window.internals) {

                    window.image = image;

                    shouldBe("internals.pdfDocumentCachingCount(window.image)", "1");

                }

                finishJSTest();

            }

            loop();

        }

        moveImageLoop(document.querySelector("img"), 50, 10);

    </script>

    <script src="../../resources/js-test-post.js"></script>

</body>

nonexistent

LayoutTests/platform/ios/TestExpectations

@@media/video-seek-to-current-time.html [

fast/attachment/attachment-wrapping-action.html [ Pass ]

fast/attachment/attachment-borderless.html [ Pass ]

2802fast/images/pdf-as-image-dest-rect-change.html [ Pass ]

fast/events/page-visibility-iframe-move-test.html [ Skip ]

227422