138920 2014-11-20 01:45:51 -0800 TextIndicator should have getters for TextIndicator::Data properties 2014-11-20 14:26:06 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca bdakin webkit-bug-importer oldest_to_newest 1050091 0 thorton 2014-11-20 01:45:51 -0800 TextIndicator should have getters for TextIndicator::Data properties 1050092 1 241933 thorton 2014-11-20 01:46:45 -0800 Created attachment 241933 Patch 1050093 2 webkit-bug-importer 2014-11-20 01:47:17 -0800 <rdar://problem/19042323> 1050253 3 thorton 2014-11-20 14:26:06 -0800 http://trac.webkit.org/changeset/176418 241933 2014-11-20 01:46:45 -0800 2014-11-20 13:38:33 -0800 Patch bug-138920-20141120014700.patch text/plain 9720 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2Mzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTlkNDNkMGUzZTRhNTI2 NTE4MDZlZGZiNmNlNDE1MjVkMWRiNWNlOC4uYTE1YTFmMzRlMWRiZGUyYWQxOTUyNThjZjUxNzE3 MWM4Mjk2MTZmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDE0LTExLTIwICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCisgICAgICAgIFRleHRJbmRpY2F0 b3Igc2hvdWxkIGhhdmUgZ2V0dGVycyBmb3IgVGV4dEluZGljYXRvcjo6RGF0YSBwcm9wZXJ0aWVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg5MjAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFk IG9mIGhhdmluZyBjbGllbnRzIHJlYWNoIGludG8gdGhlIGRhdGEoKSwgYWRkIGdldHRlcnMuCisg ICAgICAgIFJlbW92ZSBmcmFtZVJlY3QoKSwgd2hpY2ggaXMgaWRlbnRpY2FsIHRvIHRoZSB0ZXh0 Qm91bmRpbmdSZWN0SW5XaW5kb3dDb29yZGluYXRlcyBnZXR0ZXIuCisgICAgICAgIFJlbW92ZSBk ZWNsYXJhdGlvbnMgZm9yIGRyYXcvZHJhd0NvbnRlbnRJbWFnZSwgd2hpY2ggd2VyZSBhbHJlYWR5 IHJlbW92ZWQuCisKKyAgICAgICAgKiBTaGFyZWQvVGV4dEluZGljYXRvci5jcHA6CisgICAgICAg IChXZWJLaXQ6OlRleHRJbmRpY2F0b3I6OmZyYW1lUmVjdCk6IERlbGV0ZWQuCisgICAgICAgICog U2hhcmVkL1RleHRJbmRpY2F0b3IuaDoKKyAgICAgICAgKFdlYktpdDo6VGV4dEluZGljYXRvcjo6 dGV4dEJvdW5kaW5nUmVjdEluV2luZG93Q29vcmRpbmF0ZXMpOgorICAgICAgICAoV2ViS2l0OjpU ZXh0SW5kaWNhdG9yOjp0ZXh0UmVjdHNJbkJvdW5kaW5nUmVjdENvb3JkaW5hdGVzKToKKyAgICAg ICAgKFdlYktpdDo6VGV4dEluZGljYXRvcjo6Y29udGVudEltYWdlU2NhbGVGYWN0b3IpOgorICAg ICAgICAoV2ViS2l0OjpUZXh0SW5kaWNhdG9yOjpjb250ZW50SW1hZ2VXaXRoSGlnaGxpZ2h0KToK KyAgICAgICAgKFdlYktpdDo6VGV4dEluZGljYXRvcjo6Y29udGVudEltYWdlKToKKyAgICAgICAg KiBVSVByb2Nlc3MvbWFjL1RleHRJbmRpY2F0b3JXaW5kb3cubW06CisgICAgICAgICgtW1dLVGV4 dEluZGljYXRvclZpZXcgaW5pdFdpdGhGcmFtZTp0ZXh0SW5kaWNhdG9yOm1hcmdpbjpdKToKKyAg ICAgICAgKC1bV0tUZXh0SW5kaWNhdG9yVmlldyBwcmVzZW50V2l0aENvbXBsZXRpb25IYW5kbGVy Ol0pOgorICAgICAgICAoV2ViS2l0OjpUZXh0SW5kaWNhdG9yV2luZG93OjpzZXRUZXh0SW5kaWNh dG9yKToKKworMjAxNC0xMS0yMCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNv bT4KKwogICAgICAgICBEb24ndCB1c2UgYSBUZXh0SW5kaWNhdG9yIEJvdW5jZUFuZENyb3NzZmFk ZSB0cmFuc2l0aW9uIGlmIHRoZSBzZWxlY3Rpb24gaGlnaGxpZ2h0IGlzIG5ldmVyIHNob3duCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg5MTkKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1RleHRJbmRpY2F0b3IuY3BwIGIvU291 cmNlL1dlYktpdDIvU2hhcmVkL1RleHRJbmRpY2F0b3IuY3BwCmluZGV4IGUzNDQ1MTRhYjRiMTc4 NzAyM2M5MzU3M2ZmZTdmNzM5YzU4ZmQ1NjkuLjMyZTkyMzA5MTdiY2MxM2MzMzJjOGQ2ZDk5OTBj ZWQwNTVhYzVmODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9UZXh0SW5kaWNh dG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVGV4dEluZGljYXRvci5jcHAKQEAg LTIxMSwxMSArMjExLDYgQEAgVGV4dEluZGljYXRvcjo6flRleHRJbmRpY2F0b3IoKQogewogfQog Ci1GbG9hdFJlY3QgVGV4dEluZGljYXRvcjo6ZnJhbWVSZWN0KCkgY29uc3QKLXsKLSAgICByZXR1 cm4gbV9kYXRhLnRleHRCb3VuZGluZ1JlY3RJbldpbmRvd0Nvb3JkaW5hdGVzOwotfQotCiB2b2lk IFRleHRJbmRpY2F0b3I6OkRhdGE6OmVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2RlciYgZW5jb2Rl cikgY29uc3QKIHsKICAgICBlbmNvZGVyIDw8IHNlbGVjdGlvblJlY3RJbldpbmRvd0Nvb3JkaW5h dGVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1RleHRJbmRpY2F0b3IuaCBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9UZXh0SW5kaWNhdG9yLmgKaW5kZXggMDdmMzAzNjdiNmZm YTgxYTc2MGM4NTU4N2UxMjgwZTk3ZDgxNmE4Yi4uNGUxYTI0Yjg5M2E5NmZmMzA5Mjk4ZDNlMjhl ZjMzMDdkY2QwMGFkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1RleHRJbmRp Y2F0b3IuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVGV4dEluZGljYXRvci5oCkBAIC02 Nyw3ICs2Nyw2IEBAIHB1YmxpYzoKICAgICAgICAgZmxvYXQgY29udGVudEltYWdlU2NhbGVGYWN0 b3I7CiAgICAgICAgIFJlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGNvbnRlbnRJbWFnZVdpdGhIaWdo bGlnaHQ7CiAgICAgICAgIFJlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGNvbnRlbnRJbWFnZTsKLQog ICAgICAgICBQcmVzZW50YXRpb25UcmFuc2l0aW9uIHByZXNlbnRhdGlvblRyYW5zaXRpb247CiAK ICAgICAgICAgdm9pZCBlbmNvZGUoSVBDOjpBcmd1bWVudEVuY29kZXImKSBjb25zdDsKQEAgLTgx LDIwICs4MCwyMCBAQCBwdWJsaWM6CiAgICAgflRleHRJbmRpY2F0b3IoKTsKIAogICAgIFdlYkNv cmU6OkZsb2F0UmVjdCBzZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlcygpIGNvbnN0IHsg cmV0dXJuIG1fZGF0YS5zZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlczsgfQotCisgICAg V2ViQ29yZTo6RmxvYXRSZWN0IHRleHRCb3VuZGluZ1JlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKCkg Y29uc3QgeyByZXR1cm4gbV9kYXRhLnRleHRCb3VuZGluZ1JlY3RJbldpbmRvd0Nvb3JkaW5hdGVz OyB9CisgICAgY29uc3QgVmVjdG9yPFdlYkNvcmU6OkZsb2F0UmVjdD4mIHRleHRSZWN0c0luQm91 bmRpbmdSZWN0Q29vcmRpbmF0ZXMoKSBjb25zdCB7IHJldHVybiBtX2RhdGEudGV4dFJlY3RzSW5C b3VuZGluZ1JlY3RDb29yZGluYXRlczsgfQorICAgIGZsb2F0IGNvbnRlbnRJbWFnZVNjYWxlRmFj dG9yKCkgY29uc3QgeyByZXR1cm4gbV9kYXRhLmNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yOyB9Cisg ICAgU2hhcmVhYmxlQml0bWFwICpjb250ZW50SW1hZ2VXaXRoSGlnaGxpZ2h0KCkgY29uc3QgeyBy ZXR1cm4gbV9kYXRhLmNvbnRlbnRJbWFnZVdpdGhIaWdobGlnaHQuZ2V0KCk7IH0KKyAgICBTaGFy ZWFibGVCaXRtYXAgKmNvbnRlbnRJbWFnZSgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0YS5jb250ZW50 SW1hZ2UuZ2V0KCk7IH0KICAgICBQcmVzZW50YXRpb25UcmFuc2l0aW9uIHByZXNlbnRhdGlvblRy YW5zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX2RhdGEucHJlc2VudGF0aW9uVHJhbnNpdGlvbjsg fQorCiAgICAgdm9pZCBzZXRQcmVzZW50YXRpb25UcmFuc2l0aW9uKFByZXNlbnRhdGlvblRyYW5z aXRpb24gdHJhbnNpdGlvbikgeyBtX2RhdGEucHJlc2VudGF0aW9uVHJhbnNpdGlvbiA9IHRyYW5z aXRpb247IH0KIAotICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBmcmFtZVJlY3QoKSBjb25zdDsKICAg ICBEYXRhIGRhdGEoKSBjb25zdCB7IHJldHVybiBtX2RhdGE7IH0KIAotICAgIHZvaWQgZHJhdyhX ZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBkaXJ0eVJl Y3QpOwotCiBwcml2YXRlOgogICAgIFRleHRJbmRpY2F0b3IoY29uc3QgVGV4dEluZGljYXRvcjo6 RGF0YSYpOwogCi0gICAgdm9pZCBkcmF3Q29udGVudEltYWdlKFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dCYsIFdlYkNvcmU6OkZsb2F0UmVjdCB0ZXh0UmVjdCk7Ci0KICAgICBEYXRhIG1fZGF0YTsK IH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVGV4dEluZGlj YXRvcldpbmRvdy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVGV4dEluZGljYXRv cldpbmRvdy5tbQppbmRleCA4NDYyZTMxODk5ZjNlYTU1NmNhZDlmZDA4OTg1NDA1Zjc2ZDAzZjA2 Li45ODM0NmIzZWFiMmRmOWM0NmMzOTk1ZTljODMwODZjMmIxMmFlYTFmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RleHRJbmRpY2F0b3JXaW5kb3cubW0KKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9UZXh0SW5kaWNhdG9yV2luZG93Lm1tCkBAIC05 MiwxNSArOTIsMTUgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAgICAgc2VsZi53YW50c0xh eWVyID0gWUVTOwogICAgIHNlbGYubGF5ZXIuYW5jaG9yUG9pbnQgPSBDR1BvaW50WmVybzsKIAot ICAgIGJvb2wgd2FudHNDcm9zc2ZhZGUgPSBfdGV4dEluZGljYXRvci0+ZGF0YSgpLnByZXNlbnRh dGlvblRyYW5zaXRpb24gPT0gV2ViS2l0OjpUZXh0SW5kaWNhdG9yOjpQcmVzZW50YXRpb25UcmFu c2l0aW9uOjpCb3VuY2VBbmRDcm9zc2ZhZGU7CisgICAgYm9vbCB3YW50c0Nyb3NzZmFkZSA9IF90 ZXh0SW5kaWNhdG9yLT5wcmVzZW50YXRpb25UcmFuc2l0aW9uKCkgPT0gV2ViS2l0OjpUZXh0SW5k aWNhdG9yOjpQcmVzZW50YXRpb25UcmFuc2l0aW9uOjpCb3VuY2VBbmRDcm9zc2ZhZGU7CiAKLSAg ICBGbG9hdFNpemUgY29udGVudHNJbWFnZUxvZ2ljYWxTaXplID0gX3RleHRJbmRpY2F0b3ItPmRh dGEoKS5jb250ZW50SW1hZ2UtPnNpemUoKTsKLSAgICBjb250ZW50c0ltYWdlTG9naWNhbFNpemUu c2NhbGUoMSAvIF90ZXh0SW5kaWNhdG9yLT5kYXRhKCkuY29udGVudEltYWdlU2NhbGVGYWN0b3Ip OworICAgIEZsb2F0U2l6ZSBjb250ZW50c0ltYWdlTG9naWNhbFNpemUgPSBfdGV4dEluZGljYXRv ci0+Y29udGVudEltYWdlKCktPnNpemUoKTsKKyAgICBjb250ZW50c0ltYWdlTG9naWNhbFNpemUu c2NhbGUoMSAvIF90ZXh0SW5kaWNhdG9yLT5jb250ZW50SW1hZ2VTY2FsZUZhY3RvcigpKTsKICAg ICBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gY29udGVudHNJbWFnZTsKICAgICBpZiAod2FudHNDcm9z c2ZhZGUpCi0gICAgICAgIGNvbnRlbnRzSW1hZ2UgPSBfdGV4dEluZGljYXRvci0+ZGF0YSgpLmNv bnRlbnRJbWFnZVdpdGhIaWdobGlnaHQtPm1ha2VDR0ltYWdlKCk7CisgICAgICAgIGNvbnRlbnRz SW1hZ2UgPSBfdGV4dEluZGljYXRvci0+Y29udGVudEltYWdlV2l0aEhpZ2hsaWdodCgpLT5tYWtl Q0dJbWFnZSgpOwogICAgIGVsc2UKLSAgICAgICAgY29udGVudHNJbWFnZSA9IF90ZXh0SW5kaWNh dG9yLT5kYXRhKCkuY29udGVudEltYWdlLT5tYWtlQ0dJbWFnZSgpOworICAgICAgICBjb250ZW50 c0ltYWdlID0gX3RleHRJbmRpY2F0b3ItPmNvbnRlbnRJbWFnZSgpLT5tYWtlQ0dJbWFnZSgpOwog CiAgICAgUmV0YWluUHRyPE5TTXV0YWJsZUFycmF5PiBib3VuY2VMYXllcnMgPSBhZG9wdE5TKFtb TlNNdXRhYmxlQXJyYXkgYWxsb2NdIGluaXRdKTsKIApAQCAtMTEyLDcgKzExMiw3IEBAIHVzaW5n IG5hbWVzcGFjZSBXZWJDb3JlOwogICAgIFJldGFpblB0cjxDR0NvbG9yUmVmPiBncmFkaWVudERh cmtDb2xvciA9IFtOU0NvbG9yIGNvbG9yV2l0aERldmljZVJlZDouOTI5IGdyZWVuOi44IGJsdWU6 MCBhbHBoYToxXS5DR0NvbG9yOwogICAgIFJldGFpblB0cjxDR0NvbG9yUmVmPiBncmFkaWVudExp Z2h0Q29sb3IgPSBbTlNDb2xvciBjb2xvcldpdGhEZXZpY2VSZWQ6Ljk0OSBncmVlbjouOTM3IGJs dWU6MCBhbHBoYToxXS5DR0NvbG9yOwogCi0gICAgZm9yIChhdXRvJiB0ZXh0UmVjdCA6IF90ZXh0 SW5kaWNhdG9yLT5kYXRhKCkudGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RDb29yZGluYXRlcykgewor ICAgIGZvciAoYXV0byYgdGV4dFJlY3QgOiBfdGV4dEluZGljYXRvci0+dGV4dFJlY3RzSW5Cb3Vu ZGluZ1JlY3RDb29yZGluYXRlcygpKSB7CiAgICAgICAgIEZsb2F0UmVjdCBib3VuY2VMYXllclJl Y3QgPSB0ZXh0UmVjdDsKICAgICAgICAgYm91bmNlTGF5ZXJSZWN0Lm1vdmUoX21hcmdpbi53aWR0 aCwgX21hcmdpbi5oZWlnaHQpOwogICAgICAgICBib3VuY2VMYXllclJlY3QuaW5mbGF0ZVgoaG9y aXpvbnRhbEJvcmRlcik7CkBAIC0xNzIsMTAgKzE3MiwxMCBAQCB1c2luZyBuYW1lc3BhY2UgV2Vi Q29yZTsKICAgICAgICAgW3RleHRMYXllciBzZXRDb250ZW50czooaWQpY29udGVudHNJbWFnZS5n ZXQoKV07CiAKICAgICAgICAgRmxvYXRSZWN0IGltYWdlUmVjdCA9IHRleHRSZWN0OwotICAgICAg ICBpbWFnZVJlY3QubW92ZShfdGV4dEluZGljYXRvci0+ZGF0YSgpLnRleHRCb3VuZGluZ1JlY3RJ bldpbmRvd0Nvb3JkaW5hdGVzLmxvY2F0aW9uKCkgLSBfdGV4dEluZGljYXRvci0+ZGF0YSgpLnNl bGVjdGlvblJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLmxvY2F0aW9uKCkpOworICAgICAgICBpbWFn ZVJlY3QubW92ZShfdGV4dEluZGljYXRvci0+dGV4dEJvdW5kaW5nUmVjdEluV2luZG93Q29vcmRp bmF0ZXMoKS5sb2NhdGlvbigpIC0gX3RleHRJbmRpY2F0b3ItPnNlbGVjdGlvblJlY3RJbldpbmRv d0Nvb3JkaW5hdGVzKCkubG9jYXRpb24oKSk7CiAgICAgICAgIFt0ZXh0TGF5ZXIgc2V0Q29udGVu dHNSZWN0OkNHUmVjdE1ha2UoaW1hZ2VSZWN0LngoKSAvIGNvbnRlbnRzSW1hZ2VMb2dpY2FsU2l6 ZS53aWR0aCgpLCBpbWFnZVJlY3QueSgpIC8gY29udGVudHNJbWFnZUxvZ2ljYWxTaXplLmhlaWdo dCgpLCBpbWFnZVJlY3Qud2lkdGgoKSAvIGNvbnRlbnRzSW1hZ2VMb2dpY2FsU2l6ZS53aWR0aCgp LCBpbWFnZVJlY3QuaGVpZ2h0KCkgLyBjb250ZW50c0ltYWdlTG9naWNhbFNpemUuaGVpZ2h0KCkp XTsKICAgICAgICAgW3RleHRMYXllciBzZXRDb250ZW50c0dyYXZpdHk6a0NBR3Jhdml0eUNlbnRl cl07Ci0gICAgICAgIFt0ZXh0TGF5ZXIgc2V0Q29udGVudHNTY2FsZTpfdGV4dEluZGljYXRvci0+ ZGF0YSgpLmNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yXTsKKyAgICAgICAgW3RleHRMYXllciBzZXRD b250ZW50c1NjYWxlOl90ZXh0SW5kaWNhdG9yLT5jb250ZW50SW1hZ2VTY2FsZUZhY3RvcigpXTsK ICAgICAgICAgW3RleHRMYXllciBzZXRGcmFtZTp5ZWxsb3dIaWdobGlnaHRSZWN0XTsKICAgICAg ICAgW3RleHRMYXllciBzZXRDb3JuZXJSYWRpdXM6Y29ybmVyUmFkaXVzXTsKICAgICAgICAgW2Jv dW5jZUxheWVyIHNldFZhbHVlOnRleHRMYXllci5nZXQoKSBmb3JLZXk6dGV4dExheWVyS2V5XTsK QEAgLTE5MCw3ICsxOTAsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogLSAodm9pZClw cmVzZW50V2l0aENvbXBsZXRpb25IYW5kbGVyOih2b2lkKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5k bGVyCiB7Ci0gICAgYm9vbCB3YW50c0Nyb3NzZmFkZSA9IF90ZXh0SW5kaWNhdG9yLT5kYXRhKCku cHJlc2VudGF0aW9uVHJhbnNpdGlvbiA9PSBXZWJLaXQ6OlRleHRJbmRpY2F0b3I6OlByZXNlbnRh dGlvblRyYW5zaXRpb246OkJvdW5jZUFuZENyb3NzZmFkZTsKKyAgICBib29sIHdhbnRzQ3Jvc3Nm YWRlID0gX3RleHRJbmRpY2F0b3ItPnByZXNlbnRhdGlvblRyYW5zaXRpb24oKSA9PSBXZWJLaXQ6 OlRleHRJbmRpY2F0b3I6OlByZXNlbnRhdGlvblRyYW5zaXRpb246OkJvdW5jZUFuZENyb3NzZmFk ZTsKICAgICBkb3VibGUgYW5pbWF0aW9uRHVyYXRpb24gPSB3YW50c0Nyb3NzZmFkZSA/IGJvdW5j ZVdpdGhDcm9zc2ZhZGVBbmltYXRpb25EdXJhdGlvbiA6IGJvdW5jZUFuaW1hdGlvbkR1cmF0aW9u OwogICAgIFJldGFpblB0cjxDQUtleWZyYW1lQW5pbWF0aW9uPiBib3VuY2VBbmltYXRpb24gPSBb Q0FLZXlmcmFtZUFuaW1hdGlvbiBhbmltYXRpb25XaXRoS2V5UGF0aDpAInRyYW5zZm9ybSJdOwog ICAgIFtib3VuY2VBbmltYXRpb24gc2V0VmFsdWVzOkBbCkBAIC0yMDQsNyArMjA0LDcgQEAgdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAgICAgUmV0YWluUHRyPENBQmFzaWNBbmltYXRpb24+IGZh ZGVTaGFkb3dJbkFuaW1hdGlvbjsKICAgICBpZiAod2FudHNDcm9zc2ZhZGUpIHsKICAgICAgICAg Y3Jvc3NmYWRlQW5pbWF0aW9uID0gW0NBQmFzaWNBbmltYXRpb24gYW5pbWF0aW9uV2l0aEtleVBh dGg6QCJjb250ZW50cyJdOwotICAgICAgICBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gY29udGVudHNJ bWFnZSA9IF90ZXh0SW5kaWNhdG9yLT5kYXRhKCkuY29udGVudEltYWdlLT5tYWtlQ0dJbWFnZSgp OworICAgICAgICBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gY29udGVudHNJbWFnZSA9IF90ZXh0SW5k aWNhdG9yLT5jb250ZW50SW1hZ2UoKS0+bWFrZUNHSW1hZ2UoKTsKICAgICAgICAgW2Nyb3NzZmFk ZUFuaW1hdGlvbiBzZXRUb1ZhbHVlOihpZCljb250ZW50c0ltYWdlLmdldCgpXTsKICAgICAgICAg W2Nyb3NzZmFkZUFuaW1hdGlvbiBzZXRGaWxsTW9kZTprQ0FGaWxsTW9kZUZvcndhcmRzXTsKICAg ICAgICAgW2Nyb3NzZmFkZUFuaW1hdGlvbiBzZXRSZW1vdmVkT25Db21wbGV0aW9uOk5PXTsKQEAg LTI4MCw3ICsyODAsNyBAQCB2b2lkIFRleHRJbmRpY2F0b3JXaW5kb3c6OnNldFRleHRJbmRpY2F0 b3IoUGFzc1JlZlB0cjxUZXh0SW5kaWNhdG9yPiB0ZXh0SW5kaWNhdAogICAgIGlmICghbV90ZXh0 SW5kaWNhdG9yKQogICAgICAgICByZXR1cm47CiAKLSAgICBOU1JlY3QgY29udGVudFJlY3QgPSBt X3RleHRJbmRpY2F0b3ItPmZyYW1lUmVjdCgpOworICAgIE5TUmVjdCBjb250ZW50UmVjdCA9IG1f dGV4dEluZGljYXRvci0+dGV4dEJvdW5kaW5nUmVjdEluV2luZG93Q29vcmRpbmF0ZXMoKTsKIAog ICAgIENHRmxvYXQgaG9yaXpvbnRhbE1hcmdpbiA9IHN0ZDo6bWF4KGRyb3BTaGFkb3dCbHVyUmFk aXVzICogMiArIGhvcml6b250YWxCb3JkZXIsIGNvbnRlbnRSZWN0LnNpemUud2lkdGggKiAyKTsK ICAgICBDR0Zsb2F0IHZlcnRpY2FsTWFyZ2luID0gc3RkOjptYXgoZHJvcFNoYWRvd0JsdXJSYWRp dXMgKiAyICsgdmVydGljYWxCb3JkZXIsIGNvbnRlbnRSZWN0LnNpemUuaGVpZ2h0ICogMik7CkBA IC0zMDIsNyArMzAyLDcgQEAgdm9pZCBUZXh0SW5kaWNhdG9yV2luZG93OjpzZXRUZXh0SW5kaWNh dG9yKFBhc3NSZWZQdHI8VGV4dEluZGljYXRvcj4gdGV4dEluZGljYXQKICAgICBbW21fd2tWaWV3 IHdpbmRvd10gYWRkQ2hpbGRXaW5kb3c6bV90ZXh0SW5kaWNhdG9yV2luZG93LmdldCgpIG9yZGVy ZWQ6TlNXaW5kb3dBYm92ZV07CiAgICAgW21fdGV4dEluZGljYXRvcldpbmRvdyBzZXRSZWxlYXNl ZFdoZW5DbG9zZWQ6Tk9dOwogCi0gICAgaWYgKG1fdGV4dEluZGljYXRvci0+ZGF0YSgpLnByZXNl bnRhdGlvblRyYW5zaXRpb24gIT0gVGV4dEluZGljYXRvcjo6UHJlc2VudGF0aW9uVHJhbnNpdGlv bjo6Tm9uZSkgeworICAgIGlmIChtX3RleHRJbmRpY2F0b3ItPnByZXNlbnRhdGlvblRyYW5zaXRp b24oKSAhPSBUZXh0SW5kaWNhdG9yOjpQcmVzZW50YXRpb25UcmFuc2l0aW9uOjpOb25lKSB7CiAg ICAgICAgIFttX3RleHRJbmRpY2F0b3JWaWV3IHByZXNlbnRXaXRoQ29tcGxldGlvbkhhbmRsZXI6 W2FuaW1hdGlvbkNvbXBsZXRpb25IYW5kbGVyXSB7CiAgICAgICAgICAgICBhbmltYXRpb25Db21w bGV0aW9uSGFuZGxlcigpOwogICAgICAgICB9XTsK