204984 2019-12-07 06:29:27 -0800 [LFC][IFC] Move LineBox to Display namespace 2019-12-07 07:22:19 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham commit-queue simon.fraser webkit-bug-importer zalan oldest_to_newest 1596566 0 koivisto 2019-12-07 06:29:27 -0800 ...where it belongs. 1596567 1 385097 koivisto 2019-12-07 06:32:54 -0800 Created attachment 385097 patch 1596572 2 385097 commit-queue 2019-12-07 07:21:09 -0800 Comment on attachment 385097 patch Clearing flags on attachment: 385097 Committed r253254: <https://trac.webkit.org/changeset/253254> 1596573 3 commit-queue 2019-12-07 07:21:10 -0800 All reviewed patches have been landed. Closing bug. 1596574 4 webkit-bug-importer 2019-12-07 07:22:19 -0800 <rdar://problem/57727884> 385097 2019-12-07 06:32:54 -0800 2019-12-07 07:21:09 -0800 patch lfc-display-linebox.patch text/plain 21508 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2MTIzMzBiYmZkOC4uZGIxNmNmNmNhYWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNiBAQAorMjAxOS0xMi0wNyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+ CisKKyAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIExpbmVCb3ggdG8gRGlzcGxheSBuYW1lc3BhY2UK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDk4NAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IGlzIGEg ZGlzcGxheSB0eXBlLCBsaWtlIERpc3BsYXk6OlJ1bi4KKworICAgICAgICAqIFNvdXJjZXMudHh0 OgorICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAg KiBsYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUlubGluZUNvbnRlbnQuY3BwOiBBZGRlZC4KKwor ICAgICAgICBBbHNvIGFkZGVkIGEgY3BwIGZvciBEaXNwbGF5OjpJbmxpbmVDb250ZW50LgorCisg ICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjogY29uc3QpOgorICAgICAgICAqIGxheW91dC9kaXNw bGF5dHJlZS9EaXNwbGF5SW5saW5lQ29udGVudC5oOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxh eTo6SW5saW5lQ29udGVudDo6bGluZUJveEZvclJ1biBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpEaXNwbGF5OjogY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9kaXNwbGF5dHJl ZS9EaXNwbGF5TGluZUJveC5oOiBSZW5hbWVkIGZyb20gU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oLgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxh eTo6TGluZUJveDo6TGluZUJveCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6c2V0RGlzcGxheUJveGVzRm9yTGluZSk6CisgICAgICAg ICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3Mu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 UXVpcmtzOjpsaW5lSGVpZ2h0Q29uc3RyYWludHMgY29uc3QpOgorICAgICAgICAqIGxheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5oOgorICAgICAgICAqIGxheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmluaXRpYWxpemUpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpMaW5lQnVpbGRlcjo6aGFsZkxlYWRpbmdNZXRyaWNzKToKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6bGluZUJveCBjb25zdCk6CisgICAgICAgICogbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuaDoKKwogMjAxOS0xMi0wNyAgWmFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gRml4IGNz czEvZm9ybWF0dGluZ19tb2RlbC9mbG9hdGluZ19lbGVtZW50cy5odG1sCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Tb3VyY2VzLnR4dCBiL1NvdXJjZS9XZWJDb3JlL1NvdXJjZXMudHh0Cmlu ZGV4IDI0NmM3YWQ1YTE3Li5iY2E3M2NmOWU3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv U291cmNlcy50eHQKKysrIGIvU291cmNlL1dlYkNvcmUvU291cmNlcy50eHQKQEAgLTE0MzIsNiAr MTQzMiw3IEBAIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dFF1 aXJrcy5jcHAKIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nU3RhdGUuY3Bw CiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCiBsYXlvdXQv ZGlzcGxheXRyZWUvRGlzcGxheUJveC5jcHAKK2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5SW5s aW5lQ29udGVudC5jcHAKIGxheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5UGFpbnRlci5jcHAKIGxh eW91dC9mbG9hdHMvRmxvYXRBdm9pZGVyLmNwcAogbGF5b3V0L2Zsb2F0cy9GbG9hdEJveC5jcHAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpp bmRleCBkYjJmYzNjYzk5MC4uZmJhMGJiOWM0NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTIwNDksNyArMjA0OSw3IEBACiAJ CTZGOTk1QTNBMUE3MDgzMzcwMEE3MzVGNCAvKiBKU1dlYkdMVmVydGV4QXJyYXlPYmplY3QuaCBp biBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDZGOTk1QTMwMUE3 MDgzMzcwMEE3MzVGNCAvKiBKU1dlYkdMVmVydGV4QXJyYXlPYmplY3QuaCAqLzsgfTsKIAkJNkZB NDQ1NEU4OThGMkZDMTY4QkMzOEMxIC8qIEpTQmVmb3JlVW5sb2FkRXZlbnQuaCBpbiBIZWFkZXJz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI5RTA0QTI3QkVEMkY4MUY5OEU5 MDIyQiAvKiBKU0JlZm9yZVVubG9hZEV2ZW50LmggKi87IH07CiAJCTZGQjExQjVDMjE3ODNGRDAw MEUyQTU3NCAvKiBUZXh0VXRpbC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gNkZCMTFCNTkyMTc4M0ZDRjAwRTJBNTc0IC8qIFRleHRVdGlsLmggKi87IHNl dHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKLQkJNkZCNDdFNjMyMjc3 NDI1QTAwQzdCQ0IwIC8qIElubGluZUxpbmVCb3guaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDZGQjQ3RTYxMjI3NzQyNUEwMEM3QkNCMCAvKiBJbmxpbmVM aW5lQm94LmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsK KwkJNkZCNDdFNjMyMjc3NDI1QTAwQzdCQ0IwIC8qIERpc3BsYXlMaW5lQm94LmggaW4gSGVhZGVy cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA2RkI0N0U2MTIyNzc0MjVBMDBD N0JDQjAgLyogRGlzcGxheUxpbmVCb3guaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQ cml2YXRlLCApOyB9OyB9OwogCQk2RkI1RTIxNDIyMUYyNDUzMDAzOTg5Q0YgLyogQ29udGVudENo YW5nZU9ic2VydmVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSA2RkI1RTIxMjIyMUYyNDQ3MDAzOTg5Q0YgLyogQ29udGVudENoYW5nZU9ic2VydmVyLmgg Ki87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJNkZDRTFB MUEyMjYxOEFCRDAwNEYwMzQzIC8qIERpc3BsYXlSdW4uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDZGQ0UxQTE4MjI2MThBQjMwMDRGMDM0MyAvKiBEaXNw bGF5UnVuLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsK IAkJNkZEOUNENTQyMjdFMjFDODAwRTUzOTU3IC8qIERpc3BsYXlSZWN0LmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA2RkQ5Q0Q1MjIyN0UyMUM4MDBFNTM5 NTcgLyogRGlzcGxheVJlY3QuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRl LCApOyB9OyB9OwpAQCAtOTMzMyw3ICs5MzMzLDcgQEAKIAkJNkZCMTFCNTkyMTc4M0ZDRjAwRTJB NTc0IC8qIFRleHRVdGlsLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFRleHRV dGlsLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTZGQjExQjVCMjE3ODNGQ0YwMEUy QTU3NCAvKiBUZXh0VXRpbC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGgg PSBUZXh0VXRpbC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTZGQjIyRTMwMjMw MDk3RTMwMEMyMDg2NiAvKiBUYWJsZUdyaWQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gVGFibGVHcmlkLmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCTZGQjQ3RTYxMjI3NzQyNUEwMEM3QkNCMCAv KiBJbmxpbmVMaW5lQm94LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IElubGlu ZUxpbmVCb3guaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNkZCNDdFNjEyMjc3NDI1 QTAwQzdCQ0IwIC8qIERpc3BsYXlMaW5lQm94LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg cGF0aCA9IERpc3BsYXlMaW5lQm94Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTZG QjVFMjEyMjIxRjI0NDcwMDM5ODlDRiAvKiBDb250ZW50Q2hhbmdlT2JzZXJ2ZXIuaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gQ29udGVudENoYW5nZU9ic2VydmVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTZGQkI4NjA1MjBCNDY0QjYwMERBRDkzOCAvKiBGb3JtYXR0aW5nQ29udGV4dEdlb21l dHJ5LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3Bw OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk2RkM1Q0E5MjIyRTM1OTkzMDBCMTNFMTEg LyogVGFibGVGb3JtYXR0aW5nU3RhdGUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gVGFibGVGb3Jt YXR0aW5nU3RhdGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtMTUzMjQsNiAr MTUzMjQsNyBAQAogCQlFNEU5QjExQzE4MTQ1NjlDMDAzQUNDREYgLyogU2ltcGxlTGluZUxheW91 dEZ1bmN0aW9ucy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBTaW1wbGVMaW5l TGF5b3V0RnVuY3Rpb25zLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUU0RjlFRUYw MTU2RDg0QzQwMEQyM0U3RSAvKiBTdHlsZVNoZWV0Q29udGVudHMuY3BwICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gU3R5bGVTaGVldENvbnRlbnRzLmNwcDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRTRGOUVFRjExNTZEODRDNDAwRDIzRTdFIC8qIFN0eWxlU2hl ZXRDb250ZW50cy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBTdHlsZVNoZWV0 Q29udGVudHMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJRTRGQjRCMzUyMzlCRUIx MDAwM0MzMzZBIC8qIERpc3BsYXlJbmxpbmVDb250ZW50LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9 IERpc3BsYXlJbmxpbmVDb250ZW50LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ RTUxNjY5OEYyMEZGOTkxNjAwOUQyQzI3IC8qIExpc3RCdXR0b25BcnJvd0AyeC5wbmcgKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBpbWFnZS5wbmc7IHBh dGggPSAiTGlzdEJ1dHRvbkFycm93QDJ4LnBuZyI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCUU1MTc2NzAyMjBCODhDMTQwMEQ0MTE2NyAvKiBEYXRhTGlzdFN1Z2dlc3Rpb25JbmZvcm1h dGlvbi5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jLmg7IHBhdGggPSBEYXRhTGlzdFN1Z2dlc3Rpb25JbmZvcm1hdGlvbi5oOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlFNTFBODFERTE3Mjk4RDc3MDBCRkNBNjEgLyog SlNQZXJmb3JtYW5jZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBK U1BlcmZvcm1hbmNlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTE2NzI0LDcg KzE2NzI1LDYgQEAKIAkJCQkxMTVDRkE3QzIwOEI4RTEwMDAxRTY5OTEgLyogSW5saW5lRm9ybWF0 dGluZ1N0YXRlLmggKi8sCiAJCQkJNkY3QjhDRUMyMzYyNkU2NjAwQzlGRjE1IC8qIElubGluZUl0 ZW0uY3BwICovLAogCQkJCTZGRTdDRkEwMjE3N0VFRjEwMDVCMTU3MyAvKiBJbmxpbmVJdGVtLmgg Ki8sCi0JCQkJNkZCNDdFNjEyMjc3NDI1QTAwQzdCQ0IwIC8qIElubGluZUxpbmVCb3guaCAqLywK IAkJCQk2RkUxOTgxMzIxNzgzOTdCMDA0NDZGMDggLyogSW5saW5lTGluZUJyZWFrZXIuY3BwICov LAogCQkJCTZGRTE5ODE1MjE3ODM5N0MwMDQ0NkYwOCAvKiBJbmxpbmVMaW5lQnJlYWtlci5oICov LAogCQkJCTZGMENENjkyMjI5RUQzMTkwMEM1OTk0RSAvKiBJbmxpbmVMaW5lQnVpbGRlci5jcHAg Ki8sCkBAIC0xNjc0Myw3ICsxNjc0Myw5IEBACiAJCQljaGlsZHJlbiA9ICgKIAkJCQkxMTk5RkE1 QTIwOEUzQzdGMDAyMzU4Q0MgLyogRGlzcGxheUJveC5jcHAgKi8sCiAJCQkJMTE5OUZBNTkyMDhF M0M3RjAwMjM1OENDIC8qIERpc3BsYXlCb3guaCAqLywKKwkJCQlFNEZCNEIzNTIzOUJFQjEwMDAz QzMzNkEgLyogRGlzcGxheUlubGluZUNvbnRlbnQuY3BwICovLAogCQkJCUU0NTFDNjMzMjM5NDA1 OEUwMDk5MzE5MCAvKiBEaXNwbGF5SW5saW5lQ29udGVudC5oICovLAorCQkJCTZGQjQ3RTYxMjI3 NzQyNUEwMEM3QkNCMCAvKiBEaXNwbGF5TGluZUJveC5oICovLAogCQkJCTZGNzc4Njg1MjM0OTFB QzYwMDREOTYzNiAvKiBEaXNwbGF5UGFpbnRlci5jcHAgKi8sCiAJCQkJNkY3Nzg2ODcyMzQ5MUFE NzAwNEQ5NjM2IC8qIERpc3BsYXlQYWludGVyLmggKi8sCiAJCQkJNkZEOUNENTIyMjdFMjFDODAw RTUzOTU3IC8qIERpc3BsYXlSZWN0LmggKi8sCkBAIC0zMDI2MCw3ICszMDI2Miw3IEBACiAJCQkJ MTE1Q0ZBN0UyMDhCOEUxMDAwMUU2OTkxIC8qIElubGluZUZvcm1hdHRpbmdTdGF0ZS5oIGluIEhl YWRlcnMgKi8sCiAJCQkJNkZFN0NGQTIyMTc3RUVGMjAwNUIxNTczIC8qIElubGluZUl0ZW0uaCBp biBIZWFkZXJzICovLAogCQkJCUJDRTc4OTE2MTEyMEQ2MDgwMDYwRUNFNSAvKiBJbmxpbmVJdGVy YXRvci5oIGluIEhlYWRlcnMgKi8sCi0JCQkJNkZCNDdFNjMyMjc3NDI1QTAwQzdCQ0IwIC8qIElu bGluZUxpbmVCb3guaCBpbiBIZWFkZXJzICovLAorCQkJCTZGQjQ3RTYzMjI3NzQyNUEwMEM3QkNC MCAvKiBEaXNwbGF5TGluZUJveC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJNkZFMTk4MTcyMTc4Mzk3 QzAwNDQ2RjA4IC8qIElubGluZUxpbmVCcmVha2VyLmggaW4gSGVhZGVycyAqLywKIAkJCQk2RjBD RDY5NTIyOUVEMzI3MDBDNTk5NEUgLyogSW5saW5lTGluZUJ1aWxkZXIuaCBpbiBIZWFkZXJzICov LAogCQkJCTZGMzYwRTUwMjM5OTk0MjEwMDE1MTJBNyAvKiBJbmxpbmVTb2Z0TGluZUJyZWFrSXRl bS5oIGluIEhlYWRlcnMgKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlz cGxheXRyZWUvRGlzcGxheUlubGluZUNvbnRlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Rpc3BsYXl0cmVlL0Rpc3BsYXlJbmxpbmVDb250ZW50LmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMC4uZDVhOTkxOTM4NjMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUlubGluZUNvbnRlbnQuY3BwCkBA IC0wLDAgKzEsNjMgQEAKKy8qCisqIENvcHlyaWdodCAoQykgMjAxOSBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisqCisqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyogYXJlIG1ldDoK KyogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92 ZSBjb3B5cmlnaHQKKyogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyLgorKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZv cm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorKiAgICBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisq ICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRo ZSBkaXN0cmlidXRpb24uCisqCisqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUg SU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyogQU5EIEFOWSBFWFBSRVNTIE9S IElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisqIFRI RSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBB IFBBUlRJQ1VMQVIKKyogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwg QVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVD VCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyogQ09OU0VR VUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1F TlQgT0YKKyogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEs IE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQg QU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisqIENPTlRSQUNULCBT VFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJ U0UpCisqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YKKyogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgor Ki8KKworI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQorCisjaW5jbHVkZSAi Y29uZmlnLmgiCisjaW5jbHVkZSAiRGlzcGxheUlubGluZUNvbnRlbnQuaCIKKworbmFtZXNwYWNl IFdlYkNvcmUgeworbmFtZXNwYWNlIERpc3BsYXkgeworCitXVEY6Okl0ZXJhdG9yUmFuZ2U8Y29u c3QgUnVuKj4gSW5saW5lQ29udGVudDo6cnVuc0ZvclJlY3QoY29uc3QgTGF5b3V0UmVjdCYgcmVj dCkgY29uc3QKK3sKKyAgICAvLyBGSVhNRTogRG8gc29tZXRoaW5nIGVmZmljaWVudC4KKyAgICBj b25zdCBSdW4qIGZpcnN0ID0gbnVsbHB0cjsKKyAgICBmb3IgKGF1dG8mIHJ1biA6IHJ1bnMpIHsK KyAgICAgICAgTGF5b3V0UmVjdCBydW5SZWN0ID0gcnVuLmxvZ2ljYWxSZWN0KCk7CisgICAgICAg IGlmIChydW5SZWN0LmludGVyc2VjdHMocmVjdCkpIHsKKyAgICAgICAgICAgIGZpcnN0ID0gJnJ1 bjsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfQorICAgIGlmICghZmlyc3Qp CisgICAgICAgIHJldHVybiB7IG51bGxwdHIsIG51bGxwdHIgfTsKKworICAgIGNvbnN0IFJ1biog bGFzdCA9IG51bGxwdHI7CisgICAgZm9yIChhdXRvJiBydW4gOiBXVEY6Om1ha2VSZXZlcnNlZFJh bmdlKHJ1bnMpKSB7CisgICAgICAgIExheW91dFJlY3QgcnVuUmVjdCA9IHJ1bi5sb2dpY2FsUmVj dCgpOworICAgICAgICBpZiAocnVuUmVjdC5pbnRlcnNlY3RzKHJlY3QpKSB7CisgICAgICAgICAg ICBsYXN0ID0gJnJ1bjsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfQorCisg ICAgcmV0dXJuIHsgZmlyc3QsIGxhc3QgKyAxIH07Cit9CisKK30KK30KKworI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUlubGluZUNv bnRlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5SW5saW5l Q29udGVudC5oCmluZGV4IDVjMGM4YzFkZTNmLi41ZWM4ZGYwNTQ3YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlJbmxpbmVDb250ZW50LmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlJbmxpbmVDb250ZW50 LmgKQEAgLTI3LDggKzI3LDggQEAKIAogI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05U RVhUKQogCisjaW5jbHVkZSAiRGlzcGxheUxpbmVCb3guaCIKICNpbmNsdWRlICJEaXNwbGF5UnVu LmgiCi0jaW5jbHVkZSAiSW5saW5lTGluZUJveC5oIgogI2luY2x1ZGUgPHd0Zi9JdGVyYXRvclJh bmdlLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCkBAIC0zNyw0MSArMzcsMTUgQEAgbmFt ZXNwYWNlIERpc3BsYXkgewogCiBzdHJ1Y3QgSW5saW5lQ29udGVudCA6IHB1YmxpYyBSZWZDb3Vu dGVkPElubGluZUNvbnRlbnQ+IHsKICAgICB1c2luZyBSdW5zID0gVmVjdG9yPFJ1biwgMTA+Owot ICAgIHVzaW5nIExpbmVCb3hlcyA9IFZlY3RvcjxMYXlvdXQ6OkxpbmVCb3gsIDU+OworICAgIHVz aW5nIExpbmVCb3hlcyA9IFZlY3RvcjxMaW5lQm94LCA1PjsKIAogICAgIFJ1bnMgcnVuczsKICAg ICBMaW5lQm94ZXMgbGluZUJveGVzOwogCi0gICAgY29uc3QgTGF5b3V0OjpMaW5lQm94JiBsaW5l Qm94Rm9yUnVuKGNvbnN0IFJ1biYgcnVuKSBjb25zdCB7IHJldHVybiBsaW5lQm94ZXNbcnVuLmxp bmVJbmRleCgpXTsgfQorICAgIGNvbnN0IExpbmVCb3gmIGxpbmVCb3hGb3JSdW4oY29uc3QgUnVu JiBydW4pIGNvbnN0IHsgcmV0dXJuIGxpbmVCb3hlc1tydW4ubGluZUluZGV4KCldOyB9CiAgICAg V1RGOjpJdGVyYXRvclJhbmdlPGNvbnN0IFJ1bio+IHJ1bnNGb3JSZWN0KGNvbnN0IExheW91dFJl Y3QmKSBjb25zdDsKIH07CiAKLWlubGluZSBXVEY6Okl0ZXJhdG9yUmFuZ2U8Y29uc3QgUnVuKj4g SW5saW5lQ29udGVudDo6cnVuc0ZvclJlY3QoY29uc3QgTGF5b3V0UmVjdCYgcmVjdCkgY29uc3QK LXsKLSAgICAvLyBGSVhNRTogRG8gc29tZXRoaW5nIGVmZmljaWVudC4KLSAgICBjb25zdCBSdW4q IGZpcnN0ID0gbnVsbHB0cjsKLSAgICBmb3IgKGF1dG8mIHJ1biA6IHJ1bnMpIHsKLSAgICAgICAg TGF5b3V0UmVjdCBydW5SZWN0ID0gcnVuLmxvZ2ljYWxSZWN0KCk7Ci0gICAgICAgIGlmIChydW5S ZWN0LmludGVyc2VjdHMocmVjdCkpIHsKLSAgICAgICAgICAgIGZpcnN0ID0gJnJ1bjsKLSAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgfQotICAgIGlmICghZmlyc3QpCi0gICAgICAg IHJldHVybiB7IG51bGxwdHIsIG51bGxwdHIgfTsKLQotICAgIGNvbnN0IFJ1biogbGFzdCA9IG51 bGxwdHI7Ci0gICAgZm9yIChhdXRvJiBydW4gOiBXVEY6Om1ha2VSZXZlcnNlZFJhbmdlKHJ1bnMp KSB7Ci0gICAgICAgIExheW91dFJlY3QgcnVuUmVjdCA9IHJ1bi5sb2dpY2FsUmVjdCgpOwotICAg ICAgICBpZiAocnVuUmVjdC5pbnRlcnNlY3RzKHJlY3QpKSB7Ci0gICAgICAgICAgICBsYXN0ID0g JnJ1bjsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgfQotCi0gICAgcmV0dXJu IHsgZmlyc3QsIGxhc3QgKyAxIH07Ci19Ci0KIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlMaW5lQm94LmgKc2ltaWxhcml0eSBpbmRl eCA5NyUKcmVuYW1lIGZyb20gU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJveC5oCnJlbmFtZSB0byBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRy ZWUvRGlzcGxheUxpbmVCb3guaAppbmRleCAzM2M0NWNlYmFhYy4uMzkwOTYxMGU5Y2IgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC b3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUxpbmVC b3guaApAQCAtMzAsNyArMzAsNyBAQAogI2luY2x1ZGUgIkRpc3BsYXlCb3guaCIKIAogbmFtZXNw YWNlIFdlYkNvcmUgewotbmFtZXNwYWNlIExheW91dCB7CituYW1lc3BhY2UgRGlzcGxheSB7CiAK IGNsYXNzIExpbmVCb3ggewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwpAQCAtNTcsNyAr NTcsNyBAQCBwdWJsaWM6CiAgICAgICAgIExheW91dFVuaXQgbV9kZXNjZW50OwogICAgIH07CiAK LSAgICBMaW5lQm94KERpc3BsYXk6OlJlY3QsIGNvbnN0IEJhc2VsaW5lJiwgTGF5b3V0VW5pdCBi YXNlbGluZU9mZnNldCk7CisgICAgTGluZUJveChSZWN0LCBjb25zdCBCYXNlbGluZSYsIExheW91 dFVuaXQgYmFzZWxpbmVPZmZzZXQpOwogICAgIExpbmVCb3goKSA9IGRlZmF1bHQ7CiAgICAgCiAg ICAgTGF5b3V0UG9pbnQgbG9naWNhbFRvcExlZnQoKSBjb25zdCB7IHJldHVybiBtX3JlY3QudG9w TGVmdCgpOyB9CkBAIC0xMjMsMTMgKzEyMywxMyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9oYXNW YWxpZEJhc2VsaW5lIHsgZmFsc2UgfTsKICAgICBib29sIG1faGFzVmFsaWRCYXNlbGluZU9mZnNl dCB7IGZhbHNlIH07CiAjZW5kaWYKLSAgICBEaXNwbGF5OjpSZWN0IG1fcmVjdDsKKyAgICBSZWN0 IG1fcmVjdDsKICAgICBCYXNlbGluZSBtX2Jhc2VsaW5lOwogICAgIExheW91dFVuaXQgbV9iYXNl bGluZU9mZnNldDsKICAgICBib29sIG1faXNDb25zaWRlcmVkRW1wdHkgeyB0cnVlIH07CiB9Owog Ci1pbmxpbmUgTGluZUJveDo6TGluZUJveChEaXNwbGF5OjpSZWN0IHJlY3QsIGNvbnN0IEJhc2Vs aW5lJiBiYXNlbGluZSwgTGF5b3V0VW5pdCBiYXNlbGluZU9mZnNldCkKK2lubGluZSBMaW5lQm94 OjpMaW5lQm94KFJlY3QgcmVjdCwgY29uc3QgQmFzZWxpbmUmIGJhc2VsaW5lLCBMYXlvdXRVbml0 IGJhc2VsaW5lT2Zmc2V0KQogICAgIDogbV9yZWN0KHJlY3QpCiAgICAgLCBtX2Jhc2VsaW5lKGJh c2VsaW5lKQogICAgICwgbV9iYXNlbGluZU9mZnNldChiYXNlbGluZU9mZnNldCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRp bmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBkZDg0YTAxODZjYy4uOTFhMGQyYjBlYzUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTQyOCw3ICs0MjgsNyBA QCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpzZXREaXNwbGF5Qm94ZXNGb3JMaW5lKGNv bnN0IExpbmVMYXlvdXRDb250ZXh0OjpMaQogCiAgICAgYXV0byYgaW5saW5lQ29udGVudCA9IGZv cm1hdHRpbmdTdGF0ZS5lbnN1cmVEaXNwbGF5SW5saW5lQ29udGVudCgpOwogICAgIGF1dG8gbGlu ZUluZGV4ID0gaW5saW5lQ29udGVudC5saW5lQm94ZXMuc2l6ZSgpOwotICAgIGlubGluZUNvbnRl bnQubGluZUJveGVzLmFwcGVuZChMaW5lQm94IHsgbGluZUNvbnRlbnQubGluZUJveCB9KTsKKyAg ICBpbmxpbmVDb250ZW50LmxpbmVCb3hlcy5hcHBlbmQoRGlzcGxheTo6TGluZUJveCB7IGxpbmVD b250ZW50LmxpbmVCb3ggfSk7CiAgICAgT3B0aW9uYWw8dW5zaWduZWQ+IGxhc3RUZXh0SXRlbUlu ZGV4OwogICAgIC8vIENvbXB1dGUgYm94IGZpbmFsIGdlb21ldHJ5LgogICAgIGF1dG8mIGxpbmVS dW5zID0gbGluZUNvbnRlbnQucnVuTGlzdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0UXVpcmtzLmNwcAppbmRleCA4MTk2NDE3ZjQyNi4uYWIxY2U0YTY1NTEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRp bmdDb250ZXh0UXVpcmtzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKQEAgLTg2LDEyICs4Niwx MiBAQCBMaW5lQnVpbGRlcjo6Q29uc3RyYWludHM6OkhlaWdodEFuZEJhc2VsaW5lIElubGluZUZv cm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmxpbgogICAgIGF1dG8gbGluZUhlaWdodCA9IGZvcm1h dHRpbmdSb290LnN0eWxlKCkubGluZUhlaWdodCgpOwogICAgIGlmIChsaW5lSGVpZ2h0LmlzUGVy Y2VudE9yQ2FsY3VsYXRlZCgpKSB7CiAgICAgICAgIGF1dG8gaW5pdGlhbEJhc2VsaW5lT2Zmc2V0 ID0gTGluZUJ1aWxkZXI6OmhhbGZMZWFkaW5nTWV0cmljcyhmb3JtYXR0aW5nUm9vdC5zdHlsZSgp LmZvbnRNZXRyaWNzKCksIDBfbHUpLmFzY2VudCgpOwotICAgICAgICByZXR1cm4geyBpbml0aWFs QmFzZWxpbmVPZmZzZXQsIGluaXRpYWxCYXNlbGluZU9mZnNldCwgTGluZUJveDo6QmFzZWxpbmUg eyBzdHJ1dEJhc2VsaW5lT2Zmc2V0LCBzdHJ1dEhlaWdodCAtIHN0cnV0QmFzZWxpbmVPZmZzZXQg fSB9OworICAgICAgICByZXR1cm4geyBpbml0aWFsQmFzZWxpbmVPZmZzZXQsIGluaXRpYWxCYXNl bGluZU9mZnNldCwgRGlzcGxheTo6TGluZUJveDo6QmFzZWxpbmUgeyBzdHJ1dEJhc2VsaW5lT2Zm c2V0LCBzdHJ1dEhlaWdodCAtIHN0cnV0QmFzZWxpbmVPZmZzZXQgfSB9OwogICAgIH0KICAgICAv LyBGSVhNRTogVGhlIG9ubHkgcmVhc29uIHdoeSB3ZSB1c2UgaW50VmFsdWUoKSBoZXJlIGlzIHRv IG1hdGNoIGN1cnJlbnQgaW5saW5lIHRyZWUgKGludGVncmFsKWJlaGF2aW9yLgogICAgIGF1dG8g aW5pdGlhbExpbmVIZWlnaHQgPSBMYXlvdXRVbml0IHsgbGluZUhlaWdodC5pbnRWYWx1ZSgpIH07 CiAgICAgYXV0byBpbml0aWFsQmFzZWxpbmVPZmZzZXQgPSBMaW5lQnVpbGRlcjo6aGFsZkxlYWRp bmdNZXRyaWNzKGZvcm1hdHRpbmdSb290LnN0eWxlKCkuZm9udE1ldHJpY3MoKSwgaW5pdGlhbExp bmVIZWlnaHQpLmFzY2VudCgpOwotICAgIHJldHVybiB7IGluaXRpYWxMaW5lSGVpZ2h0LCBpbml0 aWFsQmFzZWxpbmVPZmZzZXQsIExpbmVCb3g6OkJhc2VsaW5lIHsgc3RydXRCYXNlbGluZU9mZnNl dCwgc3RydXRIZWlnaHQgLSBzdHJ1dEJhc2VsaW5lT2Zmc2V0IH0gfTsKKyAgICByZXR1cm4geyBp bml0aWFsTGluZUhlaWdodCwgaW5pdGlhbEJhc2VsaW5lT2Zmc2V0LCBEaXNwbGF5OjpMaW5lQm94 OjpCYXNlbGluZSB7IHN0cnV0QmFzZWxpbmVPZmZzZXQsIHN0cnV0SGVpZ2h0IC0gc3RydXRCYXNl bGluZU9mZnNldCB9IH07CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5oIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmgKaW5kZXgg NzcxMGM3YzI4NjUuLmYzNTE2NTRkNTBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuaApA QCAtMjgsMTAgKzI4LDggQEAKICNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkK IAogI2luY2x1ZGUgIkRpc3BsYXlJbmxpbmVDb250ZW50LmgiCi0jaW5jbHVkZSAiRGlzcGxheVJ1 bi5oIgogI2luY2x1ZGUgIkZvcm1hdHRpbmdTdGF0ZS5oIgogI2luY2x1ZGUgIklubGluZUl0ZW0u aCIKLSNpbmNsdWRlICJJbmxpbmVMaW5lQm94LmgiCiAjaW5jbHVkZSA8d3RmL0lzb01hbGxvYy5o PgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggMmZl ODZiZGFmMDEuLjc0MzA4ZmM3ZWYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0xNzgs OCArMTc4LDggQEAgdm9pZCBMaW5lQnVpbGRlcjo6aW5pdGlhbGl6ZShjb25zdCBDb25zdHJhaW50 cyYgY29uc3RyYWludHMpCiAgICAgICAgIG1faW5pdGlhbFN0cnV0ID0geyB9OwogCiAgICAgYXV0 byBsaW5lUmVjdCA9IERpc3BsYXk6OlJlY3QgeyBjb25zdHJhaW50cy5sb2dpY2FsVG9wTGVmdCwg MF9sdSwgaW5pdGlhbExpbmVIZWlnaHQgfTsKLSAgICBhdXRvIGJhc2VsaW5lID0gTGluZUJveDo6 QmFzZWxpbmUgeyBpbml0aWFsQmFzZWxpbmVPZmZzZXQsIGluaXRpYWxMaW5lSGVpZ2h0IC0gaW5p dGlhbEJhc2VsaW5lT2Zmc2V0IH07Ci0gICAgbV9saW5lQm94ID0gTGluZUJveCB7IGxpbmVSZWN0 LCBiYXNlbGluZSwgaW5pdGlhbEJhc2VsaW5lT2Zmc2V0IH07CisgICAgYXV0byBiYXNlbGluZSA9 IERpc3BsYXk6OkxpbmVCb3g6OkJhc2VsaW5lIHsgaW5pdGlhbEJhc2VsaW5lT2Zmc2V0LCBpbml0 aWFsTGluZUhlaWdodCAtIGluaXRpYWxCYXNlbGluZU9mZnNldCB9OworICAgIG1fbGluZUJveCA9 IERpc3BsYXk6OkxpbmVCb3ggeyBsaW5lUmVjdCwgYmFzZWxpbmUsIGluaXRpYWxCYXNlbGluZU9m ZnNldCB9OwogICAgIG1fbGluZUxvZ2ljYWxXaWR0aCA9IGNvbnN0cmFpbnRzLmF2YWlsYWJsZUxv Z2ljYWxXaWR0aDsKICAgICBtX2hhc0ludHJ1c2l2ZUZsb2F0ID0gY29uc3RyYWludHMubGluZUlz Q29uc3RyYWluZWRCeUZsb2F0OwogCkBAIC02NzcsNyArNjc3LDcgQEAgYm9vbCBMaW5lQnVpbGRl cjo6aXNWaXN1YWxseU5vbkVtcHR5KGNvbnN0IElubGluZUl0ZW1SdW4mIHJ1bikgY29uc3QKICAg ICByZXR1cm4gZmFsc2U7CiB9CiAKLUxpbmVCb3g6OkJhc2VsaW5lIExpbmVCdWlsZGVyOjpoYWxm TGVhZGluZ01ldHJpY3MoY29uc3QgRm9udE1ldHJpY3MmIGZvbnRNZXRyaWNzLCBMYXlvdXRVbml0 IGxpbmVMb2dpY2FsSGVpZ2h0KQorRGlzcGxheTo6TGluZUJveDo6QmFzZWxpbmUgTGluZUJ1aWxk ZXI6OmhhbGZMZWFkaW5nTWV0cmljcyhjb25zdCBGb250TWV0cmljcyYgZm9udE1ldHJpY3MsIExh eW91dFVuaXQgbGluZUxvZ2ljYWxIZWlnaHQpCiB7CiAgICAgYXV0byBhc2NlbnQgPSBmb250TWV0 cmljcy5hc2NlbnQoKTsKICAgICBhdXRvIGRlc2NlbnQgPSBmb250TWV0cmljcy5kZXNjZW50KCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lQnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJ1aWxkZXIuaAppbmRleCAzNGJhZWU0Y2Q4Yy4uYzBhNGRiY2Y5OWQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC dWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJ1aWxkZXIuaApAQCAtMjcsOSArMjcsOSBAQAogCiAjaWYgRU5BQkxFKExBWU9VVF9G T1JNQVRUSU5HX0NPTlRFWFQpCiAKKyNpbmNsdWRlICJEaXNwbGF5TGluZUJveC5oIgogI2luY2x1 ZGUgIkRpc3BsYXlSdW4uaCIKICNpbmNsdWRlICJJbmxpbmVJdGVtLmgiCi0jaW5jbHVkZSAiSW5s aW5lTGluZUJveC5oIgogI2luY2x1ZGUgIklubGluZVRleHRJdGVtLmgiCiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKQEAgLTQ5LDcgKzQ5LDcgQEAgcHVibGljOgogICAgICAgICBzdHJ1Y3QgSGVpZ2h0 QW5kQmFzZWxpbmUgewogICAgICAgICAgICAgTGF5b3V0VW5pdCBoZWlnaHQ7CiAgICAgICAgICAg ICBMYXlvdXRVbml0IGJhc2VsaW5lT2Zmc2V0OwotICAgICAgICAgICAgT3B0aW9uYWw8TGluZUJv eDo6QmFzZWxpbmU+IHN0cnV0OworICAgICAgICAgICAgT3B0aW9uYWw8RGlzcGxheTo6TGluZUJv eDo6QmFzZWxpbmU+IHN0cnV0OwogICAgICAgICB9OwogICAgICAgICBPcHRpb25hbDxIZWlnaHRB bmRCYXNlbGluZT4gaGVpZ2h0QW5kQmFzZWxpbmU7CiAgICAgfTsKQEAgLTY3LDcgKzY3LDcgQEAg cHVibGljOgogICAgIExheW91dFVuaXQgdHJhaWxpbmdUcmltbWFibGVXaWR0aCgpIGNvbnN0IHsg cmV0dXJuIG1fdHJpbW1hYmxlQ29udGVudC53aWR0aCgpOyB9CiAgICAgYm9vbCBpc1RyYWlsaW5n UnVuRnVsbHlUcmltbWFibGUoKSBjb25zdCB7IHJldHVybiBtX3RyaW1tYWJsZUNvbnRlbnQuaXNU cmFpbGluZ1J1bkZ1bGx5VHJpbW1hYmxlKCk7IH0KIAotICAgIGNvbnN0IExpbmVCb3gmIGxpbmVC b3goKSBjb25zdCB7IHJldHVybiBtX2xpbmVCb3g7IH0KKyAgICBjb25zdCBEaXNwbGF5OjpMaW5l Qm94JiBsaW5lQm94KCkgY29uc3QgeyByZXR1cm4gbV9saW5lQm94OyB9CiAgICAgdm9pZCBtb3Zl TG9naWNhbExlZnQoTGF5b3V0VW5pdCk7CiAgICAgdm9pZCBtb3ZlTG9naWNhbFJpZ2h0KExheW91 dFVuaXQpOwogICAgIHZvaWQgc2V0SGFzSW50cnVzaXZlRmxvYXQoKSB7IG1faGFzSW50cnVzaXZl RmxvYXQgPSB0cnVlOyB9CkBAIC0xMTUsNyArMTE1LDcgQEAgcHVibGljOgogICAgIGVudW0gY2xh c3MgSXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50IHsgTm8sIFllcyB9OwogICAgIFJ1bkxpc3Qg Y2xvc2UoSXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50ID0gSXNMYXN0TGluZVdpdGhJbmxpbmVD b250ZW50OjpObyk7CiAKLSAgICBzdGF0aWMgTGluZUJveDo6QmFzZWxpbmUgaGFsZkxlYWRpbmdN ZXRyaWNzKGNvbnN0IEZvbnRNZXRyaWNzJiwgTGF5b3V0VW5pdCBsaW5lTG9naWNhbEhlaWdodCk7 CisgICAgc3RhdGljIERpc3BsYXk6OkxpbmVCb3g6OkJhc2VsaW5lIGhhbGZMZWFkaW5nTWV0cmlj cyhjb25zdCBGb250TWV0cmljcyYsIExheW91dFVuaXQgbGluZUxvZ2ljYWxIZWlnaHQpOwogCiBw cml2YXRlOgogICAgIExheW91dFVuaXQgbG9naWNhbFRvcCgpIGNvbnN0IHsgcmV0dXJuIG1fbGlu ZUJveC5sb2dpY2FsVG9wKCk7IH0KQEAgLTIyNSwxMiArMjI1LDEyIEBAIHByaXZhdGU6CiAgICAg Y29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7 CiAgICAgSW5saW5lSXRlbVJ1bkxpc3QgbV9pbmxpbmVJdGVtUnVuczsKICAgICBUcmltbWFibGVD b250ZW50IG1fdHJpbW1hYmxlQ29udGVudDsKLSAgICBPcHRpb25hbDxMaW5lQm94OjpCYXNlbGlu ZT4gbV9pbml0aWFsU3RydXQ7CisgICAgT3B0aW9uYWw8RGlzcGxheTo6TGluZUJveDo6QmFzZWxp bmU+IG1faW5pdGlhbFN0cnV0OwogICAgIExheW91dFVuaXQgbV9saW5lTG9naWNhbFdpZHRoOwog ICAgIE9wdGlvbmFsPFRleHRBbGlnbk1vZGU+IG1faG9yaXpvbnRhbEFsaWdubWVudDsKICAgICBi b29sIG1fc2tpcEFsaWdubWVudCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hhc0ludHJ1c2l2ZUZs b2F0IHsgZmFsc2UgfTsKLSAgICBMaW5lQm94IG1fbGluZUJveDsKKyAgICBEaXNwbGF5OjpMaW5l Qm94IG1fbGluZUJveDsKICAgICBPcHRpb25hbDxib29sPiBtX2xpbmVJc1Zpc3VhbGx5RW1wdHlC ZWZvcmVUcmltbWFibGVDb250ZW50OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuaCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmgKaW5kZXggMGZi ODBiNmY3MzAuLmU1OWU4MjBlNzgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmgKQEAgLTQ2LDcgKzQ2 LDcgQEAgcHVibGljOgogICAgICAgICBPcHRpb25hbDxQYXJ0aWFsQ29udGVudD4gcGFydGlhbENv bnRlbnQ7CiAgICAgICAgIFZlY3RvcjxXZWFrUHRyPElubGluZUl0ZW0+PiBmbG9hdHM7CiAgICAg ICAgIGNvbnN0IExpbmVCdWlsZGVyOjpSdW5MaXN0IHJ1bkxpc3Q7Ci0gICAgICAgIGNvbnN0IExp bmVCb3ggbGluZUJveDsKKyAgICAgICAgY29uc3QgRGlzcGxheTo6TGluZUJveCBsaW5lQm94Owog ICAgIH07CiAgICAgTGluZUNvbnRlbnQgbGF5b3V0TGluZShMaW5lQnVpbGRlciYsIHVuc2lnbmVk IGxlYWRpbmdJbmxpbmVJdGVtSW5kZXgsIE9wdGlvbmFsPHVuc2lnbmVkPiBwYXJ0aWFsTGVhZGlu Z0NvbnRlbnRMZW5ndGgpOwogCg==