72471 2011-11-15 23:30:23 -0800 [chromium] Improvements for page scale delta during commit 2011-11-16 14:38:15 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 aelias webkit-unassigned aelias cc-bugs jamesr webkit.review.bot oldest_to_newest 503629 0 aelias 2011-11-15 23:30:23 -0800 [chromium] Improvements for page scale delta during commit 503642 1 115334 aelias 2011-11-15 23:43:57 -0800 Created attachment 115334 Patch 503694 2 115334 jamesr 2011-11-16 00:52:34 -0800 Comment on attachment 115334 Patch terminology request: we have pageScale and pageScaleDelta in most places but also scaleDelta and sentScaleDelta. Can the latter two please be pageScaleDelta and sentPageScaleDelta? 504159 3 115426 aelias 2011-11-16 12:51:25 -0800 Created attachment 115426 Patch 504161 4 aelias 2011-11-16 12:53:18 -0800 OK, renamed to pageScaleDelta everywhere. 504206 5 115426 jamesr 2011-11-16 13:40:59 -0800 Comment on attachment 115426 Patch Looks great, thanks! 504269 6 115426 webkit.review.bot 2011-11-16 14:38:10 -0800 Comment on attachment 115426 Patch Clearing flags on attachment: 115426 Committed r100508: <http://trac.webkit.org/changeset/100508> 504270 7 webkit.review.bot 2011-11-16 14:38:15 -0800 All reviewed patches have been landed. Closing bug. 115334 2011-11-15 23:43:57 -0800 2011-11-16 12:51:21 -0800 Patch bug-72471-20111115234356.patch text/plain 13627 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwMjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWM1NzEwOTNiNjQwZDNm Y2Q1Zjg1MGQ3ZWRiMjUzNDk1NmVkOTRmNC4uOGY5YjY0NWQyZTZlNzNkMzU3MDZjOWUxNzBhMzdl ZjdmMDJlZWRkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDExLTExLTE1ICBBbGV4 YW5kcmUgRWxpYXMgIDxhZWxpYXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIElt cHJvdmVtZW50cyBmb3IgcGFnZSBzY2FsZSBkZWx0YSBkdXJpbmcgY29tbWl0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjQ3MQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhZ2Ugc2NhbGUgbm93IGZvbGxv d3MgdGhlIHNhbWUgY29tbWl0IGZsb3cgYXMgc2Nyb2xsIHBvc2l0aW9uOgorICAgICAgICB0aGUg ZGVsdGEgaXMgZm9sZGVkIGludG8gbV9wYWdlU2NhbGUgYXQgQkZBQyB0aW1lLCBhbmQgYSAic2Vu dCIgdmFsdWUKKyAgICAgICAgaXMgcHJlc2VydmVkIGZvciB0ZW1wb3JhcnkgdXNlIHVudGlsIHRo ZSBjb21taXQgZmluaXNoZXMuCisKKyAgICAgICAgSSBhbHNvIG1lcmdlZCBzZXRQYWdlU2NhbGVG YWN0b3IgYW5kIHNldFBhZ2VTY2FsZUZhY3RvckxpbWl0cyBpbnRvIG9uZQorICAgICAgICBmdW5j dGlvbiBvbiB0aGUgaW1wbCBzaWRlLiAgVGhlIHJlYXNvbiBpcyB0aGF0IHNldFBhZ2VGYWN0b3Ig bXVzdAorICAgICAgICBiZSBhcHBsaWVkIGFmdGVyIHRoZSBsaW1pdHMgYXJlIHVwZGF0ZWQsIGJ1 dCBvbiB0aGUgb3RoZXIgaGFuZCBzZXR0aW5nCisgICAgICAgIHRoZSBsaW1pdHMgZmlyc3QgbWF5 IGNhdXNlIGFuIHVubmVjZXNzYXJ5IGNsYW1wIG9mIHRoZSBzY2FsZSBkZWx0YS4KKyAgICAgICAg TWVyZ2luZyB0aGUgbWV0aG9kcyBhdm9pZHMgdGhpcyBiaW5kLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4gKHBsYW5uaW5nIHRvIGFkZCBsYXRlcjogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTcxNTI5KQorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJUcmVl SG9zdDo6ZmluaXNoQ29tbWl0T25JbXBsVGhyZWFkKToKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5 ZXJUcmVlSG9zdDo6YXBwbHlTY3JvbGxBbmRTY2FsZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmg6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsOjpDQ0xheWVyVHJlZUhvc3RJbXBsKToK KyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJUcmVlSG9zdEltcGw6OnNldFBhZ2VTY2FsZUZhY3Rv ckFuZExpbWl0cyk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsOjphZGp1 c3RTY3JvbGxzRm9yUGFnZVNjYWxlQ2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJU cmVlSG9zdEltcGw6OnNldFNjYWxlRGVsdGEpOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllclRy ZWVIb3N0SW1wbDo6YXBwbHlTY2FsZURlbHRhVG9TY3JvbGxMYXllcik6CisgICAgICAgIChXZWJD b3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsOjpzY3JvbGxSb290TGF5ZXIpOgorICAgICAgICAoV2Vi Q29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbDo6cHJvY2Vzc1Njcm9sbERlbHRhcyk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5oOgor CiAyMDExLTExLTE1ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTAwMjEzLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZwppbmRleCBhOTNjN2Q2OGE4ZmRlMDkwZGVhNTYxMjlhY2YwMTM5NDBkYThlZmE0 Li42MDE5MTRiYTQ4ODNjYzY0MDlmZjFhYTIzMTZjZGNhZmFhNDI1ZmE4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDExLTExLTE1ICBBbGV4YW5kcmUgRWxp YXMgIDxhZWxpYXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIEltcHJvdmVtZW50 cyBmb3IgcGFnZSBzY2FsZSBkZWx0YSBkdXJpbmcgY29tbWl0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjQ3MQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhZ2Ugc2NhbGUgbm93IGZvbGxvd3MgdGhlIHNh bWUgY29tbWl0IGZsb3cgYXMgc2Nyb2xsIHBvc2l0aW9uOgorICAgICAgICB0aGUgZGVsdGEgaXMg Zm9sZGVkIGludG8gbV9wYWdlU2NhbGUgYXQgQkZBQyB0aW1lLCBhbmQgYSAic2VudCIgdmFsdWUK KyAgICAgICAgaXMgcHJlc2VydmVkIGZvciB0ZW1wb3JhcnkgdXNlIHVudGlsIHRoZSBjb21taXQg ZmluaXNoZXMuCisKKyAgICAgICAgSSBhbHNvIG1lcmdlZCBzZXRQYWdlU2NhbGVGYWN0b3IgYW5k IHNldFBhZ2VTY2FsZUZhY3RvckxpbWl0cyBpbnRvIG9uZQorICAgICAgICBmdW5jdGlvbiBvbiB0 aGUgaW1wbCBzaWRlLiAgVGhlIHJlYXNvbiBpcyB0aGF0IHNldFBhZ2VGYWN0b3IgbXVzdAorICAg ICAgICBiZSBhcHBsaWVkIGFmdGVyIHRoZSBsaW1pdHMgYXJlIHVwZGF0ZWQsIGJ1dCBvbiB0aGUg b3RoZXIgaGFuZCBzZXR0aW5nCisgICAgICAgIHRoZSBsaW1pdHMgZmlyc3QgbWF5IGNhdXNlIGFu IHVubmVjZXNzYXJ5IGNsYW1wIG9mIHRoZSBzY2FsZSBkZWx0YS4KKyAgICAgICAgTWVyZ2luZyB0 aGUgbWV0aG9kcyBhdm9pZHMgdGhpcyBiaW5kLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKHBs YW5uaW5nIHRvIGFkZCBsYXRlcjogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTcxNTI5KQorCisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViVmlld0ltcGw6OmFwcGx5U2Nyb2xsQW5kU2NhbGUpOgorCiAyMDExLTExLTE1ICBB bHBoYSBMYW0gIDxoY2xhbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBzY3Jv bGwgZGVsdGFzIGFyZSBjbGVhcmVkIGR1cmluZyBjb21taXQgdG8gdGhlIG1haW4gdGhyZWFkCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0xheWVyVHJlZUhvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcAppbmRleCBiYTQzMGVjNTE3YjAyN2E3NjZlNjNk YWFlZTA2OGY4MjkxZjQ0OGYxLi41MmRjYmFkNjUyZTk3MTc4ZDljYTk1YTliMzEzMDE1MjM5Yjdl MjJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAKQEAgLTEzMyw4ICsxMzMsNyBA QCB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6ZmluaXNoQ29tbWl0T25JbXBsVGhyZWFkKENDTGF5ZXJU cmVlSG9zdEltcGwqIGhvc3RJbXBsKQogICAgIGhvc3RJbXBsLT5zZXRIYXZlV2hlZWxFdmVudEhh bmRsZXJzKG1faGF2ZVdoZWVsRXZlbnRIYW5kbGVycyk7CiAgICAgaG9zdEltcGwtPnNldFpvb21B bmltYXRvclRyYW5zZm9ybShtX3pvb21BbmltYXRvclRyYW5zZm9ybSk7CiAgICAgaG9zdEltcGwt PnNldFZpZXdwb3J0KHZpZXdwb3J0U2l6ZSgpKTsKLSAgICBob3N0SW1wbC0+c2V0UGFnZVNjYWxl KHBhZ2VTY2FsZSgpKTsKLSAgICBob3N0SW1wbC0+c2V0UGFnZVNjYWxlRmFjdG9yTGltaXRzKG1f bWluUGFnZVNjYWxlLCBtX21heFBhZ2VTY2FsZSk7CisgICAgaG9zdEltcGwtPnNldFBhZ2VTY2Fs ZUZhY3RvckFuZExpbWl0cyhwYWdlU2NhbGUoKSwgbV9taW5QYWdlU2NhbGUsIG1fbWF4UGFnZVNj YWxlKTsKIAogICAgIC8vIFN5bmNocm9uaXplIHRyZWVzLCBpZiBvbmUgZXhpc3RzIGF0IGFsbC4u LgogICAgIGlmIChyb290TGF5ZXIoKSkKQEAgLTQ3MCw3ICs0NjksNyBAQCB2b2lkIENDTGF5ZXJU cmVlSG9zdDo6YXBwbHlTY3JvbGxBbmRTY2FsZShjb25zdCBDQ1Njcm9sbEFuZFNjYWxlU2V0JiBp bmZvKQogCiAgICAgQVNTRVJUKGluZm8uc2Nyb2xscy5zaXplKCkgPT0gMSk7CiAgICAgSW50U2l6 ZSBzY3JvbGxEZWx0YSA9IGluZm8uc2Nyb2xsc1swXS5zY3JvbGxEZWx0YTsKLSAgICBtX2NsaWVu dC0+YXBwbHlTY3JvbGxBbmRTY2FsZShzY3JvbGxEZWx0YSwgaW5mby5wYWdlU2NhbGUpOworICAg IG1fY2xpZW50LT5hcHBseVNjcm9sbEFuZFNjYWxlKHNjcm9sbERlbHRhLCBpbmZvLnBhZ2VTY2Fs ZURlbHRhKTsKIH0KIAogdm9pZCBDQ0xheWVyVHJlZUhvc3Q6OnN0YXJ0UmF0ZUxpbWl0ZXIoR3Jh cGhpY3NDb250ZXh0M0QqIGNvbnRleHQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RDb21tb24uaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENv bW1vbi5oCmluZGV4IDUyOWIzYjMyMGNmNzI0NGUyZTQxOThlZjE5N2U1YzQzZGM1YjY5YWMuLjhh NTdiZmU5NTkzNzM0MjhiNmE4OWI5YThhMmM4M2Y3OThiZjU5ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENv bW1vbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5oCkBAIC01Myw3ICs1Myw3IEBAIHB1YmxpYzoKIAogc3Ry dWN0IENDU2Nyb2xsQW5kU2NhbGVTZXQgewogICAgIFZlY3RvcjxDQ0xheWVyVHJlZUhvc3RDb21t b246OlNjcm9sbFVwZGF0ZUluZm8+IHNjcm9sbHM7Ci0gICAgZmxvYXQgcGFnZVNjYWxlOworICAg IGZsb2F0IHBhZ2VTY2FsZURlbHRhOwogfTsKIAogdGVtcGxhdGU8dHlwZW5hbWUgTGF5ZXJUeXBl PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcAppbmRleCAyNWE4MTgwNTdm ZmIxYjBhNzcxNGE1NzNiOWUxNDdmZWY0YTNkMTUyLi40ZWU1Y2FlYzJlNDYzNTkzMzFiZGYxYTA2 OTcxNzE1Y2Q5MDVhMzVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNw cApAQCAtNTIsNiArNTIsNyBAQCBDQ0xheWVyVHJlZUhvc3RJbXBsOjpDQ0xheWVyVHJlZUhvc3RJ bXBsKGNvbnN0IENDU2V0dGluZ3MmIHNldHRpbmdzLCBDQ0xheWVyVHJlZQogICAgICwgbV9oYXZl V2hlZWxFdmVudEhhbmRsZXJzKGZhbHNlKQogICAgICwgbV9wYWdlU2NhbGUoMSkKICAgICAsIG1f c2NhbGVEZWx0YSgxKQorICAgICwgbV9zZW50U2NhbGVEZWx0YSgxKQogICAgICwgbV9taW5QYWdl U2NhbGUoMCkKICAgICAsIG1fbWF4UGFnZVNjYWxlKDApCiAgICAgLCBtX3BpbmNoR2VzdHVyZUFj dGl2ZShmYWxzZSkKQEAgLTE5NiwyMiArMTk3LDM3IEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0SW1w bDo6c2V0Vmlld3BvcnQoY29uc3QgSW50U2l6ZSYgdmlld3BvcnRTaXplKQogICAgIG1fbGF5ZXJS ZW5kZXJlci0+dmlld3BvcnRDaGFuZ2VkKCk7CiB9CiAKLXZvaWQgQ0NMYXllclRyZWVIb3N0SW1w bDo6c2V0UGFnZVNjYWxlKGZsb2F0IHBhZ2VTY2FsZSkKK3ZvaWQgQ0NMYXllclRyZWVIb3N0SW1w bDo6c2V0UGFnZVNjYWxlRmFjdG9yQW5kTGltaXRzKGZsb2F0IHBhZ2VTY2FsZSwgZmxvYXQgbWlu UGFnZVNjYWxlLCBmbG9hdCBtYXhQYWdlU2NhbGUpCiB7Ci0gICAgaWYgKCFwYWdlU2NhbGUgfHwg cGFnZVNjYWxlID09IG1fcGFnZVNjYWxlKQorICAgIGlmICghcGFnZVNjYWxlKQogICAgICAgICBy ZXR1cm47CiAKLSAgICAvLyBNYWludGFpbiBjb25zdGFudCB0aGUgcHJvZHVjdCBvZiBtX3BhZ2VT Y2FsZSAqIG1fc2NhbGVEZWx0YS4KLSAgICBmbG9hdCBzY2FsZUNoYW5nZSA9IHBhZ2VTY2FsZSAv IG1fcGFnZVNjYWxlOwotICAgIGZsb2F0IG9sZE1hZ25pZnlTY2FsZSA9IG1fcGFnZVNjYWxlICog bV9zY2FsZURlbHRhOworICAgIGlmIChtX3NlbnRTY2FsZURlbHRhID09IDEgJiYgcGFnZVNjYWxl ID09IG1fcGFnZVNjYWxlICYmIG1pblBhZ2VTY2FsZSA9PSBtX21pblBhZ2VTY2FsZSAmJiBtYXhQ YWdlU2NhbGUgPT0gbV9tYXhQYWdlU2NhbGUpCisgICAgICAgIHJldHVybjsKKworICAgIG1fbWlu UGFnZVNjYWxlID0gbWluUGFnZVNjYWxlOworICAgIG1fbWF4UGFnZVNjYWxlID0gbWF4UGFnZVNj YWxlOworCisgICAgZmxvYXQgcGFnZVNjYWxlQ2hhbmdlID0gcGFnZVNjYWxlIC8gbV9wYWdlU2Nh bGU7CiAgICAgbV9wYWdlU2NhbGUgPSBwYWdlU2NhbGU7CisgICAgbV9zZW50U2NhbGVEZWx0YSA9 IDE7CiAKLSAgICBzZXRTY2FsZURlbHRhKG9sZE1hZ25pZnlTY2FsZSAvIHBhZ2VTY2FsZSk7Cisg ICAgLy8gQ2xhbXAgZGVsdGEgdG8gbGltaXRzIGFuZCByZWZyZXNoIGRpc3BsYXkgbWF0cml4Lgor ICAgIHNldFNjYWxlRGVsdGEobV9zY2FsZURlbHRhKTsKKyAgICBhcHBseVNjYWxlRGVsdGFUb1Nj cm9sbExheWVyKCk7CisKKyAgICBhZGp1c3RTY3JvbGxzRm9yUGFnZVNjYWxlQ2hhbmdlKHBhZ2VT Y2FsZUNoYW5nZSk7Cit9CisKK3ZvaWQgQ0NMYXllclRyZWVIb3N0SW1wbDo6YWRqdXN0U2Nyb2xs c0ZvclBhZ2VTY2FsZUNoYW5nZShmbG9hdCBwYWdlU2NhbGVDaGFuZ2UpCit7CisgICAgaWYgKHBh Z2VTY2FsZUNoYW5nZSA9PSAxKQorICAgICAgICByZXR1cm47CiAKICAgICAvLyBXZSBhbHNvIG5l ZWQgdG8gY29udmVydCBpbXBsLXNpZGUgc2Nyb2xsIGRlbHRhcyB0byBwYWdlU2NhbGUgc3BhY2Uu Ci0gICAgaWYgKG1fc2Nyb2xsTGF5ZXJJbXBsICYmIG1fc2Nyb2xsTGF5ZXJJbXBsLT5zY3JvbGxh YmxlKCkpIHsKKyAgICBpZiAobV9zY3JvbGxMYXllckltcGwpIHsKICAgICAgICAgSW50U2l6ZSBz Y3JvbGxEZWx0YSA9IG1fc2Nyb2xsTGF5ZXJJbXBsLT5zY3JvbGxEZWx0YSgpOwotICAgICAgICBz Y3JvbGxEZWx0YS5zY2FsZShzY2FsZUNoYW5nZSk7CisgICAgICAgIHNjcm9sbERlbHRhLnNjYWxl KHBhZ2VTY2FsZUNoYW5nZSk7CiAgICAgICAgIG1fc2Nyb2xsTGF5ZXJJbXBsLT5zZXRTY3JvbGxE ZWx0YShzY3JvbGxEZWx0YSk7CiAgICAgfQogfQpAQCAtMjMxLDE4ICsyNDcsMTMgQEAgdm9pZCBD Q0xheWVyVHJlZUhvc3RJbXBsOjpzZXRTY2FsZURlbHRhKGZsb2F0IGRlbHRhKQogICAgIG1fc2Nh bGVEZWx0YSA9IGRlbHRhOwogCiAgICAgdXBkYXRlTWF4U2Nyb2xsUG9zaXRpb24oKTsKLQotICAg IGlmIChtX3Njcm9sbExheWVySW1wbCAmJiBtX3Njcm9sbExheWVySW1wbC0+c2Nyb2xsYWJsZSgp KQotICAgICAgICBtX3Njcm9sbExheWVySW1wbC0+c2V0U2NhbGVEZWx0YShtX3NjYWxlRGVsdGEp OworICAgIGFwcGx5U2NhbGVEZWx0YVRvU2Nyb2xsTGF5ZXIoKTsKIH0KIAotdm9pZCBDQ0xheWVy VHJlZUhvc3RJbXBsOjpzZXRQYWdlU2NhbGVGYWN0b3JMaW1pdHMoZmxvYXQgbWluUGFnZVNjYWxl LCBmbG9hdCBtYXhQYWdlU2NhbGUpCit2b2lkIENDTGF5ZXJUcmVlSG9zdEltcGw6OmFwcGx5U2Nh bGVEZWx0YVRvU2Nyb2xsTGF5ZXIoKQogewotICAgIG1fbWluUGFnZVNjYWxlID0gbWluUGFnZVNj YWxlOwotICAgIG1fbWF4UGFnZVNjYWxlID0gbWF4UGFnZVNjYWxlOwotCi0gICAgLy8gVGhpcyB3 aWxsIGNsYW1wIG1fc2NhbGVEZWx0YSBhbmQgYXBwbHkgc2lkZSBlZmZlY3RzIGlmIGNsYW1wZWQu Ci0gICAgc2V0U2NhbGVEZWx0YShtX3NjYWxlRGVsdGEpOworICAgIGlmIChtX3Njcm9sbExheWVy SW1wbCkKKyAgICAgICAgbV9zY3JvbGxMYXllckltcGwtPnNldFNjYWxlRGVsdGEobV9zY2FsZURl bHRhICogbV9zZW50U2NhbGVEZWx0YSk7CiB9CiAKIHZvaWQgQ0NMYXllclRyZWVIb3N0SW1wbDo6 dXBkYXRlTWF4U2Nyb2xsUG9zaXRpb24oKQpAQCAtMjc2LDcgKzI4Nyw3IEBAIHZvaWQgQ0NMYXll clRyZWVIb3N0SW1wbDo6c2V0Wm9vbUFuaW1hdG9yVHJhbnNmb3JtKGNvbnN0IFRyYW5zZm9ybWF0 aW9uTWF0cml4JiB6CiB2b2lkIENDTGF5ZXJUcmVlSG9zdEltcGw6OnNjcm9sbFJvb3RMYXllcihj b25zdCBJbnRTaXplJiBzY3JvbGxEZWx0YSkKIHsKICAgICBUUkFDRV9FVkVOVCgiQ0NMYXllclRy ZWVIb3N0SW1wbDo6c2Nyb2xsUm9vdExheWVyIiwgdGhpcywgMCk7Ci0gICAgaWYgKCFtX3Njcm9s bExheWVySW1wbCB8fCAhbV9zY3JvbGxMYXllckltcGwtPnNjcm9sbGFibGUoKSkKKyAgICBpZiAo IW1fc2Nyb2xsTGF5ZXJJbXBsKQogICAgICAgICByZXR1cm47CiAKICAgICBtX3Njcm9sbExheWVy SW1wbC0+c2Nyb2xsQnkoc2Nyb2xsRGVsdGEpOwpAQCAtMzI5LDEyICszNDAsMTUgQEAgUGFzc093 blB0cjxDQ1Njcm9sbEFuZFNjYWxlU2V0PiBDQ0xheWVyVHJlZUhvc3RJbXBsOjpwcm9jZXNzU2Ny b2xsRGVsdGFzKCkKICAgICBPd25QdHI8Q0NTY3JvbGxBbmRTY2FsZVNldD4gc2Nyb2xsSW5mbyA9 IGFkb3B0UHRyKG5ldyBDQ1Njcm9sbEFuZFNjYWxlU2V0KCkpOwogICAgIGJvb2wgZGlkTW92ZSA9 IG1fc2Nyb2xsTGF5ZXJJbXBsICYmICghbV9zY3JvbGxMYXllckltcGwtPnNjcm9sbERlbHRhKCku aXNaZXJvKCkgfHwgbV9zY2FsZURlbHRhICE9IDEuMGYpOwogICAgIGlmICghZGlkTW92ZSB8fCBt X3BpbmNoR2VzdHVyZUFjdGl2ZSkgewotICAgICAgICBzY3JvbGxJbmZvLT5wYWdlU2NhbGUgPSBt X3BhZ2VTY2FsZTsKKyAgICAgICAgbV9zZW50U2NhbGVEZWx0YSA9IHNjcm9sbEluZm8tPnBhZ2VT Y2FsZURlbHRhID0gMTsKICAgICAgICAgcmV0dXJuIHNjcm9sbEluZm8ucmVsZWFzZSgpOwogICAg IH0KIAorICAgIG1fc2VudFNjYWxlRGVsdGEgPSBzY3JvbGxJbmZvLT5wYWdlU2NhbGVEZWx0YSA9 IG1fc2NhbGVEZWx0YTsKKyAgICBtX3BhZ2VTY2FsZSA9IG1fcGFnZVNjYWxlICogbV9zZW50U2Nh bGVEZWx0YTsKKyAgICBzZXRTY2FsZURlbHRhKDEpOworCiAgICAgLy8gRklYTUU6IHRyYWNrIHNj cm9sbHMgZnJvbSBsYXllcnMgb3RoZXIgdGhhbiB0aGUgcm9vdAotICAgIHNjcm9sbEluZm8tPnBh Z2VTY2FsZSA9IG1fcGFnZVNjYWxlICogbV9zY2FsZURlbHRhOwogICAgIENDTGF5ZXJUcmVlSG9z dENvbW1vbjo6U2Nyb2xsVXBkYXRlSW5mbyBzY3JvbGw7CiAgICAgc2Nyb2xsLmxheWVySWQgPSBt X3Njcm9sbExheWVySW1wbC0+aWQoKTsKICAgICBzY3JvbGwuc2Nyb2xsRGVsdGEgPSBtX3Njcm9s bExheWVySW1wbC0+c2Nyb2xsRGVsdGEoKTsKQEAgLTM0NSw2ICszNTksOCBAQCBQYXNzT3duUHRy PENDU2Nyb2xsQW5kU2NhbGVTZXQ+IENDTGF5ZXJUcmVlSG9zdEltcGw6OnByb2Nlc3NTY3JvbGxE ZWx0YXMoKQogICAgIG1fc2Nyb2xsTGF5ZXJJbXBsLT5zZXRTZW50U2Nyb2xsRGVsdGEobV9zY3Jv bGxMYXllckltcGwtPnNjcm9sbERlbHRhKCkpOwogICAgIG1fc2Nyb2xsTGF5ZXJJbXBsLT5zZXRT Y3JvbGxEZWx0YShJbnRTaXplKCkpOwogCisgICAgYWRqdXN0U2Nyb2xsc0ZvclBhZ2VTY2FsZUNo YW5nZShtX3NlbnRTY2FsZURlbHRhKTsKKwogICAgIHJldHVybiBzY3JvbGxJbmZvLnJlbGVhc2Uo KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5oCmluZGV4IDQ0YjllYjkz ZThhNDQ1NzY4ZDQzNzgyNzAxZDYwMGM0MzAwNDJmZGUuLjY1OWYyZGZkZTcwNjBhMjU4MmZhY2Qz ZDMzMmU0OGM4NGViODMyYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmgK QEAgLTk5LDkgKzk5LDggQEAgcHVibGljOgogICAgIGNvbnN0IEludFNpemUmIHZpZXdwb3J0U2l6 ZSgpIGNvbnN0IHsgcmV0dXJuIG1fdmlld3BvcnRTaXplOyB9CiAgICAgdm9pZCBzZXRab29tQW5p bWF0b3JUcmFuc2Zvcm0oY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmKTsKIAotICAgIHZvaWQg c2V0UGFnZVNjYWxlKGZsb2F0KTsKKyAgICB2b2lkIHNldFBhZ2VTY2FsZUZhY3RvckFuZExpbWl0 cyhmbG9hdCBwYWdlU2NhbGUsIGZsb2F0IG1pblBhZ2VTY2FsZSwgZmxvYXQgbWF4UGFnZVNjYWxl KTsKICAgICBmbG9hdCBwYWdlU2NhbGUoKSBjb25zdCB7IHJldHVybiBtX3BhZ2VTY2FsZTsgfQot ICAgIHZvaWQgc2V0UGFnZVNjYWxlRmFjdG9yTGltaXRzKGZsb2F0IG1pblBhZ2VTY2FsZSwgZmxv YXQgbWF4UGFnZVNjYWxlKTsKIAogICAgIGNvbnN0IENDU2V0dGluZ3MmIHNldHRpbmdzKCkgY29u c3QgeyByZXR1cm4gbV9zZXR0aW5nczsgfQogCkBAIC0xMDksNyArMTA4LDYgQEAgcHVibGljOgog ICAgIHZpcnR1YWwgdm9pZCBwaW5jaEdlc3R1cmVVcGRhdGUoZmxvYXQsIGNvbnN0IEludFBvaW50 Jik7CiAgICAgdmlydHVhbCB2b2lkIHBpbmNoR2VzdHVyZUVuZCgpOwogICAgIFBhc3NPd25QdHI8 Q0NTY3JvbGxBbmRTY2FsZVNldD4gcHJvY2Vzc1Njcm9sbERlbHRhcygpOwotICAgIHZvaWQgdXBk YXRlTWF4U2Nyb2xsUG9zaXRpb24oKTsKIAogcHJvdGVjdGVkOgogICAgIENDTGF5ZXJUcmVlSG9z dEltcGwoY29uc3QgQ0NTZXR0aW5ncyYsIENDTGF5ZXJUcmVlSG9zdEltcGxDbGllbnQqKTsKQEAg LTExOSw2ICsxMTcsOSBAQCBwcm90ZWN0ZWQ6CiAKIHByaXZhdGU6CiAgICAgdm9pZCBzZXRTY2Fs ZURlbHRhKGZsb2F0KTsKKyAgICB2b2lkIGFwcGx5U2NhbGVEZWx0YVRvU2Nyb2xsTGF5ZXIoKTsK KyAgICB2b2lkIGFkanVzdFNjcm9sbHNGb3JQYWdlU2NhbGVDaGFuZ2UoZmxvYXQpOworICAgIHZv aWQgdXBkYXRlTWF4U2Nyb2xsUG9zaXRpb24oKTsKIAogICAgIE93blB0cjxMYXllclJlbmRlcmVy Q2hyb21pdW0+IG1fbGF5ZXJSZW5kZXJlcjsKICAgICBSZWZQdHI8Q0NMYXllckltcGw+IG1fcm9v dExheWVySW1wbDsKQEAgLTEzMCw2ICsxMzEsNyBAQCBwcml2YXRlOgogCiAgICAgZmxvYXQgbV9w YWdlU2NhbGU7CiAgICAgZmxvYXQgbV9zY2FsZURlbHRhOworICAgIGZsb2F0IG1fc2VudFNjYWxl RGVsdGE7CiAgICAgZmxvYXQgbV9taW5QYWdlU2NhbGUsIG1fbWF4UGFnZVNjYWxlOwogCiAgICAg Ym9vbCBtX3BpbmNoR2VzdHVyZUFjdGl2ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmNwcAppbmRleCA2YWViNzIzNjE1OTJhNGI1NWUzYTJiODY4ZTAzMzUzYzkxYjQx YTBkLi5kOTc3NjNmMGU5Mzc1NTAzOTVmMmQ3Mzc2MWUzODg0MDY3ZWRhYzIzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0yNzc3LDE2ICsyNzc3LDEy IEBAIHZvaWQgV2ViVmlld0ltcGw6OmFuaW1hdGVBbmRMYXlvdXQoZG91YmxlIGZyYW1lQmVnaW5U aW1lKQogICAgIGxheW91dCgpOwogfQogCi12b2lkIFdlYlZpZXdJbXBsOjphcHBseVNjcm9sbEFu ZFNjYWxlKGNvbnN0IEludFNpemUmIHNjcm9sbERlbHRhLCBmbG9hdCBzY2FsZUZhY3RvcikKK3Zv aWQgV2ViVmlld0ltcGw6OmFwcGx5U2Nyb2xsQW5kU2NhbGUoY29uc3QgSW50U2l6ZSYgc2Nyb2xs RGVsdGEsIGZsb2F0IHBhZ2VTY2FsZURlbHRhKQogewogICAgIGlmICghbWFpbkZyYW1lSW1wbCgp IHx8ICFtYWluRnJhbWVJbXBsKCktPmZyYW1lVmlldygpKQogICAgICAgICByZXR1cm47CiAKLSAg ICBmbG9hdCBvbGRTY2FsZSA9IHBhZ2VTY2FsZUZhY3RvcigpOwotICAgIGlmICghb2xkU2NhbGUp Ci0gICAgICAgIG9sZFNjYWxlID0gMTsKLQotICAgIGlmICghc2NhbGVGYWN0b3IgfHwgb2xkU2Nh bGUgPT0gc2NhbGVGYWN0b3IpCisgICAgaWYgKHBhZ2VTY2FsZURlbHRhID09IDEpCiAgICAgICAg IG1haW5GcmFtZUltcGwoKS0+ZnJhbWVWaWV3KCktPnNjcm9sbEJ5KHNjcm9sbERlbHRhKTsKICAg ICBlbHNlIHsKICAgICAgICAgLy8gVGhlIHBhZ2Ugc2NhbGUgY2hhbmdlZCwgc28gYXBwbHkgYSBz Y2FsZSBhbmQgc2Nyb2xsIGluIGEgc2luZ2xlCkBAIC0yNzk2LDEwICsyNzkyLDkgQEAgdm9pZCBX ZWJWaWV3SW1wbDo6YXBwbHlTY3JvbGxBbmRTY2FsZShjb25zdCBJbnRTaXplJiBzY3JvbGxEZWx0 YSwgZmxvYXQgc2NhbGVGYWMKICAgICAgICAgV2ViU2l6ZSBzY3JvbGxPZmZzZXQgPSBtYWluRnJh bWUoKS0+c2Nyb2xsT2Zmc2V0KCk7CiAgICAgICAgIHNjcm9sbE9mZnNldC53aWR0aCArPSBzY3Jv bGxEZWx0YS53aWR0aCgpOwogICAgICAgICBzY3JvbGxPZmZzZXQuaGVpZ2h0ICs9IHNjcm9sbERl bHRhLmhlaWdodCgpOwotICAgICAgICBmbG9hdCBzY2FsZURlbHRhID0gc2NhbGVGYWN0b3IgLyBv bGRTY2FsZTsKLSAgICAgICAgV2ViUG9pbnQgc2NhbGVkU2Nyb2xsT2Zmc2V0KHNjcm9sbE9mZnNl dC53aWR0aCAqIHNjYWxlRGVsdGEsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBzY3JvbGxPZmZzZXQuaGVpZ2h0ICogc2NhbGVEZWx0YSk7Ci0gICAgICAgIHNldFBhZ2VTY2Fs ZUZhY3RvcihzY2FsZUZhY3Rvciwgc2NhbGVkU2Nyb2xsT2Zmc2V0KTsKKyAgICAgICAgV2ViUG9p bnQgc2NhbGVkU2Nyb2xsT2Zmc2V0KHNjcm9sbE9mZnNldC53aWR0aCAqIHBhZ2VTY2FsZURlbHRh LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Nyb2xsT2Zmc2V0LmhlaWdo dCAqIHBhZ2VTY2FsZURlbHRhKTsKKyAgICAgICAgc2V0UGFnZVNjYWxlRmFjdG9yKHBhZ2VTY2Fs ZUZhY3RvcigpICogcGFnZVNjYWxlRGVsdGEsIHNjYWxlZFNjcm9sbE9mZnNldCk7CiAgICAgfQog fQogCg== 115426 2011-11-16 12:51:25 -0800 2011-11-16 14:38:10 -0800 Patch bug-72471-20111116125124.patch text/plain 21981 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwMjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWM1NzEwOTNiNjQwZDNm Y2Q1Zjg1MGQ3ZWRiMjUzNDk1NmVkOTRmNC4uOGY5YjY0NWQyZTZlNzNkMzU3MDZjOWUxNzBhMzdl ZjdmMDJlZWRkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDExLTExLTE1ICBBbGV4 YW5kcmUgRWxpYXMgIDxhZWxpYXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIElt cHJvdmVtZW50cyBmb3IgcGFnZSBzY2FsZSBkZWx0YSBkdXJpbmcgY29tbWl0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjQ3MQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhZ2Ugc2NhbGUgbm93IGZvbGxv d3MgdGhlIHNhbWUgY29tbWl0IGZsb3cgYXMgc2Nyb2xsIHBvc2l0aW9uOgorICAgICAgICB0aGUg ZGVsdGEgaXMgZm9sZGVkIGludG8gbV9wYWdlU2NhbGUgYXQgQkZBQyB0aW1lLCBhbmQgYSAic2Vu dCIgdmFsdWUKKyAgICAgICAgaXMgcHJlc2VydmVkIGZvciB0ZW1wb3JhcnkgdXNlIHVudGlsIHRo ZSBjb21taXQgZmluaXNoZXMuCisKKyAgICAgICAgSSBhbHNvIG1lcmdlZCBzZXRQYWdlU2NhbGVG YWN0b3IgYW5kIHNldFBhZ2VTY2FsZUZhY3RvckxpbWl0cyBpbnRvIG9uZQorICAgICAgICBmdW5j dGlvbiBvbiB0aGUgaW1wbCBzaWRlLiAgVGhlIHJlYXNvbiBpcyB0aGF0IHNldFBhZ2VGYWN0b3Ig bXVzdAorICAgICAgICBiZSBhcHBsaWVkIGFmdGVyIHRoZSBsaW1pdHMgYXJlIHVwZGF0ZWQsIGJ1 dCBvbiB0aGUgb3RoZXIgaGFuZCBzZXR0aW5nCisgICAgICAgIHRoZSBsaW1pdHMgZmlyc3QgbWF5 IGNhdXNlIGFuIHVubmVjZXNzYXJ5IGNsYW1wIG9mIHRoZSBzY2FsZSBkZWx0YS4KKyAgICAgICAg TWVyZ2luZyB0aGUgbWV0aG9kcyBhdm9pZHMgdGhpcyBiaW5kLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4gKHBsYW5uaW5nIHRvIGFkZCBsYXRlcjogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTcxNTI5KQorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJUcmVl SG9zdDo6ZmluaXNoQ29tbWl0T25JbXBsVGhyZWFkKToKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5 ZXJUcmVlSG9zdDo6YXBwbHlTY3JvbGxBbmRTY2FsZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmg6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsOjpDQ0xheWVyVHJlZUhvc3RJbXBsKToK KyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJUcmVlSG9zdEltcGw6OnNldFBhZ2VTY2FsZUZhY3Rv ckFuZExpbWl0cyk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsOjphZGp1 c3RTY3JvbGxzRm9yUGFnZVNjYWxlQ2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJU cmVlSG9zdEltcGw6OnNldFNjYWxlRGVsdGEpOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllclRy ZWVIb3N0SW1wbDo6YXBwbHlTY2FsZURlbHRhVG9TY3JvbGxMYXllcik6CisgICAgICAgIChXZWJD b3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsOjpzY3JvbGxSb290TGF5ZXIpOgorICAgICAgICAoV2Vi Q29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbDo6cHJvY2Vzc1Njcm9sbERlbHRhcyk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5oOgor CiAyMDExLTExLTE1ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTAwMjEzLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZwppbmRleCBhOTNjN2Q2OGE4ZmRlMDkwZGVhNTYxMjlhY2YwMTM5NDBkYThlZmE0 Li42MDE5MTRiYTQ4ODNjYzY0MDlmZjFhYTIzMTZjZGNhZmFhNDI1ZmE4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDExLTExLTE1ICBBbGV4YW5kcmUgRWxp YXMgIDxhZWxpYXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIEltcHJvdmVtZW50 cyBmb3IgcGFnZSBzY2FsZSBkZWx0YSBkdXJpbmcgY29tbWl0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjQ3MQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhZ2Ugc2NhbGUgbm93IGZvbGxvd3MgdGhlIHNh bWUgY29tbWl0IGZsb3cgYXMgc2Nyb2xsIHBvc2l0aW9uOgorICAgICAgICB0aGUgZGVsdGEgaXMg Zm9sZGVkIGludG8gbV9wYWdlU2NhbGUgYXQgQkZBQyB0aW1lLCBhbmQgYSAic2VudCIgdmFsdWUK KyAgICAgICAgaXMgcHJlc2VydmVkIGZvciB0ZW1wb3JhcnkgdXNlIHVudGlsIHRoZSBjb21taXQg ZmluaXNoZXMuCisKKyAgICAgICAgSSBhbHNvIG1lcmdlZCBzZXRQYWdlU2NhbGVGYWN0b3IgYW5k IHNldFBhZ2VTY2FsZUZhY3RvckxpbWl0cyBpbnRvIG9uZQorICAgICAgICBmdW5jdGlvbiBvbiB0 aGUgaW1wbCBzaWRlLiAgVGhlIHJlYXNvbiBpcyB0aGF0IHNldFBhZ2VGYWN0b3IgbXVzdAorICAg ICAgICBiZSBhcHBsaWVkIGFmdGVyIHRoZSBsaW1pdHMgYXJlIHVwZGF0ZWQsIGJ1dCBvbiB0aGUg b3RoZXIgaGFuZCBzZXR0aW5nCisgICAgICAgIHRoZSBsaW1pdHMgZmlyc3QgbWF5IGNhdXNlIGFu IHVubmVjZXNzYXJ5IGNsYW1wIG9mIHRoZSBzY2FsZSBkZWx0YS4KKyAgICAgICAgTWVyZ2luZyB0 aGUgbWV0aG9kcyBhdm9pZHMgdGhpcyBiaW5kLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKHBs YW5uaW5nIHRvIGFkZCBsYXRlcjogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTcxNTI5KQorCisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViVmlld0ltcGw6OmFwcGx5U2Nyb2xsQW5kU2NhbGUpOgorCiAyMDExLTExLTE1ICBB bHBoYSBMYW0gIDxoY2xhbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBzY3Jv bGwgZGVsdGFzIGFyZSBjbGVhcmVkIGR1cmluZyBjb21taXQgdG8gdGhlIG1haW4gdGhyZWFkCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXll ckNocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9M YXllckNocm9taXVtLmgKaW5kZXggYWFiOWQzODg1ODYwN2M4NDU5ZjFjZGI3MzQ5YjA5ZGQ0YjIz MjVjNy4uZjVjNDMxOGRjOTlmZmMxN2M1YWY0ZGE0ZTkzMThhOWM3MjIzZDU5MyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1 bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVy Q2hyb21pdW0uaApAQCAtMTM4LDcgKzEzOCw3IEBAIHB1YmxpYzoKIAogICAgIEludFNpemUgc2Ny b2xsRGVsdGEoKSBjb25zdCB7IHJldHVybiBJbnRTaXplKCk7IH0KIAotICAgIGZsb2F0IHNjYWxl RGVsdGEoKSBjb25zdCB7IHJldHVybiAxOyB9CisgICAgZmxvYXQgcGFnZVNjYWxlRGVsdGEoKSBj b25zdCB7IHJldHVybiAxOyB9CiAKICAgICBib29sIGRvdWJsZVNpZGVkKCkgY29uc3QgeyByZXR1 cm4gbV9kb3VibGVTaWRlZDsgfQogICAgIHZvaWQgc2V0RG91YmxlU2lkZWQoYm9vbCBkb3VibGVT aWRlZCkgeyBtX2RvdWJsZVNpZGVkID0gZG91YmxlU2lkZWQ7IHNldE5lZWRzQ29tbWl0KCk7IH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJJbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL2NjL0NDTGF5ZXJJbXBsLmNwcAppbmRleCA5MDQ4ZmRjODJkMTA1YjNjNjI2MGRlYWIxZDkx MGQxMDgxZWFhNDY2Li41ZGJhOWQwYmZhMjIxM2EyMmMzMjU1YWI0ZjA2ZTEyYzczYjU5NWI3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0xheWVySW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vY2MvQ0NMYXllckltcGwuY3BwCkBAIC01Miw3ICs1Miw3IEBAIENDTGF5ZXJJbXBsOjpD Q0xheWVySW1wbChpbnQgaWQpCiAgICAgLCBtX3VzZXNMYXllckNsaXBwaW5nKGZhbHNlKQogICAg ICwgbV9pc05vbkNvbXBvc2l0ZWRDb250ZW50KGZhbHNlKQogICAgICwgbV9kcmF3c0NvbnRlbnQo ZmFsc2UpCi0gICAgLCBtX3NjYWxlRGVsdGEoMSkKKyAgICAsIG1fcGFnZVNjYWxlRGVsdGEoMSkK ICAgICAsIG1fdGFyZ2V0UmVuZGVyU3VyZmFjZSgwKQogICAgICwgbV9kcmF3RGVwdGgoMCkKICAg ICAsIG1fZHJhd09wYWNpdHkoMCkKQEAgLTQwNSwxMCArNDA1LDEwIEBAIHZvaWQgQ0NMYXllcklt cGw6OnNldFNjcm9sbERlbHRhKGNvbnN0IEludFNpemUmIHNjcm9sbERlbHRhKQogICAgIH0KIH0K IAotdm9pZCBDQ0xheWVySW1wbDo6c2V0U2NhbGVEZWx0YShmbG9hdCBzY2FsZURlbHRhKQordm9p ZCBDQ0xheWVySW1wbDo6c2V0UGFnZVNjYWxlRGVsdGEoZmxvYXQgcGFnZVNjYWxlRGVsdGEpCiB7 Ci0gICAgaWYgKG1fc2NhbGVEZWx0YSAhPSBzY2FsZURlbHRhKSB7Ci0gICAgICAgIG1fc2NhbGVE ZWx0YSA9IHNjYWxlRGVsdGE7CisgICAgaWYgKG1fcGFnZVNjYWxlRGVsdGEgIT0gcGFnZVNjYWxl RGVsdGEpIHsKKyAgICAgICAgbV9wYWdlU2NhbGVEZWx0YSA9IHBhZ2VTY2FsZURlbHRhOwogICAg ICAgICBub3RlTGF5ZXJQcm9wZXJ0eUNoYW5nZWRGb3JTdWJ0cmVlKCk7CiAgICAgfQogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NM YXllckltcGwuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJJbXBsLmgKaW5kZXggNTI0MTMzNTkxZjQyMWU1OGZmNmU1Mzk4MzYwN2NlYWY3NjI5 YjMxMS4uMDk5ZjQwMjFhYzhiMTAzZTQ2YTI4NDNjMzIzYjFiOTQyODdhNmE1ZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllcklt cGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0xheWVySW1wbC5oCkBAIC0xNjAsOCArMTYwLDggQEAgcHVibGljOgogICAgIGNvbnN0IEludFNp emUmIHNjcm9sbERlbHRhKCkgY29uc3QgeyByZXR1cm4gbV9zY3JvbGxEZWx0YTsgfQogICAgIHZv aWQgc2V0U2Nyb2xsRGVsdGEoY29uc3QgSW50U2l6ZSYpOwogCi0gICAgZmxvYXQgc2NhbGVEZWx0 YSgpIGNvbnN0IHsgcmV0dXJuIG1fc2NhbGVEZWx0YTsgfQotICAgIHZvaWQgc2V0U2NhbGVEZWx0 YShmbG9hdCk7CisgICAgZmxvYXQgcGFnZVNjYWxlRGVsdGEoKSBjb25zdCB7IHJldHVybiBtX3Bh Z2VTY2FsZURlbHRhOyB9CisgICAgdm9pZCBzZXRQYWdlU2NhbGVEZWx0YShmbG9hdCk7CiAKICAg ICBjb25zdCBJbnRTaXplJiBzZW50U2Nyb2xsRGVsdGEoKSBjb25zdCB7IHJldHVybiBtX3NlbnRT Y3JvbGxEZWx0YTsgfQogICAgIHZvaWQgc2V0U2VudFNjcm9sbERlbHRhKGNvbnN0IEludFNpemUm IHNlbnRTY3JvbGxEZWx0YSkgeyBtX3NlbnRTY3JvbGxEZWx0YSA9IHNlbnRTY3JvbGxEZWx0YTsg fQpAQCAtMjUzLDcgKzI1Myw3IEBAIHByaXZhdGU6CiAgICAgSW50U2l6ZSBtX3Njcm9sbERlbHRh OwogICAgIEludFNpemUgbV9zZW50U2Nyb2xsRGVsdGE7CiAgICAgSW50U2l6ZSBtX21heFNjcm9s bFBvc2l0aW9uOwotICAgIGZsb2F0IG1fc2NhbGVEZWx0YTsKKyAgICBmbG9hdCBtX3BhZ2VTY2Fs ZURlbHRhOwogCiAgICAgLy8gUHJvcGVydGllcyBvd25lZCBleGNsdXNpdmVseSBieSB0aGlzIEND TGF5ZXJJbXBsLgogICAgIC8vIERlYnVnZ2luZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3Qu Y3BwCmluZGV4IGJhNDMwZWM1MTdiMDI3YTc2NmU2M2RhYWVlMDY4ZjgyOTFmNDQ4ZjEuLjUyZGNi YWQ2NTJlOTcxNzhkOWNhOTVhOWIzMTMwMTUyMzliN2UyMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXll clRyZWVIb3N0LmNwcApAQCAtMTMzLDggKzEzMyw3IEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0Ojpm aW5pc2hDb21taXRPbkltcGxUaHJlYWQoQ0NMYXllclRyZWVIb3N0SW1wbCogaG9zdEltcGwpCiAg ICAgaG9zdEltcGwtPnNldEhhdmVXaGVlbEV2ZW50SGFuZGxlcnMobV9oYXZlV2hlZWxFdmVudEhh bmRsZXJzKTsKICAgICBob3N0SW1wbC0+c2V0Wm9vbUFuaW1hdG9yVHJhbnNmb3JtKG1fem9vbUFu aW1hdG9yVHJhbnNmb3JtKTsKICAgICBob3N0SW1wbC0+c2V0Vmlld3BvcnQodmlld3BvcnRTaXpl KCkpOwotICAgIGhvc3RJbXBsLT5zZXRQYWdlU2NhbGUocGFnZVNjYWxlKCkpOwotICAgIGhvc3RJ bXBsLT5zZXRQYWdlU2NhbGVGYWN0b3JMaW1pdHMobV9taW5QYWdlU2NhbGUsIG1fbWF4UGFnZVNj YWxlKTsKKyAgICBob3N0SW1wbC0+c2V0UGFnZVNjYWxlRmFjdG9yQW5kTGltaXRzKHBhZ2VTY2Fs ZSgpLCBtX21pblBhZ2VTY2FsZSwgbV9tYXhQYWdlU2NhbGUpOwogCiAgICAgLy8gU3luY2hyb25p emUgdHJlZXMsIGlmIG9uZSBleGlzdHMgYXQgYWxsLi4uCiAgICAgaWYgKHJvb3RMYXllcigpKQpA QCAtNDcwLDcgKzQ2OSw3IEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0OjphcHBseVNjcm9sbEFuZFNj YWxlKGNvbnN0IENDU2Nyb2xsQW5kU2NhbGVTZXQmIGluZm8pCiAKICAgICBBU1NFUlQoaW5mby5z Y3JvbGxzLnNpemUoKSA9PSAxKTsKICAgICBJbnRTaXplIHNjcm9sbERlbHRhID0gaW5mby5zY3Jv bGxzWzBdLnNjcm9sbERlbHRhOwotICAgIG1fY2xpZW50LT5hcHBseVNjcm9sbEFuZFNjYWxlKHNj cm9sbERlbHRhLCBpbmZvLnBhZ2VTY2FsZSk7CisgICAgbV9jbGllbnQtPmFwcGx5U2Nyb2xsQW5k U2NhbGUoc2Nyb2xsRGVsdGEsIGluZm8ucGFnZVNjYWxlRGVsdGEpOwogfQogCiB2b2lkIENDTGF5 ZXJUcmVlSG9zdDo6c3RhcnRSYXRlTGltaXRlcihHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RDb21tb24uY3BwCmluZGV4IDNiMjNjOTky YTgwMWM1NjA5NTI4YjgwN2VlODJmOWNmMWQyZDVmYjIuLmNkOTAwZWEzNjJiOTkyYTk3ODk1OGMy ZGFkMmFmZDdmNTk2ZjYzNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29t bW9uLmNwcApAQCAtMTk4LDEzICsxOTgsMTMgQEAgc3RhdGljIHZvaWQgY2FsY3VsYXRlRHJhd1Ry YW5zZm9ybXNBbmRWaXNpYmlsaXR5SW50ZXJuYWwoTGF5ZXJUeXBlKiBsYXllciwgTGF5ZXIKICAg ICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBsYXllckxvY2FsVHJhbnNmb3JtOwogICAgIC8vIExUID0g VHJbb3JpZ2luXSAqIE1bem9vbUFuaW1hdG9yXQogICAgIGxheWVyTG9jYWxUcmFuc2Zvcm0ubXVs dGlwbHkobGF5ZXItPnpvb21BbmltYXRvclRyYW5zZm9ybSgpKTsKLSAgICAvLyBMVCA9IFRyW29y aWdpbl0gKiBNW3pvb21BbmltYXRvcl0gKiBTW3NjYWxlRGVsdGFdCi0gICAgbGF5ZXJMb2NhbFRy YW5zZm9ybS5zY2FsZShsYXllci0+c2NhbGVEZWx0YSgpKTsKLSAgICAvLyBMVCA9IFRyW29yaWdp bl0gKiBNW3pvb21BbmltYXRvcl0gKiBTW3NjYWxlRGVsdGFdICogVHJbb3JpZ2luMmFuY2hvcl0K KyAgICAvLyBMVCA9IFRyW29yaWdpbl0gKiBNW3pvb21BbmltYXRvcl0gKiBTW3BhZ2VTY2FsZURl bHRhXQorICAgIGxheWVyTG9jYWxUcmFuc2Zvcm0uc2NhbGUobGF5ZXItPnBhZ2VTY2FsZURlbHRh KCkpOworICAgIC8vIExUID0gVHJbb3JpZ2luXSAqIE1bem9vbUFuaW1hdG9yXSAqIFNbcGFnZVNj YWxlRGVsdGFdICogVHJbb3JpZ2luMmFuY2hvcl0KICAgICBsYXllckxvY2FsVHJhbnNmb3JtLnRy YW5zbGF0ZTNkKHBvc2l0aW9uLngoKSwgcG9zaXRpb24ueSgpLCBsYXllci0+YW5jaG9yUG9pbnRa KCkpOwotICAgIC8vIExUID0gVHJbb3JpZ2luXSAqIE1bem9vbUFuaW1hdG9yXSAqIFNbc2NhbGVE ZWx0YV0gKiBUcltvcmlnaW4yYW5jaG9yXSAqIE1bbGF5ZXJdCisgICAgLy8gTFQgPSBUcltvcmln aW5dICogTVt6b29tQW5pbWF0b3JdICogU1twYWdlU2NhbGVEZWx0YV0gKiBUcltvcmlnaW4yYW5j aG9yXSAqIE1bbGF5ZXJdCiAgICAgbGF5ZXJMb2NhbFRyYW5zZm9ybS5tdWx0aXBseShsYXllci0+ dHJhbnNmb3JtKCkpOwotICAgIC8vIExUID0gVHJbb3JpZ2luXSAqIE1bem9vbUFuaW1hdG9yXSAq IFNbc2NhbGVEZWx0YV0gKiBUcltvcmlnaW4yYW5jaG9yXSAqIE1bbGF5ZXJdICogVHJbYW5jaG9y MmNlbnRlcl0KKyAgICAvLyBMVCA9IFRyW29yaWdpbl0gKiBNW3pvb21BbmltYXRvcl0gKiBTW3Bh Z2VTY2FsZURlbHRhXSAqIFRyW29yaWdpbjJhbmNob3JdICogTVtsYXllcl0gKiBUclthbmNob3Iy Y2VudGVyXQogICAgIGxheWVyTG9jYWxUcmFuc2Zvcm0udHJhbnNsYXRlM2QoY2VudGVyT2Zmc2V0 WCwgY2VudGVyT2Zmc2V0WSwgLWxheWVyLT5hbmNob3JQb2ludFooKSk7CiAKICAgICBUcmFuc2Zv cm1hdGlvbk1hdHJpeCBjb21iaW5lZFRyYW5zZm9ybSA9IHBhcmVudE1hdHJpeDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJU cmVlSG9zdENvbW1vbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmgKaW5kZXggNTI5YjNiMzIwY2Y3MjQ0ZTJlNDE5 OGVmMTk3ZTVjNDNkYzViNjlhYy4uOGE1N2JmZTk1OTM3MzQyOGI2YTg5YjlhOGEyYzgzZjc5OGJm NTlkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmgKQEAgLTUzLDcg KzUzLDcgQEAgcHVibGljOgogCiBzdHJ1Y3QgQ0NTY3JvbGxBbmRTY2FsZVNldCB7CiAgICAgVmVj dG9yPENDTGF5ZXJUcmVlSG9zdENvbW1vbjo6U2Nyb2xsVXBkYXRlSW5mbz4gc2Nyb2xsczsKLSAg ICBmbG9hdCBwYWdlU2NhbGU7CisgICAgZmxvYXQgcGFnZVNjYWxlRGVsdGE7CiB9OwogCiB0ZW1w bGF0ZTx0eXBlbmFtZSBMYXllclR5cGU+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdElt cGwuY3BwCmluZGV4IDI1YTgxODA1N2ZmYjFiMGE3NzE0YTU3M2I5ZTE0N2ZlZjRhM2QxNTIuLjE1 Y2JkYzhiZTg0NWEzMzhhNjRlNTYzZjE4YjU1ZTY3YWE0Njc2MzcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdElt cGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwCkBAIC01MSw3ICs1MSw4IEBAIENDTGF5ZXJUcmVlSG9z dEltcGw6OkNDTGF5ZXJUcmVlSG9zdEltcGwoY29uc3QgQ0NTZXR0aW5ncyYgc2V0dGluZ3MsIEND TGF5ZXJUcmVlCiAgICAgLCBtX3Zpc2libGUodHJ1ZSkKICAgICAsIG1faGF2ZVdoZWVsRXZlbnRI YW5kbGVycyhmYWxzZSkKICAgICAsIG1fcGFnZVNjYWxlKDEpCi0gICAgLCBtX3NjYWxlRGVsdGEo MSkKKyAgICAsIG1fcGFnZVNjYWxlRGVsdGEoMSkKKyAgICAsIG1fc2VudFBhZ2VTY2FsZURlbHRh KDEpCiAgICAgLCBtX21pblBhZ2VTY2FsZSgwKQogICAgICwgbV9tYXhQYWdlU2NhbGUoMCkKICAg ICAsIG1fcGluY2hHZXN0dXJlQWN0aXZlKGZhbHNlKQpAQCAtMTk2LDI3ICsxOTcsNDIgQEAgdm9p ZCBDQ0xheWVyVHJlZUhvc3RJbXBsOjpzZXRWaWV3cG9ydChjb25zdCBJbnRTaXplJiB2aWV3cG9y dFNpemUpCiAgICAgbV9sYXllclJlbmRlcmVyLT52aWV3cG9ydENoYW5nZWQoKTsKIH0KIAotdm9p ZCBDQ0xheWVyVHJlZUhvc3RJbXBsOjpzZXRQYWdlU2NhbGUoZmxvYXQgcGFnZVNjYWxlKQordm9p ZCBDQ0xheWVyVHJlZUhvc3RJbXBsOjpzZXRQYWdlU2NhbGVGYWN0b3JBbmRMaW1pdHMoZmxvYXQg cGFnZVNjYWxlLCBmbG9hdCBtaW5QYWdlU2NhbGUsIGZsb2F0IG1heFBhZ2VTY2FsZSkKIHsKLSAg ICBpZiAoIXBhZ2VTY2FsZSB8fCBwYWdlU2NhbGUgPT0gbV9wYWdlU2NhbGUpCisgICAgaWYgKCFw YWdlU2NhbGUpCiAgICAgICAgIHJldHVybjsKIAotICAgIC8vIE1haW50YWluIGNvbnN0YW50IHRo ZSBwcm9kdWN0IG9mIG1fcGFnZVNjYWxlICogbV9zY2FsZURlbHRhLgotICAgIGZsb2F0IHNjYWxl Q2hhbmdlID0gcGFnZVNjYWxlIC8gbV9wYWdlU2NhbGU7Ci0gICAgZmxvYXQgb2xkTWFnbmlmeVNj YWxlID0gbV9wYWdlU2NhbGUgKiBtX3NjYWxlRGVsdGE7CisgICAgaWYgKG1fc2VudFBhZ2VTY2Fs ZURlbHRhID09IDEgJiYgcGFnZVNjYWxlID09IG1fcGFnZVNjYWxlICYmIG1pblBhZ2VTY2FsZSA9 PSBtX21pblBhZ2VTY2FsZSAmJiBtYXhQYWdlU2NhbGUgPT0gbV9tYXhQYWdlU2NhbGUpCisgICAg ICAgIHJldHVybjsKKworICAgIG1fbWluUGFnZVNjYWxlID0gbWluUGFnZVNjYWxlOworICAgIG1f bWF4UGFnZVNjYWxlID0gbWF4UGFnZVNjYWxlOworCisgICAgZmxvYXQgcGFnZVNjYWxlQ2hhbmdl ID0gcGFnZVNjYWxlIC8gbV9wYWdlU2NhbGU7CiAgICAgbV9wYWdlU2NhbGUgPSBwYWdlU2NhbGU7 CisgICAgbV9zZW50UGFnZVNjYWxlRGVsdGEgPSAxOwogCi0gICAgc2V0U2NhbGVEZWx0YShvbGRN YWduaWZ5U2NhbGUgLyBwYWdlU2NhbGUpOworICAgIC8vIENsYW1wIGRlbHRhIHRvIGxpbWl0cyBh bmQgcmVmcmVzaCBkaXNwbGF5IG1hdHJpeC4KKyAgICBzZXRQYWdlU2NhbGVEZWx0YShtX3BhZ2VT Y2FsZURlbHRhKTsKKyAgICBhcHBseVBhZ2VTY2FsZURlbHRhVG9TY3JvbGxMYXllcigpOworCisg ICAgYWRqdXN0U2Nyb2xsc0ZvclBhZ2VTY2FsZUNoYW5nZShwYWdlU2NhbGVDaGFuZ2UpOworfQor Cit2b2lkIENDTGF5ZXJUcmVlSG9zdEltcGw6OmFkanVzdFNjcm9sbHNGb3JQYWdlU2NhbGVDaGFu Z2UoZmxvYXQgcGFnZVNjYWxlQ2hhbmdlKQoreworICAgIGlmIChwYWdlU2NhbGVDaGFuZ2UgPT0g MSkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gV2UgYWxzbyBuZWVkIHRvIGNvbnZlcnQgaW1w bC1zaWRlIHNjcm9sbCBkZWx0YXMgdG8gcGFnZVNjYWxlIHNwYWNlLgotICAgIGlmIChtX3Njcm9s bExheWVySW1wbCAmJiBtX3Njcm9sbExheWVySW1wbC0+c2Nyb2xsYWJsZSgpKSB7CisgICAgaWYg KG1fc2Nyb2xsTGF5ZXJJbXBsKSB7CiAgICAgICAgIEludFNpemUgc2Nyb2xsRGVsdGEgPSBtX3Nj cm9sbExheWVySW1wbC0+c2Nyb2xsRGVsdGEoKTsKLSAgICAgICAgc2Nyb2xsRGVsdGEuc2NhbGUo c2NhbGVDaGFuZ2UpOworICAgICAgICBzY3JvbGxEZWx0YS5zY2FsZShwYWdlU2NhbGVDaGFuZ2Up OwogICAgICAgICBtX3Njcm9sbExheWVySW1wbC0+c2V0U2Nyb2xsRGVsdGEoc2Nyb2xsRGVsdGEp OwogICAgIH0KIH0KIAotdm9pZCBDQ0xheWVyVHJlZUhvc3RJbXBsOjpzZXRTY2FsZURlbHRhKGZs b2F0IGRlbHRhKQordm9pZCBDQ0xheWVyVHJlZUhvc3RJbXBsOjpzZXRQYWdlU2NhbGVEZWx0YShm bG9hdCBkZWx0YSkKIHsKICAgICAvLyBDbGFtcCB0byB0aGUgY3VycmVudCBtaW4vbWF4IGxpbWl0 cy4KICAgICBmbG9hdCBmaW5hbE1hZ25pZnlTY2FsZSA9IG1fcGFnZVNjYWxlICogZGVsdGE7CkBA IC0yMjUsMjQgKzI0MSwxOSBAQCB2b2lkIENDTGF5ZXJUcmVlSG9zdEltcGw6OnNldFNjYWxlRGVs dGEoZmxvYXQgZGVsdGEpCiAgICAgZWxzZSBpZiAobV9tYXhQYWdlU2NhbGUgJiYgZmluYWxNYWdu aWZ5U2NhbGUgPiBtX21heFBhZ2VTY2FsZSkKICAgICAgICAgZGVsdGEgPSBtX21heFBhZ2VTY2Fs ZSAvIG1fcGFnZVNjYWxlOwogCi0gICAgaWYgKGRlbHRhID09IG1fc2NhbGVEZWx0YSkKKyAgICBp ZiAoZGVsdGEgPT0gbV9wYWdlU2NhbGVEZWx0YSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9z Y2FsZURlbHRhID0gZGVsdGE7CisgICAgbV9wYWdlU2NhbGVEZWx0YSA9IGRlbHRhOwogCiAgICAg dXBkYXRlTWF4U2Nyb2xsUG9zaXRpb24oKTsKLQotICAgIGlmIChtX3Njcm9sbExheWVySW1wbCAm JiBtX3Njcm9sbExheWVySW1wbC0+c2Nyb2xsYWJsZSgpKQotICAgICAgICBtX3Njcm9sbExheWVy SW1wbC0+c2V0U2NhbGVEZWx0YShtX3NjYWxlRGVsdGEpOworICAgIGFwcGx5UGFnZVNjYWxlRGVs dGFUb1Njcm9sbExheWVyKCk7CiB9CiAKLXZvaWQgQ0NMYXllclRyZWVIb3N0SW1wbDo6c2V0UGFn ZVNjYWxlRmFjdG9yTGltaXRzKGZsb2F0IG1pblBhZ2VTY2FsZSwgZmxvYXQgbWF4UGFnZVNjYWxl KQordm9pZCBDQ0xheWVyVHJlZUhvc3RJbXBsOjphcHBseVBhZ2VTY2FsZURlbHRhVG9TY3JvbGxM YXllcigpCiB7Ci0gICAgbV9taW5QYWdlU2NhbGUgPSBtaW5QYWdlU2NhbGU7Ci0gICAgbV9tYXhQ YWdlU2NhbGUgPSBtYXhQYWdlU2NhbGU7Ci0KLSAgICAvLyBUaGlzIHdpbGwgY2xhbXAgbV9zY2Fs ZURlbHRhIGFuZCBhcHBseSBzaWRlIGVmZmVjdHMgaWYgY2xhbXBlZC4KLSAgICBzZXRTY2FsZURl bHRhKG1fc2NhbGVEZWx0YSk7CisgICAgaWYgKG1fc2Nyb2xsTGF5ZXJJbXBsKQorICAgICAgICBt X3Njcm9sbExheWVySW1wbC0+c2V0UGFnZVNjYWxlRGVsdGEobV9wYWdlU2NhbGVEZWx0YSAqIG1f c2VudFBhZ2VTY2FsZURlbHRhKTsKIH0KIAogdm9pZCBDQ0xheWVyVHJlZUhvc3RJbXBsOjp1cGRh dGVNYXhTY3JvbGxQb3NpdGlvbigpCkBAIC0yNTEsNyArMjYyLDcgQEAgdm9pZCBDQ0xheWVyVHJl ZUhvc3RJbXBsOjp1cGRhdGVNYXhTY3JvbGxQb3NpdGlvbigpCiAgICAgICAgIHJldHVybjsKIAog ICAgIEZsb2F0U2l6ZSB2aWV3Qm91bmRzID0gbV92aWV3cG9ydFNpemU7Ci0gICAgdmlld0JvdW5k cy5zY2FsZSgxIC8gbV9zY2FsZURlbHRhKTsKKyAgICB2aWV3Qm91bmRzLnNjYWxlKDEgLyBtX3Bh Z2VTY2FsZURlbHRhKTsKIAogICAgIC8vIFRPRE8oYWVsaWFzKTogSGFyZGNvZGluZyB0aGUgZmly c3QgY2hpbGQgaGVyZSBpcyB3ZWlyZC4gVGhpbmsgb2YKICAgICAvLyBhIGNsZWFuZXIgd2F5IHRv IGdldCB0aGUgY29udGVudEJvdW5kcyBvbiB0aGUgSW1wbCBzaWRlLgpAQCAtMjc2LDcgKzI4Nyw3 IEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0SW1wbDo6c2V0Wm9vbUFuaW1hdG9yVHJhbnNmb3JtKGNv bnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiB6CiB2b2lkIENDTGF5ZXJUcmVlSG9zdEltcGw6OnNj cm9sbFJvb3RMYXllcihjb25zdCBJbnRTaXplJiBzY3JvbGxEZWx0YSkKIHsKICAgICBUUkFDRV9F VkVOVCgiQ0NMYXllclRyZWVIb3N0SW1wbDo6c2Nyb2xsUm9vdExheWVyIiwgdGhpcywgMCk7Ci0g ICAgaWYgKCFtX3Njcm9sbExheWVySW1wbCB8fCAhbV9zY3JvbGxMYXllckltcGwtPnNjcm9sbGFi bGUoKSkKKyAgICBpZiAoIW1fc2Nyb2xsTGF5ZXJJbXBsKQogICAgICAgICByZXR1cm47CiAKICAg ICBtX3Njcm9sbExheWVySW1wbC0+c2Nyb2xsQnkoc2Nyb2xsRGVsdGEpOwpAQCAtMzA2LDkgKzMx Nyw5IEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0SW1wbDo6cGluY2hHZXN0dXJlVXBkYXRlKGZsb2F0 IG1hZ25pZnlEZWx0YSwKIAogICAgIC8vIEtlZXAgdGhlIGNlbnRlci1vZi1waW5jaCBhbmNob3Ig c3BlY2lmaWVkIGJ5ICh4LCB5KSBpbiBhIHN0YWJsZQogICAgIC8vIHBvc2l0aW9uIG92ZXIgdGhl IGNvdXJzZSBvZiB0aGUgbWFnbmlmeS4KLSAgICBGbG9hdFBvaW50IHByZXZTY2FsZUFuY2hvcihh bmNob3IueCgpIC8gbV9zY2FsZURlbHRhLCBhbmNob3IueSgpIC8gbV9zY2FsZURlbHRhKTsKLSAg ICBzZXRTY2FsZURlbHRhKG1fc2NhbGVEZWx0YSAqIG1hZ25pZnlEZWx0YSk7Ci0gICAgRmxvYXRQ b2ludCBuZXdTY2FsZUFuY2hvcihhbmNob3IueCgpIC8gbV9zY2FsZURlbHRhLCBhbmNob3IueSgp IC8gbV9zY2FsZURlbHRhKTsKKyAgICBGbG9hdFBvaW50IHByZXZTY2FsZUFuY2hvcihhbmNob3Iu eCgpIC8gbV9wYWdlU2NhbGVEZWx0YSwgYW5jaG9yLnkoKSAvIG1fcGFnZVNjYWxlRGVsdGEpOwor ICAgIHNldFBhZ2VTY2FsZURlbHRhKG1fcGFnZVNjYWxlRGVsdGEgKiBtYWduaWZ5RGVsdGEpOwor ICAgIEZsb2F0UG9pbnQgbmV3U2NhbGVBbmNob3IoYW5jaG9yLngoKSAvIG1fcGFnZVNjYWxlRGVs dGEsIGFuY2hvci55KCkgLyBtX3BhZ2VTY2FsZURlbHRhKTsKIAogICAgIEZsb2F0U2l6ZSBtb3Zl ID0gcHJldlNjYWxlQW5jaG9yIC0gbmV3U2NhbGVBbmNob3I7CiAKQEAgLTMyNywxNCArMzM4LDE3 IEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0SW1wbDo6cGluY2hHZXN0dXJlRW5kKCkKIFBhc3NPd25Q dHI8Q0NTY3JvbGxBbmRTY2FsZVNldD4gQ0NMYXllclRyZWVIb3N0SW1wbDo6cHJvY2Vzc1Njcm9s bERlbHRhcygpCiB7CiAgICAgT3duUHRyPENDU2Nyb2xsQW5kU2NhbGVTZXQ+IHNjcm9sbEluZm8g PSBhZG9wdFB0cihuZXcgQ0NTY3JvbGxBbmRTY2FsZVNldCgpKTsKLSAgICBib29sIGRpZE1vdmUg PSBtX3Njcm9sbExheWVySW1wbCAmJiAoIW1fc2Nyb2xsTGF5ZXJJbXBsLT5zY3JvbGxEZWx0YSgp LmlzWmVybygpIHx8IG1fc2NhbGVEZWx0YSAhPSAxLjBmKTsKKyAgICBib29sIGRpZE1vdmUgPSBt X3Njcm9sbExheWVySW1wbCAmJiAoIW1fc2Nyb2xsTGF5ZXJJbXBsLT5zY3JvbGxEZWx0YSgpLmlz WmVybygpIHx8IG1fcGFnZVNjYWxlRGVsdGEgIT0gMS4wZik7CiAgICAgaWYgKCFkaWRNb3ZlIHx8 IG1fcGluY2hHZXN0dXJlQWN0aXZlKSB7Ci0gICAgICAgIHNjcm9sbEluZm8tPnBhZ2VTY2FsZSA9 IG1fcGFnZVNjYWxlOworICAgICAgICBtX3NlbnRQYWdlU2NhbGVEZWx0YSA9IHNjcm9sbEluZm8t PnBhZ2VTY2FsZURlbHRhID0gMTsKICAgICAgICAgcmV0dXJuIHNjcm9sbEluZm8ucmVsZWFzZSgp OwogICAgIH0KIAorICAgIG1fc2VudFBhZ2VTY2FsZURlbHRhID0gc2Nyb2xsSW5mby0+cGFnZVNj YWxlRGVsdGEgPSBtX3BhZ2VTY2FsZURlbHRhOworICAgIG1fcGFnZVNjYWxlID0gbV9wYWdlU2Nh bGUgKiBtX3NlbnRQYWdlU2NhbGVEZWx0YTsKKyAgICBzZXRQYWdlU2NhbGVEZWx0YSgxKTsKKwog ICAgIC8vIEZJWE1FOiB0cmFjayBzY3JvbGxzIGZyb20gbGF5ZXJzIG90aGVyIHRoYW4gdGhlIHJv b3QKLSAgICBzY3JvbGxJbmZvLT5wYWdlU2NhbGUgPSBtX3BhZ2VTY2FsZSAqIG1fc2NhbGVEZWx0 YTsKICAgICBDQ0xheWVyVHJlZUhvc3RDb21tb246OlNjcm9sbFVwZGF0ZUluZm8gc2Nyb2xsOwog ICAgIHNjcm9sbC5sYXllcklkID0gbV9zY3JvbGxMYXllckltcGwtPmlkKCk7CiAgICAgc2Nyb2xs LnNjcm9sbERlbHRhID0gbV9zY3JvbGxMYXllckltcGwtPnNjcm9sbERlbHRhKCk7CkBAIC0zNDUs NiArMzU5LDggQEAgUGFzc093blB0cjxDQ1Njcm9sbEFuZFNjYWxlU2V0PiBDQ0xheWVyVHJlZUhv c3RJbXBsOjpwcm9jZXNzU2Nyb2xsRGVsdGFzKCkKICAgICBtX3Njcm9sbExheWVySW1wbC0+c2V0 U2VudFNjcm9sbERlbHRhKG1fc2Nyb2xsTGF5ZXJJbXBsLT5zY3JvbGxEZWx0YSgpKTsKICAgICBt X3Njcm9sbExheWVySW1wbC0+c2V0U2Nyb2xsRGVsdGEoSW50U2l6ZSgpKTsKIAorICAgIGFkanVz dFNjcm9sbHNGb3JQYWdlU2NhbGVDaGFuZ2UobV9zZW50UGFnZVNjYWxlRGVsdGEpOworCiAgICAg cmV0dXJuIHNjcm9sbEluZm8ucmVsZWFzZSgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJl ZUhvc3RJbXBsLmgKaW5kZXggNDRiOWViOTNlOGE0NDU3NjhkNDM3ODI3MDFkNjAwYzQzMDA0MmZk ZS4uYzI5ZmU0ZTA5NDExNTJlNDBlMGM0ZDJjMmNkZWEyMzdjNDllZDlmNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVI b3N0SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuaApAQCAtOTksOSArOTksOCBAQCBwdWJsaWM6CiAgICAg Y29uc3QgSW50U2l6ZSYgdmlld3BvcnRTaXplKCkgY29uc3QgeyByZXR1cm4gbV92aWV3cG9ydFNp emU7IH0KICAgICB2b2lkIHNldFpvb21BbmltYXRvclRyYW5zZm9ybShjb25zdCBUcmFuc2Zvcm1h dGlvbk1hdHJpeCYpOwogCi0gICAgdm9pZCBzZXRQYWdlU2NhbGUoZmxvYXQpOworICAgIHZvaWQg c2V0UGFnZVNjYWxlRmFjdG9yQW5kTGltaXRzKGZsb2F0IHBhZ2VTY2FsZSwgZmxvYXQgbWluUGFn ZVNjYWxlLCBmbG9hdCBtYXhQYWdlU2NhbGUpOwogICAgIGZsb2F0IHBhZ2VTY2FsZSgpIGNvbnN0 IHsgcmV0dXJuIG1fcGFnZVNjYWxlOyB9Ci0gICAgdm9pZCBzZXRQYWdlU2NhbGVGYWN0b3JMaW1p dHMoZmxvYXQgbWluUGFnZVNjYWxlLCBmbG9hdCBtYXhQYWdlU2NhbGUpOwogCiAgICAgY29uc3Qg Q0NTZXR0aW5ncyYgc2V0dGluZ3MoKSBjb25zdCB7IHJldHVybiBtX3NldHRpbmdzOyB9CiAKQEAg LTEwOSw3ICsxMDgsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHBpbmNoR2VzdHVyZVVw ZGF0ZShmbG9hdCwgY29uc3QgSW50UG9pbnQmKTsKICAgICB2aXJ0dWFsIHZvaWQgcGluY2hHZXN0 dXJlRW5kKCk7CiAgICAgUGFzc093blB0cjxDQ1Njcm9sbEFuZFNjYWxlU2V0PiBwcm9jZXNzU2Ny b2xsRGVsdGFzKCk7Ci0gICAgdm9pZCB1cGRhdGVNYXhTY3JvbGxQb3NpdGlvbigpOwogCiBwcm90 ZWN0ZWQ6CiAgICAgQ0NMYXllclRyZWVIb3N0SW1wbChjb25zdCBDQ1NldHRpbmdzJiwgQ0NMYXll clRyZWVIb3N0SW1wbENsaWVudCopOwpAQCAtMTE4LDcgKzExNiwxMCBAQCBwcm90ZWN0ZWQ6CiAg ICAgaW50IG1fZnJhbWVOdW1iZXI7CiAKIHByaXZhdGU6Ci0gICAgdm9pZCBzZXRTY2FsZURlbHRh KGZsb2F0KTsKKyAgICB2b2lkIHNldFBhZ2VTY2FsZURlbHRhKGZsb2F0KTsKKyAgICB2b2lkIGFw cGx5UGFnZVNjYWxlRGVsdGFUb1Njcm9sbExheWVyKCk7CisgICAgdm9pZCBhZGp1c3RTY3JvbGxz Rm9yUGFnZVNjYWxlQ2hhbmdlKGZsb2F0KTsKKyAgICB2b2lkIHVwZGF0ZU1heFNjcm9sbFBvc2l0 aW9uKCk7CiAKICAgICBPd25QdHI8TGF5ZXJSZW5kZXJlckNocm9taXVtPiBtX2xheWVyUmVuZGVy ZXI7CiAgICAgUmVmUHRyPENDTGF5ZXJJbXBsPiBtX3Jvb3RMYXllckltcGw7CkBAIC0xMjksNyAr MTMwLDggQEAgcHJpdmF0ZToKICAgICBib29sIG1faGF2ZVdoZWVsRXZlbnRIYW5kbGVyczsKIAog ICAgIGZsb2F0IG1fcGFnZVNjYWxlOwotICAgIGZsb2F0IG1fc2NhbGVEZWx0YTsKKyAgICBmbG9h dCBtX3BhZ2VTY2FsZURlbHRhOworICAgIGZsb2F0IG1fc2VudFBhZ2VTY2FsZURlbHRhOwogICAg IGZsb2F0IG1fbWluUGFnZVNjYWxlLCBtX21heFBhZ2VTY2FsZTsKIAogICAgIGJvb2wgbV9waW5j aEdlc3R1cmVBY3RpdmU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAKaW5kZXggNmFlYjcyMzYxNTkyYTRiNTVlM2EyYjg2OGUwMzM1M2M5MWI0MWEwZC4uZDk3NzYz ZjBlOTM3NTUwMzk1ZjJkNzM3NjFlMzg4NDA2N2VkYWMyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMjc3NywxNiArMjc3NywxMiBAQCB2b2lkIFdl YlZpZXdJbXBsOjphbmltYXRlQW5kTGF5b3V0KGRvdWJsZSBmcmFtZUJlZ2luVGltZSkKICAgICBs YXlvdXQoKTsKIH0KIAotdm9pZCBXZWJWaWV3SW1wbDo6YXBwbHlTY3JvbGxBbmRTY2FsZShjb25z dCBJbnRTaXplJiBzY3JvbGxEZWx0YSwgZmxvYXQgc2NhbGVGYWN0b3IpCit2b2lkIFdlYlZpZXdJ bXBsOjphcHBseVNjcm9sbEFuZFNjYWxlKGNvbnN0IEludFNpemUmIHNjcm9sbERlbHRhLCBmbG9h dCBwYWdlU2NhbGVEZWx0YSkKIHsKICAgICBpZiAoIW1haW5GcmFtZUltcGwoKSB8fCAhbWFpbkZy YW1lSW1wbCgpLT5mcmFtZVZpZXcoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgZmxvYXQgb2xk U2NhbGUgPSBwYWdlU2NhbGVGYWN0b3IoKTsKLSAgICBpZiAoIW9sZFNjYWxlKQotICAgICAgICBv bGRTY2FsZSA9IDE7Ci0KLSAgICBpZiAoIXNjYWxlRmFjdG9yIHx8IG9sZFNjYWxlID09IHNjYWxl RmFjdG9yKQorICAgIGlmIChwYWdlU2NhbGVEZWx0YSA9PSAxKQogICAgICAgICBtYWluRnJhbWVJ bXBsKCktPmZyYW1lVmlldygpLT5zY3JvbGxCeShzY3JvbGxEZWx0YSk7CiAgICAgZWxzZSB7CiAg ICAgICAgIC8vIFRoZSBwYWdlIHNjYWxlIGNoYW5nZWQsIHNvIGFwcGx5IGEgc2NhbGUgYW5kIHNj cm9sbCBpbiBhIHNpbmdsZQpAQCAtMjc5NiwxMCArMjc5Miw5IEBAIHZvaWQgV2ViVmlld0ltcGw6 OmFwcGx5U2Nyb2xsQW5kU2NhbGUoY29uc3QgSW50U2l6ZSYgc2Nyb2xsRGVsdGEsIGZsb2F0IHNj YWxlRmFjCiAgICAgICAgIFdlYlNpemUgc2Nyb2xsT2Zmc2V0ID0gbWFpbkZyYW1lKCktPnNjcm9s bE9mZnNldCgpOwogICAgICAgICBzY3JvbGxPZmZzZXQud2lkdGggKz0gc2Nyb2xsRGVsdGEud2lk dGgoKTsKICAgICAgICAgc2Nyb2xsT2Zmc2V0LmhlaWdodCArPSBzY3JvbGxEZWx0YS5oZWlnaHQo KTsKLSAgICAgICAgZmxvYXQgc2NhbGVEZWx0YSA9IHNjYWxlRmFjdG9yIC8gb2xkU2NhbGU7Ci0g ICAgICAgIFdlYlBvaW50IHNjYWxlZFNjcm9sbE9mZnNldChzY3JvbGxPZmZzZXQud2lkdGggKiBz Y2FsZURlbHRhLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Nyb2xsT2Zm c2V0LmhlaWdodCAqIHNjYWxlRGVsdGEpOwotICAgICAgICBzZXRQYWdlU2NhbGVGYWN0b3Ioc2Nh bGVGYWN0b3IsIHNjYWxlZFNjcm9sbE9mZnNldCk7CisgICAgICAgIFdlYlBvaW50IHNjYWxlZFNj cm9sbE9mZnNldChzY3JvbGxPZmZzZXQud2lkdGggKiBwYWdlU2NhbGVEZWx0YSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNjcm9sbE9mZnNldC5oZWlnaHQgKiBwYWdlU2Nh bGVEZWx0YSk7CisgICAgICAgIHNldFBhZ2VTY2FsZUZhY3RvcihwYWdlU2NhbGVGYWN0b3IoKSAq IHBhZ2VTY2FsZURlbHRhLCBzY2FsZWRTY3JvbGxPZmZzZXQpOwogICAgIH0KIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVySW1wbFRlc3QuY3BwIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVySW1wbFRlc3QuY3BwCmluZGV4IGQ3 MzMzODc2YmI0NDZmOGJlNTQ4M2E1NzRiNTU2NTc2NDE1MWI3YmEuLjA2ZGM2YzFkZjM4NWQ1ZmFi MGNhYjU3ZjRkMDZjZjVmZjU0NDBmNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvQ0NMYXllckltcGxUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3Rlc3RzL0NDTGF5ZXJJbXBsVGVzdC5jcHAKQEAgLTExMSw3ICsxMTEsNyBAQCBURVNUKENDTGF5 ZXJJbXBsVGVzdCwgdmVyaWZ5TGF5ZXJDaGFuZ2VzQXJlVHJhY2tlZFByb3Blcmx5KQogICAgIEVY RUNVVEVfQU5EX1ZFUklGWV9TVUJUUkVFX0NIQU5HRUQocm9vdC0+c2Nyb2xsQnkoYXJiaXRyYXJ5 SW50U2l6ZSkpOwogICAgIEVYRUNVVEVfQU5EX1ZFUklGWV9TVUJUUkVFX0NIQU5HRUQocm9vdC0+ c2V0U2Nyb2xsRGVsdGEoYXJiaXRyYXJ5SW50U2l6ZSkpOwogICAgIEVYRUNVVEVfQU5EX1ZFUklG WV9TVUJUUkVFX0NIQU5HRUQocm9vdC0+c2V0U2Nyb2xsUG9zaXRpb24oYXJiaXRyYXJ5SW50UG9p bnQpKTsKLSAgICBFWEVDVVRFX0FORF9WRVJJRllfU1VCVFJFRV9DSEFOR0VEKHJvb3QtPnNldFNj YWxlRGVsdGEoYXJiaXRyYXJ5TnVtYmVyKSk7CisgICAgRVhFQ1VURV9BTkRfVkVSSUZZX1NVQlRS RUVfQ0hBTkdFRChyb290LT5zZXRQYWdlU2NhbGVEZWx0YShhcmJpdHJhcnlOdW1iZXIpKTsKIAog ICAgIC8vIENoYW5naW5nIHRoZXNlIHByb3BlcnRpZXMgb25seSBhZmZlY3RzIHRoZSBsYXllciBp dHNlbGYuCiAgICAgRVhFQ1VURV9BTkRfVkVSSUZZX09OTFlfTEFZRVJfQ0hBTkdFRChyb290LT5z ZXRDb250ZW50Qm91bmRzKGFyYml0cmFyeUludFNpemUpKTsKQEAgLTE0OSw3ICsxNDksNyBAQCBU RVNUKENDTGF5ZXJJbXBsVGVzdCwgdmVyaWZ5TGF5ZXJDaGFuZ2VzQXJlVHJhY2tlZFByb3Blcmx5 KQogICAgIEVYRUNVVEVfQU5EX1ZFUklGWV9TVUJUUkVFX0RJRF9OT1RfQ0hBTkdFKHJvb3QtPnNl dERvdWJsZVNpZGVkKGZhbHNlKSk7IC8vIGNvbnN0cnVjdG9yIGluaXRpYWxpemVzIGl0IHRvICJ0 cnVlIi4KICAgICBFWEVDVVRFX0FORF9WRVJJRllfU1VCVFJFRV9ESURfTk9UX0NIQU5HRShyb290 LT5zZXRTY3JvbGxEZWx0YShhcmJpdHJhcnlJbnRTaXplKSk7CiAgICAgRVhFQ1VURV9BTkRfVkVS SUZZX1NVQlRSRUVfRElEX05PVF9DSEFOR0Uocm9vdC0+c2V0U2Nyb2xsUG9zaXRpb24oYXJiaXRy YXJ5SW50UG9pbnQpKTsKLSAgICBFWEVDVVRFX0FORF9WRVJJRllfU1VCVFJFRV9ESURfTk9UX0NI QU5HRShyb290LT5zZXRTY2FsZURlbHRhKGFyYml0cmFyeU51bWJlcikpOworICAgIEVYRUNVVEVf QU5EX1ZFUklGWV9TVUJUUkVFX0RJRF9OT1RfQ0hBTkdFKHJvb3QtPnNldFBhZ2VTY2FsZURlbHRh KGFyYml0cmFyeU51bWJlcikpOwogICAgIEVYRUNVVEVfQU5EX1ZFUklGWV9TVUJUUkVFX0RJRF9O T1RfQ0hBTkdFKHJvb3QtPnNldENvbnRlbnRCb3VuZHMoYXJiaXRyYXJ5SW50U2l6ZSkpOwogICAg IEVYRUNVVEVfQU5EX1ZFUklGWV9TVUJUUkVFX0RJRF9OT1RfQ0hBTkdFKHJvb3QtPnNldE9wYXF1 ZSh0cnVlKSk7CiAgICAgRVhFQ1VURV9BTkRfVkVSSUZZX1NVQlRSRUVfRElEX05PVF9DSEFOR0Uo cm9vdC0+c2V0T3BhY2l0eShhcmJpdHJhcnlOdW1iZXIpKTsK