109614 2013-02-12 14:25:33 -0800 [BlackBerry] Assume setScrollingOrZooming() to be called on the WebKit thread 2013-02-12 15:39:41 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jpetsovits jpetsovits anilsson mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 831257 0 jpetsovits 2013-02-12 14:25:33 -0800 With a further simplification of threading assumptions, we can get rid of atomic integer access as well as the backing store mutex which was otherwise unused. Patch below. 831271 1 187938 jpetsovits 2013-02-12 14:37:31 -0800 Created attachment 187938 Patch 831296 2 187944 jpetsovits 2013-02-12 14:57:37 -0800 Created attachment 187944 Patch Apparently we're not RIM anymore, so referencing a RIM PR in the commit message is probably suboptimal. It's now Internal PR. No changes to the patch except for that reference. 831300 3 187944 rwlbuis 2013-02-12 14:59:41 -0800 Comment on attachment 187944 Patch LGTM. 831361 4 187944 webkit.review.bot 2013-02-12 15:39:38 -0800 Comment on attachment 187944 Patch Clearing flags on attachment: 187944 Committed r142682: <http://trac.webkit.org/changeset/142682> 831362 5 webkit.review.bot 2013-02-12 15:39:41 -0800 All reviewed patches have been landed. Closing bug. 187938 2013-02-12 14:37:31 -0800 2013-02-12 14:57:34 -0800 Patch bug-109614-20130212173347.patch text/plain 7387 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBiZGM2YjJlYjVkOTYwNjM5NzQ3OTc4MTk5ZGQzMjM0ODkzZWU2M2YwLi4wNmU3ZTlkMzc4 ZDI1Nzg3NmY1YWQxYjBlYTRhNjYwZWVkM2NjNjRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMy0wMi0xMiAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBBc3N1bWUgc2V0U2Nyb2xs aW5nT3Jab29taW5nKCkgdG8gYmUgY2FsbGVkIG9uIHRoZSBXZWJLaXQgdGhyZWFkLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5NjE0CisgICAgICAg IFJJTSBQUiAyOTQ1MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAg ICAgICAgSW50ZXJuYWxseSByZXZpZXdlZCBieSBBcnZpZCBOaWxzc29uLgorCisgICAgICAgIFdp dGggdGhpcyBmdXJ0aGVyIHNpbXBsaWZpY2F0aW9uIG9mIHRocmVhZGluZyBhc3N1bXB0aW9ucywK KyAgICAgICAgd2UgY2FuIGdldCByaWQgb2YgYXRvbWljIGludGVnZXIgYWNjZXNzIGFzIHdlbGwg YXMgdGhlCisgICAgICAgIGJhY2tpbmcgc3RvcmUgbXV0ZXggd2hpY2ggd2FzIG90aGVyd2lzZSB1 bnVzZWQuCisKKyAgICAgICAgKiBBcGkvQmFja2luZ1N0b3JlLmNwcDoKKyAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6QmFja2luZ1N0b3JlUHJpdmF0ZTo6QmFja2luZ1N0b3JlUHJpdmF0ZSk6 CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9yZVByaXZhdGU6On5CYWNr aW5nU3RvcmVQcml2YXRlKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6QmFja2luZ1N0 b3JlUHJpdmF0ZTo6c3VzcGVuZEJhY2tpbmdTdG9yZVVwZGF0ZXMpOgorICAgICAgICAoQmxhY2tC ZXJyeTo6V2ViS2l0OjpCYWNraW5nU3RvcmVQcml2YXRlOjpyZXN1bWVCYWNraW5nU3RvcmVVcGRh dGVzKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6QmFja2luZ1N0b3JlUHJpdmF0ZTo6 aXNTY3JvbGxpbmdPclpvb21pbmcpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpCYWNr aW5nU3RvcmVQcml2YXRlOjpzZXRTY3JvbGxpbmdPclpvb21pbmcpOgorICAgICAgICAqIEFwaS9C YWNraW5nU3RvcmVfcC5oOgorICAgICAgICAoQmFja2luZ1N0b3JlUHJpdmF0ZSk6CisKIDIwMTMt MDItMTIgIEFuZHJldyBMbyAgPGFubG9AcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0g Q1NTIGFuaW1hdGlvbnMgc3RvcCBydW5uaW5nIGR1cmluZyB6b29tCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKaW5kZXggNjJiMWQyM2IyODQzZWY5MDZj ODEyZjA0MTM4YWRjMTNmODc2MjRmOC4uZjBjYjdmMWM1MTNmNWIyYjdhMmQyZGM5Nzk3ODMxZmYx OTZkNGRkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5n U3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3Jl LmNwcApAQCAtMTY5LDIyICsxNjksNiBAQCBzdGF0aWMgRGl2aXNvciBiZXN0RGl2aXNvcihQbGF0 Zm9ybTo6SW50U2l6ZSBzaXplLCBpbnQgdGlsZVdpZHRoLCBpbnQgdGlsZUhlaWdodAogICAgIHJl dHVybiBiZXN0RGl2aXNvcjsKIH0KIAotc3RydWN0IEJhY2tpbmdTdG9yZU11dGV4TG9ja2VyIHsK LSAgICBCYWNraW5nU3RvcmVNdXRleExvY2tlcihCYWNraW5nU3RvcmVQcml2YXRlKiBiYWNraW5n U3RvcmVQcml2YXRlKQotICAgICAgICA6IG1fYmFja2luZ1N0b3JlUHJpdmF0ZShiYWNraW5nU3Rv cmVQcml2YXRlKQotICAgIHsKLSAgICAgICAgbV9iYWNraW5nU3RvcmVQcml2YXRlLT5sb2NrQmFj a2luZ1N0b3JlKCk7Ci0gICAgfQotCi0gICAgfkJhY2tpbmdTdG9yZU11dGV4TG9ja2VyKCkKLSAg ICB7Ci0gICAgICAgIG1fYmFja2luZ1N0b3JlUHJpdmF0ZS0+dW5sb2NrQmFja2luZ1N0b3JlKCk7 Ci0gICAgfQotCi1wcml2YXRlOgotICAgIEJhY2tpbmdTdG9yZVByaXZhdGUqIG1fYmFja2luZ1N0 b3JlUHJpdmF0ZTsKLX07Ci0KIFBsYXRmb3JtOjpJbnRSZWN0IEJhY2tpbmdTdG9yZUdlb21ldHJ5 OjpiYWNraW5nU3RvcmVSZWN0KCkgY29uc3QKIHsKICAgICByZXR1cm4gUGxhdGZvcm06OkludFJl Y3QoYmFja2luZ1N0b3JlT2Zmc2V0KCksIGJhY2tpbmdTdG9yZVNpemUoKSk7CkBAIC0yMjYsMTMg KzIxMCw2IEBAIEJhY2tpbmdTdG9yZVByaXZhdGU6OkJhY2tpbmdTdG9yZVByaXZhdGUoKQogI2Vu ZGlmCiB7CiAgICAgbV9mcm9udFN0YXRlID0gcmVpbnRlcnByZXRfY2FzdDx1bnNpZ25lZD4obmV3 IEJhY2tpbmdTdG9yZUdlb21ldHJ5KTsKLQotICAgIC8vIE5lZWQgYSByZWN1cnNpdmUgbXV0ZXgg dG8gYWNoaWV2ZSBhIGdsb2JhbCBsb2NrLgotICAgIHB0aHJlYWRfbXV0ZXhhdHRyX3QgYXR0cjsK LSAgICBwdGhyZWFkX211dGV4YXR0cl9pbml0KCZhdHRyKTsKLSAgICBwdGhyZWFkX211dGV4YXR0 cl9zZXR0eXBlKCZhdHRyLCBQVEhSRUFEX01VVEVYX1JFQ1VSU0lWRSk7Ci0gICAgcHRocmVhZF9t dXRleF9pbml0KCZtX211dGV4LCAmYXR0cik7Ci0gICAgcHRocmVhZF9tdXRleGF0dHJfZGVzdHJv eSgmYXR0cik7CiB9CiAKIEJhY2tpbmdTdG9yZVByaXZhdGU6On5CYWNraW5nU3RvcmVQcml2YXRl KCkKQEAgLTI0MCw4ICsyMTcsNiBAQCBCYWNraW5nU3RvcmVQcml2YXRlOjp+QmFja2luZ1N0b3Jl UHJpdmF0ZSgpCiAgICAgQmFja2luZ1N0b3JlR2VvbWV0cnkqIGZyb250ID0gcmVpbnRlcnByZXRf Y2FzdDxCYWNraW5nU3RvcmVHZW9tZXRyeSo+KG1fZnJvbnRTdGF0ZSk7CiAgICAgZGVsZXRlIGZy b250OwogICAgIG1fZnJvbnRTdGF0ZSA9IDA7Ci0KLSAgICBwdGhyZWFkX211dGV4X2Rlc3Ryb3ko Jm1fbXV0ZXgpOwogfQogCiB2b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6Omluc3RydW1lbnRCZWdp bkZyYW1lKCkKQEAgLTI5MCwxNiArMjY1LDEyIEBAIHZvaWQgQmFja2luZ1N0b3JlUHJpdmF0ZTo6 c3VzcGVuZEJhY2tpbmdTdG9yZVVwZGF0ZXMoKQogewogICAgIEFTU0VSVChCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6d2ViS2l0VGhyZWFkTWVzc2FnZUNsaWVudCgpLT5pc0N1cnJlbnRUaHJlYWQoKSk7 CiAKLSAgICAvLyBXZSBzdGlsbCB1c2UgYXRvbWljIHZhbHVlcyBoZXJlIGJlY2F1c2UgdGhlIFVJ IHRocmVhZCBjYW4gdXNlIGl0IGluCi0gICAgLy8gc2V0U2Nyb2xsaW5nT3Jab29taW5nKCkgKHRo cm91Z2ggc2hvdWxkUGVyZm9ybVJlZ3VsYXJSZW5kZXJKb2JzKCkpLgotICAgIC8vIEZJWE1FOiBP bmNlIHRoYXQgb25lIHJlc3BlY3RzIHRocmVhZCBib3VuZGFyaWVzIHByb3Blcmx5LCBzd2l0Y2gg dG8KLSAgICAvLyByZWd1bGFyIGluY3JlbWVudC9kZWNyZW1lbnQgb3BlcmF0aW9ucy4KLSAgICBp ZiAoYXRvbWljX2FkZF92YWx1ZSgmbV9zdXNwZW5kQmFja2luZ1N0b3JlVXBkYXRlcywgMCkpIHsK KyAgICBpZiAobV9zdXNwZW5kQmFja2luZ1N0b3JlVXBkYXRlcykgewogICAgICAgICBCQkxPRyhQ bGF0Zm9ybTo6TG9nTGV2ZWxJbmZvLAogICAgICAgICAgICAgIkJhY2tpbmdzdG9yZSBhbHJlYWR5 IHN1c3BlbmRlZCwgaW5jcmVhc2luZyBzdXNwZW5kIGNvdW50ZXIuIik7CiAgICAgfQogCi0gICAg YXRvbWljX2FkZCgmbV9zdXNwZW5kQmFja2luZ1N0b3JlVXBkYXRlcywgMSk7CisgICAgKyttX3N1 c3BlbmRCYWNraW5nU3RvcmVVcGRhdGVzOwogfQogCiB2b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6 OnN1c3BlbmRHZW9tZXRyeVVwZGF0ZXMoKQpAQCAtMzM0LDkgKzMwNSw4IEBAIHZvaWQgQmFja2lu Z1N0b3JlUHJpdmF0ZTo6cmVzdW1lQmFja2luZ1N0b3JlVXBkYXRlcygpCiB7CiAgICAgQVNTRVJU KEJsYWNrQmVycnk6OlBsYXRmb3JtOjp3ZWJLaXRUaHJlYWRNZXNzYWdlQ2xpZW50KCktPmlzQ3Vy cmVudFRocmVhZCgpKTsKIAotICAgIHVuc2lnbmVkIGN1cnJlbnRWYWx1ZSA9IGF0b21pY19hZGRf dmFsdWUoJm1fc3VzcGVuZEJhY2tpbmdTdG9yZVVwZGF0ZXMsIDApOwotICAgIEFTU0VSVChjdXJy ZW50VmFsdWUgPj0gMSk7Ci0gICAgaWYgKGN1cnJlbnRWYWx1ZSA8IDEpIHsKKyAgICBBU1NFUlQo bV9zdXNwZW5kQmFja2luZ1N0b3JlVXBkYXRlcyA+PSAxKTsKKyAgICBpZiAobV9zdXNwZW5kQmFj a2luZ1N0b3JlVXBkYXRlcyA8IDEpIHsKICAgICAgICAgUGxhdGZvcm06OmxvZ0Fsd2F5cyhQbGF0 Zm9ybTo6TG9nTGV2ZWxDcml0aWNhbCwKICAgICAgICAgICAgICJDYWxsIG1pc21hdGNoOiBCYWNr aW5nc3RvcmUgaGFzbid0IGJlZW4gc3VzcGVuZGVkLCB0aGVyZWZvcmUgd29uJ3QgcmVzdW1lISIp OwogICAgICAgICByZXR1cm47CkBAIC0zNDUsMTAgKzMxNSwxMCBAQCB2b2lkIEJhY2tpbmdTdG9y ZVByaXZhdGU6OnJlc3VtZUJhY2tpbmdTdG9yZVVwZGF0ZXMoKQogICAgIC8vIFNldCBhIGZsYWcg aW5kaWNhdGluZyB0aGF0IHdlJ3JlIGFib3V0IHRvIHJlc3VtZSBiYWNraW5nc3RvcmUgdXBkYXRl cyBhbmQKICAgICAvLyB0aGUgdGlsZSBtYXRyaXggc2hvdWxkIGJlIHVwZGF0ZWQgYXMgYSBjb25z ZXF1ZW5jZSBieSB0aGUgZmlyc3QgcmVuZGVyCiAgICAgLy8gam9iIHRoYXQgaGFwcGVucyBhZnRl ciB0aGlzIHJlc3VtcHRpb24gb2YgYmFja2luZ3N0b3JlIHVwZGF0ZXMuCi0gICAgaWYgKGN1cnJl bnRWYWx1ZSA9PSAxKQorICAgIGlmIChtX3N1c3BlbmRCYWNraW5nU3RvcmVVcGRhdGVzID09IDEp CiAgICAgICAgIHNldFRpbGVNYXRyaXhOZWVkc1VwZGF0ZSgpOwogCi0gICAgYXRvbWljX3N1Yigm bV9zdXNwZW5kQmFja2luZ1N0b3JlVXBkYXRlcywgMSk7CisgICAgLS1tX3N1c3BlbmRCYWNraW5n U3RvcmVVcGRhdGVzOwogCiAgICAgZGlzcGF0Y2hSZW5kZXJKb2IoKTsKIH0KQEAgLTIyNTAsMTYg KzIyMjAsMTggQEAgdm9pZCBCYWNraW5nU3RvcmVQcml2YXRlOjpjbGVhcldpbmRvdyhjb25zdCBQ bGF0Zm9ybTo6SW50UmVjdCYgcmVjdCwKIAogYm9vbCBCYWNraW5nU3RvcmVQcml2YXRlOjppc1Nj cm9sbGluZ09yWm9vbWluZygpIGNvbnN0CiB7Ci0gICAgQmFja2luZ1N0b3JlTXV0ZXhMb2NrZXIg bG9ja2VyKGNvbnN0X2Nhc3Q8QmFja2luZ1N0b3JlUHJpdmF0ZSo+KHRoaXMpKTsKKyAgICBBU1NF UlQoQmxhY2tCZXJyeTo6UGxhdGZvcm06OndlYktpdFRocmVhZE1lc3NhZ2VDbGllbnQoKS0+aXND dXJyZW50VGhyZWFkKCkpOwogICAgIHJldHVybiBtX2lzU2Nyb2xsaW5nT3Jab29taW5nOwogfQog CiB2b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6OnNldFNjcm9sbGluZ09yWm9vbWluZyhib29sIHNj cm9sbGluZ09yWm9vbWluZywgYm9vbCBzaG91bGRCbGl0KQogewotICAgIHsKLSAgICAgICAgQmFj a2luZ1N0b3JlTXV0ZXhMb2NrZXIgbG9ja2VyKHRoaXMpOwotICAgICAgICBtX2lzU2Nyb2xsaW5n T3Jab29taW5nID0gc2Nyb2xsaW5nT3Jab29taW5nOwotICAgIH0KKyAgICBBU1NFUlQoQmxhY2tC ZXJyeTo6UGxhdGZvcm06OndlYktpdFRocmVhZE1lc3NhZ2VDbGllbnQoKS0+aXNDdXJyZW50VGhy ZWFkKCkpOworCisgICAgaWYgKG1faXNTY3JvbGxpbmdPclpvb21pbmcgPT0gc2Nyb2xsaW5nT3Ja b29taW5nKQorICAgICAgICByZXR1cm47CisKKyAgICBtX2lzU2Nyb2xsaW5nT3Jab29taW5nID0g c2Nyb2xsaW5nT3Jab29taW5nOwogCiAjaWYgIUVOQUJMRV9SRVBBSU5UT05TQ1JPTEwKICAgICBt X3N1c3BlbmRSZW5kZXJKb2JzID0gc2Nyb2xsaW5nT3Jab29taW5nOyAvLyBTdXNwZW5kIHRoZSBy ZW5kZXJpbmcgb2YgZXZlcnl0aGluZy4KQEAgLTIyODMsMTYgKzIyNTUsNiBAQCB2b2lkIEJhY2tp bmdTdG9yZVByaXZhdGU6OnNldFNjcm9sbGluZ09yWm9vbWluZyhib29sIHNjcm9sbGluZ09yWm9v bWluZywgYm9vbCBzaAogICAgICAgICBkaXNwYXRjaFJlbmRlckpvYigpOwogfQogCi12b2lkIEJh Y2tpbmdTdG9yZVByaXZhdGU6OmxvY2tCYWNraW5nU3RvcmUoKQotewotICAgIHB0aHJlYWRfbXV0 ZXhfbG9jaygmbV9tdXRleCk7Ci19Ci0KLXZvaWQgQmFja2luZ1N0b3JlUHJpdmF0ZTo6dW5sb2Nr QmFja2luZ1N0b3JlKCkKLXsKLSAgICBwdGhyZWFkX211dGV4X3VubG9jaygmbV9tdXRleCk7Ci19 Ci0KIEJhY2tpbmdTdG9yZUdlb21ldHJ5KiBCYWNraW5nU3RvcmVQcml2YXRlOjpmcm9udFN0YXRl KCkgY29uc3QKIHsKICAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxCYWNraW5nU3RvcmVHZW9t ZXRyeSo+KG1fZnJvbnRTdGF0ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL0JhY2tpbmdTdG9yZV9wLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0Jh Y2tpbmdTdG9yZV9wLmgKaW5kZXggZjMxZmEwMDIyOWQ5ZmFkYTIxOGFmMDVlNTljMTQ0ODI5NGI3 N2I0Ny4uYTU4MDM2NTJiOWI5NGU0NGY5OTJjNTRjYWExZmY4ZmI2YWQxZmM5NSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlX3AuaApAQCAtMzI4LDkgKzMy OCw2IEBAIHB1YmxpYzoKICAgICBib29sIGlzU2Nyb2xsaW5nT3Jab29taW5nKCkgY29uc3Q7CiAg ICAgdm9pZCBzZXRTY3JvbGxpbmdPclpvb21pbmcoYm9vbCBzY3JvbGxpbmdPclpvb21pbmcsIGJv b2wgc2hvdWxkQmxpdCA9IHRydWUpOwogCi0gICAgdm9pZCBsb2NrQmFja2luZ1N0b3JlKCk7Ci0g ICAgdm9pZCB1bmxvY2tCYWNraW5nU3RvcmUoKTsKLQogICAgIEJhY2tpbmdTdG9yZUdlb21ldHJ5 KiBmcm9udFN0YXRlKCkgY29uc3Q7CiAgICAgdm9pZCBhZG9wdEFzRnJvbnRTdGF0ZShCYWNraW5n U3RvcmVHZW9tZXRyeSogbmV3RnJvbnRTdGF0ZSk7CiAKQEAgLTM3OSw4ICszNzYsNiBAQCBwdWJs aWM6CiAKICAgICBQbGF0Zm9ybTo6SW50UmVjdCBtX3Zpc2libGVUaWxlQnVmZmVyUmVjdDsKIAot ICAgIHB0aHJlYWRfbXV0ZXhfdCBtX211dGV4OwotCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBP U0lUSU5HKQogICAgIG11dGFibGUgYm9vbCBtX25lZWRzRHJhd0xheWVyc09uQ29tbWl0OyAvLyBO b3QgdGhyZWFkIHNhZmUsIFdlYktpdCB0aHJlYWQgb25seQogICAgIGJvb2wgbV9pc0RpcmVjdFJl bmRlcmluZ0FuaW1hdGlvbk1lc3NhZ2VTY2hlZHVsZWQ7Cg== 187944 2013-02-12 14:57:37 -0800 2013-02-12 15:39:38 -0800 Patch bug-109614-20130212175353.patch text/plain 7392 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBiZGM2YjJlYjVkOTYwNjM5NzQ3OTc4MTk5ZGQzMjM0ODkzZWU2M2YwLi45ODBlZDU5ZmE5 YmRjM2QxMDdlNTViYTllZGJjZjQ3ZDg3MDdiYWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMy0wMi0xMiAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBBc3N1bWUgc2V0U2Nyb2xs aW5nT3Jab29taW5nKCkgdG8gYmUgY2FsbGVkIG9uIHRoZSBXZWJLaXQgdGhyZWFkLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5NjE0CisgICAgICAg IEludGVybmFsIFBSIDI5NDUxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorICAgICAgICBJbnRlcm5hbGx5IHJldmlld2VkIGJ5IEFydmlkIE5pbHNzb24uCisKKyAgICAg ICAgV2l0aCB0aGlzIGZ1cnRoZXIgc2ltcGxpZmljYXRpb24gb2YgdGhyZWFkaW5nIGFzc3VtcHRp b25zLAorICAgICAgICB3ZSBjYW4gZ2V0IHJpZCBvZiBhdG9taWMgaW50ZWdlciBhY2Nlc3MgYXMg d2VsbCBhcyB0aGUKKyAgICAgICAgYmFja2luZyBzdG9yZSBtdXRleCB3aGljaCB3YXMgb3RoZXJ3 aXNlIHVudXNlZC4KKworICAgICAgICAqIEFwaS9CYWNraW5nU3RvcmUuY3BwOgorICAgICAgICAo QmxhY2tCZXJyeTo6V2ViS2l0OjpCYWNraW5nU3RvcmVQcml2YXRlOjpCYWNraW5nU3RvcmVQcml2 YXRlKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6QmFja2luZ1N0b3JlUHJpdmF0ZTo6 fkJhY2tpbmdTdG9yZVByaXZhdGUpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpCYWNr aW5nU3RvcmVQcml2YXRlOjpzdXNwZW5kQmFja2luZ1N0b3JlVXBkYXRlcyk6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9yZVByaXZhdGU6OnJlc3VtZUJhY2tpbmdTdG9y ZVVwZGF0ZXMpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpCYWNraW5nU3RvcmVQcml2 YXRlOjppc1Njcm9sbGluZ09yWm9vbWluZyk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6 OkJhY2tpbmdTdG9yZVByaXZhdGU6OnNldFNjcm9sbGluZ09yWm9vbWluZyk6CisgICAgICAgICog QXBpL0JhY2tpbmdTdG9yZV9wLmg6CisgICAgICAgIChCYWNraW5nU3RvcmVQcml2YXRlKToKKwog MjAxMy0wMi0xMiAgQW5kcmV3IExvICA8YW5sb0ByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0Jl cnJ5XSBDU1MgYW5pbWF0aW9ucyBzdG9wIHJ1bm5pbmcgZHVyaW5nIHpvb20KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcAppbmRleCA2MmIxZDIzYjI4NDNl ZjkwNmM4MTJmMDQxMzhhZGMxM2Y4NzYyNGY4Li5mMGNiN2YxYzUxM2Y1YjJiN2EyZDJkYzk3OTc4 MzFmZjE5NmQ0ZGQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0Jh Y2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5n U3RvcmUuY3BwCkBAIC0xNjksMjIgKzE2OSw2IEBAIHN0YXRpYyBEaXZpc29yIGJlc3REaXZpc29y KFBsYXRmb3JtOjpJbnRTaXplIHNpemUsIGludCB0aWxlV2lkdGgsIGludCB0aWxlSGVpZ2h0CiAg ICAgcmV0dXJuIGJlc3REaXZpc29yOwogfQogCi1zdHJ1Y3QgQmFja2luZ1N0b3JlTXV0ZXhMb2Nr ZXIgewotICAgIEJhY2tpbmdTdG9yZU11dGV4TG9ja2VyKEJhY2tpbmdTdG9yZVByaXZhdGUqIGJh Y2tpbmdTdG9yZVByaXZhdGUpCi0gICAgICAgIDogbV9iYWNraW5nU3RvcmVQcml2YXRlKGJhY2tp bmdTdG9yZVByaXZhdGUpCi0gICAgewotICAgICAgICBtX2JhY2tpbmdTdG9yZVByaXZhdGUtPmxv Y2tCYWNraW5nU3RvcmUoKTsKLSAgICB9Ci0KLSAgICB+QmFja2luZ1N0b3JlTXV0ZXhMb2NrZXIo KQotICAgIHsKLSAgICAgICAgbV9iYWNraW5nU3RvcmVQcml2YXRlLT51bmxvY2tCYWNraW5nU3Rv cmUoKTsKLSAgICB9Ci0KLXByaXZhdGU6Ci0gICAgQmFja2luZ1N0b3JlUHJpdmF0ZSogbV9iYWNr aW5nU3RvcmVQcml2YXRlOwotfTsKLQogUGxhdGZvcm06OkludFJlY3QgQmFja2luZ1N0b3JlR2Vv bWV0cnk6OmJhY2tpbmdTdG9yZVJlY3QoKSBjb25zdAogewogICAgIHJldHVybiBQbGF0Zm9ybTo6 SW50UmVjdChiYWNraW5nU3RvcmVPZmZzZXQoKSwgYmFja2luZ1N0b3JlU2l6ZSgpKTsKQEAgLTIy NiwxMyArMjEwLDYgQEAgQmFja2luZ1N0b3JlUHJpdmF0ZTo6QmFja2luZ1N0b3JlUHJpdmF0ZSgp CiAjZW5kaWYKIHsKICAgICBtX2Zyb250U3RhdGUgPSByZWludGVycHJldF9jYXN0PHVuc2lnbmVk PihuZXcgQmFja2luZ1N0b3JlR2VvbWV0cnkpOwotCi0gICAgLy8gTmVlZCBhIHJlY3Vyc2l2ZSBt dXRleCB0byBhY2hpZXZlIGEgZ2xvYmFsIGxvY2suCi0gICAgcHRocmVhZF9tdXRleGF0dHJfdCBh dHRyOwotICAgIHB0aHJlYWRfbXV0ZXhhdHRyX2luaXQoJmF0dHIpOwotICAgIHB0aHJlYWRfbXV0 ZXhhdHRyX3NldHR5cGUoJmF0dHIsIFBUSFJFQURfTVVURVhfUkVDVVJTSVZFKTsKLSAgICBwdGhy ZWFkX211dGV4X2luaXQoJm1fbXV0ZXgsICZhdHRyKTsKLSAgICBwdGhyZWFkX211dGV4YXR0cl9k ZXN0cm95KCZhdHRyKTsKIH0KIAogQmFja2luZ1N0b3JlUHJpdmF0ZTo6fkJhY2tpbmdTdG9yZVBy aXZhdGUoKQpAQCAtMjQwLDggKzIxNyw2IEBAIEJhY2tpbmdTdG9yZVByaXZhdGU6On5CYWNraW5n U3RvcmVQcml2YXRlKCkKICAgICBCYWNraW5nU3RvcmVHZW9tZXRyeSogZnJvbnQgPSByZWludGVy cHJldF9jYXN0PEJhY2tpbmdTdG9yZUdlb21ldHJ5Kj4obV9mcm9udFN0YXRlKTsKICAgICBkZWxl dGUgZnJvbnQ7CiAgICAgbV9mcm9udFN0YXRlID0gMDsKLQotICAgIHB0aHJlYWRfbXV0ZXhfZGVz dHJveSgmbV9tdXRleCk7CiB9CiAKIHZvaWQgQmFja2luZ1N0b3JlUHJpdmF0ZTo6aW5zdHJ1bWVu dEJlZ2luRnJhbWUoKQpAQCAtMjkwLDE2ICsyNjUsMTIgQEAgdm9pZCBCYWNraW5nU3RvcmVQcml2 YXRlOjpzdXNwZW5kQmFja2luZ1N0b3JlVXBkYXRlcygpCiB7CiAgICAgQVNTRVJUKEJsYWNrQmVy cnk6OlBsYXRmb3JtOjp3ZWJLaXRUaHJlYWRNZXNzYWdlQ2xpZW50KCktPmlzQ3VycmVudFRocmVh ZCgpKTsKIAotICAgIC8vIFdlIHN0aWxsIHVzZSBhdG9taWMgdmFsdWVzIGhlcmUgYmVjYXVzZSB0 aGUgVUkgdGhyZWFkIGNhbiB1c2UgaXQgaW4KLSAgICAvLyBzZXRTY3JvbGxpbmdPclpvb21pbmco KSAodGhyb3VnaCBzaG91bGRQZXJmb3JtUmVndWxhclJlbmRlckpvYnMoKSkuCi0gICAgLy8gRklY TUU6IE9uY2UgdGhhdCBvbmUgcmVzcGVjdHMgdGhyZWFkIGJvdW5kYXJpZXMgcHJvcGVybHksIHN3 aXRjaCB0bwotICAgIC8vIHJlZ3VsYXIgaW5jcmVtZW50L2RlY3JlbWVudCBvcGVyYXRpb25zLgot ICAgIGlmIChhdG9taWNfYWRkX3ZhbHVlKCZtX3N1c3BlbmRCYWNraW5nU3RvcmVVcGRhdGVzLCAw KSkgeworICAgIGlmIChtX3N1c3BlbmRCYWNraW5nU3RvcmVVcGRhdGVzKSB7CiAgICAgICAgIEJC TE9HKFBsYXRmb3JtOjpMb2dMZXZlbEluZm8sCiAgICAgICAgICAgICAiQmFja2luZ3N0b3JlIGFs cmVhZHkgc3VzcGVuZGVkLCBpbmNyZWFzaW5nIHN1c3BlbmQgY291bnRlci4iKTsKICAgICB9CiAK LSAgICBhdG9taWNfYWRkKCZtX3N1c3BlbmRCYWNraW5nU3RvcmVVcGRhdGVzLCAxKTsKKyAgICAr K21fc3VzcGVuZEJhY2tpbmdTdG9yZVVwZGF0ZXM7CiB9CiAKIHZvaWQgQmFja2luZ1N0b3JlUHJp dmF0ZTo6c3VzcGVuZEdlb21ldHJ5VXBkYXRlcygpCkBAIC0zMzQsOSArMzA1LDggQEAgdm9pZCBC YWNraW5nU3RvcmVQcml2YXRlOjpyZXN1bWVCYWNraW5nU3RvcmVVcGRhdGVzKCkKIHsKICAgICBB U1NFUlQoQmxhY2tCZXJyeTo6UGxhdGZvcm06OndlYktpdFRocmVhZE1lc3NhZ2VDbGllbnQoKS0+ aXNDdXJyZW50VGhyZWFkKCkpOwogCi0gICAgdW5zaWduZWQgY3VycmVudFZhbHVlID0gYXRvbWlj X2FkZF92YWx1ZSgmbV9zdXNwZW5kQmFja2luZ1N0b3JlVXBkYXRlcywgMCk7Ci0gICAgQVNTRVJU KGN1cnJlbnRWYWx1ZSA+PSAxKTsKLSAgICBpZiAoY3VycmVudFZhbHVlIDwgMSkgeworICAgIEFT U0VSVChtX3N1c3BlbmRCYWNraW5nU3RvcmVVcGRhdGVzID49IDEpOworICAgIGlmIChtX3N1c3Bl bmRCYWNraW5nU3RvcmVVcGRhdGVzIDwgMSkgewogICAgICAgICBQbGF0Zm9ybTo6bG9nQWx3YXlz KFBsYXRmb3JtOjpMb2dMZXZlbENyaXRpY2FsLAogICAgICAgICAgICAgIkNhbGwgbWlzbWF0Y2g6 IEJhY2tpbmdzdG9yZSBoYXNuJ3QgYmVlbiBzdXNwZW5kZWQsIHRoZXJlZm9yZSB3b24ndCByZXN1 bWUhIik7CiAgICAgICAgIHJldHVybjsKQEAgLTM0NSwxMCArMzE1LDEwIEBAIHZvaWQgQmFja2lu Z1N0b3JlUHJpdmF0ZTo6cmVzdW1lQmFja2luZ1N0b3JlVXBkYXRlcygpCiAgICAgLy8gU2V0IGEg ZmxhZyBpbmRpY2F0aW5nIHRoYXQgd2UncmUgYWJvdXQgdG8gcmVzdW1lIGJhY2tpbmdzdG9yZSB1 cGRhdGVzIGFuZAogICAgIC8vIHRoZSB0aWxlIG1hdHJpeCBzaG91bGQgYmUgdXBkYXRlZCBhcyBh IGNvbnNlcXVlbmNlIGJ5IHRoZSBmaXJzdCByZW5kZXIKICAgICAvLyBqb2IgdGhhdCBoYXBwZW5z IGFmdGVyIHRoaXMgcmVzdW1wdGlvbiBvZiBiYWNraW5nc3RvcmUgdXBkYXRlcy4KLSAgICBpZiAo Y3VycmVudFZhbHVlID09IDEpCisgICAgaWYgKG1fc3VzcGVuZEJhY2tpbmdTdG9yZVVwZGF0ZXMg PT0gMSkKICAgICAgICAgc2V0VGlsZU1hdHJpeE5lZWRzVXBkYXRlKCk7CiAKLSAgICBhdG9taWNf c3ViKCZtX3N1c3BlbmRCYWNraW5nU3RvcmVVcGRhdGVzLCAxKTsKKyAgICAtLW1fc3VzcGVuZEJh Y2tpbmdTdG9yZVVwZGF0ZXM7CiAKICAgICBkaXNwYXRjaFJlbmRlckpvYigpOwogfQpAQCAtMjI1 MCwxNiArMjIyMCwxOCBAQCB2b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6OmNsZWFyV2luZG93KGNv bnN0IFBsYXRmb3JtOjpJbnRSZWN0JiByZWN0LAogCiBib29sIEJhY2tpbmdTdG9yZVByaXZhdGU6 OmlzU2Nyb2xsaW5nT3Jab29taW5nKCkgY29uc3QKIHsKLSAgICBCYWNraW5nU3RvcmVNdXRleExv Y2tlciBsb2NrZXIoY29uc3RfY2FzdDxCYWNraW5nU3RvcmVQcml2YXRlKj4odGhpcykpOworICAg IEFTU0VSVChCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6d2ViS2l0VGhyZWFkTWVzc2FnZUNsaWVudCgp LT5pc0N1cnJlbnRUaHJlYWQoKSk7CiAgICAgcmV0dXJuIG1faXNTY3JvbGxpbmdPclpvb21pbmc7 CiB9CiAKIHZvaWQgQmFja2luZ1N0b3JlUHJpdmF0ZTo6c2V0U2Nyb2xsaW5nT3Jab29taW5nKGJv b2wgc2Nyb2xsaW5nT3Jab29taW5nLCBib29sIHNob3VsZEJsaXQpCiB7Ci0gICAgewotICAgICAg ICBCYWNraW5nU3RvcmVNdXRleExvY2tlciBsb2NrZXIodGhpcyk7Ci0gICAgICAgIG1faXNTY3Jv bGxpbmdPclpvb21pbmcgPSBzY3JvbGxpbmdPclpvb21pbmc7Ci0gICAgfQorICAgIEFTU0VSVChC bGFja0JlcnJ5OjpQbGF0Zm9ybTo6d2ViS2l0VGhyZWFkTWVzc2FnZUNsaWVudCgpLT5pc0N1cnJl bnRUaHJlYWQoKSk7CisKKyAgICBpZiAobV9pc1Njcm9sbGluZ09yWm9vbWluZyA9PSBzY3JvbGxp bmdPclpvb21pbmcpCisgICAgICAgIHJldHVybjsKKworICAgIG1faXNTY3JvbGxpbmdPclpvb21p bmcgPSBzY3JvbGxpbmdPclpvb21pbmc7CiAKICNpZiAhRU5BQkxFX1JFUEFJTlRPTlNDUk9MTAog ICAgIG1fc3VzcGVuZFJlbmRlckpvYnMgPSBzY3JvbGxpbmdPclpvb21pbmc7IC8vIFN1c3BlbmQg dGhlIHJlbmRlcmluZyBvZiBldmVyeXRoaW5nLgpAQCAtMjI4MywxNiArMjI1NSw2IEBAIHZvaWQg QmFja2luZ1N0b3JlUHJpdmF0ZTo6c2V0U2Nyb2xsaW5nT3Jab29taW5nKGJvb2wgc2Nyb2xsaW5n T3Jab29taW5nLCBib29sIHNoCiAgICAgICAgIGRpc3BhdGNoUmVuZGVySm9iKCk7CiB9CiAKLXZv aWQgQmFja2luZ1N0b3JlUHJpdmF0ZTo6bG9ja0JhY2tpbmdTdG9yZSgpCi17Ci0gICAgcHRocmVh ZF9tdXRleF9sb2NrKCZtX211dGV4KTsKLX0KLQotdm9pZCBCYWNraW5nU3RvcmVQcml2YXRlOjp1 bmxvY2tCYWNraW5nU3RvcmUoKQotewotICAgIHB0aHJlYWRfbXV0ZXhfdW5sb2NrKCZtX211dGV4 KTsKLX0KLQogQmFja2luZ1N0b3JlR2VvbWV0cnkqIEJhY2tpbmdTdG9yZVByaXZhdGU6OmZyb250 U3RhdGUoKSBjb25zdAogewogICAgIHJldHVybiByZWludGVycHJldF9jYXN0PEJhY2tpbmdTdG9y ZUdlb21ldHJ5Kj4obV9mcm9udFN0YXRlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlX3AuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvQmFja2luZ1N0b3JlX3AuaAppbmRleCBmMzFmYTAwMjI5ZDlmYWRhMjE4YWYwNWU1OWMxNDQ4 Mjk0Yjc3YjQ3Li5hNTgwMzY1MmI5Yjk0ZTQ0Zjk5MmM1NGNhYTFmZjhmYjZhZDFmYzk1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZV9wLmgKKysr IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oCkBAIC0zMjgs OSArMzI4LDYgQEAgcHVibGljOgogICAgIGJvb2wgaXNTY3JvbGxpbmdPclpvb21pbmcoKSBjb25z dDsKICAgICB2b2lkIHNldFNjcm9sbGluZ09yWm9vbWluZyhib29sIHNjcm9sbGluZ09yWm9vbWlu ZywgYm9vbCBzaG91bGRCbGl0ID0gdHJ1ZSk7CiAKLSAgICB2b2lkIGxvY2tCYWNraW5nU3RvcmUo KTsKLSAgICB2b2lkIHVubG9ja0JhY2tpbmdTdG9yZSgpOwotCiAgICAgQmFja2luZ1N0b3JlR2Vv bWV0cnkqIGZyb250U3RhdGUoKSBjb25zdDsKICAgICB2b2lkIGFkb3B0QXNGcm9udFN0YXRlKEJh Y2tpbmdTdG9yZUdlb21ldHJ5KiBuZXdGcm9udFN0YXRlKTsKIApAQCAtMzc5LDggKzM3Niw2IEBA IHB1YmxpYzoKIAogICAgIFBsYXRmb3JtOjpJbnRSZWN0IG1fdmlzaWJsZVRpbGVCdWZmZXJSZWN0 OwogCi0gICAgcHRocmVhZF9tdXRleF90IG1fbXV0ZXg7Ci0KICNpZiBVU0UoQUNDRUxFUkFURURf Q09NUE9TSVRJTkcpCiAgICAgbXV0YWJsZSBib29sIG1fbmVlZHNEcmF3TGF5ZXJzT25Db21taXQ7 IC8vIE5vdCB0aHJlYWQgc2FmZSwgV2ViS2l0IHRocmVhZCBvbmx5CiAgICAgYm9vbCBtX2lzRGly ZWN0UmVuZGVyaW5nQW5pbWF0aW9uTWVzc2FnZVNjaGVkdWxlZDsK