148139 2015-08-18 14:04:44 -0700 Remove "platform text track menu" 2015-08-18 17:33:08 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric.carlson eric.carlson commit-queue jer.noble oldest_to_newest 1118626 0 eric.carlson 2015-08-18 14:04:44 -0700 The code inside of PLATFORM_TEXT_TRACK_MENU is no longer being used and should be removed. 1118628 1 259296 eric.carlson 2015-08-18 14:13:06 -0700 Created attachment 259296 Proposed patch 1118736 2 259296 commit-queue 2015-08-18 17:33:06 -0700 Comment on attachment 259296 Proposed patch Clearing flags on attachment: 259296 Committed r188612: <http://trac.webkit.org/changeset/188612> 1118737 3 commit-queue 2015-08-18 17:33:08 -0700 All reviewed patches have been landed. Closing bug. 259296 2015-08-18 14:13:06 -0700 2015-08-18 17:33:06 -0700 Proposed patch patch_2.txt text/plain 23501 eric.carlson SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxODg1OTUpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDE1LTA4LTE4ICBFcmljIENhcmxzb24gIDxlcmlj LmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSAicGxhdGZvcm0gdGV4dCB0cmFj ayBtZW51IgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ4MTM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiB3dGYvUGxhdGZvcm0uaDogUmVtb3ZlIFBMQVRGT1JNX1RFWFRfVFJBQ0tfTUVOVS4KKwogMjAx NS0wOC0xNyAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIFJlcGxh Y2UgYWxsIHJlbWFpbmluZyB1c2VzIG9mIFdURjo6TXV0ZXggd2l0aCBXVEY6OkxvY2sKSW5kZXg6 IFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYv UGxhdGZvcm0uaAkocmV2aXNpb24gMTg4NTI0KQorKysgU291cmNlL1dURi93dGYvUGxhdGZvcm0u aAkod29ya2luZyBjb3B5KQpAQCAtMTA4MCwxMCArMTA4MCw2IEBACiAjZGVmaW5lIEhBVkVfVElN SU5HREFUQU9QVElPTlMgMQogI2VuZGlmCiAKLSNpZiBQTEFURk9STShJT1MpCi0jZGVmaW5lIFVT RV9QTEFURk9STV9URVhUX1RSQUNLX01FTlUgMQotI2VuZGlmCi0KICNpZiBQTEFURk9STShDT0NP QSkKICNkZWZpbmUgVVNFX0FVRElPX1NFU1NJT04gMQogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCShy ZXZpc2lvbiAxODg1OTUpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSw0NyBAQAorMjAxNS0wOC0xOCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJs c29uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgInBsYXRmb3JtIHRleHQgdHJhY2sgbWVu dSIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODEz OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cywgdGhpcyBwYXRjaCByZW1vdmVzIHVudXNlZCBjb2RlLgorCisgICAgICAgICogV2Vi Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOiBSZW1vdmUgUGxhdGZvcm1UZXh0VHJhY2tN ZW51LmguCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnNjaGVkdWxlRGVsYXllZEFjdGlvbik6IFJlbW92ZSBQ TEFURk9STV9URVhUX1RSQUNLX01FTlUuCisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVt ZW50OjpwZW5kaW5nQWN0aW9uVGltZXJGaXJlZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVk aWFFbGVtZW50Ojp0ZXh0VHJhY2tNb2RlQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50OjptZWRpYVBsYXllckRpZFJlbW92ZVZpZGVvVHJhY2spOgorICAgICAgICAo V2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6Y2xvc2VDYXB0aW9uVHJhY2tzQ2hhbmdlZCk6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjphZGRBdWRpb1RyYWNrKToKKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmNsZWFyTWVkaWFQbGF5ZXIpOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0U2VsZWN0ZWRUZXh0VHJhY2spOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6cGxhdGZvcm1UZXh0VHJh Y2tzKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om5vdGlm eU1lZGlhUGxheWVyT2ZUZXh0VHJhY2tDaGFuZ2VzKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBsYXRmb3JtVGV4dFRyYWNrTWVudSk6IERlbGV0ZWQuCisg ICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50OjpwbGF5ZXIpOgorICAgICAgICAqIGh0bWwvdHJhY2svSW5iYW5kVGV4dFRy YWNrLmg6CisgICAgICAgICogaHRtbC90cmFjay9UZXh0VHJhY2suY3BwOgorICAgICAgICAoV2Vi Q29yZTo6VGV4dFRyYWNrOjpoYXNDdWUpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dFRyYWNrOjpp c01haW5Qcm9ncmFtQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0VHJhY2s6OnBsYXRm b3JtVGV4dFRyYWNrKTogRGVsZXRlZC4KKyAgICAgICAgKiBodG1sL3RyYWNrL1RleHRUcmFjay5o OgorICAgICAgICAoV2ViQ29yZTo6VGV4dFRyYWNrOjpjcmVhdGUpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxh eWVyOjpyZXNldE1lZGlhRW5naW5lcyk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllcjo6 aW1wbGVtZW50c1RleHRUcmFja0NvbnRyb2xzKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyOjp0ZXh0VHJhY2tNZW51KTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9NZWRpYVBsYXllci5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01l ZGlhUGxheWVyUHJpdmF0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRl SW50ZXJmYWNlOjp0cmFja3NDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUludGVyZmFjZTo6c2ltdWxhdGVBdWRpb0ludGVycnVwdGlvbik6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2U6OmltcGxlbWVudHNUZXh0VHJhY2tD b250cm9scyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVJ bnRlcmZhY2U6OnRleHRUcmFja01lbnUpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL1BsYXRmb3JtVGV4dFRyYWNrLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv UGxhdGZvcm1UZXh0VHJhY2tNZW51Lmg6IFJlbW92ZWQuCisKIDIwMTUtMDgtMTggIEZpbGlwIFBp emxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXggdGhlIGNh aXJvIGJ1aWxkLgpJbmRleDogU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gMTg4NTI0KQorKysgU291cmNlL1dlYkNvcmUvV2Vi Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC01MTgsNyAr NTE4LDYgQEAKIAkJMEY2MzgzREUxODYxNUIyOTAwM0U1REI1IC8qIFRocmVhZGVkU2Nyb2xsaW5n VHJlZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEY2 MzgzREMxODYxNUIyOTAwM0U1REI1IC8qIFRocmVhZGVkU2Nyb2xsaW5nVHJlZS5oICovOyBzZXR0 aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTBGNkExMkJEMUEwMDky MzcwMEM2REU3MiAvKiBEZWJ1Z1BhZ2VPdmVybGF5cy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRjZBMTJCQjFBMDA5MjM3MDBDNkRFNzIgLyogRGVi dWdQYWdlT3ZlcmxheXMuY3BwICovOyB9OwogCQkwRjZBMTJCRTFBMDA5MjM3MDBDNkRFNzIgLyog RGVidWdQYWdlT3ZlcmxheXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDBGNkExMkJDMUEwMDkyMzcwMEM2REU3MiAvKiBEZWJ1Z1BhZ2VPdmVybGF5cy5o ICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07Ci0JCTBGN0Qw NzMyMTg4NEM0NUMwMEI0QUY4NiAvKiBQbGF0Zm9ybVRleHRUcmFja01lbnUuaCBpbiBIZWFkZXJz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDA3Mjg0N0UzMTZFQkM1QjAwMDQz Q0ZBNCAvKiBQbGF0Zm9ybVRleHRUcmFja01lbnUuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRF UyA9IChQcml2YXRlLCApOyB9OyB9OwogCQkwRjdEMDczMzE4ODRDNTZDMDBCNEFGODYgLyogUGxh dGZvcm1UZXh0VHJhY2suaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDA3Mjg0N0UyMTZFQkM1QjAwMDQzQ0ZBNCAvKiBQbGF0Zm9ybVRleHRUcmFjay5oICov OyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTBGOTdBNjU4 MTU1REE4MUUwMEZBREQ0QyAvKiBEaXNwbGF5UmVmcmVzaE1vbml0b3JJT1MubW0gaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRjk3QTY1NzE1NURBODFFMDBG QURENEMgLyogRGlzcGxheVJlZnJlc2hNb25pdG9ySU9TLm1tICovOyB9OwogCQkwRkEyNEQ3OTE2 MkRGOTE5MDBBM0Y0QzAgLyogR3JhcGhpY3NMYXllclVwZGF0ZXIuY3BwIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEZBMjRENzcxNjJERjkxOTAwQTNGNEMw IC8qIEdyYXBoaWNzTGF5ZXJVcGRhdGVyLmNwcCAqLzsgfTsKQEAgLTczMTMsNyArNzMxMiw2IEBA CiAJCTA3Mjc3RTQ4MTdEMDE4Q0MwMDE1NTM0RCAvKiBKU01lZGlhU3RyZWFtVHJhY2tFdmVudC5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBKU01lZGlhU3RyZWFtVHJh Y2tFdmVudC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTA3Mjc3RTQ5MTdEMDE4 Q0MwMDE1NTM0RCAvKiBKU01lZGlhU3RyZWFtVHJhY2tFdmVudC5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IHBhdGggPSBKU01lZGlhU3RyZWFtVHJhY2tFdmVudC5oOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQkwNzI4NDdFMjE2RUJDNUIwMDA0M0NGQTQgLyogUGxhdGZvcm1UZXh0 VHJhY2suaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gUGxhdGZvcm1UZXh0VHJhY2suaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKLQkJMDcyODQ3RTMxNkVCQzVCMDAwNDNDRkE0IC8qIFBsYXRmb3JtVGV4 dFRyYWNrTWVudS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBQbGF0Zm9ybVRleHRUcmFja01lbnUuaDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMDcyQUUxREYxODNDMDc0MTAwMEE1OTg4IC8qIFBs dWdpblJlcGxhY2VtZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFBsdWdp blJlcGxhY2VtZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTA3MkFFMUUwMTgz QzA3NDEwMDBBNTk4OCAvKiBRdWlja1RpbWVQbHVnaW5SZXBsYWNlbWVudC5tbSAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFF1aWNrVGltZVBsdWdpblJlcGxhY2VtZW50 Lm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkwNzJBRTFFMTE4M0MwNzQxMDAwQTU5 ODggLyogUXVpY2tUaW1lUGx1Z2luUmVwbGFjZW1lbnQuY3NzICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5jc3M7 IHBhdGggPSBRdWlja1RpbWVQbHVnaW5SZXBsYWNlbWVudC5jc3M7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CkBAIC0yMTExMCw3ICsyMTEwOCw2IEBACiAJCQkJMDU2MkY5NjAxNTczRjg4RjAw MzFDQTE2IC8qIFBsYXRmb3JtTGF5ZXIuaCAqLywKIAkJCQlDRUVGQ0Q3QjE5REIzM0RDMDAzODc2 RDcgLyogUGxhdGZvcm1NZWRpYVJlc291cmNlTG9hZGVyLmggKi8sCiAJCQkJMDcyODQ3RTIxNkVC QzVCMDAwNDNDRkE0IC8qIFBsYXRmb3JtVGV4dFRyYWNrLmggKi8sCi0JCQkJMDcyODQ3RTMxNkVC QzVCMDAwNDNDRkE0IC8qIFBsYXRmb3JtVGV4dFRyYWNrTWVudS5oICovLAogCQkJCTA3NEU4MkI4 MThBNjlGMEUwMDdFRjU0QyAvKiBQbGF0Zm9ybVRpbWVSYW5nZXMuY3BwICovLAogCQkJCTA3NEU4 MkI5MThBNjlGMEUwMDdFRjU0QyAvKiBQbGF0Zm9ybVRpbWVSYW5nZXMuaCAqLywKIAkJCQlCQ0FC NDE3RjEzRTM1NkU4MDBEOEFBRjMgLyogUmVnaW9uLmNwcCAqLywKQEAgLTI2MzA1LDcgKzI2MzAy LDYgQEAKIAkJCQkyOTdCRTNENzE2QzAzQzBFMDAzMzE2QkQgLyogUGxhdGZvcm1TcGVlY2hTeW50 aGVzaXplci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMUFEOEY4MUIxMUNBQjlFOTAwRTkzRTU0IC8q IFBsYXRmb3JtU3RyYXRlZ2llcy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMEY3RDA3MzMxODg0QzU2 QzAwQjRBRjg2IC8qIFBsYXRmb3JtVGV4dFRyYWNrLmggaW4gSGVhZGVycyAqLywKLQkJCQkwRjdE MDczMjE4ODRDNDVDMDBCNEFGODYgLyogUGxhdGZvcm1UZXh0VHJhY2tNZW51LmggaW4gSGVhZGVy cyAqLywKIAkJCQkwNzRFODJCQjE4QTY5RjBFMDA3RUY1NEMgLyogUGxhdGZvcm1UaW1lUmFuZ2Vz LmggaW4gSGVhZGVycyAqLywKIAkJCQk5MzVDNDc2QjA5QUM0RDRGMDBBNkFBQjQgLyogUGxhdGZv cm1XaGVlbEV2ZW50LmggaW4gSGVhZGVycyAqLywKIAkJCQkzMUQ1OTFCMzE2Njk3QTZDMDBFNkJG MDIgLyogUGx1Z0luQ2xpZW50LmggaW4gSGVhZGVycyAqLywKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24gMTg4NTI0KQorKysgU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM3LDEw ICsxMzcsNiBAQAogI2luY2x1ZGUgIk1lZGlhS2V5cy5oIgogI2VuZGlmCiAKLSNpZiBVU0UoUExB VEZPUk1fVEVYVF9UUkFDS19NRU5VKQotI2luY2x1ZGUgIlBsYXRmb3JtVGV4dFRyYWNrLmgiCi0j ZW5kaWYKLQogI2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCiAjaW5jbHVkZSAiSlNN ZWRpYUNvbnRyb2xzSG9zdC5oIgogI2luY2x1ZGUgIk1lZGlhQ29udHJvbHNIb3N0LmgiCkBAIC04 MDMsMTEgKzc5OSw2IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2NoZWR1bGVEZWxheWVkQWMK ICAgICAgICAgc2V0RmxhZ3MobV9wZW5kaW5nQWN0aW9uRmxhZ3MsIENvbmZpZ3VyZVRleHRUcmFj a3MpOwogI2VuZGlmCiAKLSNpZiBVU0UoUExBVEZPUk1fVEVYVF9UUkFDS19NRU5VKQotICAgIGlm IChhY3Rpb25UeXBlICYgVGV4dFRyYWNrQ2hhbmdlc05vdGlmaWNhdGlvbikKLSAgICAgICAgc2V0 RmxhZ3MobV9wZW5kaW5nQWN0aW9uRmxhZ3MsIFRleHRUcmFja0NoYW5nZXNOb3RpZmljYXRpb24p OwotI2VuZGlmCi0KICNpZiBFTkFCTEUoV0lSRUxFU1NfUExBWUJBQ0tfVEFSR0VUKQogICAgIGlm IChhY3Rpb25UeXBlICYgQ2hlY2tQbGF5YmFja1RhcmdldENvbXBhdGFibGl0eSkKICAgICAgICAg c2V0RmxhZ3MobV9wZW5kaW5nQWN0aW9uRmxhZ3MsIENoZWNrUGxheWJhY2tUYXJnZXRDb21wYXRh YmxpdHkpOwpAQCAtODU1LDExICs4NDYsNiBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnBlbmRp bmdBY3Rpb25UaW1lCiAgICAgICAgICAgICBsb2FkSW50ZXJuYWwoKTsKICAgICB9CiAKLSNpZiBV U0UoUExBVEZPUk1fVEVYVF9UUkFDS19NRU5VKQotICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1 cmVzOjpzaGFyZWRGZWF0dXJlcygpLndlYmtpdFZpZGVvVHJhY2tFbmFibGVkKCkgJiYgKG1fcGVu ZGluZ0FjdGlvbkZsYWdzICYgVGV4dFRyYWNrQ2hhbmdlc05vdGlmaWNhdGlvbikpCi0gICAgICAg IG5vdGlmeU1lZGlhUGxheWVyT2ZUZXh0VHJhY2tDaGFuZ2VzKCk7Ci0jZW5kaWYKLQogI2lmIEVO QUJMRShXSVJFTEVTU19QTEFZQkFDS19UQVJHRVQpCiAgICAgaWYgKG1fcGVuZGluZ0FjdGlvbkZs YWdzICYgQ2hlY2tQbGF5YmFja1RhcmdldENvbXBhdGFibGl0eSAmJiBtX3BsYXllciAmJiBtX3Bs YXllci0+aXNDdXJyZW50UGxheWJhY2tUYXJnZXRXaXJlbGVzcygpICYmICFtX3BsYXllci0+Y2Fu UGxheVRvV2lyZWxlc3NQbGF5YmFja1RhcmdldCgpKSB7CiAgICAgICAgIExPRyhNZWRpYSwgIkhU TUxNZWRpYUVsZW1lbnQ6OnBlbmRpbmdBY3Rpb25UaW1lckZpcmVkKCVwKSAtIGNhbGxpbmcgc2V0 U2hvdWxkUGxheVRvUGxheWJhY2tUYXJnZXQoZmFsc2UpIiwgdGhpcyk7CkBAIC0xNjY3LDExICsx NjUzLDYgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp0ZXh0VHJhY2tNb2RlQ2hhbgogICAgIGlm ICh0cmFjay0+bW9kZSgpICE9IFRleHRUcmFjazo6ZGlzYWJsZWRLZXl3b3JkKCkgJiYgdHJhY2tJ c0xvYWRlZCkKICAgICAgICAgdGV4dFRyYWNrQWRkQ3Vlcyh0cmFjaywgdHJhY2stPmN1ZXMoKSk7 CiAKLSNpZiBVU0UoUExBVEZPUk1fVEVYVF9UUkFDS19NRU5VKQotICAgIGlmIChwbGF0Zm9ybVRl eHRUcmFja01lbnUoKSkKLSAgICAgICAgcGxhdGZvcm1UZXh0VHJhY2tNZW51KCktPnRyYWNrV2Fz U2VsZWN0ZWQodHJhY2stPnBsYXRmb3JtVGV4dFRyYWNrKCkpOwotI2VuZGlmCi0gICAgCiAgICAg Y29uZmlndXJlVGV4dFRyYWNrRGlzcGxheShBc3N1bWVUZXh0VHJhY2tWaXNpYmlsaXR5Q2hhbmdl ZCk7CiAKICAgICBpZiAobV90ZXh0VHJhY2tzICYmIG1fdGV4dFRyYWNrcy0+Y29udGFpbnModHJh Y2spKQpAQCAtMzQ3Nyw4NiArMzQ1OCwxMCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlh UGxheWVyRGlkUmVtCiAgICAgcHJwVHJhY2stPndpbGxCZVJlbW92ZWQoKTsKIH0KIAotI2lmIFVT RShQTEFURk9STV9URVhUX1RSQUNLX01FTlUpCi12b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldFNl bGVjdGVkVGV4dFRyYWNrKFBhc3NSZWZQdHI8UGxhdGZvcm1UZXh0VHJhY2s+IHBsYXRmb3JtVHJh Y2spCi17Ci0gICAgaWYgKCFtX3RleHRUcmFja3MpCi0gICAgICAgIHJldHVybjsKLQotICAgIFRy YWNrRGlzcGxheVVwZGF0ZVNjb3BlIHNjb3BlKHRoaXMpOwotCi0gICAgaWYgKCFwbGF0Zm9ybVRy YWNrKSB7Ci0gICAgICAgIHNldFNlbGVjdGVkVGV4dFRyYWNrKFRleHRUcmFjazo6Y2FwdGlvbk1l bnVPZmZJdGVtKCkpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgVGV4dFRyYWNrKiB0 ZXh0VHJhY2s7Ci0gICAgaWYgKHBsYXRmb3JtVHJhY2sgPT0gUGxhdGZvcm1UZXh0VHJhY2s6OmNh cHRpb25NZW51T2ZmSXRlbSgpKQotICAgICAgICB0ZXh0VHJhY2sgPSBUZXh0VHJhY2s6OmNhcHRp b25NZW51T2ZmSXRlbSgpOwotICAgIGVsc2UgaWYgKHBsYXRmb3JtVHJhY2sgPT0gUGxhdGZvcm1U ZXh0VHJhY2s6OmNhcHRpb25NZW51QXV0b21hdGljSXRlbSgpKQotICAgICAgICB0ZXh0VHJhY2sg PSBUZXh0VHJhY2s6OmNhcHRpb25NZW51QXV0b21hdGljSXRlbSgpOwotICAgIGVsc2UgewotICAg ICAgICBzaXplX3QgaTsKLSAgICAgICAgZm9yIChpID0gMDsgaSA8IG1fdGV4dFRyYWNrcy0+bGVu Z3RoKCk7ICsraSkgewotICAgICAgICAgICAgdGV4dFRyYWNrID0gbV90ZXh0VHJhY2tzLT5pdGVt KGkpOwotICAgICAgICAgICAgCi0gICAgICAgICAgICBpZiAodGV4dFRyYWNrLT5wbGF0Zm9ybVRl eHRUcmFjaygpID09IHBsYXRmb3JtVHJhY2spCi0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgIH0KLSAgICAgICAgaWYgKGkgPT0gbV90ZXh0VHJhY2tzLT5sZW5ndGgoKSkKLSAgICAgICAg ICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBzZXRTZWxlY3RlZFRleHRUcmFjayh0ZXh0VHJhY2sp OwotfQotCi1WZWN0b3I8UmVmUHRyPFBsYXRmb3JtVGV4dFRyYWNrPj4gSFRNTE1lZGlhRWxlbWVu dDo6cGxhdGZvcm1UZXh0VHJhY2tzKCkKLXsKLSAgICBpZiAoIW1fdGV4dFRyYWNrcyB8fCAhbV90 ZXh0VHJhY2tzLT5sZW5ndGgoKSkKLSAgICAgICAgcmV0dXJuIFZlY3RvcjxSZWZQdHI8UGxhdGZv cm1UZXh0VHJhY2s+PigpOwotICAgIAotICAgIFZlY3RvcjxSZWZQdHI8UGxhdGZvcm1UZXh0VHJh Y2s+PiBwbGF0Zm9ybVRyYWNrczsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fdGV4dFRy YWNrcy0+bGVuZ3RoKCk7ICsraSkKLSAgICAgICAgcGxhdGZvcm1UcmFja3MuYXBwZW5kKG1fdGV4 dFRyYWNrcy0+aXRlbShpKS0+cGxhdGZvcm1UZXh0VHJhY2soKSk7Ci0gICAgCi0gICAgcmV0dXJu IHBsYXRmb3JtVHJhY2tzOwotfQotCi12b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om5vdGlmeU1lZGlh UGxheWVyT2ZUZXh0VHJhY2tDaGFuZ2VzKCkKLXsKLSAgICBpZiAoIW1fdGV4dFRyYWNrcyB8fCAh bV90ZXh0VHJhY2tzLT5sZW5ndGgoKSB8fCAhcGxhdGZvcm1UZXh0VHJhY2tNZW51KCkpCi0gICAg ICAgIHJldHVybjsKLSAgICAKLSAgICBtX3BsYXRmb3JtTWVudS0+dHJhY2tzRGlkQ2hhbmdlKCk7 Ci19Ci0KLVBsYXRmb3JtVGV4dFRyYWNrTWVudUludGVyZmFjZSogSFRNTE1lZGlhRWxlbWVudDo6 cGxhdGZvcm1UZXh0VHJhY2tNZW51KCkKLXsKLSAgICBpZiAobV9wbGF0Zm9ybU1lbnUpCi0gICAg ICAgIHJldHVybiBtX3BsYXRmb3JtTWVudS5nZXQoKTsKLQotICAgIGlmICghbV9wbGF5ZXIgfHwg IW1fcGxheWVyLT5pbXBsZW1lbnRzVGV4dFRyYWNrQ29udHJvbHMoKSkKLSAgICAgICAgcmV0dXJu IDA7Ci0KLSAgICBtX3BsYXRmb3JtTWVudSA9IG1fcGxheWVyLT50ZXh0VHJhY2tNZW51KCk7Ci0g ICAgaWYgKCFtX3BsYXRmb3JtTWVudSkKLSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBtX3BsYXRm b3JtTWVudS0+c2V0Q2xpZW50KHRoaXMpOwotCi0gICAgcmV0dXJuIG1fcGxhdGZvcm1NZW51Lmdl dCgpOwotfQotI2VuZGlmIC8vICNpZiBVU0UoUExBVEZPUk1fVEVYVF9UUkFDS19NRU5VKQotICAg IAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpjbG9zZUNhcHRpb25UcmFja3NDaGFuZ2VkKCkKIHsK ICAgICBpZiAoaGFzTWVkaWFDb250cm9scygpKQogICAgICAgICBtZWRpYUNvbnRyb2xzKCktPmNs b3NlZENhcHRpb25UcmFja3NDaGFuZ2VkKCk7Ci0KLSNpZiBVU0UoUExBVEZPUk1fVEVYVF9UUkFD S19NRU5VKQotICAgIGlmIChtX3BsYXllciAmJiBtX3BsYXllci0+aW1wbGVtZW50c1RleHRUcmFj a0NvbnRyb2xzKCkpCi0gICAgICAgIHNjaGVkdWxlRGVsYXllZEFjdGlvbihUZXh0VHJhY2tDaGFu Z2VzTm90aWZpY2F0aW9uKTsKLSNlbmRpZgogfQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmFk ZEF1ZGlvVHJhY2soUGFzc1JlZlB0cjxBdWRpb1RyYWNrPiB0cmFjaykKQEAgLTQ5MjUsMTMgKzQ4 MzAsNiBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmNsZWFyTWVkaWFQbGF5ZXIoCiB7CiAgICAg TE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6Y2xlYXJNZWRpYVBsYXllciglcCkgLSBmbGFn cyA9ICV4IiwgdGhpcywgKHVuc2lnbmVkKWZsYWdzKTsKIAotI2lmIFVTRShQTEFURk9STV9URVhU X1RSQUNLX01FTlUpCi0gICAgaWYgKHBsYXRmb3JtVGV4dFRyYWNrTWVudSgpKSB7Ci0gICAgICAg IG1fcGxhdGZvcm1NZW51LT5zZXRDbGllbnQobnVsbHB0cik7Ci0gICAgICAgIG1fcGxhdGZvcm1N ZW51ID0gbnVsbHB0cjsKLSAgICB9Ci0jZW5kaWYKLQogI2lmIEVOQUJMRShWSURFT19UUkFDSykK ICAgICBmb3JnZXRSZXNvdXJjZVNwZWNpZmljVHJhY2tzKCk7CiAjZW5kaWYKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCShyZXZpc2lvbiAxODg1MjQpCisrKyBTb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTA2 LDkgKzEwNiw2IEBAIGNsYXNzIEhUTUxNZWRpYUVsZW1lbnQKICAgICAsIHByaXZhdGUgVGV4dFRy YWNrQ2xpZW50CiAgICAgLCBwcml2YXRlIFZpZGVvVHJhY2tDbGllbnQKICNlbmRpZgotI2lmIFVT RShQTEFURk9STV9URVhUX1RSQUNLX01FTlUpCi0gICAgLCBwdWJsaWMgUGxhdGZvcm1UZXh0VHJh Y2tNZW51Q2xpZW50Ci0jZW5kaWYKIHsKIHB1YmxpYzoKICAgICBNZWRpYVBsYXllciogcGxheWVy KCkgY29uc3QgeyByZXR1cm4gbV9wbGF5ZXIuZ2V0KCk7IH0KQEAgLTMwNCwxMiArMzAxLDYgQEAg cHVibGljOgogICAgIHZpcnR1YWwgVmVjdG9yPFJlZlB0cjxQbGF0Zm9ybVRleHRUcmFjaz4+IG91 dE9mQmFuZFRyYWNrU291cmNlcygpIG92ZXJyaWRlOwogI2VuZGlmCiAKLSNpZiBVU0UoUExBVEZP Uk1fVEVYVF9UUkFDS19NRU5VKQotICAgIHZpcnR1YWwgdm9pZCBzZXRTZWxlY3RlZFRleHRUcmFj ayhQYXNzUmVmUHRyPFBsYXRmb3JtVGV4dFRyYWNrPikgb3ZlcnJpZGU7Ci0gICAgdmlydHVhbCBW ZWN0b3I8UmVmUHRyPFBsYXRmb3JtVGV4dFRyYWNrPj4gcGxhdGZvcm1UZXh0VHJhY2tzKCkgb3Zl cnJpZGU7Ci0gICAgUGxhdGZvcm1UZXh0VHJhY2tNZW51SW50ZXJmYWNlKiBwbGF0Zm9ybVRleHRU cmFja01lbnUoKTsKLSNlbmRpZgotCiAgICAgc3RydWN0IFRyYWNrR3JvdXA7CiAgICAgdm9pZCBj b25maWd1cmVUZXh0VHJhY2tHcm91cEZvckxhbmd1YWdlKGNvbnN0IFRyYWNrR3JvdXAmKSBjb25z dDsKICAgICB2b2lkIGNvbmZpZ3VyZVRleHRUcmFja3MoKTsKQEAgLTk0MywxMCArOTM0LDYgQEAg cHJpdmF0ZToKICAgICBSZWZQdHI8TWVkaWFLZXlzPiBtX21lZGlhS2V5czsKICNlbmRpZgogCi0j aWYgVVNFKFBMQVRGT1JNX1RFWFRfVFJBQ0tfTUVOVSkKLSAgICBSZWZQdHI8UGxhdGZvcm1UZXh0 VHJhY2tNZW51SW50ZXJmYWNlPiBtX3BsYXRmb3JtTWVudTsKLSNlbmRpZgotCiAgICAgc3RkOjp1 bmlxdWVfcHRyPE1lZGlhRWxlbWVudFNlc3Npb24+IG1fbWVkaWFTZXNzaW9uOwogICAgIFBhZ2VB Y3Rpdml0eUFzc2VydGlvblRva2VuIG1fYWN0aXZpdHlUb2tlbjsKICAgICBzaXplX3QgbV9yZXBv cnRlZEV4dHJhTWVtb3J5Q29zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svSW5i YW5kVGV4dFRyYWNrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9J bmJhbmRUZXh0VHJhY2suaAkocmV2aXNpb24gMTg4NTI0KQorKysgU291cmNlL1dlYkNvcmUvaHRt bC90cmFjay9JbmJhbmRUZXh0VHJhY2suaAkod29ya2luZyBjb3B5KQpAQCAtODUsMTAgKzg1LDYg QEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgcGFyc2VXZWJWVFRDdWVEYXRhKEluYmFuZFRl eHRUcmFja1ByaXZhdGUqLCBjb25zdCBJU09XZWJWVFRDdWUmKSBvdmVycmlkZSB7IEFTU0VSVF9O T1RfUkVBQ0hFRCgpOyB9CiAKICAgICB2aXJ0dWFsIE1lZGlhVGltZSBzdGFydFRpbWVWYXJpYW5j ZSgpIGNvbnN0IG92ZXJyaWRlOwotCi0jaWYgVVNFKFBMQVRGT1JNX1RFWFRfVFJBQ0tfTUVOVSkK LSAgICB2aXJ0dWFsIEluYmFuZFRleHRUcmFja1ByaXZhdGUqIHByaXZhdGVUcmFjaygpIG92ZXJy aWRlIHsgcmV0dXJuIG1fcHJpdmF0ZS5nZXQoKTsgfQotI2VuZGlmCiB9OwogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFjay5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2suY3Bw CShyZXZpc2lvbiAxODg1MjQpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFj ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU0Miw0OCArNTQyLDYgQEAgYm9vbCBUZXh0VHJhY2s6 Omhhc0N1ZShUZXh0VHJhY2tDdWUqIGN1ZQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotI2lmIFVT RShQTEFURk9STV9URVhUX1RSQUNLX01FTlUpCi1QYXNzUmVmUHRyPFBsYXRmb3JtVGV4dFRyYWNr PiBUZXh0VHJhY2s6OnBsYXRmb3JtVGV4dFRyYWNrKCkKLXsKLSAgICBpZiAobV9wbGF0Zm9ybVRl eHRUcmFjaykKLSAgICAgICAgcmV0dXJuIG1fcGxhdGZvcm1UZXh0VHJhY2s7Ci0KLSAgICBQbGF0 Zm9ybVRleHRUcmFjazo6VHJhY2tLaW5kIHBsYXRmb3JtS2luZCA9IFBsYXRmb3JtVGV4dFRyYWNr OjpDYXB0aW9uOwotICAgIGlmIChraW5kKCkgPT0gc3VidGl0bGVzS2V5d29yZCgpKQotICAgICAg ICBwbGF0Zm9ybUtpbmQgPSBQbGF0Zm9ybVRleHRUcmFjazo6U3VidGl0bGU7Ci0gICAgZWxzZSBp ZiAoa2luZCgpID09IGNhcHRpb25zS2V5d29yZCgpKQotICAgICAgICBwbGF0Zm9ybUtpbmQgPSBQ bGF0Zm9ybVRleHRUcmFjazo6Q2FwdGlvbjsKLSAgICBlbHNlIGlmIChraW5kKCkgPT0gZGVzY3Jp cHRpb25zS2V5d29yZCgpKQotICAgICAgICBwbGF0Zm9ybUtpbmQgPSBQbGF0Zm9ybVRleHRUcmFj azo6RGVzY3JpcHRpb247Ci0gICAgZWxzZSBpZiAoa2luZCgpID09IGNoYXB0ZXJzS2V5d29yZCgp KQotICAgICAgICBwbGF0Zm9ybUtpbmQgPSBQbGF0Zm9ybVRleHRUcmFjazo6Q2hhcHRlcjsKLSAg ICBlbHNlIGlmIChraW5kKCkgPT0gbWV0YWRhdGFLZXl3b3JkKCkpCi0gICAgICAgIHBsYXRmb3Jt S2luZCA9IFBsYXRmb3JtVGV4dFRyYWNrOjpNZXRhRGF0YTsKLSAgICBlbHNlIGlmIChraW5kKCkg PT0gZm9yY2VkS2V5d29yZCgpKQotICAgICAgICBwbGF0Zm9ybUtpbmQgPSBQbGF0Zm9ybVRleHRU cmFjazo6Rm9yY2VkOwotCi0gICAgUGxhdGZvcm1UZXh0VHJhY2s6OlRyYWNrVHlwZSB0eXBlID0g UGxhdGZvcm1UZXh0VHJhY2s6Ok91dE9mQmFuZDsKLSAgICBpZiAobV90cmFja1R5cGUgPT0gVHJh Y2tFbGVtZW50KQotICAgICAgICB0eXBlID0gUGxhdGZvcm1UZXh0VHJhY2s6Ok91dE9mQmFuZDsK LSAgICBlbHNlIGlmIChtX3RyYWNrVHlwZSA9PSBBZGRUcmFjaykKLSAgICAgICAgdHlwZSA9IFBs YXRmb3JtVGV4dFRyYWNrOjpTY3JpcHQ7Ci0gICAgZWxzZSBpZiAobV90cmFja1R5cGUgPT0gSW5C YW5kKQotICAgICAgICB0eXBlID0gUGxhdGZvcm1UZXh0VHJhY2s6OkluQmFuZDsKLQotICAgIFBs YXRmb3JtVGV4dFRyYWNrOjpUcmFja01vZGUgcGxhdGZvcm1Nb2RlID0gUGxhdGZvcm1UZXh0VHJh Y2s6OkRpc2FibGVkOwotICAgIGlmIChUZXh0VHJhY2s6OmhpZGRlbktleXdvcmQoKSA9PSBtb2Rl KCkpCi0gICAgICAgIHBsYXRmb3JtTW9kZSA9IFBsYXRmb3JtVGV4dFRyYWNrOjpIaWRkZW47Ci0g ICAgZWxzZSBpZiAoVGV4dFRyYWNrOjpkaXNhYmxlZEtleXdvcmQoKSA9PSBtb2RlKCkpCi0gICAg ICAgIHBsYXRmb3JtTW9kZSA9IFBsYXRmb3JtVGV4dFRyYWNrOjpEaXNhYmxlZDsKLSAgICBlbHNl IGlmIChUZXh0VHJhY2s6OnNob3dpbmdLZXl3b3JkKCkgPT0gbW9kZSgpKQotICAgICAgICBwbGF0 Zm9ybU1vZGUgPSBQbGF0Zm9ybVRleHRUcmFjazo6U2hvd2luZzsKLQotICAgIG1fcGxhdGZvcm1U ZXh0VHJhY2sgPSBQbGF0Zm9ybVRleHRUcmFjazo6Y3JlYXRlKHRoaXMsIGxhYmVsKCksIGxhbmd1 YWdlKCksIHBsYXRmb3JtTW9kZSwgcGxhdGZvcm1LaW5kLCB0eXBlLCB1bmlxdWVJZCgpKTsKLQot ICAgIHJldHVybiBtX3BsYXRmb3JtVGV4dFRyYWNrOwotfQotI2VuZGlmCi0KIGJvb2wgVGV4dFRy YWNrOjppc01haW5Qcm9ncmFtQ29udGVudCgpIGNvbnN0CiB7CiAgICAgLy8gIk1haW4gcHJvZ3Jh bSIgY29udGVudCBpcyBpbnRyaW5zaWMgdG8gdGhlIHByZXNlbnRhdGlvbiBvZiB0aGUgbWVkaWEg ZmlsZSwgcmVnYXJkbGVzcyBvZiBsb2NhbGUuIENvbnRlbnQgc3VjaCBhcwpJbmRleDogU291cmNl L1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9odG1sL3RyYWNrL1RleHRUcmFjay5oCShyZXZpc2lvbiAxODg1MjQpCisrKyBTb3VyY2Uv V2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFjay5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiwxMCAr MzYsNiBAQAogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQv V1RGU3RyaW5nLmg+CiAKLSNpZiBVU0UoUExBVEZPUk1fVEVYVF9UUkFDS19NRU5VKQotI2luY2x1 ZGUgIlBsYXRmb3JtVGV4dFRyYWNrLmgiCi0jZW5kaWYKLQogbmFtZXNwYWNlIFdlYkNvcmUgewog CiBjbGFzcyBTY3JpcHRFeGVjdXRpb25Db250ZXh0OwpAQCAtNjEsMTEgKzU3LDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCB0ZXh0VHJhY2tSZW1vdmVDdWUoVGV4dFRyYWNrKiwgUGFzc1Jl ZlB0cjxUZXh0VHJhY2tDdWU+KSA9IDA7CiB9OwogCi1jbGFzcyBUZXh0VHJhY2sgOiBwdWJsaWMg VHJhY2tCYXNlLCBwdWJsaWMgRXZlbnRUYXJnZXRXaXRoSW5saW5lRGF0YQotI2lmIFVTRShQTEFU Rk9STV9URVhUX1RSQUNLX01FTlUpCi0gICAgLCBwdWJsaWMgUGxhdGZvcm1UZXh0VHJhY2tDbGll bnQKLSNlbmRpZgotICAgIHsKK2NsYXNzIFRleHRUcmFjayA6IHB1YmxpYyBUcmFja0Jhc2UsIHB1 YmxpYyBFdmVudFRhcmdldFdpdGhJbmxpbmVEYXRhIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUmVm PFRleHRUcmFjaz4gY3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIFRleHRU cmFja0NsaWVudCogY2xpZW50LCBjb25zdCBBdG9taWNTdHJpbmcmIGtpbmQsIGNvbnN0IEF0b21p Y1N0cmluZyYgaWQsIGNvbnN0IEF0b21pY1N0cmluZyYgbGFiZWwsIGNvbnN0IEF0b21pY1N0cmlu ZyYgbGFuZ3VhZ2UpCiAgICAgewpAQCAtMTQ2LDEwICsxMzgsNiBAQCBwdWJsaWM6CiAKICAgICB2 b2lkIHJlbW92ZUFsbEN1ZXMoKTsKIAotI2lmIFVTRShQTEFURk9STV9URVhUX1RSQUNLX01FTlUp Ci0gICAgUGFzc1JlZlB0cjxQbGF0Zm9ybVRleHRUcmFjaz4gcGxhdGZvcm1UZXh0VHJhY2soKTsK LSNlbmRpZgotCiAjaWYgRU5BQkxFKE1FRElBX1NPVVJDRSkKICAgICB2aXJ0dWFsIHZvaWQgc2V0 TGFuZ3VhZ2UoY29uc3QgQXRvbWljU3RyaW5nJikgb3ZlcnJpZGU7CiAjZW5kaWYKQEAgLTE3OSwx MiArMTY3LDYgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8VlRUUmVnaW9uTGlzdD4gbV9yZWdpb25z OwogI2VuZGlmCiAKLSNpZiBVU0UoUExBVEZPUk1fVEVYVF9UUkFDS19NRU5VKQotICAgIHZpcnR1 YWwgVGV4dFRyYWNrKiBwdWJsaWNUcmFjaygpIG92ZXJyaWRlIHsgcmV0dXJuIHRoaXM7IH0KLQot ICAgIFJlZlB0cjxQbGF0Zm9ybVRleHRUcmFjaz4gbV9wbGF0Zm9ybVRleHRUcmFjazsKLSNlbmRp ZgotCiAgICAgVGV4dFRyYWNrQ3VlTGlzdCogZW5zdXJlVGV4dFRyYWNrQ3VlTGlzdCgpOwogCiAg ICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogbV9zY3JpcHRFeGVjdXRpb25Db250ZXh0OwpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNw cAkocmV2aXNpb24gMTg4NTI0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv TWVkaWFQbGF5ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjYyLDE4ICsxMjYyLDYgQEAgVmVj dG9yPFJlZlB0cjxQbGF0Zm9ybVRleHRUcmFjaz4+IE1lZGlhUAogCiAjZW5kaWYgLy8gRU5BQkxF KFZJREVPX1RSQUNLKQogCi0jaWYgVVNFKFBMQVRGT1JNX1RFWFRfVFJBQ0tfTUVOVSkKLWJvb2wg TWVkaWFQbGF5ZXI6OmltcGxlbWVudHNUZXh0VHJhY2tDb250cm9scygpIGNvbnN0Ci17Ci0gICAg cmV0dXJuIG1fcHJpdmF0ZS0+aW1wbGVtZW50c1RleHRUcmFja0NvbnRyb2xzKCk7Ci19Ci0KLVBh c3NSZWZQdHI8UGxhdGZvcm1UZXh0VHJhY2tNZW51SW50ZXJmYWNlPiBNZWRpYVBsYXllcjo6dGV4 dFRyYWNrTWVudSgpCi17Ci0gICAgcmV0dXJuIG1fcHJpdmF0ZS0+dGV4dFRyYWNrTWVudSgpOwot fQotI2VuZGlmIC8vIFVTRShQTEFURk9STV9URVhUX1RSQUNLX01FTlUpCi0KIHZvaWQgTWVkaWFQ bGF5ZXI6OnJlc2V0TWVkaWFFbmdpbmVzKCkKIHsKICAgICBtdXRhYmxlSW5zdGFsbGVkTWVkaWFF bmdpbmVzVmVjdG9yKCkuY2xlYXIoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL01lZGlhUGxheWVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaAkocmV2aXNpb24gMTg4NTI0KQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaAkod29ya2luZyBjb3B5KQpAQCAt NTMsMTAgKzUzLDYgQEAKICNpbmNsdWRlICJQbGF0Zm9ybVRleHRUcmFjay5oIgogI2VuZGlmCiAK LSNpZiBVU0UoUExBVEZPUk1fVEVYVF9UUkFDS19NRU5VKQotI2luY2x1ZGUgIlBsYXRmb3JtVGV4 dFRyYWNrTWVudS5oIgotI2VuZGlmCi0KIE9CSkNfQ0xBU1MgQVZBc3NldDsKIE9CSkNfQ0xBU1Mg QVZQbGF5ZXI7CiBPQkpDX0NMQVNTIE5TQXJyYXk7CkBAIC01ODYsMTEgKzU4Miw2IEBAIHB1Ymxp YzoKIAogICAgIHN0YXRpYyB2b2lkIHJlc2V0TWVkaWFFbmdpbmVzKCk7CiAKLSNpZiBVU0UoUExB VEZPUk1fVEVYVF9UUkFDS19NRU5VKQotICAgIGJvb2wgaW1wbGVtZW50c1RleHRUcmFja0NvbnRy b2xzKCkgY29uc3Q7Ci0gICAgUGFzc1JlZlB0cjxQbGF0Zm9ybVRleHRUcmFja01lbnVJbnRlcmZh Y2U+IHRleHRUcmFja01lbnUoKTsKLSNlbmRpZgotCiAjaWYgVVNFKEdTVFJFQU1FUikKICAgICB2 b2lkIHNpbXVsYXRlQXVkaW9JbnRlcnJ1cHRpb24oKTsKICNlbmRpZgpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRlLmgJ KHJldmlzaW9uIDE4ODUyNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01l ZGlhUGxheWVyUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNDIsMTEgKzI0Miw2IEBAIHB1 YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgdHJhY2tzQ2hhbmdlZCgpIHsgfTsKICNlbmRpZgogCi0j aWYgVVNFKFBMQVRGT1JNX1RFWFRfVFJBQ0tfTUVOVSkKLSAgICB2aXJ0dWFsIGJvb2wgaW1wbGVt ZW50c1RleHRUcmFja0NvbnRyb2xzKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0 dWFsIFBhc3NSZWZQdHI8UGxhdGZvcm1UZXh0VHJhY2tNZW51SW50ZXJmYWNlPiB0ZXh0VHJhY2tN ZW51KCkgeyByZXR1cm4gMDsgfQotI2VuZGlmCi0KICNpZiBVU0UoR1NUUkVBTUVSKQogICAgIHZp cnR1YWwgdm9pZCBzaW11bGF0ZUF1ZGlvSW50ZXJydXB0aW9uKCkgeyB9CiAjZW5kaWYKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BsYXRmb3JtVGV4dFRyYWNrLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGxhdGZvcm1UZXh0 VHJhY2suaAkocmV2aXNpb24gMTg4NTI0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvUGxhdGZvcm1UZXh0VHJhY2suaAkod29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYsNyBA QAogI2lmbmRlZiBQbGF0Zm9ybVRleHRUcmFja19oCiAjZGVmaW5lIFBsYXRmb3JtVGV4dFRyYWNr X2gKIAotI2lmIFVTRShQTEFURk9STV9URVhUX1RSQUNLX01FTlUpIHx8IEVOQUJMRShBVkZfQ0FQ VElPTlMpCisjaWYgRU5BQkxFKEFWRl9DQVBUSU9OUykKIAogI2luY2x1ZGUgPHd0Zi9SZWZDb3Vu dGVkLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QbGF0Zm9ybVRleHRUcmFja01lbnUuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QbGF0Zm9ybVRleHRUcmFja01l bnUuaAkocmV2aXNpb24gMTg4NTI0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvUGxhdGZvcm1UZXh0VHJhY2tNZW51LmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNjAgKzAsMCBA QAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCi0gKgotICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0Ci0gKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKLSAqIGFyZSBtZXQ6Ci0gKiAxLiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgotICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAqICAg IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBk aXN0cmlidXRpb24uCi0gKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJ TkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJwotICogQU5EIEFOWSBFWFBSRVNTIE9S IElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCi0gKiBU SEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1Ig QSBQQVJUSUNVTEFSCi0gKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFM TCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKLSAqIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKLSAqIENP TlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NV UkVNRU5UIE9GCi0gKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwg REFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKLSAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCi0gKiBDT05U UkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1Ig T1RIRVJXSVNFKQotICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgotICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgotICovCi0KLSNpZm5kZWYgUGxhdGZvcm1UZXh0VHJhY2tNZW51X2gKLSNkZWZpbmUg UGxhdGZvcm1UZXh0VHJhY2tNZW51X2gKLQotI2lmIFVTRShQTEFURk9STV9URVhUX1RSQUNLX01F TlUpCi0KLSNpbmNsdWRlICJQbGF0Zm9ybVRleHRUcmFjay5oIgotI2luY2x1ZGUgPHd0Zi9Ob25j b3B5YWJsZS5oPgotI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+Ci0KLW5hbWVzcGFjZSBXZWJD b3JlIHsKLQotY2xhc3MgUGxhdGZvcm1UZXh0VHJhY2s7Ci0KLWNsYXNzIFBsYXRmb3JtVGV4dFRy YWNrTWVudUNsaWVudCB7Ci1wdWJsaWM6Ci0gICAgdmlydHVhbCB+UGxhdGZvcm1UZXh0VHJhY2tN ZW51Q2xpZW50KCkgeyB9Ci0gICAgCi0gICAgdmlydHVhbCB2b2lkIHNldFNlbGVjdGVkVGV4dFRy YWNrKFBhc3NSZWZQdHI8UGxhdGZvcm1UZXh0VHJhY2s+KSA9IDA7Ci0gICAgdmlydHVhbCBWZWN0 b3I8UmVmUHRyPFBsYXRmb3JtVGV4dFRyYWNrPj4gcGxhdGZvcm1UZXh0VHJhY2tzKCkgPSAwOwot fTsKLQotY2xhc3MgUGxhdGZvcm1UZXh0VHJhY2tNZW51SW50ZXJmYWNlICA6IHB1YmxpYyBSZWZD b3VudGVkPFBsYXRmb3JtVGV4dFRyYWNrTWVudUludGVyZmFjZT4gewotcHVibGljOgotICAgIGV4 cGxpY2l0IFBsYXRmb3JtVGV4dFRyYWNrTWVudUludGVyZmFjZSgpIHsgfQotICAgIHZpcnR1YWwg flBsYXRmb3JtVGV4dFRyYWNrTWVudUludGVyZmFjZSgpIHsgfQotCi0gICAgdmlydHVhbCB2b2lk IHRyYWNrc0RpZENoYW5nZSgpID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgdHJhY2tXYXNTZWxlY3Rl ZChQYXNzUmVmUHRyPFBsYXRmb3JtVGV4dFRyYWNrPikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBz ZXRDbGllbnQoUGxhdGZvcm1UZXh0VHJhY2tNZW51Q2xpZW50KikgPSAwOwotfTsKLQotfQotCi0j ZW5kaWYgLy8gVVNFKFBMQVRGT1JNX1RFWFRfVFJBQ0tfTUVOVSkKLSNlbmRpZiAvLyBQbGF0Zm9y bVRleHRUcmFja01lbnVfaAo=