Bug 120771 – iOS build broke with change to make Mac use PDFKit for PDFDocumentImage

• Status: RESOLVED
• Resolution: FIXED
• Component: PDF

[David Kilzer (:ddkilzer)]

The fix for Bug 120651 ([mac] PDFDocumentImage should use PDFKit to draw) caused in <http://trac.webkit.org/changeset/155069> caused a build failure on iOS because macros used to guard sharedBufferGetBytesAtPosition() are now inconsistent.

In these two files, !PLATFORM(MAC) is used:

Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp
Source/WebCore/platform/graphics/cg/ImageSourceCG.h

In this file, !USE(PDFKIT_FOR_PDFDOCUMENTIMAGE) is used:

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

I'm also seeing a new build failure (although I suspect this code wasn't being compiled before):

Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp:67:18: error: comparison o
f integers of different signs: 'off_t' (aka 'long long') and 'size_t' (aka 'unsigned long') [-Werror,-Wsign-compare]
    if (position >= sourceSize)
        ~~~~~~~~ ^  ~~~~~~~~~~

[Tim Horton]

Oh, I see. I never revised that part of the change after Alexey reminded me that PLATFORM(MAC) includes iOS. I'll post a patch.

[Tim Horton]

Created attachment 210632 [details]
patch

This should fix the iOS build by restoring the code that was previously being used there.
This should also work fine on Windows, but I'm going to test on a trybot momentarily.

[Tim Horton]

(In reply to comment #2)
> Created an attachment (id=210632) [details]
> patch
> 
> This should fix the iOS build by restoring the code that was previously being used there.
> This should also work fine on Windows, but I'm going to test on a trybot momentarily.

Looks good on Windows.

[Tim Horton]

http://trac.webkit.org/changeset/155138