108060 2013-01-28 00:55:05 -0800 PDFPlugin: getMainResourceDataOfFrame should return PDFPlugin's data so that Save... works 2013-01-28 13:45:23 -0800 1 1 1 Unclassified WebKit PDF 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton ap sam oldest_to_newest 817575 0 thorton 2013-01-28 00:55:05 -0800 Save... saves a zero-byte file right now. We should intercept getMainResourceDataOfFrame and extract the data from the plugin instead. <rdar://problem/13075454> 817599 1 184952 thorton 2013-01-28 01:25:57 -0800 Created attachment 184952 patch 818062 2 thorton 2013-01-28 13:45:23 -0800 http://trac.webkit.org/changeset/141004 184952 2013-01-28 01:25:57 -0800 2013-01-28 07:53:47 -0800 patch save.diff text/plain 7334 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1YWY2NzliLi5kYzQ4NzI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTMtMDEtMjggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgUERGUGx1Z2luOiBnZXRNYWluUmVzb3VyY2VEYXRhT2ZGcmFtZSBzaG91bGQgcmV0 dXJuIFBERlBsdWdpbidzIGRhdGEgc28gdGhhdCBTYXZlLi4uIHdvcmtzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDgwNjAKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzEzMDc1NDU0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2lu Lmg6IEltcGxlbWVudCBnZXRSZXNvdXJjZURhdGEuCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVn aW5zL1BERi9TaW1wbGVQREZQbHVnaW4uaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMv UERGL1NpbXBsZVBERlBsdWdpbi5tbTogSW1wbGVtZW50IGdldFJlc291cmNlRGF0YSwgcmV0dXJu aW5nIHRoZSBhY2N1bXVsYXRlZAorICAgICAgICBkYXRhIGlmIGl0IGV4aXN0cyBhbmQgaGFzIGZp bmlzaGVkIGxvYWRpbmcuCisgICAgICAgIChXZWJLaXQ6OlNpbXBsZVBERlBsdWdpbjo6Z2V0UmVz b3VyY2VEYXRhKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luLmg6IEFkZCBn ZXRSZXNvdXJjZURhdGEsIHdoaWNoIGhhbmRzIG91dCBhIHJhdyBwb2ludGVyL3NpemUgcGFpcgor ICAgICAgICB0byB0aGUgcGx1Z2luJ3MgIm1haW4gcmVzb3VyY2UiIGRhdGEuCisgICAgICAgICog V2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5Lmg6IEltcGxlbWVudCBnZXRSZXNvdXJjZURh dGEuCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwOgorICAgICAg ICAoV2ViS2l0OjpQbHVnaW5WaWV3OjpnZXRSZXNvdXJjZURhdGEpOiBGb3J3YXJkIGdldFJlc291 cmNlRGF0YSB0aHJvdWdoIHRvIHRoZSBwbHVnaW4uCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVn aW5zL1BsdWdpblZpZXcuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmdldE1haW5SZXNvdXJjZURhdGFPZkZyYW1l KTogSWYgdGhlIHJlcXVlc3RlZCBmcmFtZSBpcyBiYWNrZWQgYnkgYSBQbHVnaW5Eb2N1bWVudCwK KyAgICAgICAgYXR0ZW1wdCB0byBhc2sgdGhlIFBsdWdpblZpZXcgZm9yIGl0cyByZXNvdXJjZSBk YXRhLgorCiAyMDEzLTAxLTI3ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgog CiAgICAgICAgIEZpeCBsb2NhdGlvbiBvZiBzYW5kYm94IHByb2ZpbGVzIGluIGJ1aWx0IHByb2R1 Y3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2Nh cGUvTmV0c2NhcGVQbHVnaW4uaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9O ZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCmluZGV4IGY4ZmY5MjcuLmQwMTQ5NmQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBs dWdpbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9O ZXRzY2FwZVBsdWdpbi5oCkBAIC0yNDcsNiArMjQ3LDggQEAgcHJpdmF0ZToKICAgICAvLyBjb252 ZXJ0ZWQgKGlmIHRoZSB0cmFuc2Zvcm1hdGlvbiBtYXRyaXggaXNuJ3QgaW52ZXJ0aWJsZSkuCiAg ICAgYm9vbCBjb252ZXJ0RnJvbVJvb3RWaWV3KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb2lu dEluUm9vdFZpZXdDb29yZGluYXRlcywgV2ViQ29yZTo6SW50UG9pbnQmIHBvaW50SW5QbHVnaW5D b29yZGluYXRlcyk7CiAKKyAgICB2aXJ0dWFsIGJvb2wgZ2V0UmVzb3VyY2VEYXRhKGNvbnN0IHVu c2lnbmVkIGNoYXIqJiBieXRlcywgdW5zaWduZWQmIGxlbmd0aCkgY29uc3QgT1ZFUlJJREUgeyBy ZXR1cm4gZmFsc2U7IH0KKwogICAgIHZvaWQgdXBkYXRlTlBOUHJpdmF0ZU1vZGUoKTsKIAogI2lm IFBMVUdJTl9BUkNISVRFQ1RVUkUoV0lOKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL1BERi9TaW1wbGVQREZQbHVnaW4uaCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9QREYvU2ltcGxlUERGUGx1Z2luLmgKaW5kZXggMmY1ZWQyNS4uMWE2 NTFlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9T aW1wbGVQREZQbHVnaW4uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv UERGL1NpbXBsZVBERlBsdWdpbi5oCkBAIC0xNzcsNiArMTc3LDggQEAgcHJvdGVjdGVkOgogICAg IHZpcnR1YWwgdW5zaWduZWQgY291bnRGaW5kTWF0Y2hlcyhjb25zdCBTdHJpbmcmLCBXZWJDb3Jl OjpGaW5kT3B0aW9ucywgdW5zaWduZWQpIE9WRVJSSURFIHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0 dWFsIGJvb2wgZmluZFN0cmluZyhjb25zdCBTdHJpbmcmLCBXZWJDb3JlOjpGaW5kT3B0aW9ucywg dW5zaWduZWQpIE9WRVJSSURFIHsgcmV0dXJuIGZhbHNlOyB9CiAKKyAgICB2aXJ0dWFsIGJvb2wg Z2V0UmVzb3VyY2VEYXRhKGNvbnN0IHVuc2lnbmVkIGNoYXIqJiBieXRlcywgdW5zaWduZWQmIGxl bmd0aCkgY29uc3QgT1ZFUlJJREU7CisKICAgICBXZWJDb3JlOjpJbnRTaXplIG1fc2Nyb2xsT2Zm c2V0OwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL1BERi9TaW1wbGVQREZQbHVnaW4ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvUERGL1NpbXBsZVBERlBsdWdpbi5tbQppbmRleCA4YzMzODQ3Li5mMDcxMmI5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1NpbXBsZVBE RlBsdWdpbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1Np bXBsZVBERlBsdWdpbi5tbQpAQCAtNjcyLDYgKzY3MiwxOCBAQCB2b2lkIFNpbXBsZVBERlBsdWdp bjo6bWFudWFsU3RyZWFtRGlkRmluaXNoTG9hZGluZygpCiAgICAgcGRmRG9jdW1lbnREaWRMb2Fk KCk7CiB9CiAKK2Jvb2wgU2ltcGxlUERGUGx1Z2luOjpnZXRSZXNvdXJjZURhdGEoY29uc3QgdW5z aWduZWQgY2hhciomIGJ5dGVzLCB1bnNpZ25lZCYgbGVuZ3RoKSBjb25zdAoreworICAgIGlmICht X2RhdGEgJiYgbV9wZGZEb2N1bWVudCkgeworICAgICAgICBieXRlcyA9IENGRGF0YUdldEJ5dGVQ dHIobV9kYXRhLmdldCgpKTsKKyAgICAgICAgbGVuZ3RoID0gQ0ZEYXRhR2V0TGVuZ3RoKG1fZGF0 YS5nZXQoKSk7CisKKyAgICAgICAgcmV0dXJuIGxlbmd0aDsKKyAgICB9CisKKyAgICByZXR1cm4g ZmFsc2U7Cit9CisKIHZvaWQgU2ltcGxlUERGUGx1Z2luOjptYW51YWxTdHJlYW1EaWRGYWlsKGJv b2wpCiB7CiAgICAgbV9kYXRhLmNsZWFyKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luLmgKaW5kZXggMTMwZTNmNC4uOTk3NWJkMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4uaApAQCAtMjYzLDYgKzI2Myw4IEBAIHB1YmxpYzoK IAogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRBbHdheXNBdXRvU3RhcnQoKSBjb25zdCB7IHJldHVy biBmYWxzZTsgfQogCisgICAgdmlydHVhbCBib29sIGdldFJlc291cmNlRGF0YShjb25zdCB1bnNp Z25lZCBjaGFyKiYgYnl0ZXMsIHVuc2lnbmVkJiBsZW5ndGgpIGNvbnN0ID0gMDsKKwogcHJvdGVj dGVkOgogICAgIFBsdWdpbigpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9QbHVnaW5Qcm94eS5oCmluZGV4IGU3MzdkZWMuLjI0OGE3ZTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5oCkBAIC0xMzMsNiArMTMz LDggQEAgcHJpdmF0ZToKIAogICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50UG9pbnQgY29udmVydFRv Um9vdFZpZXcoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmKSBjb25zdCBPVkVSUklERTsKIAorICAg IHZpcnR1YWwgYm9vbCBnZXRSZXNvdXJjZURhdGEoY29uc3QgdW5zaWduZWQgY2hhciomIGJ5dGVz LCB1bnNpZ25lZCYgbGVuZ3RoKSBjb25zdCBPVkVSUklERSB7IHJldHVybiBmYWxzZTsgfQorCiAg ICAgZmxvYXQgY29udGVudHNTY2FsZUZhY3RvcigpOwogICAgIGJvb2wgbmVlZHNCYWNraW5nU3Rv cmUoKSBjb25zdDsKICAgICBib29sIHVwZGF0ZUJhY2tpbmdTdG9yZSgpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCmluZGV4IGYwOWU5MmIu LmRlN2Q5MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9Q bHVnaW5WaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1 Z2luVmlldy5jcHAKQEAgLTg3OSw2ICs4NzksMTQgQEAgYm9vbCBQbHVnaW5WaWV3OjpzaG91bGRB bGxvd05hdmlnYXRpb25Gcm9tRHJhZ3MoKSBjb25zdAogICAgIHJldHVybiBtX3BsdWdpbi0+c2hv dWxkQWxsb3dOYXZpZ2F0aW9uRnJvbURyYWdzKCk7CiB9CiAKK2Jvb2wgUGx1Z2luVmlldzo6Z2V0 UmVzb3VyY2VEYXRhKGNvbnN0IHVuc2lnbmVkIGNoYXIqJiBieXRlcywgdW5zaWduZWQmIGxlbmd0 aCkgY29uc3QKK3sKKyAgICBpZiAoIW1faXNJbml0aWFsaXplZCB8fCAhbV9wbHVnaW4pCisgICAg ICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiBtX3BsdWdpbi0+Z2V0UmVzb3VyY2VEYXRh KGJ5dGVzLCBsZW5ndGgpOworfQorCiB2b2lkIFBsdWdpblZpZXc6Om5vdGlmeVdpZGdldChXaWRn ZXROb3RpZmljYXRpb24gbm90aWZpY2F0aW9uKQogewogICAgIHN3aXRjaCAobm90aWZpY2F0aW9u KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu Vmlldy5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaApp bmRleCBhZDRhNGNiLi5jOWJhYjA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5WaWV3LmgKQEAgLTk5LDYgKzk5LDggQEAgcHVibGljOgogCiAgICAgYm9v bCBzaG91bGRBbGxvd1NjcmlwdGluZygpOwogCisgICAgYm9vbCBnZXRSZXNvdXJjZURhdGEoY29u c3QgdW5zaWduZWQgY2hhciomIGJ5dGVzLCB1bnNpZ25lZCYgbGVuZ3RoKSBjb25zdDsKKwogcHJp dmF0ZToKICAgICBQbHVnaW5WaWV3KFBhc3NSZWZQdHI8V2ViQ29yZTo6SFRNTFBsdWdJbkVsZW1l bnQ+LCBQYXNzUmVmUHRyPFBsdWdpbj4sIGNvbnN0IFBsdWdpbjo6UGFyYW1ldGVycyYgcGFyYW1l dGVycyk7CiAgICAgdmlydHVhbCB+UGx1Z2luVmlldygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDAwNjAxNjcuLjg5MTZmYjAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTIxNTgs OSArMjE1OCwxOSBAQCB2b2lkIFdlYlBhZ2U6OmdldE1haW5SZXNvdXJjZURhdGFPZkZyYW1lKHVp bnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCiAKICAgICBSZWZQdHI8UmVzb3Vy Y2VCdWZmZXI+IGJ1ZmZlcjsKICAgICBpZiAoV2ViRnJhbWUqIGZyYW1lID0gV2ViUHJvY2Vzczo6 c2hhcmVkKCkud2ViRnJhbWUoZnJhbWVJRCkpIHsKLSAgICAgICAgaWYgKERvY3VtZW50TG9hZGVy KiBsb2FkZXIgPSBmcmFtZS0+Y29yZUZyYW1lKCktPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigp KSB7Ci0gICAgICAgICAgICBpZiAoKGJ1ZmZlciA9IGxvYWRlci0+bWFpblJlc291cmNlRGF0YSgp KSkKLSAgICAgICAgICAgICAgICBkYXRhUmVmZXJlbmNlID0gQ29yZUlQQzo6RGF0YVJlZmVyZW5j ZShyZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPihidWZmZXItPmRhdGEoKSksIGJ1ZmZl ci0+c2l6ZSgpKTsKKyAgICAgICAgaWYgKFBsdWdpblZpZXcqIHBsdWdpblZpZXcgPSBwbHVnaW5W aWV3Rm9yRnJhbWUoZnJhbWUtPmNvcmVGcmFtZSgpKSkgeworICAgICAgICAgICAgY29uc3QgdW5z aWduZWQgY2hhciogYnl0ZXM7CisgICAgICAgICAgICB1bnNpZ25lZCBsZW5ndGg7CisKKyAgICAg ICAgICAgIGlmIChwbHVnaW5WaWV3LT5nZXRSZXNvdXJjZURhdGEoYnl0ZXMsIGxlbmd0aCkpCisg ICAgICAgICAgICAgICAgZGF0YVJlZmVyZW5jZSA9IENvcmVJUEM6OkRhdGFSZWZlcmVuY2UoYnl0 ZXMsIGxlbmd0aCk7CisgICAgICAgIH0KKworICAgICAgICBpZiAoZGF0YVJlZmVyZW5jZS5pc0Vt cHR5KCkpIHsKKyAgICAgICAgICAgIGlmIChEb2N1bWVudExvYWRlciogbG9hZGVyID0gZnJhbWUt PmNvcmVGcmFtZSgpLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKSkgeworICAgICAgICAgICAg ICAgIGlmICgoYnVmZmVyID0gbG9hZGVyLT5tYWluUmVzb3VyY2VEYXRhKCkpKQorICAgICAgICAg ICAgICAgICAgICBkYXRhUmVmZXJlbmNlID0gQ29yZUlQQzo6RGF0YVJlZmVyZW5jZShyZWludGVy cHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPihidWZmZXItPmRhdGEoKSksIGJ1ZmZlci0+c2l6ZSgp KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KIAo=