103285 2012-11-26 13:33:02 -0800 PDFPlugin: Cmd-/+ should affect PDF page scale 2013-01-10 10:43:41 -0800 1 1 1 Unclassified WebKit PDF 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca ap mitz sam oldest_to_newest 775826 0 thorton 2012-11-26 13:33:02 -0800 Plugins which support handling page scale themselves should also handle page zoom, as it is a very similar concept. <rdar://problem/12710469> 775915 1 176074 thorton 2012-11-26 14:45:10 -0800 Created attachment 176074 patch 775939 2 thorton 2012-11-26 15:05:02 -0800 Whoops, accidentally merged two patches together. Will fix. 775947 3 176082 thorton 2012-11-26 15:08:43 -0800 Created attachment 176082 actual patch 804471 4 176082 darin 2013-01-10 09:51:44 -0800 Comment on attachment 176082 actual patch OK 804529 5 thorton 2013-01-10 10:43:41 -0800 Thanks, Darin! http://trac.webkit.org/changeset/139340 176074 2012-11-26 14:45:10 -0800 2012-11-26 15:08:43 -0800 patch 0004-PDFPlugin-Cmd-should-affect-PDF-page-scale.patch text/plain 11893 thorton RnJvbSA4YjBiNGNjNjA5ZjdlNzM3YjYyYTNmNTAwNDQ0Y2I0ZTVmMzljYWIxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW0gSG9ydG9uIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+ CkRhdGU6IFdlZCwgMjEgTm92IDIwMTIgMDQ6NDM6MzMgLTA4MDAKU3ViamVjdDogW1BBVENIIDA0 LzExXSBQREZQbHVnaW46IENtZC0vKyBzaG91bGQgYWZmZWN0IFBERiBwYWdlIHNjYWxlCiBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzMjg1CiA8cmRhcjovL3Byb2Js ZW0vMTI3MTA0Njk+CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClBsdWdpbnMgd2hpY2gg c3VwcG9ydCBoYW5kbGluZyBwYWdlIHNjYWxlIHRoZW1zZWx2ZXMgc2hvdWxkIGFsc28gaGFuZGxl CnBhZ2Ugem9vbSwgYXMgaXQgaXMgYSB2ZXJ5IHNpbWlsYXIgY29uY2VwdC4KClRoaXMgcGF0Y2gg ZGlzYWJsZXMgdGV4dCB6b29tIGluIHRoZSBjYXNlIG9mIGEgbWFpbi1mcmFtZSBwbHVnaW4gd2hp Y2ggc3VwcG9ydHMKcGFnZSBzY2FsZSBmYWN0b3IgY2hhbmdlcywgYXMgaXQgaXMgbm90IG5lZWRl ZCBpbiB0aGUgUERGUGx1Z2luIGNhc2UKKHdlIGNhbid0IGRvIHRleHQtb25seSBzY2FsZSBmb3Ig UERGKSwgYnV0IGl0IGNvdWxkIGJlIGFkZGVkIGxhdGVyIGlmIG5lZWRlZC4KCiogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHA6CihXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cGFnZVpvb21GYWN0b3JE aWRDaGFuZ2UpOgoqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKFdlYlBhZ2VQcm94eSk6Ciog VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKQWRkIFdlYlBhZ2VQcm94eTo6cGFn ZVpvb21GYWN0b3JEaWRDaGFuZ2UsIHRvIG5vdGlmeSBXZWJQYWdlUHJveHkgb2YKb3V0LW9mLWJh bmQgcGFnZSB6b29tIGZhY3RvciBjaGFuZ2VzIChpbiB0aGlzIGNhc2UsIGZyb20gUGx1Z2luVmll dykuCgoqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKKFdlYktpdDo6UGx1Z2lu Vmlldzo6c2V0UGFnZVNjYWxlRmFjdG9yKToKVXBkYXRlIFdlYlBhZ2VQcm94eSdzIG5vdGlvbiBv ZiB0aGUgY3VycmVudCBwYWdlIHpvb20gd2hlbmV2ZXIgUGx1Z2luVmlldwppcyBub3RpZmllZCBv ZiBhIHBhZ2Ugc2NhbGUgZmFjdG9yIGNoYW5nZS4KCiogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwOgooV2ViS2l0OjpXZWJQYWdlOjpzZXRUZXh0Wm9vbUZhY3Rvcik6IFdlIGRvbid0IHN1 cHBvcnQgdGV4dCB6b29tIGluIHBsdWdpbnMsIGJ1dAp3ZSBhbHNvIGRvbid0IHdhbnQgaXQgdG8g c2lsZW50bHkgYWN0IG9uIHRoZSBGcmFtZSBpZiB3ZSBoYXZlIGEgcGx1Z2luIHRoYXQKcHVycG9y dHMgdG8gaGFuZGxlIHBhZ2Ugc2NhbGUgaXRzZWxmLiBSZXR1cm4gZWFybHkgaWYgdGhpcyBpcyB0 aGUgY2FzZS4KKFdlYktpdDo6V2ViUGFnZTo6cGFnZVpvb21GYWN0b3IpOiBGb3IgcGx1Z2lucyB0 aGF0IHN1cHBvcnQgcGFnZSBzY2FsZSBmYWN0b3IsCndlIGVxdWF0ZSBwYWdlIHNjYWxlIGFuZCBw YWdlIHpvb20uIFJldHVybiB0aGUgUGx1Z2luVmlldydzIHBhZ2Ugc2NhbGUgZmFjdG9yCmluIHBs YWNlIG9mIHRoZSBGcmFtZSdzIHBhZ2Ugem9vbSBmYWN0b3IuCihXZWJLaXQ6OldlYlBhZ2U6OnNl dFBhZ2Vab29tRmFjdG9yKTogTWFrZSBwYWdlIHpvb20gY2hhbmdlcyBpbiB0aGUgYWZvcmVtZW50 aW9uZWQKY2FzZSBhZmZlY3QgdGhlIFBsdWdpblZpZXcncyBwYWdlIHNjYWxlLgooV2ViS2l0OjpX ZWJQYWdlOjpzZXRQYWdlQW5kVGV4dFpvb21GYWN0b3JzKTogRGl0dG8uCi0tLQogU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDYyICsrKysrKysr KysrKysrKysrKysrCiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCAg ICAgICAgICB8ICAgIDUgKysKIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aCAgICAgICAgICAgIHwgICAgMSArCiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5Lm1lc3NhZ2VzLmluICB8ICAgIDEgKwogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL1BERi9QREZQbHVnaW4uaCAgfCAgICAxICsKIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9QREYvUERGUGx1Z2luLm1tIHwgICAxNiArKysrLQogU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwICAgfCAgICAxICsKIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCAgICAgIHwgICAyMCArKysrKysrCiA4IGZp bGVzIGNoYW5nZWQsIDEwNSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpp bmRleCA4YjAwZTkxLi5iZWQ3MTExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNjUgQEAKKzIwMTIt MTEtMjEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAg UERGUGx1Z2luOiA8ZW1iZWQ+IGFuZCA8b2JqZWN0PiBQREZzIGFmZmVjdCB0aGVpciBwYXJlbnQg ZnJhbWUncyBwYWdlIHNjYWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDMyODYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEyNzUyMzE1PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERldGVjdGluZyB3 aGV0aGVyIG9yIG5vdCBhIFBERlBsdWdpbiBpcyBhIGZ1bGwtcGFnZSBwbHVnaW4gb3Igbm90IGlz IG5vdAorICAgICAgICBhcyBzaW1wbGUgYXMgY2hlY2tpbmcgaXNNYWluRnJhbWUoKSwgYmVjYXVz ZSA8ZW1iZWQ+IGFuZCA8b2JqZWN0PiB3aWxsCisgICAgICAgIGNhdXNlIFBERlBsdWdpbiB0byBs aXZlIGluIHRoZSBtYWluIGZyYW1lLCB3aGlsZSBzdGlsbCBub3QgYmVpbmcgZnVsbC1wYWdlLgor ICAgICAgICBXZSBhbHNvIGhhdmUgdG8gY2hlY2sgdGhhdCB0aGUgbWFpbiBmcmFtZSdzIGRvY3Vt ZW50IGlzIGEgUGx1Z2luRG9jdW1lbnQsCisgICAgICAgIGFuZCB3aGV0aGVyIHRoYXQgUGx1Z2lu RG9jdW1lbnQncyBQbHVnaW5XaWRnZXQgaXMgb3VyIFBERlBsdWdpbidzIFBsdWdpblZpZXcuCisK KyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5oOgorICAgICAgICAo UERGUGx1Z2luKTogQWRkIGlzRnVsbEZyYW1lUGx1Z2luLgorICAgICAgICAqIFdlYlByb2Nlc3Mv UGx1Z2lucy9QREYvUERGUGx1Z2luLm1tOgorICAgICAgICAoV2ViS2l0OjpQREZQbHVnaW46Omlz RnVsbEZyYW1lUGx1Z2luKTogQ2hlY2sgd2hldGhlciB0aGUgbWFpbiBmcmFtZSBpcworICAgICAg ICBiYWNrZWQgYnkgYSBQbHVnaW5Eb2N1bWVudCwgYW5kIHRoYXQgdGhhdCBQbHVnaW5Eb2N1bWVu dCBjb3JyZXNwb25kcworICAgICAgICB0byB0aGlzIFBERlBsdWdpbi4KKyAgICAgICAgKFdlYktp dDo6UERGUGx1Z2luOjpoYW5kbGVzUGFnZVNjYWxlRmFjdG9yKTogVXNlIGlzRnVsbEZyYW1lUGx1 Z2luLgorICAgICAgICAoV2ViS2l0OjpQREZQbHVnaW46OnN1cHBvcnRzRm9ybXMpOiBVc2UgaXNG dWxsRnJhbWVQbHVnaW4uCisKKzIwMTItMTEtMjEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRv bkBhcHBsZS5jb20+CisKKyAgICAgICAgUERGUGx1Z2luOiBDbWQtLysgc2hvdWxkIGFmZmVjdCBQ REYgcGFnZSBzY2FsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTAzMjg1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMjcxMDQ2OT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQbHVnaW5zIHdoaWNoIHN1 cHBvcnQgaGFuZGxpbmcgcGFnZSBzY2FsZSB0aGVtc2VsdmVzIHNob3VsZCBhbHNvIGhhbmRsZQor ICAgICAgICBwYWdlIHpvb20sIGFzIGl0IGlzIGEgdmVyeSBzaW1pbGFyIGNvbmNlcHQuCisKKyAg ICAgICAgVGhpcyBwYXRjaCBkaXNhYmxlcyB0ZXh0IHpvb20gaW4gdGhlIGNhc2Ugb2YgYSBtYWlu LWZyYW1lIHBsdWdpbiB3aGljaCBzdXBwb3J0cworICAgICAgICBwYWdlIHNjYWxlIGZhY3RvciBj aGFuZ2VzLCBhcyBpdCBpcyBub3QgbmVlZGVkIGluIHRoZSBQREZQbHVnaW4gY2FzZQorICAgICAg ICAod2UgY2FuJ3QgZG8gdGV4dC1vbmx5IHNjYWxlIGZvciBQREYpLCBidXQgaXQgY291bGQgYmUg YWRkZWQgbGF0ZXIgaWYgbmVlZGVkLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cGFnZVpvb21GYWN0b3JEaWRD aGFuZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdl YlBhZ2VQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5p bjoKKyAgICAgICAgQWRkIFdlYlBhZ2VQcm94eTo6cGFnZVpvb21GYWN0b3JEaWRDaGFuZ2UsIHRv IG5vdGlmeSBXZWJQYWdlUHJveHkgb2YKKyAgICAgICAgb3V0LW9mLWJhbmQgcGFnZSB6b29tIGZh Y3RvciBjaGFuZ2VzIChpbiB0aGlzIGNhc2UsIGZyb20gUGx1Z2luVmlldykuCisKKyAgICAgICAg KiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBs dWdpblZpZXc6OnNldFBhZ2VTY2FsZUZhY3Rvcik6CisgICAgICAgIFVwZGF0ZSBXZWJQYWdlUHJv eHkncyBub3Rpb24gb2YgdGhlIGN1cnJlbnQgcGFnZSB6b29tIHdoZW5ldmVyIFBsdWdpblZpZXcK KyAgICAgICAgaXMgbm90aWZpZWQgb2YgYSBwYWdlIHNjYWxlIGZhY3RvciBjaGFuZ2UuCisKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2U6OnNldFRleHRab29tRmFjdG9yKTogV2UgZG9uJ3Qgc3VwcG9ydCB0ZXh0IHpvb20g aW4gcGx1Z2lucywgYnV0CisgICAgICAgIHdlIGFsc28gZG9uJ3Qgd2FudCBpdCB0byBzaWxlbnRs eSBhY3Qgb24gdGhlIEZyYW1lIGlmIHdlIGhhdmUgYSBwbHVnaW4gdGhhdAorICAgICAgICBwdXJw b3J0cyB0byBoYW5kbGUgcGFnZSBzY2FsZSBpdHNlbGYuIFJldHVybiBlYXJseSBpZiB0aGlzIGlz IHRoZSBjYXNlLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpwYWdlWm9vbUZhY3Rvcik6IEZv ciBwbHVnaW5zIHRoYXQgc3VwcG9ydCBwYWdlIHNjYWxlIGZhY3RvciwKKyAgICAgICAgd2UgZXF1 YXRlIHBhZ2Ugc2NhbGUgYW5kIHBhZ2Ugem9vbS4gUmV0dXJuIHRoZSBQbHVnaW5WaWV3J3MgcGFn ZSBzY2FsZSBmYWN0b3IKKyAgICAgICAgaW4gcGxhY2Ugb2YgdGhlIEZyYW1lJ3MgcGFnZSB6b29t IGZhY3Rvci4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0UGFnZVpvb21GYWN0b3IpOiBN YWtlIHBhZ2Ugem9vbSBjaGFuZ2VzIGluIHRoZSBhZm9yZW1lbnRpb25lZAorICAgICAgICBjYXNl IGFmZmVjdCB0aGUgUGx1Z2luVmlldydzIHBhZ2Ugc2NhbGUuCisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2U6OnNldFBhZ2VBbmRUZXh0Wm9vbUZhY3RvcnMpOiBEaXR0by4KKwogMjAxMi0xMS0xOSAg VGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBQREZQbHVn aW46IFN1YmZyYW1lIFBERiBjb250ZXh0IG1lbnVzIGFyZSBpbiB0aGUgd3JvbmcgcGxhY2UKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMTkyYzVjYi4uMTY2 MjVhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTE2 NTEsNiArMTY1MSwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cGFnZVNjYWxlRmFjdG9yRGlkQ2hh bmdlKGRvdWJsZSBzY2FsZUZhY3RvcikKICAgICBtX3BhZ2VTY2FsZUZhY3RvciA9IHNjYWxlRmFj dG9yOwogfQogCit2b2lkIFdlYlBhZ2VQcm94eTo6cGFnZVpvb21GYWN0b3JEaWRDaGFuZ2UoZG91 YmxlIHpvb21GYWN0b3IpCit7CisgICAgbV9wYWdlWm9vbUZhY3RvciA9IHpvb21GYWN0b3I7Cit9 CisKIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRNZW1vcnlDYWNoZUNsaWVudENhbGxzRW5hYmxlZChi b29sIG1lbW9yeUNhY2hlQ2xpZW50Q2FsbHNFbmFibGVkKQogewogICAgIGlmICghaXNWYWxpZCgp KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGM2NjhhOTguLmQ1 MjBkZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTU0MSw2 ICs1NDEsNyBAQCBwdWJsaWM6CiAjZW5kaWYKIAogICAgIHZvaWQgcGFnZVNjYWxlRmFjdG9yRGlk Q2hhbmdlKGRvdWJsZSk7CisgICAgdm9pZCBwYWdlWm9vbUZhY3RvckRpZENoYW5nZShkb3VibGUp OwogCiAgICAgdm9pZCBzZXRNZW1vcnlDYWNoZUNsaWVudENhbGxzRW5hYmxlZChib29sKTsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdl cy5pbiBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4K aW5kZXggMjkxNmY2ZC4uYjc0MjgwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCkBAIC0xNzUsNiArMTc1LDcgQEAgbWVzc2FnZXMg LT4gV2ViUGFnZVByb3h5IHsKICNlbmRpZgogCiAgICAgUGFnZVNjYWxlRmFjdG9yRGlkQ2hhbmdl KGRvdWJsZSBzY2FsZUZhY3RvcikKKyAgICBQYWdlWm9vbUZhY3RvckRpZENoYW5nZShkb3VibGUg em9vbUZhY3RvcikKIAogI2lmIFBMQVRGT1JNKEdUSykKICAgICAjIFN1cHBvcnQgZm9yIEdUSysg cGxhdGZvcm0ga2V5YmluZGluZ3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvUERGL1BERlBsdWdpbi5oCmluZGV4IDkzNTAzODMuLmE4Mjc3ZjkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLmgKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4uaApAQCAtMTAz LDYgKzEwMyw3IEBAIHByaXZhdGU6CiAgICAgTlNFdmVudCAqbnNFdmVudEZvcldlYk1vdXNlRXZl bnQoY29uc3QgV2ViTW91c2VFdmVudCYpOwogICAgIAogICAgIGJvb2wgc3VwcG9ydHNGb3Jtcygp OworICAgIGJvb2wgaXNGdWxsRnJhbWVQbHVnaW4oKTsKIAogICAgIENvcmVJUEM6OkRhdGFSZWZl cmVuY2UgcGRmRG9jdW1lbnREYXRhUmVmZXJlbmNlKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0KaW5kZXggNDI4ZWM0ZS4uMDYw M2U3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9Q REZQbHVnaW4ubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9Q REZQbHVnaW4ubW0KQEAgLTYwLDYgKzYwLDcgQEAKICNpbXBvcnQgPFdlYkNvcmUvUGFnZS5oPgog I2ltcG9ydCA8V2ViQ29yZS9QYXN0ZWJvYXJkLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1BsdWdpbkRh dGEuaD4KKyNpbXBvcnQgPFdlYkNvcmUvUGx1Z2luRG9jdW1lbnQuaD4KICNpbXBvcnQgPFdlYkNv cmUvUmVuZGVyQm94TW9kZWxPYmplY3QuaD4KICNpbXBvcnQgPFdlYkNvcmUvU2Nyb2xsQW5pbWF0 b3IuaD4KICNpbXBvcnQgPFdlYkNvcmUvU2Nyb2xsYmFyVGhlbWUuaD4KQEAgLTY1Miw5ICs2NTMs MjAgQEAgdm9pZCBQREZQbHVnaW46OmludmFsaWRhdGVTY3JvbGxDb3JuZXJSZWN0KGNvbnN0IElu dFJlY3QmIHJlY3QpCiAgICAgW21fc2Nyb2xsQ29ybmVyTGF5ZXIuZ2V0KCkgc2V0TmVlZHNEaXNw bGF5XTsKIH0KIAorYm9vbCBQREZQbHVnaW46OmlzRnVsbEZyYW1lUGx1Z2luKCkKK3sKKyAgICAv LyA8b2JqZWN0PiBvciA8ZW1iZWQ+IHBsdWdpbnMgd2lsbCBhcHBlYXIgdG8gYmUgaW4gdGhlaXIg cGFyZW50IGZyYW1lLCBzbyB3ZSBoYXZlIHRvCisgICAgLy8gY2hlY2sgd2hldGhlciBvdXIgZnJh bWUncyB3aWRnZXQgaXMgZXhhY3RseSBvdXIgUGx1Z2luVmlldy4KKyAgICBEb2N1bWVudCogZG9j dW1lbnQgPSB3ZWJGcmFtZSgpLT5jb3JlRnJhbWUoKS0+ZG9jdW1lbnQoKTsKKyAgICBpZiAoZG9j dW1lbnQtPmlzUGx1Z2luRG9jdW1lbnQoKSkKKyAgICAgICAgcmV0dXJuIChzdGF0aWNfY2FzdDxQ bHVnaW5Eb2N1bWVudCo+KGRvY3VtZW50KS0+cGx1Z2luV2lkZ2V0KCkgPT0gcGx1Z2luVmlldygp KTsKKworICAgIHJldHVybiBmYWxzZTsKK30KKwogYm9vbCBQREZQbHVnaW46OmhhbmRsZXNQYWdl U2NhbGVGYWN0b3IoKQogewotICAgIHJldHVybiB3ZWJGcmFtZSgpLT5pc01haW5GcmFtZSgpOwor ICAgIHJldHVybiB3ZWJGcmFtZSgpLT5pc01haW5GcmFtZSgpICYmIGlzRnVsbEZyYW1lUGx1Z2lu KCk7CiB9CiAKIHZvaWQgUERGUGx1Z2luOjpjbGlja2VkTGluayhOU1VSTCAqdXJsKQpAQCAtNjg2 LDcgKzY5OCw3IEBAIHZvaWQgUERGUGx1Z2luOjpzZXRBY3RpdmVBbm5vdGF0aW9uKFBERkFubm90 YXRpb24gKmFubm90YXRpb24pCiBib29sIFBERlBsdWdpbjo6c3VwcG9ydHNGb3JtcygpCiB7CiAg ICAgLy8gRklYTUU6IFNob3VsZCB3ZSBzdXBwb3J0IGZvcm1zIGZvciBpbmxpbmUgUERGcz8gU2lu Y2Ugd2UgdG91Y2ggdGhlIGRvY3VtZW50LCB0aGlzIG1pZ2h0IGJlIGRpZmZpY3VsdC4KLSAgICBy ZXR1cm4gd2ViRnJhbWUoKS0+aXNNYWluRnJhbWUoKTsKKyAgICByZXR1cm4gd2ViRnJhbWUoKS0+ aXNNYWluRnJhbWUoKSAmJiBpc0Z1bGxGcmFtZVBsdWdpbigpOwogfQogCiB2b2lkIFBERlBsdWdp bjo6bm90aWZ5Q29udGVudFNjYWxlRmFjdG9yQ2hhbmdlZChDR0Zsb2F0IHNjYWxlRmFjdG9yKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcu Y3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCmlu ZGV4IDQ0ZjU3NWEuLjM4MjQ1YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKQEAgLTQzMiw2ICs0MzIsNyBAQCB2b2lkIFBsdWdpblZp ZXc6OnNldFBhZ2VTY2FsZUZhY3Rvcihkb3VibGUgc2NhbGVGYWN0b3IsIEludFBvaW50KQogewog ICAgIG1fcGFnZVNjYWxlRmFjdG9yID0gc2NhbGVGYWN0b3I7CiAgICAgbV93ZWJQYWdlLT5zZW5k KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlBhZ2VTY2FsZUZhY3RvckRpZENoYW5nZShzY2FsZUZh Y3RvcikpOworICAgIG1fd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpQYWdl Wm9vbUZhY3RvckRpZENoYW5nZShzY2FsZUZhY3RvcikpOwogICAgIHBhZ2VTY2FsZUZhY3RvckRp ZENoYW5nZSgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAKaW5kZXggZDkwMzZjYi4uZjc3NzdmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMTEwMSw2ICsxMTAxLDEwIEBAIGRvdWJs ZSBXZWJQYWdlOjp0ZXh0Wm9vbUZhY3RvcigpIGNvbnN0CiAKIHZvaWQgV2ViUGFnZTo6c2V0VGV4 dFpvb21GYWN0b3IoZG91YmxlIHpvb21GYWN0b3IpCiB7CisgICAgUGx1Z2luVmlldyogcGx1Z2lu VmlldyA9IHBsdWdpblZpZXdGb3JGcmFtZShtX3BhZ2UtPm1haW5GcmFtZSgpKTsKKyAgICBpZiAo cGx1Z2luVmlldyAmJiBwbHVnaW5WaWV3LT5oYW5kbGVzUGFnZVNjYWxlRmFjdG9yKCkpCisgICAg ICAgIHJldHVybjsKKwogICAgIEZyYW1lKiBmcmFtZSA9IG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUo KTsKICAgICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1cm47CkBAIC0xMTA5LDYgKzExMTMsMTAg QEAgdm9pZCBXZWJQYWdlOjpzZXRUZXh0Wm9vbUZhY3Rvcihkb3VibGUgem9vbUZhY3RvcikKIAog ZG91YmxlIFdlYlBhZ2U6OnBhZ2Vab29tRmFjdG9yKCkgY29uc3QKIHsKKyAgICBQbHVnaW5WaWV3 KiBwbHVnaW5WaWV3ID0gcGx1Z2luVmlld0ZvckZyYW1lKG1fcGFnZS0+bWFpbkZyYW1lKCkpOwor ICAgIGlmIChwbHVnaW5WaWV3ICYmIHBsdWdpblZpZXctPmhhbmRsZXNQYWdlU2NhbGVGYWN0b3Io KSkKKyAgICAgICAgcmV0dXJuIHBsdWdpblZpZXctPnBhZ2VTY2FsZUZhY3RvcigpOworCiAgICAg RnJhbWUqIGZyYW1lID0gbV9tYWluRnJhbWUtPmNvcmVGcmFtZSgpOwogICAgIGlmICghZnJhbWUp CiAgICAgICAgIHJldHVybiAxOwpAQCAtMTExNyw2ICsxMTI1LDEyIEBAIGRvdWJsZSBXZWJQYWdl OjpwYWdlWm9vbUZhY3RvcigpIGNvbnN0CiAKIHZvaWQgV2ViUGFnZTo6c2V0UGFnZVpvb21GYWN0 b3IoZG91YmxlIHpvb21GYWN0b3IpCiB7CisgICAgUGx1Z2luVmlldyogcGx1Z2luVmlldyA9IHBs dWdpblZpZXdGb3JGcmFtZShtX3BhZ2UtPm1haW5GcmFtZSgpKTsKKyAgICBpZiAocGx1Z2luVmll dyAmJiBwbHVnaW5WaWV3LT5oYW5kbGVzUGFnZVNjYWxlRmFjdG9yKCkpIHsKKyAgICAgICAgcGx1 Z2luVmlldy0+c2V0UGFnZVNjYWxlRmFjdG9yKHpvb21GYWN0b3IsIEludFBvaW50KCkpOworICAg ICAgICByZXR1cm47CisgICAgfQorCiAgICAgRnJhbWUqIGZyYW1lID0gbV9tYWluRnJhbWUtPmNv cmVGcmFtZSgpOwogICAgIGlmICghZnJhbWUpCiAgICAgICAgIHJldHVybjsKQEAgLTExMjUsNiAr MTEzOSwxMiBAQCB2b2lkIFdlYlBhZ2U6OnNldFBhZ2Vab29tRmFjdG9yKGRvdWJsZSB6b29tRmFj dG9yKQogCiB2b2lkIFdlYlBhZ2U6OnNldFBhZ2VBbmRUZXh0Wm9vbUZhY3RvcnMoZG91YmxlIHBh Z2Vab29tRmFjdG9yLCBkb3VibGUgdGV4dFpvb21GYWN0b3IpCiB7CisgICAgUGx1Z2luVmlldyog cGx1Z2luVmlldyA9IHBsdWdpblZpZXdGb3JGcmFtZShtX3BhZ2UtPm1haW5GcmFtZSgpKTsKKyAg ICBpZiAocGx1Z2luVmlldyAmJiBwbHVnaW5WaWV3LT5oYW5kbGVzUGFnZVNjYWxlRmFjdG9yKCkp IHsKKyAgICAgICAgcGx1Z2luVmlldy0+c2V0UGFnZVNjYWxlRmFjdG9yKHBhZ2Vab29tRmFjdG9y LCBJbnRQb2ludCgpKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIEZyYW1lKiBmcmFt ZSA9IG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQogICAgICAgICBy ZXR1cm47Ci0tIAoxLjcuOS42IChBcHBsZSBHaXQtMzEuMSkKCg== 176082 2012-11-26 15:08:43 -0800 2013-01-10 09:51:44 -0800 actual patch 0004-PDFPlugin-Cmd-should-affect-PDF-page-scale.patch text/plain 6161 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4YjAwZTkxLi5iZWQ3MTExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIg QEAKKzIwMTItMTEtMjEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgUERGUGx1Z2luOiBDbWQtLysgc2hvdWxkIGFmZmVjdCBQREYgcGFnZSBzY2FsZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzMjg1Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMjcxMDQ2OT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQbHVnaW5zIHdoaWNoIHN1cHBvcnQgaGFuZGxpbmcg cGFnZSBzY2FsZSB0aGVtc2VsdmVzIHNob3VsZCBhbHNvIGhhbmRsZQorICAgICAgICBwYWdlIHpv b20sIGFzIGl0IGlzIGEgdmVyeSBzaW1pbGFyIGNvbmNlcHQuCisKKyAgICAgICAgVGhpcyBwYXRj aCBkaXNhYmxlcyB0ZXh0IHpvb20gaW4gdGhlIGNhc2Ugb2YgYSBtYWluLWZyYW1lIHBsdWdpbiB3 aGljaCBzdXBwb3J0cworICAgICAgICBwYWdlIHNjYWxlIGZhY3RvciBjaGFuZ2VzLCBhcyBpdCBp cyBub3QgbmVlZGVkIGluIHRoZSBQREZQbHVnaW4gY2FzZQorICAgICAgICAod2UgY2FuJ3QgZG8g dGV4dC1vbmx5IHNjYWxlIGZvciBQREYpLCBidXQgaXQgY291bGQgYmUgYWRkZWQgbGF0ZXIgaWYg bmVlZGVkLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cGFnZVpvb21GYWN0b3JEaWRDaGFuZ2UpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYlBhZ2VQcm94eSk6Cisg ICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgQWRk IFdlYlBhZ2VQcm94eTo6cGFnZVpvb21GYWN0b3JEaWRDaGFuZ2UsIHRvIG5vdGlmeSBXZWJQYWdl UHJveHkgb2YKKyAgICAgICAgb3V0LW9mLWJhbmQgcGFnZSB6b29tIGZhY3RvciBjaGFuZ2VzIChp biB0aGlzIGNhc2UsIGZyb20gUGx1Z2luVmlldykuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblZpZXc6OnNldFBh Z2VTY2FsZUZhY3Rvcik6CisgICAgICAgIFVwZGF0ZSBXZWJQYWdlUHJveHkncyBub3Rpb24gb2Yg dGhlIGN1cnJlbnQgcGFnZSB6b29tIHdoZW5ldmVyIFBsdWdpblZpZXcKKyAgICAgICAgaXMgbm90 aWZpZWQgb2YgYSBwYWdlIHNjYWxlIGZhY3RvciBjaGFuZ2UuCisKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldFRl eHRab29tRmFjdG9yKTogV2UgZG9uJ3Qgc3VwcG9ydCB0ZXh0IHpvb20gaW4gcGx1Z2lucywgYnV0 CisgICAgICAgIHdlIGFsc28gZG9uJ3Qgd2FudCBpdCB0byBzaWxlbnRseSBhY3Qgb24gdGhlIEZy YW1lIGlmIHdlIGhhdmUgYSBwbHVnaW4gdGhhdAorICAgICAgICBwdXJwb3J0cyB0byBoYW5kbGUg cGFnZSBzY2FsZSBpdHNlbGYuIFJldHVybiBlYXJseSBpZiB0aGlzIGlzIHRoZSBjYXNlLgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjpwYWdlWm9vbUZhY3Rvcik6IEZvciBwbHVnaW5zIHRoYXQg c3VwcG9ydCBwYWdlIHNjYWxlIGZhY3RvciwKKyAgICAgICAgd2UgZXF1YXRlIHBhZ2Ugc2NhbGUg YW5kIHBhZ2Ugem9vbS4gUmV0dXJuIHRoZSBQbHVnaW5WaWV3J3MgcGFnZSBzY2FsZSBmYWN0b3IK KyAgICAgICAgaW4gcGxhY2Ugb2YgdGhlIEZyYW1lJ3MgcGFnZSB6b29tIGZhY3Rvci4KKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0UGFnZVpvb21GYWN0b3IpOiBNYWtlIHBhZ2Ugem9vbSBj aGFuZ2VzIGluIHRoZSBhZm9yZW1lbnRpb25lZAorICAgICAgICBjYXNlIGFmZmVjdCB0aGUgUGx1 Z2luVmlldydzIHBhZ2Ugc2NhbGUuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldFBhZ2VB bmRUZXh0Wm9vbUZhY3RvcnMpOiBEaXR0by4KKwogMjAxMi0xMS0xOSAgVGltIEhvcnRvbiAgPHRp bW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KCiAgICAgICAgIFBERlBsdWdpbjogU3ViZnJhbWUgUERG IGNvbnRleHQgbWVudXMgYXJlIGluIHRoZSB3cm9uZyBwbGFjZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCAxOTJjNWNiLi4xNjYyNWFjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMTY1MSw2ICsxNjUxLDExIEBA IHZvaWQgV2ViUGFnZVByb3h5OjpwYWdlU2NhbGVGYWN0b3JEaWRDaGFuZ2UoZG91YmxlIHNjYWxl RmFjdG9yKQogICAgIG1fcGFnZVNjYWxlRmFjdG9yID0gc2NhbGVGYWN0b3I7CiB9Cgordm9pZCBX ZWJQYWdlUHJveHk6OnBhZ2Vab29tRmFjdG9yRGlkQ2hhbmdlKGRvdWJsZSB6b29tRmFjdG9yKQor eworICAgIG1fcGFnZVpvb21GYWN0b3IgPSB6b29tRmFjdG9yOworfQorCiB2b2lkIFdlYlBhZ2VQ cm94eTo6c2V0TWVtb3J5Q2FjaGVDbGllbnRDYWxsc0VuYWJsZWQoYm9vbCBtZW1vcnlDYWNoZUNs aWVudENhbGxzRW5hYmxlZCkKIHsKICAgICBpZiAoIWlzVmFsaWQoKSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBjNjY4YTk4Li5kNTIwZGY5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC01NDEsNiArNTQxLDcgQEAgcHVibGlj OgogI2VuZGlmCgogICAgIHZvaWQgcGFnZVNjYWxlRmFjdG9yRGlkQ2hhbmdlKGRvdWJsZSk7Cisg ICAgdm9pZCBwYWdlWm9vbUZhY3RvckRpZENoYW5nZShkb3VibGUpOwoKICAgICB2b2lkIHNldE1l bW9yeUNhY2hlQ2xpZW50Q2FsbHNFbmFibGVkKGJvb2wpOwoKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCmluZGV4IDI5MTZmNmQuLmI3NDI4 MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVz c2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNz YWdlcy5pbgpAQCAtMTc1LDYgKzE3NSw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAj ZW5kaWYKCiAgICAgUGFnZVNjYWxlRmFjdG9yRGlkQ2hhbmdlKGRvdWJsZSBzY2FsZUZhY3RvcikK KyAgICBQYWdlWm9vbUZhY3RvckRpZENoYW5nZShkb3VibGUgem9vbUZhY3RvcikKCiAjaWYgUExB VEZPUk0oR1RLKQogICAgICMgU3VwcG9ydCBmb3IgR1RLKyBwbGF0Zm9ybSBrZXliaW5kaW5ncwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcu Y3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCmlu ZGV4IDQ0ZjU3NWEuLjM4MjQ1YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKQEAgLTQzMiw2ICs0MzIsNyBAQCB2b2lkIFBsdWdpblZp ZXc6OnNldFBhZ2VTY2FsZUZhY3Rvcihkb3VibGUgc2NhbGVGYWN0b3IsIEludFBvaW50KQogewog ICAgIG1fcGFnZVNjYWxlRmFjdG9yID0gc2NhbGVGYWN0b3I7CiAgICAgbV93ZWJQYWdlLT5zZW5k KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlBhZ2VTY2FsZUZhY3RvckRpZENoYW5nZShzY2FsZUZh Y3RvcikpOworICAgIG1fd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpQYWdl Wm9vbUZhY3RvckRpZENoYW5nZShzY2FsZUZhY3RvcikpOwogICAgIHBhZ2VTY2FsZUZhY3RvckRp ZENoYW5nZSgpOwogfQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAppbmRleCBkOTAzNmNiLi5mNzc3N2Y1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0xMTAxLDYgKzExMDEsMTAgQEAgZG91Ymxl IFdlYlBhZ2U6OnRleHRab29tRmFjdG9yKCkgY29uc3QKCiB2b2lkIFdlYlBhZ2U6OnNldFRleHRa b29tRmFjdG9yKGRvdWJsZSB6b29tRmFjdG9yKQogeworICAgIFBsdWdpblZpZXcqIHBsdWdpblZp ZXcgPSBwbHVnaW5WaWV3Rm9yRnJhbWUobV9wYWdlLT5tYWluRnJhbWUoKSk7CisgICAgaWYgKHBs dWdpblZpZXcgJiYgcGx1Z2luVmlldy0+aGFuZGxlc1BhZ2VTY2FsZUZhY3RvcigpKQorICAgICAg ICByZXR1cm47CisKICAgICBGcmFtZSogZnJhbWUgPSBtX21haW5GcmFtZS0+Y29yZUZyYW1lKCk7 CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuOwpAQCAtMTEwOSw2ICsxMTEzLDEwIEBA IHZvaWQgV2ViUGFnZTo6c2V0VGV4dFpvb21GYWN0b3IoZG91YmxlIHpvb21GYWN0b3IpCgogZG91 YmxlIFdlYlBhZ2U6OnBhZ2Vab29tRmFjdG9yKCkgY29uc3QKIHsKKyAgICBQbHVnaW5WaWV3KiBw bHVnaW5WaWV3ID0gcGx1Z2luVmlld0ZvckZyYW1lKG1fcGFnZS0+bWFpbkZyYW1lKCkpOworICAg IGlmIChwbHVnaW5WaWV3ICYmIHBsdWdpblZpZXctPmhhbmRsZXNQYWdlU2NhbGVGYWN0b3IoKSkK KyAgICAgICAgcmV0dXJuIHBsdWdpblZpZXctPnBhZ2VTY2FsZUZhY3RvcigpOworCiAgICAgRnJh bWUqIGZyYW1lID0gbV9tYWluRnJhbWUtPmNvcmVGcmFtZSgpOwogICAgIGlmICghZnJhbWUpCiAg ICAgICAgIHJldHVybiAxOwpAQCAtMTExNyw2ICsxMTI1LDEyIEBAIGRvdWJsZSBXZWJQYWdlOjpw YWdlWm9vbUZhY3RvcigpIGNvbnN0Cgogdm9pZCBXZWJQYWdlOjpzZXRQYWdlWm9vbUZhY3Rvcihk b3VibGUgem9vbUZhY3RvcikKIHsKKyAgICBQbHVnaW5WaWV3KiBwbHVnaW5WaWV3ID0gcGx1Z2lu Vmlld0ZvckZyYW1lKG1fcGFnZS0+bWFpbkZyYW1lKCkpOworICAgIGlmIChwbHVnaW5WaWV3ICYm IHBsdWdpblZpZXctPmhhbmRsZXNQYWdlU2NhbGVGYWN0b3IoKSkgeworICAgICAgICBwbHVnaW5W aWV3LT5zZXRQYWdlU2NhbGVGYWN0b3Ioem9vbUZhY3RvciwgSW50UG9pbnQoKSk7CisgICAgICAg IHJldHVybjsKKyAgICB9CisKICAgICBGcmFtZSogZnJhbWUgPSBtX21haW5GcmFtZS0+Y29yZUZy YW1lKCk7CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuOwpAQCAtMTEyNSw2ICsxMTM5 LDEyIEBAIHZvaWQgV2ViUGFnZTo6c2V0UGFnZVpvb21GYWN0b3IoZG91YmxlIHpvb21GYWN0b3Ip Cgogdm9pZCBXZWJQYWdlOjpzZXRQYWdlQW5kVGV4dFpvb21GYWN0b3JzKGRvdWJsZSBwYWdlWm9v bUZhY3RvciwgZG91YmxlIHRleHRab29tRmFjdG9yKQogeworICAgIFBsdWdpblZpZXcqIHBsdWdp blZpZXcgPSBwbHVnaW5WaWV3Rm9yRnJhbWUobV9wYWdlLT5tYWluRnJhbWUoKSk7CisgICAgaWYg KHBsdWdpblZpZXcgJiYgcGx1Z2luVmlldy0+aGFuZGxlc1BhZ2VTY2FsZUZhY3RvcigpKSB7Cisg ICAgICAgIHBsdWdpblZpZXctPnNldFBhZ2VTY2FsZUZhY3RvcihwYWdlWm9vbUZhY3RvciwgSW50 UG9pbnQoKSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBGcmFtZSogZnJhbWUgPSBt X21haW5GcmFtZS0+Y29yZUZyYW1lKCk7CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJu OwotLQo=