228956 2021-08-10 08:27:59 -0700 Move MarkedTextStyle into StyledMarkedText scope 2021-08-19 09:05:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=228814 InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan mmaxfield pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1783171 0 koivisto 2021-08-10 08:27:59 -0700 Cleanup 1783174 1 435259 koivisto 2021-08-10 08:31:49 -0700 Created attachment 435259 patch 1784827 2 webkit-bug-importer 2021-08-17 08:28:16 -0700 <rdar://problem/82030321> 1785464 3 ews-feeder 2021-08-19 09:05:17 -0700 Committed r281240 (240677@main): <https://commits.webkit.org/240677@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 435259. 435259 2021-08-10 08:31:49 -0700 2021-08-19 09:05:19 -0700 patch styledmarkedtext-refactor-2.patch text/plain 17636 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0NmVmNjU5MzIzODIuLjQ2OWM3MzQxNzg1MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI3IEBACisyMDIxLTA4LTEwICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNv bT4KKworICAgICAgICBNb3ZlIE1hcmtlZFRleHRTdHlsZSBpbnRvIFN0eWxlZE1hcmtlZFRleHQg c2NvcGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy ODk1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFz IFN0eWxlZE1hcmtlZFRleHQ6OlN0eWxlLgorICAgICAgICBBbHNvIG90aGVyIGNsZWFudXBzIGFu ZCBhIGZpbGUgcmVuYW1lIHRvIG1hdGNoIHRoZSB0eXBlLgorCisgICAgICAgICogU291cmNlcy50 eHQ6CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAg ICAqIHJlbmRlcmluZy9MZWdhY3lJbmxpbmVUZXh0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkxlZ2FjeUlubGluZVRleHRCb3g6OnBhaW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvU3R5bGVk TWFya2VkVGV4dC5jcHA6IFJlbmFtZWQgZnJvbSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTWFy a2VkVGV4dFN0eWxlLmNwcC4KKyAgICAgICAgKFdlYkNvcmU6OnJlc29sdmVTdHlsZUZvck1hcmtl ZFRleHQpOgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZVN0eWxlRm9yVW5tYXJrZWRNYXJrZWRU ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlZE1hcmtlZFRleHQ6OnN1YmRpdmlkZUFuZFJl c29sdmUpOgorICAgICAgICAoV2ViQ29yZTo6Y29hbGVzY2VBZGphY2VudCk6CisgICAgICAgIChX ZWJDb3JlOjpTdHlsZWRNYXJrZWRUZXh0Ojpjb2FsZXNjZUFkamFjZW50V2l0aEVxdWFsQmFja2dy b3VuZCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZWRNYXJrZWRUZXh0Ojpjb2FsZXNjZUFkamFj ZW50V2l0aEVxdWFsRm9yZWdyb3VuZCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZWRNYXJrZWRU ZXh0Ojpjb2FsZXNjZUFkamFjZW50V2l0aEVxdWFsRGVjb3JhdGlvbnMpOgorICAgICAgICAqIHJl bmRlcmluZy9TdHlsZWRNYXJrZWRUZXh0Lmg6IFJlbmFtZWQgZnJvbSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvTWFya2VkVGV4dFN0eWxlLmguCisKIDIwMjEtMDgtMDcgIE15bGVzIEMuIE1heGZp ZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBEZWR1cGxpY2F0ZSBsb2dnaW5n IGNoYW5uZWwgYWxnb3JpdGhtcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvU291cmNlcy50 eHQgYi9Tb3VyY2UvV2ViQ29yZS9Tb3VyY2VzLnR4dAppbmRleCAwNzcyNWE0MjgzOTMuLjM5MjZm N2QwZjZhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvU291cmNlcy50eHQKKysrIGIvU291 cmNlL1dlYkNvcmUvU291cmNlcy50eHQKQEAgLTIxNzMsNyArMjE3Myw2IEBAIHJlbmRlcmluZy9M ZWdhY3lMaW5lTGF5b3V0LmNwcAogcmVuZGVyaW5nL0xlZ2FjeVJvb3RJbmxpbmVCb3guY3BwCiBy ZW5kZXJpbmcvTGVnYWN5SW5saW5lVGV4dEJveC5jcHAKIHJlbmRlcmluZy9NYXJrZWRUZXh0LmNw cAotcmVuZGVyaW5nL01hcmtlZFRleHRTdHlsZS5jcHAKIHJlbmRlcmluZy9PcmRlckl0ZXJhdG9y LmNwcAogcmVuZGVyaW5nL1BvaW50ZXJFdmVudHNIaXRSdWxlcy5jcHAKIHJlbmRlcmluZy9SZW5k ZXJBdHRhY2htZW50LmNwcApAQCAtMjI2MSw2ICsyMjYwLDcgQEAgcmVuZGVyaW5nL1JlbmRlclZp ZXcuY3BwCiByZW5kZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcAogcmVuZGVyaW5nL1Njcm9sbEFsaWdu bWVudC5jcHAKIHJlbmRlcmluZy9TZWxlY3Rpb25SYW5nZURhdGEuY3BwCityZW5kZXJpbmcvU3R5 bGVkTWFya2VkVGV4dC5jcHAKIHJlbmRlcmluZy9UYWJsZUxheW91dC5jcHAKIHJlbmRlcmluZy9U ZXh0RGVjb3JhdGlvblBhaW50ZXIuY3BwCiByZW5kZXJpbmcvVGV4dFBhaW50U3R5bGUuY3BwCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5k ZXggYjYzOWE1YjhmMTI1Li5hMmE5ZDkxNDY0MTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTUxOTYsNyArNTE5Niw3IEBACiAJ CUU0M0EwMjNCMTdFQjM3MEEwMDRDREQyNSAvKiBSZW5kZXJFbGVtZW50LmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBFNDNBMDIzQTE3RUIzNzBBMDA0Q0RE MjUgLyogUmVuZGVyRWxlbWVudC5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZh dGUsICk7IH07IH07CiAJCUU0M0FGOEU3MUFDNUI3RUMwMENBNzE3RSAvKiBDYWNoZVZhbGlkYXRp b24uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEU0M0FG OEU1MUFDNUI3REQwMENBNzE3RSAvKiBDYWNoZVZhbGlkYXRpb24uaCAqLzsgc2V0dGluZ3MgPSB7 QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlFNDQwQUE5NjFDNjg0MjA4MDBBMjY1 Q0MgLyogRWxlbWVudEFuZFRleHREZXNjZW5kYW50SXRlcmF0b3IuaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEU0NDBBQTk1MUM2ODQyMDgwMEEyNjVDQyAv KiBFbGVtZW50QW5kVGV4dERlc2NlbmRhbnRJdGVyYXRvci5oICovOyB9OwotCQlFNDQwRkQ1MzI1 QTRBRkRGMDBGN0M4NDkgLyogTWFya2VkVGV4dFN0eWxlLmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBFNDQwRkQ1MTI1QTRBRkRGMDBGN0M4NDkgLyogTWFy a2VkVGV4dFN0eWxlLmggKi87IH07CisJCUU0NDBGRDUzMjVBNEFGREYwMEY3Qzg0OSAvKiBTdHls ZWRNYXJrZWRUZXh0LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSBFNDQwRkQ1MTI1QTRBRkRGMDBGN0M4NDkgLyogU3R5bGVkTWFya2VkVGV4dC5oICovOyB9 OwogCQlFNDQ2MTNBMjBDRDYzMzEwMDBGQURBNzUgLyogSFRNTEF1ZGlvRWxlbWVudC5oIGluIEhl YWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRTQ0NjEzOTAwQ0Q2MzMx MDAwRkFEQTc1IC8qIEhUTUxBdWRpb0VsZW1lbnQuaCAqLzsgfTsKIAkJRTQ0NjEzQTUwQ0Q2MzMx MDAwRkFEQTc1IC8qIEhUTUxNZWRpYUVsZW1lbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEU0NDYxMzkzMENENjMzMTAwMEZBREE3NSAvKiBIVE1MTWVk aWFFbGVtZW50LmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsg fTsKIAkJRTQ0NjEzQTgwQ0Q2MzMxMDAwRkFEQTc1IC8qIEhUTUxTb3VyY2VFbGVtZW50LmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBFNDQ2MTM5NjBDRDYz MzEwMDBGQURBNzUgLyogSFRNTFNvdXJjZUVsZW1lbnQuaCAqLzsgfTsKQEAgLTE2MTgwLDggKzE2 MTgwLDggQEAKIAkJRTQzQUY4RTQxQUM1QjdERDAwQ0E3MTdFIC8qIENhY2hlVmFsaWRhdGlvbi5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBDYWNoZVZhbGlkYXRpb24u Y3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlFNDNBRjhFNTFBQzVCN0REMDBDQTcx N0UgLyogQ2FjaGVWYWxpZGF0aW9uLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IENhY2hlVmFsaWRhdGlvbi5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlFNDQwQUE5 NTFDNjg0MjA4MDBBMjY1Q0MgLyogRWxlbWVudEFuZFRleHREZXNjZW5kYW50SXRlcmF0b3IuaCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gRWxlbWVudEFuZFRleHREZXNjZW5kYW50 SXRlcmF0b3IuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJRTQ0MEZENTEyNUE0QUZE RjAwRjdDODQ5IC8qIE1hcmtlZFRleHRTdHlsZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7 IHBhdGggPSBNYXJrZWRUZXh0U3R5bGUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJ RTQ0MEZENTQyNUE0QUZFRTAwRjdDODQ5IC8qIE1hcmtlZFRleHRTdHlsZS5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5j cHA7IHBhdGggPSBNYXJrZWRUZXh0U3R5bGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OworCQlFNDQwRkQ1MTI1QTRBRkRGMDBGN0M4NDkgLyogU3R5bGVkTWFya2VkVGV4dC5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBTdHlsZWRNYXJrZWRUZXh0Lmg7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CisJCUU0NDBGRDU0MjVBNEFGRUUwMEY3Qzg0OSAvKiBTdHlsZWRN YXJrZWRUZXh0LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFN0eWxlZE1hcmtlZFRleHQuY3BwOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlFNDQ1MTA3NzIwMkM3RTAxMDA2NTdEMzMgLyog Q29tcGlsZWRTZWxlY3Rvci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBDb21w aWxlZFNlbGVjdG9yLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUU0NDYxMzhGMENE NjMzMTAwMEZBREE3NSAvKiBIVE1MQXVkaW9FbGVtZW50LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLmNwcDsgcGF0aCA9IEhUTUxBdWRpb0VsZW1lbnQuY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQlFNDQ2MTM5MDBDRDYzMzEwMDBGQURBNzUgLyogSFRNTEF1ZGlvRWxlbWVu dC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBIVE1MQXVkaW9FbGVtZW50Lmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0yOTQ1Nyw4ICsyOTQ1Nyw2IEBACiAJCQkJ OUJBMjczRjMxNzIyMDZCQjAwOTdDRTQ3IC8qIExvZ2ljYWxTZWxlY3Rpb25PZmZzZXRDYWNoZXMu aCAqLywKIAkJCQlDRTE4NjY0MjFGNzJFNUI0MDBBMENBQjYgLyogTWFya2VkVGV4dC5jcHAgKi8s CiAJCQkJQ0UxODY2NDMxRjcyRTVCNDAwQTBDQUI2IC8qIE1hcmtlZFRleHQuaCAqLywKLQkJCQlF NDQwRkQ1NDI1QTRBRkVFMDBGN0M4NDkgLyogTWFya2VkVGV4dFN0eWxlLmNwcCAqLywKLQkJCQlF NDQwRkQ1MTI1QTRBRkRGMDBGN0M4NDkgLyogTWFya2VkVGV4dFN0eWxlLmggKi8sCiAJCQkJQ0RF N0ZDNDIxODE5MDRCMTAwMkJCQjc3IC8qIE9yZGVySXRlcmF0b3IuY3BwICovLAogCQkJCUNERTdG QzQzMTgxOTA0QjEwMDJCQkI3NyAvKiBPcmRlckl0ZXJhdG9yLmggKi8sCiAJCQkJMzc3NEFCQTMw RkEyMUVCNDAwQUQ3REU5IC8qIE92ZXJsYXBUZXN0UmVxdWVzdENsaWVudC5oICovLApAQCAtMjk2 NTIsNiArMjk2NTAsOCBAQAogCQkJCTVEOTI1QjY2MEY2NEQ0REQwMEI4NDdGMCAvKiBTY3JvbGxB bGlnbm1lbnQuaCAqLywKIAkJCQk0NEIzOEJGOTI1MzY5QTg4MDBBNDQ1OEQgLyogU2VsZWN0aW9u UmFuZ2VEYXRhLmNwcCAqLywKIAkJCQk0NEIzOEJGNDI1MzY5MDFBMDBBNDQ1OEQgLyogU2VsZWN0 aW9uUmFuZ2VEYXRhLmggKi8sCisJCQkJRTQ0MEZENTQyNUE0QUZFRTAwRjdDODQ5IC8qIFN0eWxl ZE1hcmtlZFRleHQuY3BwICovLAorCQkJCUU0NDBGRDUxMjVBNEFGREYwMEY3Qzg0OSAvKiBTdHls ZWRNYXJrZWRUZXh0LmggKi8sCiAJCQkJRTMxQ0Q3NTAyMjlGNzQ5NTAwRkJEQTE5IC8qIFRhYmxl TGF5b3V0LmNwcCAqLywKIAkJCQlBOENGRjA0QzBBMTU0RjA5MDAwQTQyMzQgLyogVGFibGVMYXlv dXQuaCAqLywKIAkJCQkwRjU0RENFMzE4ODEwNTFEMDAzRUVEQkIgLyogVGV4dEF1dG9TaXppbmcu Y3BwICovLApAQCAtMzM0ODQsNyArMzM0ODQsNyBAQAogCQkJCTdBRTZDOTNDMUJFMEM2MDEwMEUx OUUwMyAvKiBNYWluVGhyZWFkU2hhcmVkVGltZXIuaCBpbiBIZWFkZXJzICovLAogCQkJCUU0NTFD NjMyMjM5NDAzMUEwMDk5MzE5MCAvKiBNYXJnaW5UeXBlcy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJ Q0UxODY2NDUxRjcyRTVCNDAwQTBDQUI2IC8qIE1hcmtlZFRleHQuaCBpbiBIZWFkZXJzICovLAot CQkJCUU0NDBGRDUzMjVBNEFGREYwMEY3Qzg0OSAvKiBNYXJrZWRUZXh0U3R5bGUuaCBpbiBIZWFk ZXJzICovLAorCQkJCUU0NDBGRDUzMjVBNEFGREYwMEY3Qzg0OSAvKiBTdHlsZWRNYXJrZWRUZXh0 LmggaW4gSGVhZGVycyAqLywKIAkJCQk5MzMwOURGODA5OUU2NDkyMDA1NkU1ODEgLyogbWFya3Vw LmggaW4gSGVhZGVycyAqLywKIAkJCQk5NzI4QzMxNDEyNjhFNDM5MDA0MUU4OUIgLyogTWFya3Vw QWNjdW11bGF0b3IuaCBpbiBIZWFkZXJzICovLAogCQkJCTAwQzYwRTNGMTNENzZEN0UwMDkyQTI3 NSAvKiBNYXJrdXBUb2tlbml6ZXJJbmxpbmVzLmggaW4gSGVhZGVycyAqLywKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MZWdhY3lJbmxpbmVUZXh0Qm94LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9MZWdhY3lJbmxpbmVUZXh0Qm94LmNwcAppbmRleCA1MDcwMDNh MDBmY2UuLjBhY2E0MDAxNzg0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0xlZ2FjeUlubGluZVRleHRCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9M ZWdhY3lJbmxpbmVUZXh0Qm94LmNwcApAQCAtNDAsNyArNDAsNiBAQAogI2luY2x1ZGUgIkltYWdl QnVmZmVyLmgiCiAjaW5jbHVkZSAiSW5saW5lVGV4dEJveFN0eWxlLmgiCiAjaW5jbHVkZSAiTGVn YWN5RWxsaXBzaXNCb3guaCIKLSNpbmNsdWRlICJNYXJrZWRUZXh0U3R5bGUuaCIKICNpbmNsdWRl ICJQYWdlLmgiCiAjaW5jbHVkZSAiUGFpbnRJbmZvLmgiCiAjaW5jbHVkZSAiUmVuZGVyQmxvY2su aCIKQEAgLTUzLDYgKzUyLDcgQEAKICNpbmNsdWRlICJSZW5kZXJlZERvY3VtZW50TWFya2VyLmgi CiAjaW5jbHVkZSAiUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oIgogI2luY2x1ZGUgIlNldHRpbmdz LmgiCisjaW5jbHVkZSAiU3R5bGVkTWFya2VkVGV4dC5oIgogI2luY2x1ZGUgIlRleHQuaCIKICNp bmNsdWRlICJUZXh0Qm94U2VsZWN0YWJsZVJhbmdlLmgiCiAjaW5jbHVkZSAiVGV4dERlY29yYXRp b25QYWludGVyLmgiCkBAIC01MDQsMTAgKzUwNCwxMCBAQCB2b2lkIExlZ2FjeUlubGluZVRleHRC b3g6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRP ZgogICAgICAgICAgICAgICAgIG1hcmtlZFRleHRzLmFwcGVuZChXVEZNb3ZlKHNlbGVjdGlvbk1h cmtlZFRleHQpKTsKICAgICAgICAgfQogI2VuZGlmCi0gICAgICAgIGF1dG8gc3R5bGVkTWFya2Vk VGV4dHMgPSBzdWJkaXZpZGVBbmRSZXNvbHZlU3R5bGUobWFya2VkVGV4dHMsIHJlbmRlcmVyKCks IGlzRmlyc3RMaW5lKCksIHBhaW50SW5mbyk7CisgICAgICAgIGF1dG8gc3R5bGVkTWFya2VkVGV4 dHMgPSBTdHlsZWRNYXJrZWRUZXh0OjpzdWJkaXZpZGVBbmRSZXNvbHZlKG1hcmtlZFRleHRzLCBy ZW5kZXJlcigpLCBpc0ZpcnN0TGluZSgpLCBwYWludEluZm8pOwogCiAgICAgICAgIC8vIENvYWxl c2NlIHN0eWxlcyBvZiBhZGphY2VudCBtYXJrZWQgdGV4dHMgdG8gbWluaW1pemUgdGhlIG51bWJl ciBvZiBkcmF3aW5nIGNvbW1hbmRzLgotICAgICAgICBhdXRvIGNvYWxlc2NlZFN0eWxlZE1hcmtl ZFRleHRzID0gY29hbGVzY2VBZGphY2VudE1hcmtlZFRleHRzKHN0eWxlZE1hcmtlZFRleHRzLCAm TWFya2VkVGV4dFN0eWxlOjphcmVCYWNrZ3JvdW5kTWFya2VkVGV4dFN0eWxlc0VxdWFsKTsKKyAg ICAgICAgYXV0byBjb2FsZXNjZWRTdHlsZWRNYXJrZWRUZXh0cyA9IFN0eWxlZE1hcmtlZFRleHQ6 OmNvYWxlc2NlQWRqYWNlbnRXaXRoRXF1YWxCYWNrZ3JvdW5kKHN0eWxlZE1hcmtlZFRleHRzKTsK IAogICAgICAgICBwYWludE1hcmtlZFRleHRzKHBhaW50SW5mbywgTWFya2VkVGV4dDo6UGFpbnRQ aGFzZTo6QmFja2dyb3VuZCwgYm94UmVjdCwgY29hbGVzY2VkU3R5bGVkTWFya2VkVGV4dHMpOwog ICAgIH0KQEAgLTU1Myw3ICs1NTMsNyBAQCB2b2lkIExlZ2FjeUlubGluZVRleHRCb3g6OnBhaW50 KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZgogICAgICAg ICAgICAgbWFya2VkVGV4dHMuYXBwZW5kKFdURk1vdmUoc2VsZWN0aW9uTWFya2VkVGV4dCkpOwog ICAgIH0KIAotICAgIGF1dG8gc3R5bGVkTWFya2VkVGV4dHMgPSBzdWJkaXZpZGVBbmRSZXNvbHZl U3R5bGUobWFya2VkVGV4dHMsIHJlbmRlcmVyKCksIGlzRmlyc3RMaW5lKCksIHBhaW50SW5mbyk7 CisgICAgYXV0byBzdHlsZWRNYXJrZWRUZXh0cyA9IFN0eWxlZE1hcmtlZFRleHQ6OnN1YmRpdmlk ZUFuZFJlc29sdmUobWFya2VkVGV4dHMsIHJlbmRlcmVyKCksIGlzRmlyc3RMaW5lKCksIHBhaW50 SW5mbyk7CiAKICAgICAvLyAuLi4gbm93IHJlbW92ZSB0aGUgc2VsZWN0aW9uIG1hcmtlZCB0ZXh0 IGlmIHdlIGFyZSBleGNsdWRpbmcgc2VsZWN0aW9uLgogICAgIGlmICghaXNQcmludGluZyAmJiBw YWludEluZm8ucGFpbnRCZWhhdmlvci5jb250YWlucyhQYWludEJlaGF2aW9yOjpFeGNsdWRlU2Vs ZWN0aW9uKSkgewpAQCAtNTYzLDcgKzU2Myw3IEBAIHZvaWQgTGVnYWN5SW5saW5lVGV4dEJveDo6 cGFpbnQoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mCiAg ICAgfQogCiAgICAgLy8gQ29hbGVzY2Ugc3R5bGVzIG9mIGFkamFjZW50IG1hcmtlZCB0ZXh0cyB0 byBtaW5pbWl6ZSB0aGUgbnVtYmVyIG9mIGRyYXdpbmcgY29tbWFuZHMuCi0gICAgYXV0byBjb2Fs ZXNjZWRTdHlsZWRNYXJrZWRUZXh0cyA9IGNvYWxlc2NlQWRqYWNlbnRNYXJrZWRUZXh0cyhzdHls ZWRNYXJrZWRUZXh0cywgJk1hcmtlZFRleHRTdHlsZTo6YXJlRm9yZWdyb3VuZE1hcmtlZFRleHRT dHlsZXNFcXVhbCk7CisgICAgYXV0byBjb2FsZXNjZWRTdHlsZWRNYXJrZWRUZXh0cyA9IFN0eWxl ZE1hcmtlZFRleHQ6OmNvYWxlc2NlQWRqYWNlbnRXaXRoRXF1YWxGb3JlZ3JvdW5kKHN0eWxlZE1h cmtlZFRleHRzKTsKIAogICAgIHBhaW50TWFya2VkVGV4dHMocGFpbnRJbmZvLCBNYXJrZWRUZXh0 OjpQYWludFBoYXNlOjpGb3JlZ3JvdW5kLCBib3hSZWN0LCBjb2FsZXNjZWRTdHlsZWRNYXJrZWRU ZXh0cyk7CiAKQEAgLTYwMiw3ICs2MDIsNyBAQCB2b2lkIExlZ2FjeUlubGluZVRleHRCb3g6OnBh aW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZgogICAg ICAgICB9CiAKICAgICAgICAgLy8gQ29hbGVzY2Ugc3R5bGVzIG9mIGFkamFjZW50IG1hcmtlZCB0 ZXh0cyB0byBtaW5pbWl6ZSB0aGUgbnVtYmVyIG9mIGRyYXdpbmcgY29tbWFuZHMuCi0gICAgICAg IGF1dG8gY29hbGVzY2VkU3R5bGVkTWFya2VkVGV4dHMgPSBjb2FsZXNjZUFkamFjZW50TWFya2Vk VGV4dHMoc3R5bGVkTWFya2VkVGV4dHMsICZNYXJrZWRUZXh0U3R5bGU6OmFyZURlY29yYXRpb25N YXJrZWRUZXh0U3R5bGVzRXF1YWwpOworICAgICAgICBhdXRvIGNvYWxlc2NlZFN0eWxlZE1hcmtl ZFRleHRzID0gU3R5bGVkTWFya2VkVGV4dDo6Y29hbGVzY2VBZGphY2VudFdpdGhFcXVhbERlY29y YXRpb25zKHN0eWxlZE1hcmtlZFRleHRzKTsKIAogICAgICAgICBwYWludE1hcmtlZFRleHRzKHBh aW50SW5mbywgTWFya2VkVGV4dDo6UGFpbnRQaGFzZTo6RGVjb3JhdGlvbiwgYm94UmVjdCwgY29h bGVzY2VkU3R5bGVkTWFya2VkVGV4dHMsIHRleHREZWNvcmF0aW9uU2VsZWN0aW9uQ2xpcE91dFJl Y3QpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9NYXJrZWRU ZXh0U3R5bGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1N0eWxlZE1hcmtlZFRleHQu Y3BwCnNpbWlsYXJpdHkgaW5kZXggODElCnJlbmFtZSBmcm9tIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9NYXJrZWRUZXh0U3R5bGUuY3BwCnJlbmFtZSB0byBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvU3R5bGVkTWFya2VkVGV4dC5jcHAKaW5kZXggMzFmNmY5YzllYTEzLi4zNTU2NGNlNDNhNTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9NYXJrZWRUZXh0U3R5bGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TdHlsZWRNYXJrZWRUZXh0LmNwcApAQCAt MjQsNyArMjQsNyBAQAogICovCiAKICNpbmNsdWRlICJjb25maWcuaCIKLSNpbmNsdWRlICJNYXJr ZWRUZXh0U3R5bGUuaCIKKyNpbmNsdWRlICJTdHlsZWRNYXJrZWRUZXh0LmgiCiAKICNpbmNsdWRl ICJFbGVtZW50UnVsZUNvbGxlY3Rvci5oIgogI2luY2x1ZGUgIlJlbmRlckVsZW1lbnQuaCIKQEAg LTMzLDkgKzMzLDkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdGF0aWMgU3R5bGVkTWFy a2VkVGV4dCByZXNvbHZlU3R5bGVGb3JNYXJrZWRUZXh0KGNvbnN0IE1hcmtlZFRleHQmIG1hcmtl ZFRleHQsIGNvbnN0IE1hcmtlZFRleHRTdHlsZSYgYmFzZVN0eWxlLCBjb25zdCBSZW5kZXJUZXh0 JiByZW5kZXJlciwgY29uc3QgUmVuZGVyU3R5bGUmIGxpbmVTdHlsZSwgY29uc3QgUGFpbnRJbmZv JiBwYWludEluZm8pCitzdGF0aWMgU3R5bGVkTWFya2VkVGV4dCByZXNvbHZlU3R5bGVGb3JNYXJr ZWRUZXh0KGNvbnN0IE1hcmtlZFRleHQmIG1hcmtlZFRleHQsIGNvbnN0IFN0eWxlZE1hcmtlZFRl eHQ6OlN0eWxlJiBiYXNlU3R5bGUsIGNvbnN0IFJlbmRlclRleHQmIHJlbmRlcmVyLCBjb25zdCBS ZW5kZXJTdHlsZSYgbGluZVN0eWxlLCBjb25zdCBQYWludEluZm8mIHBhaW50SW5mbykKIHsKLSAg ICBNYXJrZWRUZXh0U3R5bGUgc3R5bGUgPSBiYXNlU3R5bGU7CisgICAgYXV0byBzdHlsZSA9IGJh c2VTdHlsZTsKICAgICBzd2l0Y2ggKG1hcmtlZFRleHQudHlwZSkgewogICAgIGNhc2UgTWFya2Vk VGV4dDo6Q29ycmVjdGlvbjoKICAgICBjYXNlIE1hcmtlZFRleHQ6OkRpY3RhdGlvbkFsdGVybmF0 aXZlczoKQEAgLTEwNSw5ICsxMDUsOSBAQCBzdGF0aWMgU3R5bGVkTWFya2VkVGV4dCByZXNvbHZl U3R5bGVGb3JNYXJrZWRUZXh0KGNvbnN0IE1hcmtlZFRleHQmIG1hcmtlZFRleHQsCiAgICAgcmV0 dXJuIHN0eWxlZE1hcmtlZFRleHQ7CiB9CiAKLXN0YXRpYyBNYXJrZWRUZXh0U3R5bGUgY29tcHV0 ZVN0eWxlRm9yVW5tYXJrZWRNYXJrZWRUZXh0KGNvbnN0IFJlbmRlclRleHQmIHJlbmRlcmVyLCBj b25zdCBSZW5kZXJTdHlsZSYgbGluZVN0eWxlLCBib29sIGlzRmlyc3RMaW5lLCBjb25zdCBQYWlu dEluZm8mIHBhaW50SW5mbykKK3N0YXRpYyBTdHlsZWRNYXJrZWRUZXh0OjpTdHlsZSBjb21wdXRl U3R5bGVGb3JVbm1hcmtlZE1hcmtlZFRleHQoY29uc3QgUmVuZGVyVGV4dCYgcmVuZGVyZXIsIGNv bnN0IFJlbmRlclN0eWxlJiBsaW5lU3R5bGUsIGJvb2wgaXNGaXJzdExpbmUsIGNvbnN0IFBhaW50 SW5mbyYgcGFpbnRJbmZvKQogewotICAgIE1hcmtlZFRleHRTdHlsZSBzdHlsZTsKKyAgICBTdHls ZWRNYXJrZWRUZXh0OjpTdHlsZSBzdHlsZTsKICAgICBzdHlsZS50ZXh0RGVjb3JhdGlvblN0eWxl cyA9IFRleHREZWNvcmF0aW9uUGFpbnRlcjo6c3R5bGVzRm9yUmVuZGVyZXIocmVuZGVyZXIsIGxp bmVTdHlsZS50ZXh0RGVjb3JhdGlvbnNJbkVmZmVjdCgpLCBpc0ZpcnN0TGluZSk7CiAgICAgc3R5 bGUudGV4dFN0eWxlcyA9IGNvbXB1dGVUZXh0UGFpbnRTdHlsZShyZW5kZXJlci5mcmFtZSgpLCBs aW5lU3R5bGUsIHBhaW50SW5mbyk7CiAgICAgc3R5bGUudGV4dFNoYWRvdyA9IFNoYWRvd0RhdGE6 OmNsb25lKHBhaW50SW5mby5mb3JjZVRleHRDb2xvcigpID8gbnVsbHB0ciA6IGxpbmVTdHlsZS50 ZXh0U2hhZG93KCkpOwpAQCAtMTE1LDcgKzExNSw3IEBAIHN0YXRpYyBNYXJrZWRUZXh0U3R5bGUg Y29tcHV0ZVN0eWxlRm9yVW5tYXJrZWRNYXJrZWRUZXh0KGNvbnN0IFJlbmRlclRleHQmIHJlbmRl CiAgICAgcmV0dXJuIHN0eWxlOwogfQogCi1WZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4gc3ViZGl2 aWRlQW5kUmVzb2x2ZVN0eWxlKGNvbnN0IFZlY3RvcjxNYXJrZWRUZXh0PiYgdGV4dHNUb1N1YmRp dmlkZSwgY29uc3QgUmVuZGVyVGV4dCYgcmVuZGVyZXIsIGJvb2wgaXNGaXJzdExpbmUsIGNvbnN0 IFBhaW50SW5mbyYgcGFpbnRJbmZvKQorVmVjdG9yPFN0eWxlZE1hcmtlZFRleHQ+IFN0eWxlZE1h cmtlZFRleHQ6OnN1YmRpdmlkZUFuZFJlc29sdmUoY29uc3QgVmVjdG9yPE1hcmtlZFRleHQ+JiB0 ZXh0c1RvU3ViZGl2aWRlLCBjb25zdCBSZW5kZXJUZXh0JiByZW5kZXJlciwgYm9vbCBpc0ZpcnN0 TGluZSwgY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8pCiB7CiAgICAgaWYgKHRleHRzVG9TdWJk aXZpZGUuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4geyB9OwpAQCAtMTUyLDEzICsxNTIsMTQg QEAgVmVjdG9yPFN0eWxlZE1hcmtlZFRleHQ+IHN1YmRpdmlkZUFuZFJlc29sdmVTdHlsZShjb25z dCBWZWN0b3I8TWFya2VkVGV4dD4mIHRleHQKICAgICByZXR1cm4gZnJvbnRtb3N0TWFya2VkVGV4 dHM7CiB9CiAKLVZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0PiBjb2FsZXNjZUFkamFjZW50TWFya2Vk VGV4dHMoY29uc3QgVmVjdG9yPFN0eWxlZE1hcmtlZFRleHQ+JiB0ZXh0c1RvQ29hbGVzY2UsIE1h cmtlZFRleHRTdHlsZXNFcXVhbGl0eUZ1bmN0aW9uIGFyZU1hcmtlZFRleHRTdHlsZXNFcXVhbCkK K3RlbXBsYXRlPHR5cGVuYW1lIEVxdWFsaXR5RnVuY3Rpb24+CitzdGF0aWMgVmVjdG9yPFN0eWxl ZE1hcmtlZFRleHQ+IGNvYWxlc2NlQWRqYWNlbnQoY29uc3QgVmVjdG9yPFN0eWxlZE1hcmtlZFRl eHQ+JiB0ZXh0c1RvQ29hbGVzY2UsIEVxdWFsaXR5RnVuY3Rpb24mJiBlcXVhbGl0eUZ1bmN0aW9u KQogewogICAgIGlmICh0ZXh0c1RvQ29hbGVzY2Uuc2l6ZSgpIDw9IDEpCiAgICAgICAgIHJldHVy biB0ZXh0c1RvQ29hbGVzY2U7CiAKICAgICBhdXRvIGFyZUFkamFjZW50TWFya2VkVGV4dHNXaXRo U2FtZVN0eWxlID0gWyZdIChjb25zdCBTdHlsZWRNYXJrZWRUZXh0JiBhLCBjb25zdCBTdHlsZWRN YXJrZWRUZXh0JiBiKSB7Ci0gICAgICAgIHJldHVybiBhLmVuZE9mZnNldCA9PSBiLnN0YXJ0T2Zm c2V0ICYmIGFyZU1hcmtlZFRleHRTdHlsZXNFcXVhbChhLnN0eWxlLCBiLnN0eWxlKTsKKyAgICAg ICAgcmV0dXJuIGEuZW5kT2Zmc2V0ID09IGIuc3RhcnRPZmZzZXQgJiYgZXF1YWxpdHlGdW5jdGlv bihhLnN0eWxlLCBiLnN0eWxlKTsKICAgICB9OwogCiAgICAgVmVjdG9yPFN0eWxlZE1hcmtlZFRl eHQ+IHN0eWxlZE1hcmtlZFRleHRzOwpAQCAtMTc2LDQgKzE3NywyNSBAQCBWZWN0b3I8U3R5bGVk TWFya2VkVGV4dD4gY29hbGVzY2VBZGphY2VudE1hcmtlZFRleHRzKGNvbnN0IFZlY3RvcjxTdHls ZWRNYXJrZWRUZQogICAgIHJldHVybiBzdHlsZWRNYXJrZWRUZXh0czsKIH0KIAorVmVjdG9yPFN0 eWxlZE1hcmtlZFRleHQ+IFN0eWxlZE1hcmtlZFRleHQ6OmNvYWxlc2NlQWRqYWNlbnRXaXRoRXF1 YWxCYWNrZ3JvdW5kKGNvbnN0IFZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0PiYgbWFya2VkVGV4dHMp Cit7CisgICAgcmV0dXJuIGNvYWxlc2NlQWRqYWNlbnQobWFya2VkVGV4dHMsIFsmXShhdXRvJiBh LCBhdXRvJiBiKSB7CisgICAgICAgIHJldHVybiBhLmJhY2tncm91bmRDb2xvciA9PSBiLmJhY2tn cm91bmRDb2xvcjsKKyAgICB9KTsKK30KKworVmVjdG9yPFN0eWxlZE1hcmtlZFRleHQ+IFN0eWxl ZE1hcmtlZFRleHQ6OmNvYWxlc2NlQWRqYWNlbnRXaXRoRXF1YWxGb3JlZ3JvdW5kKGNvbnN0IFZl Y3RvcjxTdHlsZWRNYXJrZWRUZXh0PiYgbWFya2VkVGV4dHMpCit7CisgICAgcmV0dXJuIGNvYWxl c2NlQWRqYWNlbnQobWFya2VkVGV4dHMsIFsmXShhdXRvJiBhLCBhdXRvJiBiKSB7CisgICAgICAg IHJldHVybiBhLnRleHRTdHlsZXMgPT0gYi50ZXh0U3R5bGVzICYmIGEudGV4dFNoYWRvdyA9PSBi LnRleHRTaGFkb3cgJiYgYS5hbHBoYSA9PSBiLmFscGhhOworICAgIH0pOworfQorCitWZWN0b3I8 U3R5bGVkTWFya2VkVGV4dD4gU3R5bGVkTWFya2VkVGV4dDo6Y29hbGVzY2VBZGphY2VudFdpdGhF cXVhbERlY29yYXRpb25zKGNvbnN0IFZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0PiYgbWFya2VkVGV4 dHMpCit7CisgICAgcmV0dXJuIGNvYWxlc2NlQWRqYWNlbnQobWFya2VkVGV4dHMsIFsmXShhdXRv JiBhLCBhdXRvJiBiKSB7CisgICAgICAgIHJldHVybiBhLnRleHREZWNvcmF0aW9uU3R5bGVzID09 IGIudGV4dERlY29yYXRpb25TdHlsZXMgJiYgYS50ZXh0U2hhZG93ID09IGIudGV4dFNoYWRvdyAm JiBhLmFscGhhID09IGIuYWxwaGE7CisgICAgfSk7Cit9CisKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9NYXJrZWRUZXh0U3R5bGUuaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9TdHlsZWRNYXJrZWRUZXh0LmgKc2ltaWxhcml0eSBpbmRleCA1OCUKcmVuYW1lIGZy b20gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL01hcmtlZFRleHRTdHlsZS5oCnJlbmFtZSB0byBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4dC5oCmluZGV4IDRmNDUzMmM2 YzdlYy4uMWIxOTY1MTBhY2QwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv TWFya2VkVGV4dFN0eWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1N0eWxlZE1h cmtlZFRleHQuaApAQCAtMzUsMzkgKzM1LDI2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNz IFJlbmRlclRleHQ7CiBjbGFzcyBSZW5kZXJlZERvY3VtZW50TWFya2VyOwogCi1zdHJ1Y3QgTWFy a2VkVGV4dFN0eWxlIHsKLSAgICBzdGF0aWMgYm9vbCBhcmVCYWNrZ3JvdW5kTWFya2VkVGV4dFN0 eWxlc0VxdWFsKGNvbnN0IE1hcmtlZFRleHRTdHlsZSYgYSwgY29uc3QgTWFya2VkVGV4dFN0eWxl JiBiKQotICAgIHsKLSAgICAgICAgcmV0dXJuIGEuYmFja2dyb3VuZENvbG9yID09IGIuYmFja2dy b3VuZENvbG9yOwotICAgIH0KLSAgICBzdGF0aWMgYm9vbCBhcmVGb3JlZ3JvdW5kTWFya2VkVGV4 dFN0eWxlc0VxdWFsKGNvbnN0IE1hcmtlZFRleHRTdHlsZSYgYSwgY29uc3QgTWFya2VkVGV4dFN0 eWxlJiBiKQotICAgIHsKLSAgICAgICAgcmV0dXJuIGEudGV4dFN0eWxlcyA9PSBiLnRleHRTdHls ZXMgJiYgYS50ZXh0U2hhZG93ID09IGIudGV4dFNoYWRvdyAmJiBhLmFscGhhID09IGIuYWxwaGE7 Ci0gICAgfQotICAgIHN0YXRpYyBib29sIGFyZURlY29yYXRpb25NYXJrZWRUZXh0U3R5bGVzRXF1 YWwoY29uc3QgTWFya2VkVGV4dFN0eWxlJiBhLCBjb25zdCBNYXJrZWRUZXh0U3R5bGUmIGIpCi0g ICAgewotICAgICAgICByZXR1cm4gYS50ZXh0RGVjb3JhdGlvblN0eWxlcyA9PSBiLnRleHREZWNv cmF0aW9uU3R5bGVzICYmIGEudGV4dFNoYWRvdyA9PSBiLnRleHRTaGFkb3cgJiYgYS5hbHBoYSA9 PSBiLmFscGhhOwotICAgIH0KLQotICAgIENvbG9yIGJhY2tncm91bmRDb2xvcjsKLSAgICBUZXh0 UGFpbnRTdHlsZSB0ZXh0U3R5bGVzOwotICAgIFRleHREZWNvcmF0aW9uUGFpbnRlcjo6U3R5bGVz IHRleHREZWNvcmF0aW9uU3R5bGVzOwotICAgIHN0ZDo6b3B0aW9uYWw8U2hhZG93RGF0YT4gdGV4 dFNoYWRvdzsKLSAgICBmbG9hdCBhbHBoYTsKLX07Ci0KIHN0cnVjdCBTdHlsZWRNYXJrZWRUZXh0 IDogTWFya2VkVGV4dCB7CiAgICAgU3R5bGVkTWFya2VkVGV4dChjb25zdCBNYXJrZWRUZXh0JiBt YXJrZXIpCiAgICAgICAgIDogTWFya2VkVGV4dCB7IG1hcmtlciB9CiAgICAgewogICAgIH0KIAot ICAgIE1hcmtlZFRleHRTdHlsZSBzdHlsZTsKLX07CisgICAgc3RydWN0IFN0eWxlIHsKKyAgICAg ICAgQ29sb3IgYmFja2dyb3VuZENvbG9yOworICAgICAgICBUZXh0UGFpbnRTdHlsZSB0ZXh0U3R5 bGVzOworICAgICAgICBUZXh0RGVjb3JhdGlvblBhaW50ZXI6OlN0eWxlcyB0ZXh0RGVjb3JhdGlv blN0eWxlczsKKyAgICAgICAgc3RkOjpvcHRpb25hbDxTaGFkb3dEYXRhPiB0ZXh0U2hhZG93Owor ICAgICAgICBmbG9hdCBhbHBoYTsKKyAgICB9OwogCi1WZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4g c3ViZGl2aWRlQW5kUmVzb2x2ZVN0eWxlKGNvbnN0IFZlY3RvcjxNYXJrZWRUZXh0PiYsIGNvbnN0 IFJlbmRlclRleHQmLCBib29sIGlzRmlyc3RMaW5lLCBjb25zdCBQYWludEluZm8mKTsKKyAgICBT dHlsZSBzdHlsZTsKIAotdXNpbmcgTWFya2VkVGV4dFN0eWxlc0VxdWFsaXR5RnVuY3Rpb24gPSBi b29sICgqKShjb25zdCBNYXJrZWRUZXh0U3R5bGUmLCBjb25zdCBNYXJrZWRUZXh0U3R5bGUmKTsK LVZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0PiBjb2FsZXNjZUFkamFjZW50TWFya2VkVGV4dHMoY29u c3QgVmVjdG9yPFN0eWxlZE1hcmtlZFRleHQ+JiwgTWFya2VkVGV4dFN0eWxlc0VxdWFsaXR5RnVu Y3Rpb24pOworICAgIHN0YXRpYyBWZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4gc3ViZGl2aWRlQW5k UmVzb2x2ZShjb25zdCBWZWN0b3I8TWFya2VkVGV4dD4mLCBjb25zdCBSZW5kZXJUZXh0JiwgYm9v bCBpc0ZpcnN0TGluZSwgY29uc3QgUGFpbnRJbmZvJik7CisgICAgc3RhdGljIFZlY3RvcjxTdHls ZWRNYXJrZWRUZXh0PiBjb2FsZXNjZUFkamFjZW50V2l0aEVxdWFsQmFja2dyb3VuZChjb25zdCBW ZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4mKTsKKyAgICBzdGF0aWMgVmVjdG9yPFN0eWxlZE1hcmtl ZFRleHQ+IGNvYWxlc2NlQWRqYWNlbnRXaXRoRXF1YWxGb3JlZ3JvdW5kKGNvbnN0IFZlY3RvcjxT dHlsZWRNYXJrZWRUZXh0PiYpOworICAgIHN0YXRpYyBWZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4g Y29hbGVzY2VBZGphY2VudFdpdGhFcXVhbERlY29yYXRpb25zKGNvbnN0IFZlY3RvcjxTdHlsZWRN YXJrZWRUZXh0PiYpOworfTsKIAogfQo=