126399 2014-01-02 14:00:29 -0800 WebKit2 View Gestures: Support plugins that take over the page scale gesture 2014-01-09 12:16:45 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca sam simon.fraser oldest_to_newest 963870 0 thorton 2014-01-02 14:00:29 -0800 We have a notion of plugins that can take over the page scale gesture (for PDFPlugin), but it's not supported with WebKit2 View Gestures, so PDFPlugin zoom is broken when they are enabled. <rdar://problem/15738928> 963935 1 220261 thorton 2014-01-02 15:42:31 -0800 Created attachment 220261 patch 966014 2 thorton 2014-01-09 12:16:45 -0800 http://trac.webkit.org/changeset/161571 220261 2014-01-02 15:42:31 -0800 2014-01-04 08:49:23 -0800 patch pdfzoom.diff text/plain 10688 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5NWJhNTVlLi41NzIyNjhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTQtMDEtMDIgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgV2ViS2l0MiBWaWV3IEdlc3R1cmVzOiBTdXBwb3J0IHBsdWdpbnMgdGhhdCB0YWtl IG92ZXIgdGhlIHBhZ2Ugc2NhbGUgZ2VzdHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2Mzk5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNTcz ODkyOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU ZWFjaCBWaWV3R2VzdHVyZUNvbnRyb2xsZXIgaG93IHRvIGhhbmRsZSBXZWJGcmFtZTo6aGFuZGxl c1BhZ2VTY2FsZUdlc3R1cmU9dHJ1ZSwKKyAgICAgICAgd2hpY2ggaXMgdXNlZCBzbyB0aGF0IFBE RlBsdWdpbiBjYW4gZGVhbCB3aXRoIG1hZ25pZmljYXRpb24gaXRzZWxmLgorCisgICAgICAgICog VUlQcm9jZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViS2l0 OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlZpZXdHZXN0dXJlQ29udHJvbGxlcik6CisgICAgICAg IChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZGlkQ29sbGVjdEdlb21ldHJ5Rm9yTWFn bmlmaWNhdGlvbkdlc3R1cmUpOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xs ZXI6OmhhbmRsZU1hZ25pZmljYXRpb25HZXN0dXJlKToKKyAgICAgICAgKFdlYktpdDo6Vmlld0dl c3R1cmVDb250cm9sbGVyOjplbmRNYWduaWZpY2F0aW9uR2VzdHVyZSk6CisgICAgICAgIChXZWJL aXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZGlkQ29sbGVjdEdlb21ldHJ5Rm9yU21hcnRNYWdu aWZpY2F0aW9uR2VzdHVyZSk6CisgICAgICAgIElmIHRoZSBXZWJGcmFtZSBpcyBnb2luZyB0byBo YW5kbGUgdGhlIHBhZ2Ugc2NhbGUgZ2VzdHVyZSBpdHNlbGYgKHdoaWNoIGN1cnJlbnRseQorICAg ICAgICBzaW1wbHkgbWVhbnMgdGhhdCBpdCBpcyBhIG1haW4tZnJhbWUgUERGUGx1Z2luKSwgc2Vu ZCB0aGUgbWFnbmlmaWNhdGlvbiBpbmZvcm1hdGlvbgorICAgICAgICBzdHJhaWdodCB0aHJvdWdo IHRvIGl0LiBBbHNvLCBkb24ndCBwcm92aWRlIHNtYXJ0LXpvb20gaW4gdGhpcyBjYXNlLCBzaW5j ZSB0aGVyZQorICAgICAgICBpcyBjdXJyZW50bHkgbm8gd2F5IHRvIGNvbGxlY3QgZ2VvbWV0cnkg aW5mb3JtYXRpb24gZnJvbSB0aGUgcGx1Z2luLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9W aWV3R2VzdHVyZUNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1ZpZXdHZXN0 dXJlQ29udHJvbGxlci5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv Vmlld0dlc3R1cmVHZW9tZXRyeUNvbGxlY3Rvci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlZpZXdH ZXN0dXJlR2VvbWV0cnlDb2xsZWN0b3I6OmNvbGxlY3RHZW9tZXRyeUZvck1hZ25pZmljYXRpb25H ZXN0dXJlKToKKyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1cmVHZW9tZXRyeUNvbGxlY3Rvcjo6 Y29sbGVjdEdlb21ldHJ5Rm9yU21hcnRNYWduaWZpY2F0aW9uR2VzdHVyZSk6CisgICAgICAgIFJl dHJpZXZlIFdlYkZyYW1lOjpoYW5kbGVzUGFnZVNjYWxlR2VzdHVyZSBhbmQgcmV0dXJuIGl0IHRv IHRoZSBVSSBwcm9jZXNzLgorCiAyMDE0LTAxLTAxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFz ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIENyZWF0ZSBhIFRocmVhZGVkU2Nyb2xsaW5nVHJlZSBz dWJjbGFzcyBvZiBTY3JvbGxpbmdUcmVlLCBhbmQgcHVzaCBhbGwga25vd2xlZGdlIG9mIHRoZSBz Y3JvbGxpbmcgdGhyZWFkIGludG8gaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyLmNwcAppbmRleCBiODUyM2JkLi43Y2VmY2Mx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29u dHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVy ZUNvbnRyb2xsZXIuY3BwCkBAIC01MSw2ICs1MSw3IEBAIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6 Vmlld0dlc3R1cmVDb250cm9sbGVyKFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5KQogICAgIDog bV93ZWJQYWdlUHJveHkod2ViUGFnZVByb3h5KQogICAgICwgbV9hY3RpdmVHZXN0dXJlVHlwZShW aWV3R2VzdHVyZVR5cGU6Ok5vbmUpCiAgICAgLCBtX3Zpc2libGVDb250ZW50UmVjdElzVmFsaWQo ZmFsc2UpCisgICAgLCBtX2ZyYW1lSGFuZGxlc01hZ25pZmljYXRpb25HZXN0dXJlKGZhbHNlKQog ewogICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2Fn ZXM6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3dlYlBh Z2VQcm94eS5wYWdlSUQoKSwgKnRoaXMpOwogfQpAQCAtODgsMTEgKzg5LDEyIEBAIEZsb2F0UG9p bnQgVmlld0dlc3R1cmVDb250cm9sbGVyOjpzY2FsZWRNYWduaWZpY2F0aW9uT3JpZ2luKEZsb2F0 UG9pbnQgb3JpZ2luLCBkCiAgICAgcmV0dXJuIHNjYWxlZE1hZ25pZmljYXRpb25PcmlnaW47CiB9 CiAKLXZvaWQgVmlld0dlc3R1cmVDb250cm9sbGVyOjpkaWRDb2xsZWN0R2VvbWV0cnlGb3JNYWdu aWZpY2F0aW9uR2VzdHVyZShGbG9hdFJlY3QgdmlzaWJsZUNvbnRlbnRSZWN0KQordm9pZCBWaWV3 R2VzdHVyZUNvbnRyb2xsZXI6OmRpZENvbGxlY3RHZW9tZXRyeUZvck1hZ25pZmljYXRpb25HZXN0 dXJlKEZsb2F0UmVjdCB2aXNpYmxlQ29udGVudFJlY3QsIGJvb2wgZnJhbWVIYW5kbGVzTWFnbmlm aWNhdGlvbkdlc3R1cmUpCiB7CiAgICAgbV9hY3RpdmVHZXN0dXJlVHlwZSA9IFZpZXdHZXN0dXJl VHlwZTo6TWFnbmlmaWNhdGlvbjsKICAgICBtX3Zpc2libGVDb250ZW50UmVjdCA9IHZpc2libGVD b250ZW50UmVjdDsKICAgICBtX3Zpc2libGVDb250ZW50UmVjdElzVmFsaWQgPSB0cnVlOworICAg IG1fZnJhbWVIYW5kbGVzTWFnbmlmaWNhdGlvbkdlc3R1cmUgPSBmcmFtZUhhbmRsZXNNYWduaWZp Y2F0aW9uR2VzdHVyZTsKIH0KIAogdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmhhbmRsZU1h Z25pZmljYXRpb25HZXN0dXJlKGRvdWJsZSBzY2FsZSwgRmxvYXRQb2ludCBvcmlnaW4pCkBAIC0x MTEsNiArMTEzLDggQEAgdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmhhbmRsZU1hZ25pZmlj YXRpb25HZXN0dXJlKGRvdWJsZSBzY2FsZSwgRmxvYXRQb2ludAogICAgIGlmICghbV92aXNpYmxl Q29udGVudFJlY3RJc1ZhbGlkKQogICAgICAgICByZXR1cm47CiAKKyAgICBtX2FjdGl2ZUdlc3R1 cmVUeXBlID0gVmlld0dlc3R1cmVUeXBlOjpNYWduaWZpY2F0aW9uOworCiAgICAgZG91YmxlIHNj YWxlV2l0aFJlc2lzdGFuY2UgPSByZXNpc3RhbmNlRm9yRGVsdGEoc2NhbGUsIG1fbWFnbmlmaWNh dGlvbikgKiBzY2FsZTsKIAogICAgIG1fbWFnbmlmaWNhdGlvbiArPSBtX21hZ25pZmljYXRpb24g KiBzY2FsZVdpdGhSZXNpc3RhbmNlOwpAQCAtMTE4LDkgKzEyMiwxMCBAQCB2b2lkIFZpZXdHZXN0 dXJlQ29udHJvbGxlcjo6aGFuZGxlTWFnbmlmaWNhdGlvbkdlc3R1cmUoZG91YmxlIHNjYWxlLCBG bG9hdFBvaW50CiAKICAgICBtX21hZ25pZmljYXRpb25PcmlnaW4gPSBvcmlnaW47CiAKLSAgICBt X3dlYlBhZ2VQcm94eS5kcmF3aW5nQXJlYSgpLT5hZGp1c3RUcmFuc2llbnRab29tKG1fbWFnbmlm aWNhdGlvbiwgc2NhbGVkTWFnbmlmaWNhdGlvbk9yaWdpbihvcmlnaW4sIG1fbWFnbmlmaWNhdGlv bikpOwotCi0gICAgbV9hY3RpdmVHZXN0dXJlVHlwZSA9IFZpZXdHZXN0dXJlVHlwZTo6TWFnbmlm aWNhdGlvbjsKKyAgICBpZiAobV9mcmFtZUhhbmRsZXNNYWduaWZpY2F0aW9uR2VzdHVyZSkKKyAg ICAgICAgbV93ZWJQYWdlUHJveHkuc2NhbGVQYWdlKG1fbWFnbmlmaWNhdGlvbiwgcm91bmRlZElu dFBvaW50KG9yaWdpbikpOworICAgIGVsc2UKKyAgICAgICAgbV93ZWJQYWdlUHJveHkuZHJhd2lu Z0FyZWEoKS0+YWRqdXN0VHJhbnNpZW50Wm9vbShtX21hZ25pZmljYXRpb24sIHNjYWxlZE1hZ25p ZmljYXRpb25PcmlnaW4ob3JpZ2luLCBtX21hZ25pZmljYXRpb24pKTsKIH0KIAogdm9pZCBWaWV3 R2VzdHVyZUNvbnRyb2xsZXI6OmVuZE1hZ25pZmljYXRpb25HZXN0dXJlKCkKQEAgLTEyOCw3ICsx MzMsMTEgQEAgdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmVuZE1hZ25pZmljYXRpb25HZXN0 dXJlKCkKICAgICBBU1NFUlQobV9hY3RpdmVHZXN0dXJlVHlwZSA9PSBWaWV3R2VzdHVyZVR5cGU6 Ok1hZ25pZmljYXRpb24pOwogCiAgICAgZG91YmxlIG5ld01hZ25pZmljYXRpb24gPSBzdGQ6Om1p bihzdGQ6Om1heChtX21hZ25pZmljYXRpb24sIG1pbk1hZ25pZmljYXRpb24pLCBtYXhNYWduaWZp Y2F0aW9uKTsKLSAgICBtX3dlYlBhZ2VQcm94eS5kcmF3aW5nQXJlYSgpLT5jb21taXRUcmFuc2ll bnRab29tKG5ld01hZ25pZmljYXRpb24sIHNjYWxlZE1hZ25pZmljYXRpb25PcmlnaW4obV9tYWdu aWZpY2F0aW9uT3JpZ2luLCBuZXdNYWduaWZpY2F0aW9uKSk7CisKKyAgICBpZiAobV9mcmFtZUhh bmRsZXNNYWduaWZpY2F0aW9uR2VzdHVyZSkKKyAgICAgICAgbV93ZWJQYWdlUHJveHkuc2NhbGVQ YWdlKG5ld01hZ25pZmljYXRpb24sIHJvdW5kZWRJbnRQb2ludChtX21hZ25pZmljYXRpb25Pcmln aW4pKTsKKyAgICBlbHNlCisgICAgICAgIG1fd2ViUGFnZVByb3h5LmRyYXdpbmdBcmVhKCktPmNv bW1pdFRyYW5zaWVudFpvb20obmV3TWFnbmlmaWNhdGlvbiwgc2NhbGVkTWFnbmlmaWNhdGlvbk9y aWdpbihtX21hZ25pZmljYXRpb25PcmlnaW4sIG5ld01hZ25pZmljYXRpb24pKTsKIH0KIAogdm9p ZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmhhbmRsZVNtYXJ0TWFnbmlmaWNhdGlvbkdlc3R1cmUo RmxvYXRQb2ludCBvcmlnaW4pCkBAIC0xNDQsOCArMTUzLDExIEBAIHN0YXRpYyBmbG9hdCBtYXhp bXVtUmVjdGFuZ2xlQ29tcG9uZW50RGVsdGEoRmxvYXRSZWN0IGEsIEZsb2F0UmVjdCBiKQogICAg IHJldHVybiBzdGQ6Om1heChmYWJzKGEueCgpIC0gYi54KCkpLCBzdGQ6Om1heChmYWJzKGEueSgp IC0gYi55KCkpLCBzdGQ6Om1heChmYWJzKGEud2lkdGgoKSAtIGIud2lkdGgoKSksIGZhYnMoYS5o ZWlnaHQoKSAtIGIuaGVpZ2h0KCkpKSkpOwogfQogCi12b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxl cjo6ZGlkQ29sbGVjdEdlb21ldHJ5Rm9yU21hcnRNYWduaWZpY2F0aW9uR2VzdHVyZShGbG9hdFBv aW50IG9yaWdpbiwgRmxvYXRSZWN0IHJlbmRlclJlY3QsIEZsb2F0UmVjdCB2aXNpYmxlQ29udGVu dFJlY3QsIGJvb2wgaXNSZXBsYWNlZEVsZW1lbnQpCit2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxl cjo6ZGlkQ29sbGVjdEdlb21ldHJ5Rm9yU21hcnRNYWduaWZpY2F0aW9uR2VzdHVyZShGbG9hdFBv aW50IG9yaWdpbiwgRmxvYXRSZWN0IHJlbmRlclJlY3QsIEZsb2F0UmVjdCB2aXNpYmxlQ29udGVu dFJlY3QsIGJvb2wgaXNSZXBsYWNlZEVsZW1lbnQsIGJvb2wgZnJhbWVIYW5kbGVzTWFnbmlmaWNh dGlvbkdlc3R1cmUpCiB7CisgICAgaWYgKGZyYW1lSGFuZGxlc01hZ25pZmljYXRpb25HZXN0dXJl KQorICAgICAgICByZXR1cm47CisKICAgICBkb3VibGUgY3VycmVudFNjYWxlRmFjdG9yID0gbV93 ZWJQYWdlUHJveHkucGFnZVNjYWxlRmFjdG9yKCk7CiAKICAgICBGbG9hdFJlY3QgdW5zY2FsZWRU YXJnZXRSZWN0ID0gcmVuZGVyUmVjdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5oCmluZGV4IDA2YThjMWIuLjBiODM5MTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9s bGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRy b2xsZXIuaApAQCAtNTcsOCArNTcsOCBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBkaWRS ZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24qLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJikgT1ZF UlJJREU7CiAKICAgICAvLyBNZXNzYWdlIGhhbmRsZXJzLgotICAgIHZvaWQgZGlkQ29sbGVjdEdl b21ldHJ5Rm9yTWFnbmlmaWNhdGlvbkdlc3R1cmUoV2ViQ29yZTo6RmxvYXRSZWN0IHZpc2libGVD b250ZW50Qm91bmRzKTsKLSAgICB2b2lkIGRpZENvbGxlY3RHZW9tZXRyeUZvclNtYXJ0TWFnbmlm aWNhdGlvbkdlc3R1cmUoV2ViQ29yZTo6RmxvYXRQb2ludCBvcmlnaW4sIFdlYkNvcmU6OkZsb2F0 UmVjdCByZW5kZXJSZWN0LCBXZWJDb3JlOjpGbG9hdFJlY3QgdmlzaWJsZUNvbnRlbnRCb3VuZHMs IGJvb2wgaXNSZXBsYWNlZEVsZW1lbnQpOworICAgIHZvaWQgZGlkQ29sbGVjdEdlb21ldHJ5Rm9y TWFnbmlmaWNhdGlvbkdlc3R1cmUoV2ViQ29yZTo6RmxvYXRSZWN0IHZpc2libGVDb250ZW50Qm91 bmRzLCBib29sIGZyYW1lSGFuZGxlc01hZ25pZmljYXRpb25HZXN0dXJlKTsKKyAgICB2b2lkIGRp ZENvbGxlY3RHZW9tZXRyeUZvclNtYXJ0TWFnbmlmaWNhdGlvbkdlc3R1cmUoV2ViQ29yZTo6Rmxv YXRQb2ludCBvcmlnaW4sIFdlYkNvcmU6OkZsb2F0UmVjdCByZW5kZXJSZWN0LCBXZWJDb3JlOjpG bG9hdFJlY3QgdmlzaWJsZUNvbnRlbnRCb3VuZHMsIGJvb2wgaXNSZXBsYWNlZEVsZW1lbnQsIGJv b2wgZnJhbWVIYW5kbGVzTWFnbmlmaWNhdGlvbkdlc3R1cmUpOwogCiAgICAgdm9pZCBlbmRNYWdu aWZpY2F0aW9uR2VzdHVyZSgpOwogICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQgc2NhbGVkTWFnbmlm aWNhdGlvbk9yaWdpbihXZWJDb3JlOjpGbG9hdFBvaW50IG9yaWdpbiwgZG91YmxlIHNjYWxlKTsK QEAgLTc0LDYgKzc0LDcgQEAgcHJpdmF0ZToKIAogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBtX3Zp c2libGVDb250ZW50UmVjdDsKICAgICBib29sIG1fdmlzaWJsZUNvbnRlbnRSZWN0SXNWYWxpZDsK KyAgICBib29sIG1fZnJhbWVIYW5kbGVzTWFnbmlmaWNhdGlvbkdlc3R1cmU7CiB9OwogCiB9IC8v IG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvVmlld0dlc3R1cmVDb250cm9sbGVyLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIubWVzc2FnZXMuaW4KaW5kZXggZjc3YjZi My4uMGIzOTllZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3 R2VzdHVyZUNvbnRyb2xsZXIubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIubWVzc2FnZXMuaW4KQEAgLTIxLDYgKzIxLDYg QEAKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KIAogbWVzc2FnZXMgLT4gVmlld0dlc3R1cmVDb250cm9sbGVyIHsK LSAgICBEaWRDb2xsZWN0R2VvbWV0cnlGb3JNYWduaWZpY2F0aW9uR2VzdHVyZShXZWJDb3JlOjpG bG9hdFJlY3QgdmlzaWJsZUNvbnRlbnRCb3VuZHMpCi0gICAgRGlkQ29sbGVjdEdlb21ldHJ5Rm9y U21hcnRNYWduaWZpY2F0aW9uR2VzdHVyZShXZWJDb3JlOjpGbG9hdFBvaW50IG9yaWdpbiwgV2Vi Q29yZTo6RmxvYXRSZWN0IHJlbmRlclJlY3QsIFdlYkNvcmU6OkZsb2F0UmVjdCB2aXNpYmxlQ29u dGVudEJvdW5kcywgYm9vbCBpc1JlcGxhY2VkRWxlbWVudCkKKyAgICBEaWRDb2xsZWN0R2VvbWV0 cnlGb3JNYWduaWZpY2F0aW9uR2VzdHVyZShXZWJDb3JlOjpGbG9hdFJlY3QgdmlzaWJsZUNvbnRl bnRCb3VuZHMsIGJvb2wgZnJhbWVIYW5kbGVzTWFnbmlmaWNhdGlvbkdlc3R1cmUpCisgICAgRGlk Q29sbGVjdEdlb21ldHJ5Rm9yU21hcnRNYWduaWZpY2F0aW9uR2VzdHVyZShXZWJDb3JlOjpGbG9h dFBvaW50IG9yaWdpbiwgV2ViQ29yZTo6RmxvYXRSZWN0IHJlbmRlclJlY3QsIFdlYkNvcmU6OkZs b2F0UmVjdCB2aXNpYmxlQ29udGVudEJvdW5kcywgYm9vbCBpc1JlcGxhY2VkRWxlbWVudCwgYm9v bCBmcmFtZUhhbmRsZXNNYWduaWZpY2F0aW9uR2VzdHVyZSkKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9WaWV3R2VzdHVyZUdlb21ldHJ5Q29sbGVjdG9y LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9WaWV3R2VzdHVyZUdlb21l dHJ5Q29sbGVjdG9yLmNwcAppbmRleCBmNDhlYWQ2Li40MTE5YThjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvVmlld0dlc3R1cmVHZW9tZXRyeUNvbGxlY3Rv ci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1ZpZXdHZXN0dXJl R2VvbWV0cnlDb2xsZWN0b3IuY3BwCkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVkZSAiVmlld0dl c3R1cmVDb250cm9sbGVyTWVzc2FnZXMuaCIKICNpbmNsdWRlICJWaWV3R2VzdHVyZUdlb21ldHJ5 Q29sbGVjdG9yTWVzc2FnZXMuaCIKICNpbmNsdWRlICJXZWJDb3JlQXJndW1lbnRDb2RlcnMuaCIK KyNpbmNsdWRlICJXZWJGcmFtZS5oIgogI2luY2x1ZGUgIldlYlBhZ2UuaCIKICNpbmNsdWRlICJX ZWJQcm9jZXNzLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZVZpZXcuaD4KQEAgLTUzLDEyICs1 NCwxNCBAQCBWaWV3R2VzdHVyZUdlb21ldHJ5Q29sbGVjdG9yOjp+Vmlld0dlc3R1cmVHZW9tZXRy eUNvbGxlY3RvcigpCiB2b2lkIFZpZXdHZXN0dXJlR2VvbWV0cnlDb2xsZWN0b3I6OmNvbGxlY3RH ZW9tZXRyeUZvck1hZ25pZmljYXRpb25HZXN0dXJlKCkKIHsKICAgICBGbG9hdFJlY3QgdmlzaWJs ZUNvbnRlbnRSZWN0ID0gbV93ZWJQYWdlLm1haW5GcmFtZVZpZXcoKS0+dmlzaWJsZUNvbnRlbnRS ZWN0KFNjcm9sbGFibGVBcmVhOjpJbmNsdWRlU2Nyb2xsYmFycyk7Ci0gICAgbV93ZWJQYWdlLnNl bmQoTWVzc2FnZXM6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6RGlkQ29sbGVjdEdlb21ldHJ5Rm9y TWFnbmlmaWNhdGlvbkdlc3R1cmUodmlzaWJsZUNvbnRlbnRSZWN0KSk7CisgICAgYm9vbCBmcmFt ZUhhbmRsZXNNYWduaWZpY2F0aW9uR2VzdHVyZSA9IG1fd2ViUGFnZS5tYWluV2ViRnJhbWUoKS0+ aGFuZGxlc1BhZ2VTY2FsZUdlc3R1cmUoKTsKKyAgICBtX3dlYlBhZ2Uuc2VuZChNZXNzYWdlczo6 Vmlld0dlc3R1cmVDb250cm9sbGVyOjpEaWRDb2xsZWN0R2VvbWV0cnlGb3JNYWduaWZpY2F0aW9u R2VzdHVyZSh2aXNpYmxlQ29udGVudFJlY3QsIGZyYW1lSGFuZGxlc01hZ25pZmljYXRpb25HZXN0 dXJlKSk7CiB9CiAKIHZvaWQgVmlld0dlc3R1cmVHZW9tZXRyeUNvbGxlY3Rvcjo6Y29sbGVjdEdl b21ldHJ5Rm9yU21hcnRNYWduaWZpY2F0aW9uR2VzdHVyZShGbG9hdFBvaW50IG9yaWdpbikKIHsK ICAgICBGbG9hdFJlY3QgdmlzaWJsZUNvbnRlbnRSZWN0ID0gbV93ZWJQYWdlLm1haW5GcmFtZVZp ZXcoKS0+dmlzaWJsZUNvbnRlbnRSZWN0KFNjcm9sbGFibGVBcmVhOjpJbmNsdWRlU2Nyb2xsYmFy cyk7CisgICAgYm9vbCBmcmFtZUhhbmRsZXNNYWduaWZpY2F0aW9uR2VzdHVyZSA9IG1fd2ViUGFn ZS5tYWluV2ViRnJhbWUoKS0+aGFuZGxlc1BhZ2VTY2FsZUdlc3R1cmUoKTsKIAogICAgIEZsb2F0 UG9pbnQgc2Nyb2xsZWRPcmlnaW4gPSBvcmlnaW47CiAgICAgc2Nyb2xsZWRPcmlnaW4ubW92ZUJ5 KG1fd2ViUGFnZS5tYWluRnJhbWVWaWV3KCktPnNjcm9sbFBvc2l0aW9uKCkpOwpAQCAtNzAsNyAr NzMsNyBAQCB2b2lkIFZpZXdHZXN0dXJlR2VvbWV0cnlDb2xsZWN0b3I6OmNvbGxlY3RHZW9tZXRy eUZvclNtYXJ0TWFnbmlmaWNhdGlvbkdlc3R1cmUoRgogICAgIGlmIChoaXRUZXN0UmVzdWx0Lmlu bmVyTm9kZSgpKSB7CiAgICAgICAgIGJvb2wgaXNSZXBsYWNlZDsKICAgICAgICAgRmxvYXRSZWN0 IHJlbmRlclJlY3QgPSBoaXRUZXN0UmVzdWx0LmlubmVyTm9kZSgpLT5yZW5kZXJSZWN0KCZpc1Jl cGxhY2VkKTsKLSAgICAgICAgbV93ZWJQYWdlLnNlbmQoTWVzc2FnZXM6OlZpZXdHZXN0dXJlQ29u dHJvbGxlcjo6RGlkQ29sbGVjdEdlb21ldHJ5Rm9yU21hcnRNYWduaWZpY2F0aW9uR2VzdHVyZShv cmlnaW4sIHJlbmRlclJlY3QsIHZpc2libGVDb250ZW50UmVjdCwgaXNSZXBsYWNlZCkpOworICAg ICAgICBtX3dlYlBhZ2Uuc2VuZChNZXNzYWdlczo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpEaWRD b2xsZWN0R2VvbWV0cnlGb3JTbWFydE1hZ25pZmljYXRpb25HZXN0dXJlKG9yaWdpbiwgcmVuZGVy UmVjdCwgdmlzaWJsZUNvbnRlbnRSZWN0LCBpc1JlcGxhY2VkLCBmcmFtZUhhbmRsZXNNYWduaWZp Y2F0aW9uR2VzdHVyZSkpOwogICAgIH0KIH0KIAo=