132175 2014-04-25 00:58:28 -0700 [iOS][WK2] Add an intermediary view to do the target transform and adjustment transform 2014-04-25 17:12:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin enrica thorton oldest_to_newest 1004001 0 benjamin 2014-04-25 00:58:28 -0700 [iOS][WK2] Add an intermediary view to do the target transform and adjustment transform 1004008 1 230149 benjamin 2014-04-25 01:05:26 -0700 Created attachment 230149 Patch 1004233 2 230209 benjamin 2014-04-25 15:07:19 -0700 Created attachment 230209 Patch 1004288 3 230224 benjamin 2014-04-25 16:59:14 -0700 Created attachment 230224 Patch 1004290 4 230224 enrica 2014-04-25 17:05:01 -0700 Comment on attachment 230224 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230224&action=review > Source/WebKit2/ChangeLog:8 > + Some utility views of WKContentView acount for the transforms between the content view typo: account > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:1426 > + I think you should remove the _resizeAnimationView from the scrollview first. 1004296 5 benjamin 2014-04-25 17:12:58 -0700 Committed r167836: <http://trac.webkit.org/changeset/167836> 230149 2014-04-25 01:05:26 -0700 2014-04-25 15:07:15 -0700 Patch bug-132175-20140425010459.patch text/plain 5249 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDJmZDFiODYyOThmNjdh OGVkMTFkYjE1Y2RjYWM2ZGEzMGUwNDBiMC4uY2I5Yzc5YTUwOGIzNTE2M2MxMTJkYjRmZmY0Nzdm ZmNiZTg1MjAxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTA0LTI1ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g QWRkIGFuIGludGVybWVkaWFyeSB2aWV3IHRvIGRvIHRoZSB0YXJnZXQgdHJhbnNmb3JtIGFuZCBh ZGp1c3RtZW50IHRyYW5zZm9ybQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTMyMTc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgU29tZSB1dGlsaXR5IHZpZXdzIG9mIFdLQ29udGVudFZpZXcgYWNvdW50IGZv ciB0aGUgdHJhbnNmb3JtcyBiZXR3ZWVuIHRoZSBjb250ZW50IHZpZXcKKyAgICAgICAgYW5kIHRo ZSB1dGlsaXR5IHZpZXcuCisKKyAgICAgICAgU2luY2UgdGhlIGR5bmFtaWMgcmVzaXplIHJlbGll cyBvbiBzZXR0aW5nIHN1YkxheWVyVHJhbnNmb3JtcywgaXQgaXMgZ2V0dGluZyBpbiB0aGUgd2F5 LgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBhIGxheWVyIGluIGJldHdlZW4gZm9yIHRoZSBh bmltYXRpb24uIFRoYXQgd2F5IHRoZSBjb250ZW50IHZpZXcgcmVtYWlucworICAgICAgICB1bnNj YWxlZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX2RpZENvbW1pdExheWVyVHJlZTpXZWJLaXQ6Ol0pOgorICAgICAg ICAoLVtXS1dlYlZpZXcgX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZUNoYW5nZWRUYXJnZXRUb1NjYWxl OnBvc2l0aW9uOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2JlZ2luQW5pbWF0ZWRSZXNpemVX aXRoVXBkYXRlczpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9lbmRBbmltYXRlZFJlc2l6ZV0p OgorCiAyMDE0LTA0LTI0ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgog CiAgICAgICAgIFdlYktpdDIgVmlldyBHZXN0dXJlczogVXNlIGEgc2luZ2xlIHN0cnVjdCBmb3Ig dGhlIHNuYXBzaG90LCBhbmQgcGFzcyBpdCBhcm91bmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggNWYyOWMzMWJlMGNkYjhmMDQ0YWU2 ZmE2NGEzNDMyODE5Y2M5ZTBkYS4uNDM5NjQwYzU5ZDc5OGM5NDA3YWExMjM1YjFiMTk5OWFjMjY3 NjhiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXcubW0KQEAgLTEwNiw2ICsxMDYsNyBAQAogICAgIGJvb2wgX2lzQ2hhbmdpbmdPYnNjdXJlZElu c2V0c0ludGVyYWN0aXZlbHk7CiAgICAgQk9PTCBfaXNBbmltYXRpbmdSZXNpemU7CiAgICAgQ0FU cmFuc2Zvcm0zRCBfcmVzaXplQW5pbWF0aW9uVHJhbnNmb3JtQWRqdXN0bWVudHM7CisgICAgUmV0 YWluUHRyPFVJVmlldz4gX3Jlc2l6ZUFuaW1hdGlvblZpZXc7CiAgICAgQ0dGbG9hdCBfbGFzdEFk anVzdG1lbnRGb3JTY3JvbGxlcjsKICAgICBDR0Zsb2F0IF9rZXlib2FyZFZlcnRpY2FsT3Zlcmxh cDsKIApAQCAtNDU4LDcgKzQ1OSw3IEBAIHN0YXRpYyBDR0Zsb2F0IGNvbnRlbnRab29tU2NhbGUo V0tXZWJWaWV3KiB3ZWJWaWV3KQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoX2lzQW5pbWF0 aW5nUmVzaXplKSB7Ci0gICAgICAgIFtfY29udGVudFZpZXcgbGF5ZXJdLnN1YmxheWVyVHJhbnNm b3JtID0gX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1lbnRzOworICAgICAgICBbX3Jl c2l6ZUFuaW1hdGlvblZpZXcgbGF5ZXJdLnN1YmxheWVyVHJhbnNmb3JtID0gX3Jlc2l6ZUFuaW1h dGlvblRyYW5zZm9ybUFkanVzdG1lbnRzOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC00 ODMsNyArNDg0LDcgQEAgc3RhdGljIENHRmxvYXQgY29udGVudFpvb21TY2FsZShXS1dlYlZpZXcq IHdlYlZpZXcpCiAtICh2b2lkKV9keW5hbWljVmlld3BvcnRVcGRhdGVDaGFuZ2VkVGFyZ2V0VG9T Y2FsZTooZG91YmxlKW5ld1NjYWxlIHBvc2l0aW9uOihDR1BvaW50KW5ld1Njcm9sbFBvc2l0aW9u CiB7CiAgICAgaWYgKF9pc0FuaW1hdGluZ1Jlc2l6ZSkgewotICAgICAgICBkb3VibGUgY3VycmVu dFRhcmdldFNjYWxlID0gW1tfY29udGVudFZpZXcgbGF5ZXJdIGFmZmluZVRyYW5zZm9ybV0uYTsK KyAgICAgICAgZG91YmxlIGN1cnJlbnRUYXJnZXRTY2FsZSA9IFtbX3Jlc2l6ZUFuaW1hdGlvblZp ZXcgbGF5ZXJdIGFmZmluZVRyYW5zZm9ybV0uYTsKICAgICAgICAgZG91YmxlIHNjYWxlID0gbmV3 U2NhbGUgLyBjdXJyZW50VGFyZ2V0U2NhbGU7CiAgICAgICAgIF9yZXNpemVBbmltYXRpb25UcmFu c2Zvcm1BZGp1c3RtZW50cyA9IENBVHJhbnNmb3JtM0RNYWtlU2NhbGUoc2NhbGUsIHNjYWxlLCAw KTsKIApAQCAtMTMyOSw2ICsxMzMwLDEwIEBAIHN0YXRpYyBpbmxpbmUgV2ViS2l0OjpGaW5kT3B0 aW9ucyB0b0ZpbmRPcHRpb25zKF9XS0ZpbmRPcHRpb25zIHdrRmluZE9wdGlvbnMpCiAgICAgX2lz QW5pbWF0aW5nUmVzaXplID0gWUVTOwogICAgIF9yZXNpemVBbmltYXRpb25UcmFuc2Zvcm1BZGp1 c3RtZW50cyA9IENBVHJhbnNmb3JtM0RJZGVudGl0eTsKIAorICAgIF9yZXNpemVBbmltYXRpb25W aWV3ID0gYWRvcHROUyhbW1VJVmlldyBhbGxvY10gaW5pdF0pOworICAgIFtfcmVzaXplQW5pbWF0 aW9uVmlldyBhZGRTdWJ2aWV3Ol9jb250ZW50Vmlldy5nZXQoKV07CisgICAgW19zY3JvbGxWaWV3 IGFkZFN1YnZpZXc6X3Jlc2l6ZUFuaW1hdGlvblZpZXcuZ2V0KCldOworCiAgICAgQ0dSZWN0IG9s ZEJvdW5kcyA9IHNlbGYuYm91bmRzOwogICAgIENHU2l6ZSBvbGRNaW5pbXVtTGF5b3V0U2l6ZSA9 IG9sZEJvdW5kcy5zaXplOwogICAgIGlmIChfaGFzU3RhdGljTWluaW11bUxheW91dFNpemUpCkBA IC0xMzU2LDcgKzEzNjEsNyBAQCBzdGF0aWMgaW5saW5lIFdlYktpdDo6RmluZE9wdGlvbnMgdG9G aW5kT3B0aW9ucyhfV0tGaW5kT3B0aW9ucyB3a0ZpbmRPcHRpb25zKQogICAgIENHRmxvYXQgb2xk V2ViVmlld1dpZHRoSW5Db250ZW50Vmlld0Nvb3JkaW5hdGVzID0gb2xkQm91bmRzLnNpemUud2lk dGggLyBjb250ZW50Wm9vbVNjYWxlKHNlbGYpOwogICAgIENHRmxvYXQgdmlzaWJsZUNvbnRlbnRW aWV3V2lkdGhJbkNvbnRlbnRDb29yZGluYXRlcyA9IHN0ZDo6bWluKGNvbnRlbnRTaXplSW5Db250 ZW50Vmlld0Nvb3JkaW5hdGVzLndpZHRoLCBvbGRXZWJWaWV3V2lkdGhJbkNvbnRlbnRWaWV3Q29v cmRpbmF0ZXMpOwogICAgIENHRmxvYXQgdGFyZ2V0U2NhbGUgPSBuZXdCb3VuZHMuc2l6ZS53aWR0 aCAvIHZpc2libGVDb250ZW50Vmlld1dpZHRoSW5Db250ZW50Q29vcmRpbmF0ZXM7Ci0gICAgW19z Y3JvbGxWaWV3IHNldFpvb21TY2FsZTp0YXJnZXRTY2FsZV07CisgICAgW19yZXNpemVBbmltYXRp b25WaWV3IHNldFRyYW5zZm9ybTpDR0FmZmluZVRyYW5zZm9ybU1ha2VTY2FsZSh0YXJnZXRTY2Fs ZSwgdGFyZ2V0U2NhbGUpXTsKIAogICAgIC8vIENvbXB1dGUgYSBuZXcgcG9zaXRpb24gdG8ga2Vl cCB0aGUgY29udGVudCBjZW50ZXJlZC4KICAgICBDR1BvaW50IG9yaWdpbmFsQ29udGVudENlbnRl ciA9IG9sZFVub2JzY3VyZWRDb250ZW50UmVjdC5jZW50ZXIoKTsKQEAgLTEzOTksMTIgKzE0MDQs MTQgQEAgc3RhdGljIGlubGluZSBXZWJLaXQ6OkZpbmRPcHRpb25zIHRvRmluZE9wdGlvbnMoX1dL RmluZE9wdGlvbnMgd2tGaW5kT3B0aW9ucykKIC0gKHZvaWQpX2VuZEFuaW1hdGVkUmVzaXplCiB7 CiAgICAgaWYgKCFfY3VzdG9tQ29udGVudFZpZXcpIHsKKyAgICAgICAgW19zY3JvbGxWaWV3IGFk ZFN1YnZpZXc6X2NvbnRlbnRWaWV3LmdldCgpXTsKKwogICAgICAgICBDQUxheWVyICpjb250ZW50 Vmlld0xheWVyID0gW19jb250ZW50VmlldyBsYXllcl07CiAgICAgICAgIENBVHJhbnNmb3JtM0Qg cmVzaXplQW5pbWF0aW9uVHJhbnNmb3JtQWRqdXN0ZW1lbnRzID0gX3Jlc2l6ZUFuaW1hdGlvblRy YW5zZm9ybUFkanVzdG1lbnRzOwogICAgICAgICBDR0Zsb2F0IGFkanVzdG1lbnRTY2FsZSA9IHJl c2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdGVtZW50cy5tMTE7CiAgICAgICAgIGNvbnRlbnRW aWV3TGF5ZXIuc3VibGF5ZXJUcmFuc2Zvcm0gPSBDQVRyYW5zZm9ybTNESWRlbnRpdHk7CiAKLSAg ICAgICAgQ0dGbG9hdCBjdXJyZW50U2NhbGUgPSBjb250ZW50Wm9vbVNjYWxlKHNlbGYpOworICAg ICAgICBDR0Zsb2F0IGN1cnJlbnRTY2FsZSA9IFtbX3Jlc2l6ZUFuaW1hdGlvblZpZXcgbGF5ZXJd IGFmZmluZVRyYW5zZm9ybV0uYTsKICAgICAgICAgQ0dQb2ludCBjdXJyZW50U2Nyb2xsT2Zmc2V0 ID0gW19zY3JvbGxWaWV3IGNvbnRlbnRPZmZzZXRdOwogICAgICAgICBbX3Njcm9sbFZpZXcgc2V0 Wm9vbVNjYWxlOmFkanVzdG1lbnRTY2FsZSAqIGN1cnJlbnRTY2FsZV07CiAKQEAgLTE0MTIsNiAr MTQxOSw4IEBAIHN0YXRpYyBpbmxpbmUgV2ViS2l0OjpGaW5kT3B0aW9ucyB0b0ZpbmRPcHRpb25z KF9XS0ZpbmRPcHRpb25zIHdrRmluZE9wdGlvbnMpCiAgICAgICAgIGRvdWJsZSB2ZXJ0aWNhbFNj cm9sbEFkanVzdG1lbnQgPSBfcmVzaXplQW5pbWF0aW9uVHJhbnNmb3JtQWRqdXN0bWVudHMubTQy ICogY3VycmVudFNjYWxlOwogCiAgICAgICAgIFtfc2Nyb2xsVmlldyBzZXRDb250ZW50T2Zmc2V0 OkNHUG9pbnRNYWtlKGN1cnJlbnRTY3JvbGxPZmZzZXQueCAtIGhvcml6b250YWxTY3JvbGxBZGp1 c3RlbWVudCwgY3VycmVudFNjcm9sbE9mZnNldC55IC0gdmVydGljYWxTY3JvbGxBZGp1c3RtZW50 KV07CisKKyAgICAgICAgX3Jlc2l6ZUFuaW1hdGlvblZpZXcgPSBuaWw7CiAgICAgfQogCiAgICAg X3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1lbnRzID0gQ0FUcmFuc2Zvcm0zRElkZW50 aXR5Owo= 230209 2014-04-25 15:07:19 -0700 2014-04-25 16:59:12 -0700 Patch bug-132175-20140425150657.patch text/plain 6879 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDJmZDFiODYyOThmNjdh OGVkMTFkYjE1Y2RjYWM2ZGEzMGUwNDBiMC4uY2I5Yzc5YTUwOGIzNTE2M2MxMTJkYjRmZmY0Nzdm ZmNiZTg1MjAxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTA0LTI1ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g QWRkIGFuIGludGVybWVkaWFyeSB2aWV3IHRvIGRvIHRoZSB0YXJnZXQgdHJhbnNmb3JtIGFuZCBh ZGp1c3RtZW50IHRyYW5zZm9ybQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTMyMTc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgU29tZSB1dGlsaXR5IHZpZXdzIG9mIFdLQ29udGVudFZpZXcgYWNvdW50IGZv ciB0aGUgdHJhbnNmb3JtcyBiZXR3ZWVuIHRoZSBjb250ZW50IHZpZXcKKyAgICAgICAgYW5kIHRo ZSB1dGlsaXR5IHZpZXcuCisKKyAgICAgICAgU2luY2UgdGhlIGR5bmFtaWMgcmVzaXplIHJlbGll cyBvbiBzZXR0aW5nIHN1YkxheWVyVHJhbnNmb3JtcywgaXQgaXMgZ2V0dGluZyBpbiB0aGUgd2F5 LgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBhIGxheWVyIGluIGJldHdlZW4gZm9yIHRoZSBh bmltYXRpb24uIFRoYXQgd2F5IHRoZSBjb250ZW50IHZpZXcgcmVtYWlucworICAgICAgICB1bnNj YWxlZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX2RpZENvbW1pdExheWVyVHJlZTpXZWJLaXQ6Ol0pOgorICAgICAg ICAoLVtXS1dlYlZpZXcgX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZUNoYW5nZWRUYXJnZXRUb1NjYWxl OnBvc2l0aW9uOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2JlZ2luQW5pbWF0ZWRSZXNpemVX aXRoVXBkYXRlczpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9lbmRBbmltYXRlZFJlc2l6ZV0p OgorCiAyMDE0LTA0LTI0ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgog CiAgICAgICAgIFdlYktpdDIgVmlldyBHZXN0dXJlczogVXNlIGEgc2luZ2xlIHN0cnVjdCBmb3Ig dGhlIHNuYXBzaG90LCBhbmQgcGFzcyBpdCBhcm91bmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggNWYyOWMzMWJlMGNkYjhmMDQ0YWU2 ZmE2NGEzNDMyODE5Y2M5ZTBkYS4uMjZiODMwMTg4ZTNhNjNmNzgwYzg4ZjFkZTUzZjhhM2U2YWE0 ZDIyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXcubW0KQEAgLTEwNiw2ICsxMDYsNyBAQAogICAgIGJvb2wgX2lzQ2hhbmdpbmdPYnNjdXJlZElu c2V0c0ludGVyYWN0aXZlbHk7CiAgICAgQk9PTCBfaXNBbmltYXRpbmdSZXNpemU7CiAgICAgQ0FU cmFuc2Zvcm0zRCBfcmVzaXplQW5pbWF0aW9uVHJhbnNmb3JtQWRqdXN0bWVudHM7CisgICAgUmV0 YWluUHRyPFVJVmlldz4gX3Jlc2l6ZUFuaW1hdGlvblZpZXc7CiAgICAgQ0dGbG9hdCBfbGFzdEFk anVzdG1lbnRGb3JTY3JvbGxlcjsKICAgICBDR0Zsb2F0IF9rZXlib2FyZFZlcnRpY2FsT3Zlcmxh cDsKIApAQCAtNDU4LDcgKzQ1OSw3IEBAIHN0YXRpYyBDR0Zsb2F0IGNvbnRlbnRab29tU2NhbGUo V0tXZWJWaWV3KiB3ZWJWaWV3KQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoX2lzQW5pbWF0 aW5nUmVzaXplKSB7Ci0gICAgICAgIFtfY29udGVudFZpZXcgbGF5ZXJdLnN1YmxheWVyVHJhbnNm b3JtID0gX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1lbnRzOworICAgICAgICBbX3Jl c2l6ZUFuaW1hdGlvblZpZXcgbGF5ZXJdLnN1YmxheWVyVHJhbnNmb3JtID0gX3Jlc2l6ZUFuaW1h dGlvblRyYW5zZm9ybUFkanVzdG1lbnRzOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC00 ODMsNyArNDg0LDggQEAgc3RhdGljIENHRmxvYXQgY29udGVudFpvb21TY2FsZShXS1dlYlZpZXcq IHdlYlZpZXcpCiAtICh2b2lkKV9keW5hbWljVmlld3BvcnRVcGRhdGVDaGFuZ2VkVGFyZ2V0VG9T Y2FsZTooZG91YmxlKW5ld1NjYWxlIHBvc2l0aW9uOihDR1BvaW50KW5ld1Njcm9sbFBvc2l0aW9u CiB7CiAgICAgaWYgKF9pc0FuaW1hdGluZ1Jlc2l6ZSkgewotICAgICAgICBkb3VibGUgY3VycmVu dFRhcmdldFNjYWxlID0gW1tfY29udGVudFZpZXcgbGF5ZXJdIGFmZmluZVRyYW5zZm9ybV0uYTsK KyAgICAgICAgQ0dGbG9hdCBhbmltYXRpbmdTY2FsZVRhcmdldCA9IFtbX3Jlc2l6ZUFuaW1hdGlv blZpZXcgbGF5ZXJdIHRyYW5zZm9ybV0ubTExOworICAgICAgICBkb3VibGUgY3VycmVudFRhcmdl dFNjYWxlID0gYW5pbWF0aW5nU2NhbGVUYXJnZXQgKiBbW19jb250ZW50VmlldyBsYXllcl0gdHJh bnNmb3JtXS5tMTE7CiAgICAgICAgIGRvdWJsZSBzY2FsZSA9IG5ld1NjYWxlIC8gY3VycmVudFRh cmdldFNjYWxlOwogICAgICAgICBfcmVzaXplQW5pbWF0aW9uVHJhbnNmb3JtQWRqdXN0bWVudHMg PSBDQVRyYW5zZm9ybTNETWFrZVNjYWxlKHNjYWxlLCBzY2FsZSwgMCk7CiAKQEAgLTQ5Miw4ICs0 OTQsOCBAQCBzdGF0aWMgQ0dGbG9hdCBjb250ZW50Wm9vbVNjYWxlKFdLV2ViVmlldyogd2ViVmll dykKICAgICAgICAgbmV3Q29udGVudE9mZnNldC55IC09IF9vYnNjdXJlZEluc2V0cy50b3A7CiAg ICAgICAgIENHUG9pbnQgY3VycmVudENvbnRlbnRPZmZzZXQgPSBbX3Njcm9sbFZpZXcgY29udGVu dE9mZnNldF07CiAKLSAgICAgICAgX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1lbnRz Lm00MSA9IChjdXJyZW50Q29udGVudE9mZnNldC54IC0gbmV3Q29udGVudE9mZnNldC54KSAvIGN1 cnJlbnRUYXJnZXRTY2FsZTsKLSAgICAgICAgX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVz dG1lbnRzLm00MiA9IChjdXJyZW50Q29udGVudE9mZnNldC55IC0gbmV3Q29udGVudE9mZnNldC55 KSAvIGN1cnJlbnRUYXJnZXRTY2FsZTsKKyAgICAgICAgX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9y bUFkanVzdG1lbnRzLm00MSA9IChjdXJyZW50Q29udGVudE9mZnNldC54IC0gbmV3Q29udGVudE9m ZnNldC54KSAvIGFuaW1hdGluZ1NjYWxlVGFyZ2V0OworICAgICAgICBfcmVzaXplQW5pbWF0aW9u VHJhbnNmb3JtQWRqdXN0bWVudHMubTQyID0gKGN1cnJlbnRDb250ZW50T2Zmc2V0LnkgLSBuZXdD b250ZW50T2Zmc2V0LnkpIC8gYW5pbWF0aW5nU2NhbGVUYXJnZXQ7CiAgICAgfQogfQogCkBAIC0x MzI5LDYgKzEzMzEsMTAgQEAgc3RhdGljIGlubGluZSBXZWJLaXQ6OkZpbmRPcHRpb25zIHRvRmlu ZE9wdGlvbnMoX1dLRmluZE9wdGlvbnMgd2tGaW5kT3B0aW9ucykKICAgICBfaXNBbmltYXRpbmdS ZXNpemUgPSBZRVM7CiAgICAgX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1lbnRzID0g Q0FUcmFuc2Zvcm0zRElkZW50aXR5OwogCisgICAgX3Jlc2l6ZUFuaW1hdGlvblZpZXcgPSBhZG9w dE5TKFtbVUlWaWV3IGFsbG9jXSBpbml0XSk7CisgICAgW19yZXNpemVBbmltYXRpb25WaWV3IGFk ZFN1YnZpZXc6X2NvbnRlbnRWaWV3LmdldCgpXTsKKyAgICBbX3Njcm9sbFZpZXcgYWRkU3Vidmll dzpfcmVzaXplQW5pbWF0aW9uVmlldy5nZXQoKV07CisKICAgICBDR1JlY3Qgb2xkQm91bmRzID0g c2VsZi5ib3VuZHM7CiAgICAgQ0dTaXplIG9sZE1pbmltdW1MYXlvdXRTaXplID0gb2xkQm91bmRz LnNpemU7CiAgICAgaWYgKF9oYXNTdGF0aWNNaW5pbXVtTGF5b3V0U2l6ZSkKQEAgLTEzNTMsMTAg KzEzNTksMTIgQEAgc3RhdGljIGlubGluZSBXZWJLaXQ6OkZpbmRPcHRpb25zIHRvRmluZE9wdGlv bnMoX1dLRmluZE9wdGlvbnMgd2tGaW5kT3B0aW9ucykKICAgICBbX3Njcm9sbFZpZXcgc2V0TWF4 aW11bVpvb21TY2FsZTpzdGQ6Om1heChuZXdCb3VuZHMuc2l6ZS53aWR0aCAvIGNvbnRlbnRTaXpl SW5Db250ZW50Vmlld0Nvb3JkaW5hdGVzLndpZHRoLCBbX3Njcm9sbFZpZXcgbWF4aW11bVpvb21T Y2FsZV0pXTsKIAogICAgIC8vIENvbXB1dGUgdGhlIG5ldyBzY2FsZSB0byBrZWVwIHRoZSBjdXJy ZW50IGNvbnRlbnQgd2lkdGggaW4gdGhlIHNjcm9sbHZpZXcuCi0gICAgQ0dGbG9hdCBvbGRXZWJW aWV3V2lkdGhJbkNvbnRlbnRWaWV3Q29vcmRpbmF0ZXMgPSBvbGRCb3VuZHMuc2l6ZS53aWR0aCAv IGNvbnRlbnRab29tU2NhbGUoc2VsZik7CisgICAgQ0dGbG9hdCBjdXJyZW50U2NhbGUgPSBjb250 ZW50Wm9vbVNjYWxlKHNlbGYpOworICAgIENHRmxvYXQgb2xkV2ViVmlld1dpZHRoSW5Db250ZW50 Vmlld0Nvb3JkaW5hdGVzID0gb2xkQm91bmRzLnNpemUud2lkdGggLyBjdXJyZW50U2NhbGU7CiAg ICAgQ0dGbG9hdCB2aXNpYmxlQ29udGVudFZpZXdXaWR0aEluQ29udGVudENvb3JkaW5hdGVzID0g c3RkOjptaW4oY29udGVudFNpemVJbkNvbnRlbnRWaWV3Q29vcmRpbmF0ZXMud2lkdGgsIG9sZFdl YlZpZXdXaWR0aEluQ29udGVudFZpZXdDb29yZGluYXRlcyk7CiAgICAgQ0dGbG9hdCB0YXJnZXRT Y2FsZSA9IG5ld0JvdW5kcy5zaXplLndpZHRoIC8gdmlzaWJsZUNvbnRlbnRWaWV3V2lkdGhJbkNv bnRlbnRDb29yZGluYXRlczsKLSAgICBbX3Njcm9sbFZpZXcgc2V0Wm9vbVNjYWxlOnRhcmdldFNj YWxlXTsKKyAgICBDR0Zsb2F0IHJlc2l6ZUFuaW1hdGlvblZpZXdBbmltYXRpb25TY2FsZSA9IHRh cmdldFNjYWxlIC8gY3VycmVudFNjYWxlOworICAgIFtfcmVzaXplQW5pbWF0aW9uVmlldyBzZXRU cmFuc2Zvcm06Q0dBZmZpbmVUcmFuc2Zvcm1NYWtlU2NhbGUocmVzaXplQW5pbWF0aW9uVmlld0Fu aW1hdGlvblNjYWxlLCByZXNpemVBbmltYXRpb25WaWV3QW5pbWF0aW9uU2NhbGUpXTsKIAogICAg IC8vIENvbXB1dGUgYSBuZXcgcG9zaXRpb24gdG8ga2VlcCB0aGUgY29udGVudCBjZW50ZXJlZC4K ICAgICBDR1BvaW50IG9yaWdpbmFsQ29udGVudENlbnRlciA9IG9sZFVub2JzY3VyZWRDb250ZW50 UmVjdC5jZW50ZXIoKTsKQEAgLTEzOTksMTkgKzE0MDcsMjQgQEAgc3RhdGljIGlubGluZSBXZWJL aXQ6OkZpbmRPcHRpb25zIHRvRmluZE9wdGlvbnMoX1dLRmluZE9wdGlvbnMgd2tGaW5kT3B0aW9u cykKIC0gKHZvaWQpX2VuZEFuaW1hdGVkUmVzaXplCiB7CiAgICAgaWYgKCFfY3VzdG9tQ29udGVu dFZpZXcpIHsKKyAgICAgICAgW19zY3JvbGxWaWV3IGFkZFN1YnZpZXc6X2NvbnRlbnRWaWV3Lmdl dCgpXTsKKwogICAgICAgICBDQUxheWVyICpjb250ZW50Vmlld0xheWVyID0gW19jb250ZW50Vmll dyBsYXllcl07CiAgICAgICAgIENBVHJhbnNmb3JtM0QgcmVzaXplQW5pbWF0aW9uVHJhbnNmb3Jt QWRqdXN0ZW1lbnRzID0gX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1lbnRzOwogICAg ICAgICBDR0Zsb2F0IGFkanVzdG1lbnRTY2FsZSA9IHJlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFk anVzdGVtZW50cy5tMTE7CiAgICAgICAgIGNvbnRlbnRWaWV3TGF5ZXIuc3VibGF5ZXJUcmFuc2Zv cm0gPSBDQVRyYW5zZm9ybTNESWRlbnRpdHk7CiAKLSAgICAgICAgQ0dGbG9hdCBjdXJyZW50U2Nh bGUgPSBjb250ZW50Wm9vbVNjYWxlKHNlbGYpOworICAgICAgICBDR0Zsb2F0IGFuaW1hdGluZ1Nj YWxlVGFyZ2V0ID0gW1tfcmVzaXplQW5pbWF0aW9uVmlldyBsYXllcl0gdHJhbnNmb3JtXS5tMTE7 CisgICAgICAgIENHRmxvYXQgY3VycmVudFNjYWxlID0gW1tfcmVzaXplQW5pbWF0aW9uVmlldyBs YXllcl0gdHJhbnNmb3JtXS5tMTEgKiBbW19jb250ZW50VmlldyBsYXllcl0gdHJhbnNmb3JtXS5t MTE7CiAgICAgICAgIENHUG9pbnQgY3VycmVudFNjcm9sbE9mZnNldCA9IFtfc2Nyb2xsVmlldyBj b250ZW50T2Zmc2V0XTsKICAgICAgICAgW19zY3JvbGxWaWV3IHNldFpvb21TY2FsZTphZGp1c3Rt ZW50U2NhbGUgKiBjdXJyZW50U2NhbGVdOwogCi0gICAgICAgIGRvdWJsZSBob3Jpem9udGFsU2Ny b2xsQWRqdXN0ZW1lbnQgPSBfcmVzaXplQW5pbWF0aW9uVHJhbnNmb3JtQWRqdXN0bWVudHMubTQx ICogY3VycmVudFNjYWxlOwotICAgICAgICBkb3VibGUgdmVydGljYWxTY3JvbGxBZGp1c3RtZW50 ID0gX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1lbnRzLm00MiAqIGN1cnJlbnRTY2Fs ZTsKKyAgICAgICAgZG91YmxlIGhvcml6b250YWxTY3JvbGxBZGp1c3RlbWVudCA9IF9yZXNpemVB bmltYXRpb25UcmFuc2Zvcm1BZGp1c3RtZW50cy5tNDEgKiBhbmltYXRpbmdTY2FsZVRhcmdldDsK KyAgICAgICAgZG91YmxlIHZlcnRpY2FsU2Nyb2xsQWRqdXN0bWVudCA9IF9yZXNpemVBbmltYXRp b25UcmFuc2Zvcm1BZGp1c3RtZW50cy5tNDIgKiBhbmltYXRpbmdTY2FsZVRhcmdldDsKIAogICAg ICAgICBbX3Njcm9sbFZpZXcgc2V0Q29udGVudE9mZnNldDpDR1BvaW50TWFrZShjdXJyZW50U2Ny b2xsT2Zmc2V0LnggLSBob3Jpem9udGFsU2Nyb2xsQWRqdXN0ZW1lbnQsIGN1cnJlbnRTY3JvbGxP ZmZzZXQueSAtIHZlcnRpY2FsU2Nyb2xsQWRqdXN0bWVudCldOworCisgICAgICAgIF9yZXNpemVB bmltYXRpb25WaWV3ID0gbmlsOwogICAgIH0KIAogICAgIF9yZXNpemVBbmltYXRpb25UcmFuc2Zv cm1BZGp1c3RtZW50cyA9IENBVHJhbnNmb3JtM0RJZGVudGl0eTsK 230224 2014-04-25 16:59:14 -0700 2014-04-25 17:05:00 -0700 Patch bug-132175-20140425165852.patch text/plain 6879 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDJmZDFiODYyOThmNjdh OGVkMTFkYjE1Y2RjYWM2ZGEzMGUwNDBiMC4uY2I5Yzc5YTUwOGIzNTE2M2MxMTJkYjRmZmY0Nzdm ZmNiZTg1MjAxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTA0LTI1ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g QWRkIGFuIGludGVybWVkaWFyeSB2aWV3IHRvIGRvIHRoZSB0YXJnZXQgdHJhbnNmb3JtIGFuZCBh ZGp1c3RtZW50IHRyYW5zZm9ybQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTMyMTc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgU29tZSB1dGlsaXR5IHZpZXdzIG9mIFdLQ29udGVudFZpZXcgYWNvdW50IGZv ciB0aGUgdHJhbnNmb3JtcyBiZXR3ZWVuIHRoZSBjb250ZW50IHZpZXcKKyAgICAgICAgYW5kIHRo ZSB1dGlsaXR5IHZpZXcuCisKKyAgICAgICAgU2luY2UgdGhlIGR5bmFtaWMgcmVzaXplIHJlbGll cyBvbiBzZXR0aW5nIHN1YkxheWVyVHJhbnNmb3JtcywgaXQgaXMgZ2V0dGluZyBpbiB0aGUgd2F5 LgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBhIGxheWVyIGluIGJldHdlZW4gZm9yIHRoZSBh bmltYXRpb24uIFRoYXQgd2F5IHRoZSBjb250ZW50IHZpZXcgcmVtYWlucworICAgICAgICB1bnNj YWxlZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX2RpZENvbW1pdExheWVyVHJlZTpXZWJLaXQ6Ol0pOgorICAgICAg ICAoLVtXS1dlYlZpZXcgX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZUNoYW5nZWRUYXJnZXRUb1NjYWxl OnBvc2l0aW9uOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2JlZ2luQW5pbWF0ZWRSZXNpemVX aXRoVXBkYXRlczpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9lbmRBbmltYXRlZFJlc2l6ZV0p OgorCiAyMDE0LTA0LTI0ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgog CiAgICAgICAgIFdlYktpdDIgVmlldyBHZXN0dXJlczogVXNlIGEgc2luZ2xlIHN0cnVjdCBmb3Ig dGhlIHNuYXBzaG90LCBhbmQgcGFzcyBpdCBhcm91bmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggNWYyOWMzMWJlMGNkYjhmMDQ0YWU2 ZmE2NGEzNDMyODE5Y2M5ZTBkYS4uOGExMmJjYTBlYmQzMTcyNDRkNTZmOTc1ZWFlNTgxOGUxNjQ4 ZjE1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXcubW0KQEAgLTEwNiw2ICsxMDYsNyBAQAogICAgIGJvb2wgX2lzQ2hhbmdpbmdPYnNjdXJlZElu c2V0c0ludGVyYWN0aXZlbHk7CiAgICAgQk9PTCBfaXNBbmltYXRpbmdSZXNpemU7CiAgICAgQ0FU cmFuc2Zvcm0zRCBfcmVzaXplQW5pbWF0aW9uVHJhbnNmb3JtQWRqdXN0bWVudHM7CisgICAgUmV0 YWluUHRyPFVJVmlldz4gX3Jlc2l6ZUFuaW1hdGlvblZpZXc7CiAgICAgQ0dGbG9hdCBfbGFzdEFk anVzdG1lbnRGb3JTY3JvbGxlcjsKICAgICBDR0Zsb2F0IF9rZXlib2FyZFZlcnRpY2FsT3Zlcmxh cDsKIApAQCAtNDU4LDcgKzQ1OSw3IEBAIHN0YXRpYyBDR0Zsb2F0IGNvbnRlbnRab29tU2NhbGUo V0tXZWJWaWV3KiB3ZWJWaWV3KQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoX2lzQW5pbWF0 aW5nUmVzaXplKSB7Ci0gICAgICAgIFtfY29udGVudFZpZXcgbGF5ZXJdLnN1YmxheWVyVHJhbnNm b3JtID0gX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1lbnRzOworICAgICAgICBbX3Jl c2l6ZUFuaW1hdGlvblZpZXcgbGF5ZXJdLnN1YmxheWVyVHJhbnNmb3JtID0gX3Jlc2l6ZUFuaW1h dGlvblRyYW5zZm9ybUFkanVzdG1lbnRzOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC00 ODMsNyArNDg0LDggQEAgc3RhdGljIENHRmxvYXQgY29udGVudFpvb21TY2FsZShXS1dlYlZpZXcq IHdlYlZpZXcpCiAtICh2b2lkKV9keW5hbWljVmlld3BvcnRVcGRhdGVDaGFuZ2VkVGFyZ2V0VG9T Y2FsZTooZG91YmxlKW5ld1NjYWxlIHBvc2l0aW9uOihDR1BvaW50KW5ld1Njcm9sbFBvc2l0aW9u CiB7CiAgICAgaWYgKF9pc0FuaW1hdGluZ1Jlc2l6ZSkgewotICAgICAgICBkb3VibGUgY3VycmVu dFRhcmdldFNjYWxlID0gW1tfY29udGVudFZpZXcgbGF5ZXJdIGFmZmluZVRyYW5zZm9ybV0uYTsK KyAgICAgICAgQ0dGbG9hdCBhbmltYXRpbmdTY2FsZVRhcmdldCA9IFtbX3Jlc2l6ZUFuaW1hdGlv blZpZXcgbGF5ZXJdIHRyYW5zZm9ybV0ubTExOworICAgICAgICBkb3VibGUgY3VycmVudFRhcmdl dFNjYWxlID0gYW5pbWF0aW5nU2NhbGVUYXJnZXQgKiBbW19jb250ZW50VmlldyBsYXllcl0gdHJh bnNmb3JtXS5tMTE7CiAgICAgICAgIGRvdWJsZSBzY2FsZSA9IG5ld1NjYWxlIC8gY3VycmVudFRh cmdldFNjYWxlOwogICAgICAgICBfcmVzaXplQW5pbWF0aW9uVHJhbnNmb3JtQWRqdXN0bWVudHMg PSBDQVRyYW5zZm9ybTNETWFrZVNjYWxlKHNjYWxlLCBzY2FsZSwgMCk7CiAKQEAgLTQ5Miw4ICs0 OTQsOCBAQCBzdGF0aWMgQ0dGbG9hdCBjb250ZW50Wm9vbVNjYWxlKFdLV2ViVmlldyogd2ViVmll dykKICAgICAgICAgbmV3Q29udGVudE9mZnNldC55IC09IF9vYnNjdXJlZEluc2V0cy50b3A7CiAg ICAgICAgIENHUG9pbnQgY3VycmVudENvbnRlbnRPZmZzZXQgPSBbX3Njcm9sbFZpZXcgY29udGVu dE9mZnNldF07CiAKLSAgICAgICAgX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1lbnRz Lm00MSA9IChjdXJyZW50Q29udGVudE9mZnNldC54IC0gbmV3Q29udGVudE9mZnNldC54KSAvIGN1 cnJlbnRUYXJnZXRTY2FsZTsKLSAgICAgICAgX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVz dG1lbnRzLm00MiA9IChjdXJyZW50Q29udGVudE9mZnNldC55IC0gbmV3Q29udGVudE9mZnNldC55 KSAvIGN1cnJlbnRUYXJnZXRTY2FsZTsKKyAgICAgICAgX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9y bUFkanVzdG1lbnRzLm00MSA9IChjdXJyZW50Q29udGVudE9mZnNldC54IC0gbmV3Q29udGVudE9m ZnNldC54KSAvIGFuaW1hdGluZ1NjYWxlVGFyZ2V0OworICAgICAgICBfcmVzaXplQW5pbWF0aW9u VHJhbnNmb3JtQWRqdXN0bWVudHMubTQyID0gKGN1cnJlbnRDb250ZW50T2Zmc2V0LnkgLSBuZXdD b250ZW50T2Zmc2V0LnkpIC8gYW5pbWF0aW5nU2NhbGVUYXJnZXQ7CiAgICAgfQogfQogCkBAIC0x MzI5LDYgKzEzMzEsMTAgQEAgc3RhdGljIGlubGluZSBXZWJLaXQ6OkZpbmRPcHRpb25zIHRvRmlu ZE9wdGlvbnMoX1dLRmluZE9wdGlvbnMgd2tGaW5kT3B0aW9ucykKICAgICBfaXNBbmltYXRpbmdS ZXNpemUgPSBZRVM7CiAgICAgX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1lbnRzID0g Q0FUcmFuc2Zvcm0zRElkZW50aXR5OwogCisgICAgX3Jlc2l6ZUFuaW1hdGlvblZpZXcgPSBhZG9w dE5TKFtbVUlWaWV3IGFsbG9jXSBpbml0XSk7CisgICAgW19zY3JvbGxWaWV3IGFkZFN1YnZpZXc6 X3Jlc2l6ZUFuaW1hdGlvblZpZXcuZ2V0KCldOworICAgIFtfcmVzaXplQW5pbWF0aW9uVmlldyBh ZGRTdWJ2aWV3Ol9jb250ZW50Vmlldy5nZXQoKV07CisKICAgICBDR1JlY3Qgb2xkQm91bmRzID0g c2VsZi5ib3VuZHM7CiAgICAgQ0dTaXplIG9sZE1pbmltdW1MYXlvdXRTaXplID0gb2xkQm91bmRz LnNpemU7CiAgICAgaWYgKF9oYXNTdGF0aWNNaW5pbXVtTGF5b3V0U2l6ZSkKQEAgLTEzNTMsMTAg KzEzNTksMTIgQEAgc3RhdGljIGlubGluZSBXZWJLaXQ6OkZpbmRPcHRpb25zIHRvRmluZE9wdGlv bnMoX1dLRmluZE9wdGlvbnMgd2tGaW5kT3B0aW9ucykKICAgICBbX3Njcm9sbFZpZXcgc2V0TWF4 aW11bVpvb21TY2FsZTpzdGQ6Om1heChuZXdCb3VuZHMuc2l6ZS53aWR0aCAvIGNvbnRlbnRTaXpl SW5Db250ZW50Vmlld0Nvb3JkaW5hdGVzLndpZHRoLCBbX3Njcm9sbFZpZXcgbWF4aW11bVpvb21T Y2FsZV0pXTsKIAogICAgIC8vIENvbXB1dGUgdGhlIG5ldyBzY2FsZSB0byBrZWVwIHRoZSBjdXJy ZW50IGNvbnRlbnQgd2lkdGggaW4gdGhlIHNjcm9sbHZpZXcuCi0gICAgQ0dGbG9hdCBvbGRXZWJW aWV3V2lkdGhJbkNvbnRlbnRWaWV3Q29vcmRpbmF0ZXMgPSBvbGRCb3VuZHMuc2l6ZS53aWR0aCAv IGNvbnRlbnRab29tU2NhbGUoc2VsZik7CisgICAgQ0dGbG9hdCBjdXJyZW50U2NhbGUgPSBjb250 ZW50Wm9vbVNjYWxlKHNlbGYpOworICAgIENHRmxvYXQgb2xkV2ViVmlld1dpZHRoSW5Db250ZW50 Vmlld0Nvb3JkaW5hdGVzID0gb2xkQm91bmRzLnNpemUud2lkdGggLyBjdXJyZW50U2NhbGU7CiAg ICAgQ0dGbG9hdCB2aXNpYmxlQ29udGVudFZpZXdXaWR0aEluQ29udGVudENvb3JkaW5hdGVzID0g c3RkOjptaW4oY29udGVudFNpemVJbkNvbnRlbnRWaWV3Q29vcmRpbmF0ZXMud2lkdGgsIG9sZFdl YlZpZXdXaWR0aEluQ29udGVudFZpZXdDb29yZGluYXRlcyk7CiAgICAgQ0dGbG9hdCB0YXJnZXRT Y2FsZSA9IG5ld0JvdW5kcy5zaXplLndpZHRoIC8gdmlzaWJsZUNvbnRlbnRWaWV3V2lkdGhJbkNv bnRlbnRDb29yZGluYXRlczsKLSAgICBbX3Njcm9sbFZpZXcgc2V0Wm9vbVNjYWxlOnRhcmdldFNj YWxlXTsKKyAgICBDR0Zsb2F0IHJlc2l6ZUFuaW1hdGlvblZpZXdBbmltYXRpb25TY2FsZSA9IHRh cmdldFNjYWxlIC8gY3VycmVudFNjYWxlOworICAgIFtfcmVzaXplQW5pbWF0aW9uVmlldyBzZXRU cmFuc2Zvcm06Q0dBZmZpbmVUcmFuc2Zvcm1NYWtlU2NhbGUocmVzaXplQW5pbWF0aW9uVmlld0Fu aW1hdGlvblNjYWxlLCByZXNpemVBbmltYXRpb25WaWV3QW5pbWF0aW9uU2NhbGUpXTsKIAogICAg IC8vIENvbXB1dGUgYSBuZXcgcG9zaXRpb24gdG8ga2VlcCB0aGUgY29udGVudCBjZW50ZXJlZC4K ICAgICBDR1BvaW50IG9yaWdpbmFsQ29udGVudENlbnRlciA9IG9sZFVub2JzY3VyZWRDb250ZW50 UmVjdC5jZW50ZXIoKTsKQEAgLTEzOTksMTkgKzE0MDcsMjQgQEAgc3RhdGljIGlubGluZSBXZWJL aXQ6OkZpbmRPcHRpb25zIHRvRmluZE9wdGlvbnMoX1dLRmluZE9wdGlvbnMgd2tGaW5kT3B0aW9u cykKIC0gKHZvaWQpX2VuZEFuaW1hdGVkUmVzaXplCiB7CiAgICAgaWYgKCFfY3VzdG9tQ29udGVu dFZpZXcpIHsKKyAgICAgICAgW19zY3JvbGxWaWV3IGFkZFN1YnZpZXc6X2NvbnRlbnRWaWV3Lmdl dCgpXTsKKwogICAgICAgICBDQUxheWVyICpjb250ZW50Vmlld0xheWVyID0gW19jb250ZW50Vmll dyBsYXllcl07CiAgICAgICAgIENBVHJhbnNmb3JtM0QgcmVzaXplQW5pbWF0aW9uVHJhbnNmb3Jt QWRqdXN0ZW1lbnRzID0gX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1lbnRzOwogICAg ICAgICBDR0Zsb2F0IGFkanVzdG1lbnRTY2FsZSA9IHJlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFk anVzdGVtZW50cy5tMTE7CiAgICAgICAgIGNvbnRlbnRWaWV3TGF5ZXIuc3VibGF5ZXJUcmFuc2Zv cm0gPSBDQVRyYW5zZm9ybTNESWRlbnRpdHk7CiAKLSAgICAgICAgQ0dGbG9hdCBjdXJyZW50U2Nh bGUgPSBjb250ZW50Wm9vbVNjYWxlKHNlbGYpOworICAgICAgICBDR0Zsb2F0IGFuaW1hdGluZ1Nj YWxlVGFyZ2V0ID0gW1tfcmVzaXplQW5pbWF0aW9uVmlldyBsYXllcl0gdHJhbnNmb3JtXS5tMTE7 CisgICAgICAgIENHRmxvYXQgY3VycmVudFNjYWxlID0gW1tfcmVzaXplQW5pbWF0aW9uVmlldyBs YXllcl0gdHJhbnNmb3JtXS5tMTEgKiBbW19jb250ZW50VmlldyBsYXllcl0gdHJhbnNmb3JtXS5t MTE7CiAgICAgICAgIENHUG9pbnQgY3VycmVudFNjcm9sbE9mZnNldCA9IFtfc2Nyb2xsVmlldyBj b250ZW50T2Zmc2V0XTsKICAgICAgICAgW19zY3JvbGxWaWV3IHNldFpvb21TY2FsZTphZGp1c3Rt ZW50U2NhbGUgKiBjdXJyZW50U2NhbGVdOwogCi0gICAgICAgIGRvdWJsZSBob3Jpem9udGFsU2Ny b2xsQWRqdXN0ZW1lbnQgPSBfcmVzaXplQW5pbWF0aW9uVHJhbnNmb3JtQWRqdXN0bWVudHMubTQx ICogY3VycmVudFNjYWxlOwotICAgICAgICBkb3VibGUgdmVydGljYWxTY3JvbGxBZGp1c3RtZW50 ID0gX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1lbnRzLm00MiAqIGN1cnJlbnRTY2Fs ZTsKKyAgICAgICAgZG91YmxlIGhvcml6b250YWxTY3JvbGxBZGp1c3RlbWVudCA9IF9yZXNpemVB bmltYXRpb25UcmFuc2Zvcm1BZGp1c3RtZW50cy5tNDEgKiBhbmltYXRpbmdTY2FsZVRhcmdldDsK KyAgICAgICAgZG91YmxlIHZlcnRpY2FsU2Nyb2xsQWRqdXN0bWVudCA9IF9yZXNpemVBbmltYXRp b25UcmFuc2Zvcm1BZGp1c3RtZW50cy5tNDIgKiBhbmltYXRpbmdTY2FsZVRhcmdldDsKIAogICAg ICAgICBbX3Njcm9sbFZpZXcgc2V0Q29udGVudE9mZnNldDpDR1BvaW50TWFrZShjdXJyZW50U2Ny b2xsT2Zmc2V0LnggLSBob3Jpem9udGFsU2Nyb2xsQWRqdXN0ZW1lbnQsIGN1cnJlbnRTY3JvbGxP ZmZzZXQueSAtIHZlcnRpY2FsU2Nyb2xsQWRqdXN0bWVudCldOworCisgICAgICAgIF9yZXNpemVB bmltYXRpb25WaWV3ID0gbmlsOwogICAgIH0KIAogICAgIF9yZXNpemVBbmltYXRpb25UcmFuc2Zv cm1BZGp1c3RtZW50cyA9IENBVHJhbnNmb3JtM0RJZGVudGl0eTsK