120771 2013-09-05 06:50:18 -0700 iOS build broke with change to make Mac use PDFKit for PDFDocumentImage 2013-09-05 12:24:35 -0700 1 1 1 Unclassified WebKit PDF 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Regression P2 Normal --- 1 ddkilzer thorton ap beidson oldest_to_newest 925002 0 ddkilzer 2013-09-05 06:50:18 -0700 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) ~~~~~~~~ ^ ~~~~~~~~~~ 925070 1 thorton 2013-09-05 09:15:51 -0700 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. 925113 2 210632 thorton 2013-09-05 10:31:22 -0700 Created attachment 210632 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. 925128 3 thorton 2013-09-05 10:58:48 -0700 (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. 925154 4 thorton 2013-09-05 12:24:35 -0700 http://trac.webkit.org/changeset/155138 210632 2013-09-05 10:31:22 -0700 2013-09-05 12:10:00 -0700 patch iospdf.diff text/plain 2388 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlMDE3M2QxLi4xNmU0M2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTMtMDktMDUgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgaU9TIGJ1aWxkIGJyb2tlIHdpdGggY2hhbmdlIHRvIG1ha2UgTWFjIHVzZSBQREZL aXQgZm9yIFBERkRvY3VtZW50SW1hZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEyMDc3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2cvUERGRG9jdW1lbnRJbWFnZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpQREZEb2N1bWVudEltYWdlOjpjcmVhdGVQREZEb2N1bWVu dCk6CisgICAgICAgIFVzZSB0aGUgKHJlbW92ZWQgaW4gcjE1NTA2OSkgUExBVEZPUk0oTUFDKSB3 YXkgb2YgbWFraW5nIGEgQ0dEYXRhUHJvdmlkZXIgZnJvbSBhIFNoYXJlZEJ1ZmZlcgorICAgICAg ICBldmVyeXdoZXJlOyB0aGlzIGlzIHdoYXQgaU9TIHdhcyBleHBlY3RpbmcgdG8gdXNlICh3aGVy ZSBJIGFjY2lkZW50YWxseSBjaGFuZ2VkIGJlaGF2aW9yKSwKKyAgICAgICAgYW5kIGl0IHNob3Vs ZCBhbHNvIHdvcmsgZm9yIFdpbmRvd3MsIHRoZSBvbmx5IG90aGVyIFVTRShDRykgcGxhdGZvcm0u CisKKyAgICAgICAgU2luY2Ugd2Ugb25seSBjcmVhdGVQREZEb2N1bWVudCgpIGFmdGVyIGFsbCBk YXRhIGhhcyBiZWVuIHJlY2VpdmVkLCBJJ20gbm90CisgICAgICAgIHJlc3RvcmluZyB0aGUgY29t bWVudCBhYm91dCB0aGUgU2hhcmVkQnVmZmVyIGJlaW5nIHNlY3JldGx5IHdyaXR0ZW4gdG8gYmVo aW5kIGl0cyBiYWNrLgorCiAyMDEzLTA5LTA0ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBh cHBsZS5jb20+CiAKICAgICAgICAgVmVjdG9yOjpyZWxlYXNlQnVmZmVyIHNob3VsZCByZXR1cm4g YW4gT3duUHRyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j Zy9QREZEb2N1bWVudEltYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NnL1BERkRvY3VtZW50SW1hZ2UuY3BwCmluZGV4IGE5OWI4YTEuLjlhZjY5Y2QgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL1BERkRvY3VtZW50SW1hZ2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL1BERkRvY3VtZW50 SW1hZ2UuY3BwCkBAIC0xNDUsMTMgKzE0NSw4IEBAIHZvaWQgUERGRG9jdW1lbnRJbWFnZTo6ZHJh dyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEZsb2F0UmVjdCYgZHN0UmVjdCwKICNp ZiAhVVNFKFBERktJVF9GT1JfUERGRE9DVU1FTlRJTUFHRSkKIHZvaWQgUERGRG9jdW1lbnRJbWFn ZTo6Y3JlYXRlUERGRG9jdW1lbnQoKQogewotICAgIC8vIENyZWF0ZSBhIENHRGF0YVByb3ZpZGVy IHRvIHdyYXAgdGhlIFNoYXJlZEJ1ZmZlci4KLSAgICAvLyBXZSB1c2UgdGhlIEdldEJ5dGVzQXRQ b3NpdGlvbiBjYWxsYmFjayByYXRoZXIgdGhhbiB0aGUgR2V0Qnl0ZVBvaW50ZXIgb25lIGJlY2F1 c2UgU2hhcmVkQnVmZmVyCi0gICAgLy8gZG9lcyBub3QgcHJvdmlkZSBhIHdheSB0byBsb2NrIGRv d24gdGhlIGJ5dGUgcG9pbnRlciBhbmQgZ3VhcmFudGVlIHRoYXQgaXQgd29uJ3QgbW92ZSwgd2hp Y2gKLSAgICAvLyBpcyBhIHJlcXVpcmVtZW50IGZvciB1c2luZyB0aGUgR2V0Qnl0ZVBvaW50ZXIg Y2FsbGJhY2suCi0KLSAgICBDR0RhdGFQcm92aWRlckRpcmVjdENhbGxiYWNrcyBwcm92aWRlckNh bGxiYWNrcyA9IHsgMCwgMCwgMCwgc2hhcmVkQnVmZmVyR2V0Qnl0ZXNBdFBvc2l0aW9uLCAwIH07 Ci0gICAgUmV0YWluUHRyPENHRGF0YVByb3ZpZGVyUmVmPiBkYXRhUHJvdmlkZXIgPSBhZG9wdENG KENHRGF0YVByb3ZpZGVyQ3JlYXRlRGlyZWN0KHRoaXMtPmRhdGEoKSwgdGhpcy0+ZGF0YSgpLT5z aXplKCksICZwcm92aWRlckNhbGxiYWNrcykpOworICAgIFJldGFpblB0cjxDRkRhdGFSZWY+IGRh dGEgPSBhZG9wdENGKHRoaXMtPmRhdGEoKS0+Y3JlYXRlQ0ZEYXRhKCkpOworICAgIFJldGFpblB0 cjxDR0RhdGFQcm92aWRlclJlZj4gZGF0YVByb3ZpZGVyID0gYWRvcHRDRihDR0RhdGFQcm92aWRl ckNyZWF0ZVdpdGhDRkRhdGEoZGF0YS5nZXQoKSkpOwogICAgIG1fZG9jdW1lbnQgPSBDR1BERkRv Y3VtZW50Q3JlYXRlV2l0aFByb3ZpZGVyKGRhdGFQcm92aWRlci5nZXQoKSk7CiB9CiAK