118213 2013-06-29 05:03:22 -0700 Adopt is/toHTMLOptGroupElement for code cleanup 2013-06-29 08:50:36 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kangil.han kangil.han commit-queue kling koivisto philn xan.lopez oldest_to_newest 904850 0 kangil.han 2013-06-29 05:03:22 -0700 Adopt is/toHTMLOptGroupElement for code cleanup 904851 1 205766 kangil.han 2013-06-29 05:16:42 -0700 Created attachment 205766 Patch 904852 2 kangil.han 2013-06-29 06:27:54 -0700 I don't think gtk-wk2 ews error is related to this patch because seems there was configuration(jhbuild) error before actual build. :) 904861 3 205766 kling 2013-06-29 08:25:53 -0700 Comment on attachment 205766 Patch r=me 904862 4 205766 commit-queue 2013-06-29 08:50:33 -0700 Comment on attachment 205766 Patch Clearing flags on attachment: 205766 Committed r152211: <http://trac.webkit.org/changeset/152211> 904863 5 commit-queue 2013-06-29 08:50:36 -0700 All reviewed patches have been landed. Closing bug. 205766 2013-06-29 05:16:42 -0700 2013-06-29 08:50:33 -0700 Patch bug-118213-20130629211451.patch text/plain 20210 kangil.han U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZThiOTUwN2MzYjZmNmI1 NDI3ZmMwNjQzZGFiZGYwYmZmMzhhNzc4OC4uMzY2NjNiMWMxZGUzNzk4NjNjYmRlN2VlZjRmMzgy YmNiZjE4YzY2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ3IEBACiAyMDEzLTA2LTI5ICBLYW5n aWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KIAorICAgICAgICBBZG9wdCBpcy90b0hU TUxPcHRHcm91cEVsZW1lbnQgZm9yIGNvZGUgY2xlYW51cAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4MjEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG8gZW5oYW5jZSByZWFkYWJpbGl0eSwgdGhpcyBw YXRjaCBhZG9wdHMgaXMvdG9IVE1MT3B0R3JvdXBFbGVtZW50LgorICAgICAgICBUaGlzIGFsc28g aGVscHMgb3V0IHRvIHJlZHVjZSBkdXBsaWNhdGVkIHVzZSBvZiBzdGF0aWNfY2FzdC4KKworICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUxpc3RCb3hPcHRpb24uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eUxpc3RCb3hPcHRpb246OmlzRW5hYmxlZCk6Cisg ICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5TGlzdEJveE9wdGlvbjo6c3RyaW5nVmFsdWUp OgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eUxpc3RCb3hPcHRpb246Omxpc3RCb3hP cHRpb25QYXJlbnROb2RlKToKKyAgICAgICAgKiBjc3MvU2VsZWN0b3JDaGVja2VyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ2hlY2tlcjo6Y2hlY2tPbmUpOgorICAgICAgICAqIGNz cy9TdHlsZVJlc29sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmNh blNoYXJlU3R5bGVXaXRoRWxlbWVudCk6CisgICAgICAgICogaHRtbC9IVE1MT3B0R3JvdXBFbGVt ZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjppc0hUTUxPcHRHcm91cEVsZW1lbnQpOgorICAgICAg ICAoV2ViQ29yZTo6dG9IVE1MT3B0R3JvdXBFbGVtZW50KToKKyAgICAgICAgKiBodG1sL0hUTUxP cHRpb25FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxPcHRpb25FbGVtZW50Ojp0 ZXh0SW5kZW50ZWRUb1Jlc3BlY3RHcm91cExhYmVsKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxP cHRpb25FbGVtZW50Ojppc0Rpc2FibGVkRm9ybUNvbnRyb2wpOgorICAgICAgICAqIGh0bWwvSFRN TFNlbGVjdEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFNlbGVjdEVsZW1lbnQ6 OmNoaWxkU2hvdWxkQ3JlYXRlUmVuZGVyZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFNlbGVj dEVsZW1lbnQ6OnJlY2FsY0xpc3RJdGVtcyk6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTENv bnN0cnVjdGlvblNpdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aGFzSW1wbGllZEVuZFRhZyk6 CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTEVsZW1lbnRTdGFjay5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpIVE1MTmFtZXM6OmlzU2VsZWN0U2NvcGVNYXJrZXIpOgorICAgICAgICAqIGh0bWwv cGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1 aWxkZXI6OnByb2Nlc3NTdGFydFRhZyk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxk ZXI6OnByb2Nlc3NFbmRUYWcpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6OnVwZGF0ZUZyb21FbGVtZW50KToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6OnBhaW50SXRlbUZvcmVncm91bmQpOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJNZW51TGlzdDo6aXRlbVRleHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWVu dUxpc3Q6Oml0ZW1Jc0VuYWJsZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWVudUxpc3Q6 Oml0ZW1Jc0xhYmVsKToKKworMjAxMy0wNi0yOSAgS2FuZ2lsIEhhbiAgPGthbmdpbC5oYW5Ac2Ft c3VuZy5jb20+CisKICAgICAgICAgQWRvcHQgaXMvdG9IVE1MT3B0aW9uRWxlbWVudCBmb3IgY29k ZSBjbGVhbnVwCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTgyMTIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXggMjNiYjIwOTRjNjgx OTBlMDhmOTU0NmVkNjg4YmViMjNhNjU5YTE2Ni4uMGFjZmJlYjU4OGZiMzZkYzE0NDU4YWVhZTE0 NWZlNGY1YmY1ZDJjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDUgKzEs MTggQEAKIDIwMTMtMDYtMjkgIEthbmdpbCBIYW4gIDxrYW5naWwuaGFuQHNhbXN1bmcuY29tPgog CisgICAgICAgIEFkb3B0IGlzL3RvSFRNTE9wdEdyb3VwRWxlbWVudCBmb3IgY29kZSBjbGVhbnVw CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTgyMTMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyBlbmhh bmNlIHJlYWRhYmlsaXR5LCB0aGlzIHBhdGNoIGFkb3B0cyBpcy90b0hUTUxPcHRHcm91cEVsZW1l bnQuCisgICAgICAgIFRoaXMgYWxzbyBoZWxwcyBvdXQgdG8gcmVkdWNlIGR1cGxpY2F0ZWQgdXNl IG9mIHN0YXRpY19jYXN0LgorCisgICAgICAgICogV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIu Y3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6Om9wZW5TZWxl Y3RQb3B1cCk6CisKKzIwMTMtMDYtMjkgIEthbmdpbCBIYW4gIDxrYW5naWwuaGFuQHNhbXN1bmcu Y29tPgorCiAgICAgICAgIEFkb3B0IGlzL3RvSFRNTE9wdGlvbkVsZW1lbnQgZm9yIGNvZGUgY2xl YW51cAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4 MjEyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eUxpc3RCb3hPcHRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5TGlzdEJveE9wdGlvbi5jcHAKaW5kZXggYjk3ZWRhYzcxZmQ2Yjc3ODA4YjUzNTU0 ZTI5NWY4ZjIyYTMzYWY3Mi4uODg5NWYxMDE1YTllZmYxNDIxNDViMTA3ZjZkMDU2NGZjMzkyMmE5 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 TGlzdEJveE9wdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5TGlzdEJveE9wdGlvbi5jcHAKQEAgLTY2LDcgKzY2LDcgQEAgYm9vbCBBY2Nlc3Np YmlsaXR5TGlzdEJveE9wdGlvbjo6aXNFbmFibGVkKCkgY29uc3QKICAgICBpZiAoIW1fb3B0aW9u RWxlbWVudCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAotICAgIGlmIChtX29wdGlvbkVs ZW1lbnQtPmhhc1RhZ05hbWUob3B0Z3JvdXBUYWcpKQorICAgIGlmIChpc0hUTUxPcHRHcm91cEVs ZW1lbnQobV9vcHRpb25FbGVtZW50KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYg KGVxdWFsSWdub3JpbmdDYXNlKGdldEF0dHJpYnV0ZShhcmlhX2Rpc2FibGVkQXR0ciksICJ0cnVl IikpCkBAIC0xNjEsOCArMTYxLDggQEAgU3RyaW5nIEFjY2Vzc2liaWxpdHlMaXN0Qm94T3B0aW9u OjpzdHJpbmdWYWx1ZSgpIGNvbnN0CiAgICAgaWYgKGlzSFRNTE9wdGlvbkVsZW1lbnQobV9vcHRp b25FbGVtZW50KSkKICAgICAgICAgcmV0dXJuIHRvSFRNTE9wdGlvbkVsZW1lbnQobV9vcHRpb25F bGVtZW50KS0+dGV4dCgpOwogICAgIAotICAgIGlmIChtX29wdGlvbkVsZW1lbnQtPmhhc1RhZ05h bWUob3B0Z3JvdXBUYWcpKQotICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SFRNTE9wdEdyb3Vw RWxlbWVudCo+KG1fb3B0aW9uRWxlbWVudCktPmdyb3VwTGFiZWxUZXh0KCk7CisgICAgaWYgKGlz SFRNTE9wdEdyb3VwRWxlbWVudChtX29wdGlvbkVsZW1lbnQpKQorICAgICAgICByZXR1cm4gdG9I VE1MT3B0R3JvdXBFbGVtZW50KG1fb3B0aW9uRWxlbWVudCktPmdyb3VwTGFiZWxUZXh0KCk7CiAg ICAgCiAgICAgcmV0dXJuIFN0cmluZygpOwogfQpAQCAtMjA3LDggKzIwNyw4IEBAIEhUTUxTZWxl Y3RFbGVtZW50KiBBY2Nlc3NpYmlsaXR5TGlzdEJveE9wdGlvbjo6bGlzdEJveE9wdGlvblBhcmVu dE5vZGUoKSBjb25zdAogICAgIGlmIChpc0hUTUxPcHRpb25FbGVtZW50KG1fb3B0aW9uRWxlbWVu dCkpCiAgICAgICAgIHJldHVybiB0b0hUTUxPcHRpb25FbGVtZW50KG1fb3B0aW9uRWxlbWVudCkt Pm93bmVyU2VsZWN0RWxlbWVudCgpOwogCi0gICAgaWYgKG1fb3B0aW9uRWxlbWVudC0+aGFzVGFn TmFtZShvcHRncm91cFRhZykpCi0gICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxIVE1MT3B0R3Jv dXBFbGVtZW50Kj4obV9vcHRpb25FbGVtZW50KS0+b3duZXJTZWxlY3RFbGVtZW50KCk7CisgICAg aWYgKGlzSFRNTE9wdEdyb3VwRWxlbWVudChtX29wdGlvbkVsZW1lbnQpKQorICAgICAgICByZXR1 cm4gdG9IVE1MT3B0R3JvdXBFbGVtZW50KG1fb3B0aW9uRWxlbWVudCktPm93bmVyU2VsZWN0RWxl bWVudCgpOwogCiAgICAgcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9j c3MvU2VsZWN0b3JDaGVja2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNr ZXIuY3BwCmluZGV4IGRmMTk4YzU2YWFiZWIyMGEyMjA4Mjk5MTA0OWUxNWEzZWFlMDBhZjguLjcy ZTA2YTE3NWNlNDI2ZDNiYWJhMjg2NTE0YTc0Y2E4Y2Q4MjZjNzUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9TZWxlY3RvckNoZWNrZXIuY3BwCkBAIC0zOSw2ICszOSw3IEBACiAjaW5jbHVkZSAiSFRNTEZy YW1lRWxlbWVudEJhc2UuaCIKICNpbmNsdWRlICJIVE1MSW5wdXRFbGVtZW50LmgiCiAjaW5jbHVk ZSAiSFRNTE5hbWVzLmgiCisjaW5jbHVkZSAiSFRNTE9wdEdyb3VwRWxlbWVudC5oIgogI2luY2x1 ZGUgIkhUTUxPcHRpb25FbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTFByb2dyZXNzRWxlbWVudC5o IgogI2luY2x1ZGUgIkhUTUxTdHlsZUVsZW1lbnQuaCIKQEAgLTY1Niw3ICs2NTcsNyBAQCBib29s IFNlbGVjdG9yQ2hlY2tlcjo6Y2hlY2tPbmUoY29uc3QgU2VsZWN0b3JDaGVja2luZ0NvbnRleHQm IGNvbnRleHQpIGNvbnN0CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgY2FzZSBDU1NTZWxlY3Rvcjo6UHNldWRvRW5hYmxlZDoKLSAgICAgICAgICAgIGlmIChlbGVt ZW50LT5pc0Zvcm1Db250cm9sRWxlbWVudCgpIHx8IGlzSFRNTE9wdGlvbkVsZW1lbnQoZWxlbWVu dCkgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShvcHRncm91cFRhZykpCisgICAgICAgICAgICBpZiAo ZWxlbWVudC0+aXNGb3JtQ29udHJvbEVsZW1lbnQoKSB8fCBpc0hUTUxPcHRpb25FbGVtZW50KGVs ZW1lbnQpIHx8IGlzSFRNTE9wdEdyb3VwRWxlbWVudChlbGVtZW50KSkKICAgICAgICAgICAgICAg ICByZXR1cm4gIWVsZW1lbnQtPmlzRGlzYWJsZWRGb3JtQ29udHJvbCgpOwogICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIGNhc2UgQ1NTU2VsZWN0b3I6OlBzZXVkb0Z1bGxQYWdlTWVkaWE6CkBA IC02NjUsNyArNjY2LDcgQEAgYm9vbCBTZWxlY3RvckNoZWNrZXI6OmNoZWNrT25lKGNvbnN0IFNl bGVjdG9yQ2hlY2tpbmdDb250ZXh0JiBjb250ZXh0KSBjb25zdAogICAgICAgICBjYXNlIENTU1Nl bGVjdG9yOjpQc2V1ZG9EZWZhdWx0OgogICAgICAgICAgICAgcmV0dXJuIGVsZW1lbnQtPmlzRGVm YXVsdEJ1dHRvbkZvckZvcm0oKTsKICAgICAgICAgY2FzZSBDU1NTZWxlY3Rvcjo6UHNldWRvRGlz YWJsZWQ6Ci0gICAgICAgICAgICBpZiAoZWxlbWVudC0+aXNGb3JtQ29udHJvbEVsZW1lbnQoKSB8 fCBpc0hUTUxPcHRpb25FbGVtZW50KGVsZW1lbnQpIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUob3B0 Z3JvdXBUYWcpKQorICAgICAgICAgICAgaWYgKGVsZW1lbnQtPmlzRm9ybUNvbnRyb2xFbGVtZW50 KCkgfHwgaXNIVE1MT3B0aW9uRWxlbWVudChlbGVtZW50KSB8fCBpc0hUTUxPcHRHcm91cEVsZW1l bnQoZWxlbWVudCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGVsZW1lbnQtPmlzRGlzYWJsZWRG b3JtQ29udHJvbCgpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQ1NTU2VsZWN0 b3I6OlBzZXVkb1JlYWRPbmx5OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxl UmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCmluZGV4 IGFhNDU0M2UzYzgxMDU5NmM5MzUxYzRhMWJmZDg1ZTRlZjk2Zjk4ODAuLmJmYTU2MTk1YzZiNTNm YzRiY2Y5YzcwMTUwNzY2YjA4MGM0ODhhY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZl ci5jcHAKQEAgLTY4LDYgKzY4LDcgQEAKICNpbmNsdWRlICJIVE1MSUZyYW1lRWxlbWVudC5oIgog I2luY2x1ZGUgIkhUTUxJbnB1dEVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKKyNp bmNsdWRlICJIVE1MT3B0R3JvdXBFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE9wdGlvbkVsZW1l bnQuaCIKICNpbmNsdWRlICJIVE1MUHJvZ3Jlc3NFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTFN0 eWxlRWxlbWVudC5oIgpAQCAtNjU5LDcgKzY2MCw3IEBAIGJvb2wgU3R5bGVSZXNvbHZlcjo6Y2Fu U2hhcmVTdHlsZVdpdGhFbGVtZW50KFN0eWxlZEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0CiAgICAg Ly8gRklYTUU6IFdlIHNob3VsZCBzaGFyZSBzdHlsZSBmb3Igb3B0aW9uIGFuZCBvcHRncm91cCB3 aGVuZXZlciBwb3NzaWJsZS4KICAgICAvLyBCZWZvcmUgZG9pbmcgc28sIHdlIG5lZWQgdG8gcmVz b2x2ZSBpc3N1ZXMgaW4gSFRNTFNlbGVjdEVsZW1lbnQ6OnJlY2FsY0xpc3RJdGVtcwogICAgIC8v IGFuZCBSZW5kZXJNZW51TGlzdDo6c2V0VGV4dC4gU2VlIGFsc28gaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg4NDA1Ci0gICAgaWYgKGlzSFRNTE9wdGlvbkVsZW1lbnQo ZWxlbWVudCkgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShvcHRncm91cFRhZykpCisgICAgaWYgKGlz SFRNTE9wdGlvbkVsZW1lbnQoZWxlbWVudCkgfHwgaXNIVE1MT3B0R3JvdXBFbGVtZW50KGVsZW1l bnQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBib29sIGlzQ29udHJvbCA9IGVsZW1l bnQtPmlzRm9ybUNvbnRyb2xFbGVtZW50KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxPcHRHcm91cEVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE9wdEdy b3VwRWxlbWVudC5oCmluZGV4IDI0MmI4YzEwMGI5NWIzNWY5NzM5NjQ0MzY5ODA2ZDJlODFkOWY4 YjkuLjRlY2RjMjVmNWM4YjM3ZjkwOWQ1NzA1MDdkZGZiYTNhZjkwNmJmMzIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE9wdEdyb3VwRWxlbWVudC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE9wdEdyb3VwRWxlbWVudC5oCkBAIC02Myw2ICs2MywxNyBAQCBwcml2 YXRlOgogICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gbV9zdHlsZTsKIH07CiAKK2lubGluZSBib29s IGlzSFRNTE9wdEdyb3VwRWxlbWVudChOb2RlKiBub2RlKQoreworICAgIHJldHVybiBub2RlLT5o YXNUYWdOYW1lKEhUTUxOYW1lczo6b3B0Z3JvdXBUYWcpOworfQorCitpbmxpbmUgSFRNTE9wdEdy b3VwRWxlbWVudCogdG9IVE1MT3B0R3JvdXBFbGVtZW50KE5vZGUqIG5vZGUpCit7CisgICAgQVNT RVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oIW5vZGUgfHwgaXNIVE1MT3B0R3JvdXBFbGVt ZW50KG5vZGUpKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SFRNTE9wdEdyb3VwRWxlbWVudCo+ KG5vZGUpOworfQorCiB9IC8vbmFtZXNwYWNlCiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MT3B0aW9uRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxPcHRpb25FbGVtZW50LmNwcAppbmRleCA4MWU5ZTlhOWQzNDU0MTliMzZjNDE2ZDdmYjYy ODkxZWUwY2JlOWI4Li5iZmE5YTlmMDBjNjVhNWQxN2I0YjZlYjM1ODVhMzllYzcwYzMzYmU1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPcHRpb25FbGVtZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPcHRpb25FbGVtZW50LmNwcApAQCAtMzIsNiArMzIs NyBAQAogI2luY2x1ZGUgIkV4Y2VwdGlvbkNvZGUuaCIKICNpbmNsdWRlICJIVE1MRGF0YUxpc3RF bGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCisjaW5jbHVkZSAiSFRNTE9wdEdyb3Vw RWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxQYXJzZXJJZGlvbXMuaCIKICNpbmNsdWRlICJIVE1M U2VsZWN0RWxlbWVudC5oIgogI2luY2x1ZGUgIk5vZGVSZW5kZXJTdHlsZS5oIgpAQCAtMzM1LDcg KzMzNiw3IEBAIHZvaWQgSFRNTE9wdGlvbkVsZW1lbnQ6OmRpZFJlY2FsY1N0eWxlKFN0eWxlQ2hh bmdlKQogU3RyaW5nIEhUTUxPcHRpb25FbGVtZW50Ojp0ZXh0SW5kZW50ZWRUb1Jlc3BlY3RHcm91 cExhYmVsKCkgY29uc3QKIHsKICAgICBDb250YWluZXJOb2RlKiBwYXJlbnQgPSBwYXJlbnROb2Rl KCk7Ci0gICAgaWYgKHBhcmVudCAmJiBwYXJlbnQtPmhhc1RhZ05hbWUob3B0Z3JvdXBUYWcpKQor ICAgIGlmIChwYXJlbnQgJiYgaXNIVE1MT3B0R3JvdXBFbGVtZW50KHBhcmVudCkpCiAgICAgICAg IHJldHVybiAiICAgICIgKyB0ZXh0KCk7CiAgICAgcmV0dXJuIHRleHQoKTsKIH0KQEAgLTM0OSw3 ICszNTAsNyBAQCBib29sIEhUTUxPcHRpb25FbGVtZW50Ojppc0Rpc2FibGVkRm9ybUNvbnRyb2wo KSBjb25zdAogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBIVE1MRWxlbWVudCogcGFyZW50 RWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxFbGVtZW50Kj4ocGFyZW50Tm9kZSgpKTsKLSAgICBy ZXR1cm4gcGFyZW50RWxlbWVudC0+aGFzVGFnTmFtZShvcHRncm91cFRhZykgJiYgcGFyZW50RWxl bWVudC0+aXNEaXNhYmxlZEZvcm1Db250cm9sKCk7CisgICAgcmV0dXJuIGlzSFRNTE9wdEdyb3Vw RWxlbWVudChwYXJlbnRFbGVtZW50KSAmJiBwYXJlbnRFbGVtZW50LT5pc0Rpc2FibGVkRm9ybUNv bnRyb2woKTsKIH0KIAogTm9kZTo6SW5zZXJ0aW9uTm90aWZpY2F0aW9uUmVxdWVzdCBIVE1MT3B0 aW9uRWxlbWVudDo6aW5zZXJ0ZWRJbnRvKENvbnRhaW5lck5vZGUqIGluc2VydGlvblBvaW50KQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxlbWVudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcAppbmRleCA4NzAxZTYzYjg1 MDZiOTFmM2IzNjQ3ZTZkZTVlYzhkNzA4YzA2NmQ5Li4xYzVkMGNiODMyYzFmNGU3OGM4YjgwNDlh NDE5ZmMxYWU0MjEzNWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxl Y3RFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50 LmNwcApAQCAtMzUwLDcgKzM1MCw3IEBAIGJvb2wgSFRNTFNlbGVjdEVsZW1lbnQ6OmNoaWxkU2hv dWxkQ3JlYXRlUmVuZGVyZXIoY29uc3QgTm9kZVJlbmRlcmluZ0NvbnRleHQmIGNoCiAgICAgaWYg KCFIVE1MRm9ybUNvbnRyb2xFbGVtZW50V2l0aFN0YXRlOjpjaGlsZFNob3VsZENyZWF0ZVJlbmRl cmVyKGNoaWxkQ29udGV4dCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIXVzZXNN ZW51TGlzdCgpKQotICAgICAgICByZXR1cm4gaXNIVE1MT3B0aW9uRWxlbWVudChjaGlsZENvbnRl eHQubm9kZSgpKSB8fCBjaGlsZENvbnRleHQubm9kZSgpLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6 b3B0Z3JvdXBUYWcpIHx8IHZhbGlkYXRpb25NZXNzYWdlU2hhZG93VHJlZUNvbnRhaW5zKGNoaWxk Q29udGV4dC5ub2RlKCkpOworICAgICAgICByZXR1cm4gaXNIVE1MT3B0aW9uRWxlbWVudChjaGls ZENvbnRleHQubm9kZSgpKSB8fCBpc0hUTUxPcHRHcm91cEVsZW1lbnQoY2hpbGRDb250ZXh0Lm5v ZGUoKSkgfHwgdmFsaWRhdGlvbk1lc3NhZ2VTaGFkb3dUcmVlQ29udGFpbnMoY2hpbGRDb250ZXh0 Lm5vZGUoKSk7CiAgICAgcmV0dXJuIHZhbGlkYXRpb25NZXNzYWdlU2hhZG93VHJlZUNvbnRhaW5z KGNoaWxkQ29udGV4dC5ub2RlKCkpOwogfQogCkBAIC03NTEsNyArNzUxLDcgQEAgdm9pZCBIVE1M U2VsZWN0RWxlbWVudDo6cmVjYWxjTGlzdEl0ZW1zKGJvb2wgdXBkYXRlU2VsZWN0ZWRTdGF0ZXMp IGNvbnN0CiAgICAgICAgIC8vIG9wdGdyb3VwIHRhZ3MgbWF5IG5vdCBuZXN0LiBIb3dldmVyLCBi b3RoIEZpcmVGb3ggYW5kIElFIHdpbGwKICAgICAgICAgLy8gZmxhdHRlbiB0aGUgdHJlZSBhdXRv bWF0aWNhbGx5LCBzbyB3ZSBmb2xsb3cgc3VpdC4KICAgICAgICAgLy8gKGh0dHA6Ly93d3cudzMu b3JnL1RSL2h0bWw0MDEvaW50ZXJhY3QvZm9ybXMuaHRtbCNoLTE3LjYpCi0gICAgICAgIGlmIChj dXJyZW50LT5oYXNUYWdOYW1lKG9wdGdyb3VwVGFnKSkgeworICAgICAgICBpZiAoaXNIVE1MT3B0 R3JvdXBFbGVtZW50KGN1cnJlbnQpKSB7CiAgICAgICAgICAgICBtX2xpc3RJdGVtcy5hcHBlbmQo Y3VycmVudCk7CiAgICAgICAgICAgICBpZiAoRWxlbWVudCogbmV4dEVsZW1lbnQgPSBFbGVtZW50 VHJhdmVyc2FsOjpmaXJzdFdpdGhpbihjdXJyZW50KSkgewogICAgICAgICAgICAgICAgIGN1cnJl bnRFbGVtZW50ID0gbmV4dEVsZW1lbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3BhcnNlci9IVE1MQ29uc3RydWN0aW9uU2l0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3Bh cnNlci9IVE1MQ29uc3RydWN0aW9uU2l0ZS5jcHAKaW5kZXggZWMzMjIwYTZmYTZlMGQ1NTY0ZWZh MzUxYzU1ZTFhMDBkNDU2OGU4Mi4uNDJkNTE2NDdiOTZlMDAzZThjMmQ1NjFiN2MyNTM0NGEyNzlk MzBlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTENvbnN0cnVj dGlvblNpdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxDb25zdHJ1 Y3Rpb25TaXRlLmNwcApAQCAtMzksNiArMzksNyBAQAogI2luY2x1ZGUgIkhUTUxGb3JtRWxlbWVu dC5oIgogI2luY2x1ZGUgIkhUTUxIdG1sRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxOYW1lcy5o IgorI2luY2x1ZGUgIkhUTUxPcHRHcm91cEVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MT3B0aW9u RWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxQYXJzZXJJZGlvbXMuaCIKICNpbmNsdWRlICJIVE1M U2NyaXB0RWxlbWVudC5oIgpAQCAtNjUsNyArNjYsNyBAQCBzdGF0aWMgYm9vbCBoYXNJbXBsaWVk RW5kVGFnKGNvbnN0IEhUTUxTdGFja0l0ZW0qIGl0ZW0pCiAgICAgICAgIHx8IGl0ZW0tPmhhc1Rh Z05hbWUoZHRUYWcpCiAgICAgICAgIHx8IGl0ZW0tPmhhc1RhZ05hbWUobGlUYWcpCiAgICAgICAg IHx8IGlzSFRNTE9wdGlvbkVsZW1lbnQoaXRlbS0+bm9kZSgpKQotICAgICAgICB8fCBpdGVtLT5o YXNUYWdOYW1lKG9wdGdyb3VwVGFnKQorICAgICAgICB8fCBpc0hUTUxPcHRHcm91cEVsZW1lbnQo aXRlbS0+bm9kZSgpKQogICAgICAgICB8fCBpdGVtLT5oYXNUYWdOYW1lKHBUYWcpCiAgICAgICAg IHx8IGl0ZW0tPmhhc1RhZ05hbWUocnBUYWcpCiAgICAgICAgIHx8IGl0ZW0tPmhhc1RhZ05hbWUo cnRUYWcpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTEVsZW1l bnRTdGFjay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRWxlbWVudFN0YWNr LmNwcAppbmRleCAzNDZhNzU5OGU2ODg4ZjVjMmIyZTQwZTI1NGFiMDU0NmQ3NGY1MGIxLi4yNmQz MDUwZDU2ZTRmMGYxMWE3ZjM0NTJmNzVjZjQwOTdiYmIzMzE2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRWxlbWVudFN0YWNrLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL3BhcnNlci9IVE1MRWxlbWVudFN0YWNrLmNwcApAQCAtMzAsNiArMzAsNyBAQAog I2luY2x1ZGUgIkRvY3VtZW50RnJhZ21lbnQuaCIKICNpbmNsdWRlICJFbGVtZW50LmgiCiAjaW5j bHVkZSAiSFRNTE5hbWVzLmgiCisjaW5jbHVkZSAiSFRNTE9wdEdyb3VwRWxlbWVudC5oIgogI2lu Y2x1ZGUgIkhUTUxPcHRpb25FbGVtZW50LmgiCiAjaW5jbHVkZSAiTWF0aE1MTmFtZXMuaCIKICNp bmNsdWRlICJTVkdOYW1lcy5oIgpAQCAtMTIzLDcgKzEyNCw3IEBAIGlubGluZSBib29sIGlzQnV0 dG9uU2NvcGVNYXJrZXIoSFRNTFN0YWNrSXRlbSogaXRlbSkKIAogaW5saW5lIGJvb2wgaXNTZWxl Y3RTY29wZU1hcmtlcihIVE1MU3RhY2tJdGVtKiBpdGVtKQogewotICAgIHJldHVybiAhaXRlbS0+ aGFzVGFnTmFtZShvcHRncm91cFRhZykgJiYgIWlzSFRNTE9wdGlvbkVsZW1lbnQoaXRlbS0+bm9k ZSgpKTsKKyAgICByZXR1cm4gIWlzSFRNTE9wdEdyb3VwRWxlbWVudChpdGVtLT5ub2RlKCkpICYm ICFpc0hUTUxPcHRpb25FbGVtZW50KGl0ZW0tPm5vZGUoKSk7CiB9CiAKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwCmluZGV4IGIwYzFlNDIzNzI5 MDI2NjUzYmMyOGEyODRjYWMyMmE4ZTQ5ZDJlNWMuLmNkNjljN2FiZjEzNTM1MTc1NmIxNzRjZTNl NWQ4MjQ4YTMzMjZmY2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hU TUxUcmVlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRy ZWVCdWlsZGVyLmNwcApAQCAtMzMsNiArMzMsNyBAQAogI2luY2x1ZGUgIkhUTUxEb2N1bWVudFBh cnNlci5oIgogI2luY2x1ZGUgIkhUTUxGb3JtRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxOYW1l cy5oIgorI2luY2x1ZGUgIkhUTUxPcHRHcm91cEVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MT3B0 aW9uRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxQYXJzZXJJZGlvbXMuaCIKICNpbmNsdWRlICJI VE1MU3RhY2tJdGVtLmgiCkBAIC0xMzg3LDcgKzEzODgsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRl cjo6cHJvY2Vzc1N0YXJ0VGFnKEF0b21pY0hUTUxUb2tlbiogdG9rZW4pCiAgICAgICAgICAgICAg ICAgQXRvbWljSFRNTFRva2VuIGVuZE9wdGlvbihIVE1MVG9rZW46OkVuZFRhZywgb3B0aW9uVGFn LmxvY2FsTmFtZSgpKTsKICAgICAgICAgICAgICAgICBwcm9jZXNzRW5kVGFnKCZlbmRPcHRpb24p OwogICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYgKG1fdHJlZS5jdXJyZW50U3RhY2tJdGVt KCktPmhhc1RhZ05hbWUob3B0Z3JvdXBUYWcpKSB7CisgICAgICAgICAgICBpZiAoaXNIVE1MT3B0 R3JvdXBFbGVtZW50KG1fdHJlZS5jdXJyZW50U3RhY2tJdGVtKCktPm5vZGUoKSkpIHsKICAgICAg ICAgICAgICAgICBBdG9taWNIVE1MVG9rZW4gZW5kT3B0Z3JvdXAoSFRNTFRva2VuOjpFbmRUYWcs IG9wdGdyb3VwVGFnLmxvY2FsTmFtZSgpKTsKICAgICAgICAgICAgICAgICBwcm9jZXNzRW5kVGFn KCZlbmRPcHRncm91cCk7CiAgICAgICAgICAgICB9CkBAIC0yMjUxLDkgKzIyNTIsOSBAQCB2b2lk IEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZFRhZyhBdG9taWNIVE1MVG9rZW4qIHRva2VuKQog ICAgIGNhc2UgSW5TZWxlY3RNb2RlOgogICAgICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09 IEluU2VsZWN0TW9kZSB8fCBpbnNlcnRpb25Nb2RlKCkgPT0gSW5TZWxlY3RJblRhYmxlTW9kZSk7 CiAgICAgICAgIGlmICh0b2tlbi0+bmFtZSgpID09IG9wdGdyb3VwVGFnKSB7Ci0gICAgICAgICAg ICBpZiAoaXNIVE1MT3B0aW9uRWxlbWVudChtX3RyZWUuY3VycmVudFN0YWNrSXRlbSgpLT5ub2Rl KCkpICYmIG1fdHJlZS5vbmVCZWxvd1RvcCgpICYmIG1fdHJlZS5vbmVCZWxvd1RvcCgpLT5oYXNU YWdOYW1lKG9wdGdyb3VwVGFnKSkKKyAgICAgICAgICAgIGlmIChpc0hUTUxPcHRpb25FbGVtZW50 KG1fdHJlZS5jdXJyZW50U3RhY2tJdGVtKCktPm5vZGUoKSkgJiYgbV90cmVlLm9uZUJlbG93VG9w KCkgJiYgaXNIVE1MT3B0R3JvdXBFbGVtZW50KG1fdHJlZS5vbmVCZWxvd1RvcCgpLT5ub2RlKCkp KQogICAgICAgICAgICAgICAgIHByb2Nlc3NGYWtlRW5kVGFnKG9wdGlvblRhZyk7Ci0gICAgICAg ICAgICBpZiAobV90cmVlLmN1cnJlbnRTdGFja0l0ZW0oKS0+aGFzVGFnTmFtZShvcHRncm91cFRh ZykpIHsKKyAgICAgICAgICAgIGlmIChpc0hUTUxPcHRHcm91cEVsZW1lbnQobV90cmVlLmN1cnJl bnRTdGFja0l0ZW0oKS0+bm9kZSgpKSkgewogICAgICAgICAgICAgICAgIG1fdHJlZS5vcGVuRWxl bWVudHMoKS0+cG9wKCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCmluZGV4IGUwYmZiZTYx ZTU0YWVlNzA3YjVhNmUxOWVmMDYwNTg2ZjhjY2Y2MzguLjFmYmY4MTljOTQ5MWEwY2NiYmUwY2Nm YzFiNDk0NGZiZDM2MzBhZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMaXN0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlz dEJveC5jcHAKQEAgLTEyNiw4ICsxMjYsOCBAQCB2b2lkIFJlbmRlckxpc3RCb3g6OnVwZGF0ZUZy b21FbGVtZW50KCkKICAgICAgICAgICAgIEZvbnQgaXRlbUZvbnQgPSBzdHlsZSgpLT5mb250KCk7 CiAgICAgICAgICAgICBpZiAoaXNIVE1MT3B0aW9uRWxlbWVudChlbGVtZW50KSkKICAgICAgICAg ICAgICAgICB0ZXh0ID0gdG9IVE1MT3B0aW9uRWxlbWVudChlbGVtZW50KS0+dGV4dEluZGVudGVk VG9SZXNwZWN0R3JvdXBMYWJlbCgpOwotICAgICAgICAgICAgZWxzZSBpZiAoZWxlbWVudC0+aGFz VGFnTmFtZShvcHRncm91cFRhZykpIHsKLSAgICAgICAgICAgICAgICB0ZXh0ID0gc3RhdGljX2Nh c3Q8Y29uc3QgSFRNTE9wdEdyb3VwRWxlbWVudCo+KGVsZW1lbnQpLT5ncm91cExhYmVsVGV4dCgp OworICAgICAgICAgICAgZWxzZSBpZiAoaXNIVE1MT3B0R3JvdXBFbGVtZW50KGVsZW1lbnQpKSB7 CisgICAgICAgICAgICAgICAgdGV4dCA9IHRvSFRNTE9wdEdyb3VwRWxlbWVudChlbGVtZW50KS0+ Z3JvdXBMYWJlbFRleHQoKTsKICAgICAgICAgICAgICAgICBGb250RGVzY3JpcHRpb24gZCA9IGl0 ZW1Gb250LmZvbnREZXNjcmlwdGlvbigpOwogICAgICAgICAgICAgICAgIGQuc2V0V2VpZ2h0KGQu Ym9sZGVyV2VpZ2h0KCkpOwogICAgICAgICAgICAgICAgIGl0ZW1Gb250ID0gRm9udChkLCBpdGVt Rm9udC5sZXR0ZXJTcGFjaW5nKCksIGl0ZW1Gb250LndvcmRTcGFjaW5nKCkpOwpAQCAtNDA2LDgg KzQwNiw4IEBAIHZvaWQgUmVuZGVyTGlzdEJveDo6cGFpbnRJdGVtRm9yZWdyb3VuZChQYWludElu Zm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmCiAgICAgYm9vbCBpc09wdGlvbkVsZW1l bnQgPSBpc0hUTUxPcHRpb25FbGVtZW50KGVsZW1lbnQpOwogICAgIGlmIChpc09wdGlvbkVsZW1l bnQpCiAgICAgICAgIGl0ZW1UZXh0ID0gdG9IVE1MT3B0aW9uRWxlbWVudChlbGVtZW50KS0+dGV4 dEluZGVudGVkVG9SZXNwZWN0R3JvdXBMYWJlbCgpOwotICAgIGVsc2UgaWYgKGVsZW1lbnQtPmhh c1RhZ05hbWUob3B0Z3JvdXBUYWcpKQotICAgICAgICBpdGVtVGV4dCA9IHN0YXRpY19jYXN0PGNv bnN0IEhUTUxPcHRHcm91cEVsZW1lbnQqPihlbGVtZW50KS0+Z3JvdXBMYWJlbFRleHQoKTsKKyAg ICBlbHNlIGlmIChpc0hUTUxPcHRHcm91cEVsZW1lbnQoZWxlbWVudCkpCisgICAgICAgIGl0ZW1U ZXh0ID0gdG9IVE1MT3B0R3JvdXBFbGVtZW50KGVsZW1lbnQpLT5ncm91cExhYmVsVGV4dCgpOwog ICAgIGFwcGx5VGV4dFRyYW5zZm9ybShzdHlsZSgpLCBpdGVtVGV4dCwgJyAnKTsKIAogICAgIENv bG9yIHRleHRDb2xvciA9IGVsZW1lbnQtPnJlbmRlclN0eWxlKCkgPyBlbGVtZW50LT5yZW5kZXJT dHlsZSgpLT52aXNpdGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlDb2xvcikgOiBzdHlsZSgp LT52aXNpdGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlDb2xvcik7CkBAIC00MjcsNyArNDI3 LDcgQEAgdm9pZCBSZW5kZXJMaXN0Qm94OjpwYWludEl0ZW1Gb3JlZ3JvdW5kKFBhaW50SW5mbyYg cGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYKICAgICBMYXlvdXRSZWN0IHIgPSBpdGVtQm91 bmRpbmdCb3hSZWN0KHBhaW50T2Zmc2V0LCBsaXN0SW5kZXgpOwogICAgIHIubW92ZShpdGVtT2Zm c2V0Rm9yQWxpZ25tZW50KHRleHRSdW4sIGl0ZW1TdHlsZSwgaXRlbUZvbnQsIHIpKTsKIAotICAg IGlmIChlbGVtZW50LT5oYXNUYWdOYW1lKG9wdGdyb3VwVGFnKSkgeworICAgIGlmIChpc0hUTUxP cHRHcm91cEVsZW1lbnQoZWxlbWVudCkpIHsKICAgICAgICAgRm9udERlc2NyaXB0aW9uIGQgPSBp dGVtRm9udC5mb250RGVzY3JpcHRpb24oKTsKICAgICAgICAgZC5zZXRXZWlnaHQoZC5ib2xkZXJX ZWlnaHQoKSk7CiAgICAgICAgIGl0ZW1Gb250ID0gRm9udChkLCBpdGVtRm9udC5sZXR0ZXJTcGFj aW5nKCksIGl0ZW1Gb250LndvcmRTcGFjaW5nKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJNZW51TGlzdC5jcHAKaW5kZXggZGIwOTM4YWY5MjY4MjZkZjU1ZjE2MDYxZmM5YjM4 YzU5M2Y0MGEyZS4uMzcyMTQyNzYyOTExMjI2OGU0MDQ1M2NiMDQ0NGFjY2UyM2ViMzk1MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwCkBAIC00MDUsOCAr NDA1LDggQEAgU3RyaW5nIFJlbmRlck1lbnVMaXN0OjppdGVtVGV4dCh1bnNpZ25lZCBsaXN0SW5k ZXgpIGNvbnN0CiAKICAgICBTdHJpbmcgaXRlbVN0cmluZzsKICAgICBFbGVtZW50KiBlbGVtZW50 ID0gbGlzdEl0ZW1zW2xpc3RJbmRleF07Ci0gICAgaWYgKGVsZW1lbnQtPmhhc1RhZ05hbWUob3B0 Z3JvdXBUYWcpKQotICAgICAgICBpdGVtU3RyaW5nID0gc3RhdGljX2Nhc3Q8Y29uc3QgSFRNTE9w dEdyb3VwRWxlbWVudCo+KGVsZW1lbnQpLT5ncm91cExhYmVsVGV4dCgpOworICAgIGlmIChpc0hU TUxPcHRHcm91cEVsZW1lbnQoZWxlbWVudCkpCisgICAgICAgIGl0ZW1TdHJpbmcgPSB0b0hUTUxP cHRHcm91cEVsZW1lbnQoZWxlbWVudCktPmdyb3VwTGFiZWxUZXh0KCk7CiAgICAgZWxzZSBpZiAo aXNIVE1MT3B0aW9uRWxlbWVudChlbGVtZW50KSkKICAgICAgICAgaXRlbVN0cmluZyA9IHRvSFRN TE9wdGlvbkVsZW1lbnQoZWxlbWVudCktPnRleHRJbmRlbnRlZFRvUmVzcGVjdEdyb3VwTGFiZWwo KTsKIApAQCAtNDUyLDcgKzQ1Miw3IEBAIGJvb2wgUmVuZGVyTWVudUxpc3Q6Oml0ZW1Jc0VuYWJs ZWQodW5zaWduZWQgbGlzdEluZGV4KSBjb25zdAogCiAgICAgYm9vbCBncm91cEVuYWJsZWQgPSB0 cnVlOwogICAgIGlmIChFbGVtZW50KiBwYXJlbnRFbGVtZW50ID0gZWxlbWVudC0+cGFyZW50RWxl bWVudCgpKSB7Ci0gICAgICAgIGlmIChwYXJlbnRFbGVtZW50LT5oYXNUYWdOYW1lKG9wdGdyb3Vw VGFnKSkKKyAgICAgICAgaWYgKGlzSFRNTE9wdEdyb3VwRWxlbWVudChwYXJlbnRFbGVtZW50KSkK ICAgICAgICAgICAgIGdyb3VwRW5hYmxlZCA9ICFwYXJlbnRFbGVtZW50LT5pc0Rpc2FibGVkRm9y bUNvbnRyb2woKTsKICAgICB9CiAgICAgaWYgKCFncm91cEVuYWJsZWQpCkBAIC01OTYsNyArNTk2 LDcgQEAgYm9vbCBSZW5kZXJNZW51TGlzdDo6aXRlbUlzU2VwYXJhdG9yKHVuc2lnbmVkIGxpc3RJ bmRleCkgY29uc3QKIGJvb2wgUmVuZGVyTWVudUxpc3Q6Oml0ZW1Jc0xhYmVsKHVuc2lnbmVkIGxp c3RJbmRleCkgY29uc3QKIHsKICAgICBjb25zdCBWZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlzdEl0 ZW1zID0gc2VsZWN0RWxlbWVudCgpLT5saXN0SXRlbXMoKTsKLSAgICByZXR1cm4gbGlzdEluZGV4 IDwgbGlzdEl0ZW1zLnNpemUoKSAmJiBsaXN0SXRlbXNbbGlzdEluZGV4XS0+aGFzVGFnTmFtZShv cHRncm91cFRhZyk7CisgICAgcmV0dXJuIGxpc3RJbmRleCA8IGxpc3RJdGVtcy5zaXplKCkgJiYg aXNIVE1MT3B0R3JvdXBFbGVtZW50KGxpc3RJdGVtc1tsaXN0SW5kZXhdKTsKIH0KIAogYm9vbCBS ZW5kZXJNZW51TGlzdDo6aXRlbUlzU2VsZWN0ZWQodW5zaWduZWQgbGlzdEluZGV4KSBjb25zdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRI YW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0 SGFuZGxlci5jcHAKaW5kZXggYzhjMDY5MTQyMjc2YzVlNDE1YjY2OGUzMmM0MWRiNGRlYjY5NjEx My4uMGZjOGMyYjc0OTAwMjdhYjc4Nzc1N2ViYTgxYzAyNGUyNjhkNWUxYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIu Y3BwCkBAIC0yMDYxLDkgKzIwNjEsOSBAQCBib29sIElucHV0SGFuZGxlcjo6b3BlblNlbGVjdFBv cHVwKEhUTUxTZWxlY3RFbGVtZW50KiBzZWxlY3QpCiAgICAgICAgICAgICAgICAgbGFiZWxzW2ld ID0gb3B0aW9uLT50ZXh0SW5kZW50ZWRUb1Jlc3BlY3RHcm91cExhYmVsKCk7CiAgICAgICAgICAg ICAgICAgZW5hYmxlZHNbaV0gPSBvcHRpb24tPmlzRGlzYWJsZWRGb3JtQ29udHJvbCgpID8gMCA6 IDE7CiAgICAgICAgICAgICAgICAgc2VsZWN0ZWRzW2ldID0gb3B0aW9uLT5zZWxlY3RlZCgpOwot ICAgICAgICAgICAgICAgIGl0ZW1UeXBlc1tpXSA9IG9wdGlvbi0+cGFyZW50Tm9kZSgpICYmIG9w dGlvbi0+cGFyZW50Tm9kZSgpLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6b3B0Z3JvdXBUYWcpID8g VHlwZU9wdGlvbkluR3JvdXAgOiBUeXBlT3B0aW9uOwotICAgICAgICAgICAgfSBlbHNlIGlmIChs aXN0SXRlbXNbaV0tPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpvcHRncm91cFRhZykpIHsKLSAgICAg ICAgICAgICAgICBIVE1MT3B0R3JvdXBFbGVtZW50KiBvcHRHcm91cCA9IHN0YXRpY19jYXN0PEhU TUxPcHRHcm91cEVsZW1lbnQqPihsaXN0SXRlbXNbaV0pOworICAgICAgICAgICAgICAgIGl0ZW1U eXBlc1tpXSA9IG9wdGlvbi0+cGFyZW50Tm9kZSgpICYmIGlzSFRNTE9wdEdyb3VwRWxlbWVudChv cHRpb24tPnBhcmVudE5vZGUoKSkgPyBUeXBlT3B0aW9uSW5Hcm91cCA6IFR5cGVPcHRpb247Cisg ICAgICAgICAgICB9IGVsc2UgaWYgKGlzSFRNTE9wdEdyb3VwRWxlbWVudChsaXN0SXRlbXNbaV0p KSB7CisgICAgICAgICAgICAgICAgSFRNTE9wdEdyb3VwRWxlbWVudCogb3B0R3JvdXAgPSB0b0hU TUxPcHRHcm91cEVsZW1lbnQobGlzdEl0ZW1zW2ldKTsKICAgICAgICAgICAgICAgICBsYWJlbHNb aV0gPSBvcHRHcm91cC0+Z3JvdXBMYWJlbFRleHQoKTsKICAgICAgICAgICAgICAgICBlbmFibGVk c1tpXSA9IG9wdEdyb3VwLT5pc0Rpc2FibGVkRm9ybUNvbnRyb2woKSA/IDAgOiAxOwogICAgICAg ICAgICAgICAgIHNlbGVjdGVkc1tpXSA9IGZhbHNlOwo=