208269 2020-02-26 15:27:07 -0800 Cleanup HitTestResult.{h, cpp} 2020-02-27 09:34:44 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=208254 InRadar P2 Normal --- 1 dbates dbates achristensen esprehn+autocc ews-watchlist glenn kondapallykalyan pdr webkit-bug-importer oldest_to_newest 1623216 0 dbates 2020-02-26 15:27:07 -0800 Use C++11 and later features to reduce code duplication and simplify the code in HitTestResult.{h, cpp}. This will make it easier for me to add a new rect-based location constructor in the future. 1623219 1 webkit-bug-importer 2020-02-26 15:27:51 -0800 <rdar://problem/59824186> 1623221 2 391790 dbates 2020-02-26 15:28:49 -0800 Created attachment 391790 Patch 1623254 3 391800 dbates 2020-02-26 16:13:29 -0800 Created attachment 391800 Patch 1623528 4 391800 dbates 2020-02-27 09:34:42 -0800 Comment on attachment 391800 Patch Clearing flags on attachment: 391800 Committed r257569: <https://trac.webkit.org/changeset/257569> 1623529 5 dbates 2020-02-27 09:34:44 -0800 All reviewed patches have been landed. Closing bug. 391790 2020-02-26 15:28:49 -0800 2020-02-26 16:13:27 -0800 Patch bug-208269-20200226152848.patch text/plain 6325 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDM4NjhiN2RkM2EwMGJj ZDQ4ZTBkMDM4YjMxMjk3NWY1NWM0NGVkNC4uMmRkY2M2ZWZmYTZhNTlkNzVjMWNkZmRkY2JhZjY3 ZDhiNTRiNTMyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTAyLTI2ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwIEhpdFRlc3RS ZXN1bHQue2gsIGNwcH0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwODI2OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTk4MjQxODY+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIG1vZGVybiBDKysg ZmVhdHVyZXMgdG8gcmVtb3ZlIGR1cGxpY2F0ZSBjb2RlLgorCisgICAgICAgICogcmVuZGVyaW5n L0hpdFRlc3RMb2NhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIaXRUZXN0TG9jYXRpb246 OkhpdFRlc3RMb2NhdGlvbik6CisgICAgICAgICogcmVuZGVyaW5nL0hpdFRlc3RMb2NhdGlvbi5o OgorICAgICAgICAqIHJlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNwcDogUmVtb3ZlIHVubmVjZXNz YXJ5ICNpbmNsdWRlcy4KKyAgICAgICAgKFdlYkNvcmU6OkhpdFRlc3RSZXN1bHQ6OkhpdFRlc3RS ZXN1bHQpOgorICAgICAgICAqIHJlbmRlcmluZy9IaXRUZXN0UmVzdWx0Lmg6IFJlbW92ZSB1bm5l Y2Vzc2FyeSAjaW5jbHVkZXMuIAorICAgICAgICAoV2ViQ29yZTo6SGl0VGVzdFJlc3VsdDo6c2V0 SXNPdmVyV2lkZ2V0KToKKwogMjAyMC0wMi0yNiAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBs ZS5jb20+CiAKICAgICAgICAgQ2xlYW4gdXAgSGl0VGVzdExvY2F0aW9uLmgKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNwcAppbmRleCBiM2M0MDA3OTAyZGY2MDQ4NjJh NWFjN2MyOTk4Y2JhZDczZjExMmU3Li4zMWQwZjg5MWYwNGFjYzk3YWFkOTcwZDk5YmFkMmZlMzZk ZGUzNjU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3Vs dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuY3BwCkBA IC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNiwgMjAwOCwgMjAxMSBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDgs IDIwMTEtMjAyMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQg KEMpIDIwMTIgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1pZXMpCiAg KgogICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRl IGl0IGFuZC9vcgpAQCAtMjgsMjAgKzI4LDE1IEBACiAjaW5jbHVkZSAiRmlsZS5oIgogI2luY2x1 ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVTZWxlY3Rpb24uaCIKLSNpbmNsdWRlICJGcmFt ZVRyZWUuaCIKICNpbmNsdWRlICJIVE1MQW5jaG9yRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxB dHRhY2htZW50RWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxFbWJlZEVsZW1lbnQuaCIKICNpbmNs dWRlICJIVE1MSW1hZ2VFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTElucHV0RWxlbWVudC5oIgot I2luY2x1ZGUgIkhUTUxNZWRpYUVsZW1lbnQuaCIKLSNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNp bmNsdWRlICJIVE1MT2JqZWN0RWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxQYXJzZXJJZGlvbXMu aCIKLSNpbmNsdWRlICJIVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTFRl eHRBcmVhRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxWaWRlb0VsZW1lbnQuaCIKLSNpbmNsdWRl ICJIaXRUZXN0TG9jYXRpb24uaCIKICNpbmNsdWRlICJQc2V1ZG9FbGVtZW50LmgiCiAjaW5jbHVk ZSAiUmVuZGVyQmxvY2tGbG93LmgiCiAjaW5jbHVkZSAiUmVuZGVySW1hZ2UuaCIKQEAgLTU5LDI5 ICs1NCwyOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFt ZXM7CiAKLUhpdFRlc3RSZXN1bHQ6OkhpdFRlc3RSZXN1bHQoKQotICAgIDogbV9pc092ZXJXaWRn ZXQoZmFsc2UpCi17Ci19CitIaXRUZXN0UmVzdWx0OjpIaXRUZXN0UmVzdWx0KCkgPSBkZWZhdWx0 OwogCiBIaXRUZXN0UmVzdWx0OjpIaXRUZXN0UmVzdWx0KGNvbnN0IExheW91dFBvaW50JiBwb2lu dCkKICAgICA6IG1faGl0VGVzdExvY2F0aW9uKHBvaW50KQogICAgICwgbV9wb2ludEluSW5uZXJO b2RlRnJhbWUocG9pbnQpCi0gICAgLCBtX2lzT3ZlcldpZGdldChmYWxzZSkKK3sKK30KKworSGl0 VGVzdFJlc3VsdDo6SGl0VGVzdFJlc3VsdChjb25zdCBMYXlvdXRSZWN0JiByZWN0KQorICAgIDog bV9oaXRUZXN0TG9jYXRpb24geyByZWN0IH0KKyAgICAsIG1fcG9pbnRJbklubmVyTm9kZUZyYW1l IHsgcmVjdC5jZW50ZXIoKSB9CiB7CiB9CiAKIEhpdFRlc3RSZXN1bHQ6OkhpdFRlc3RSZXN1bHQo Y29uc3QgTGF5b3V0UG9pbnQmIGNlbnRlclBvaW50LCB1bnNpZ25lZCB0b3BQYWRkaW5nLCB1bnNp Z25lZCByaWdodFBhZGRpbmcsIHVuc2lnbmVkIGJvdHRvbVBhZGRpbmcsIHVuc2lnbmVkIGxlZnRQ YWRkaW5nKQogICAgIDogbV9oaXRUZXN0TG9jYXRpb24oY2VudGVyUG9pbnQsIHRvcFBhZGRpbmcs IHJpZ2h0UGFkZGluZywgYm90dG9tUGFkZGluZywgbGVmdFBhZGRpbmcpCiAgICAgLCBtX3BvaW50 SW5Jbm5lck5vZGVGcmFtZShjZW50ZXJQb2ludCkKLSAgICAsIG1faXNPdmVyV2lkZ2V0KGZhbHNl KQogewogfQogCiBIaXRUZXN0UmVzdWx0OjpIaXRUZXN0UmVzdWx0KGNvbnN0IEhpdFRlc3RMb2Nh dGlvbiYgb3RoZXIpCiAgICAgOiBtX2hpdFRlc3RMb2NhdGlvbihvdGhlcikKICAgICAsIG1fcG9p bnRJbklubmVyTm9kZUZyYW1lKG1faGl0VGVzdExvY2F0aW9uLnBvaW50KCkpCi0gICAgLCBtX2lz T3ZlcldpZGdldChmYWxzZSkKIHsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0hpdFRlc3RSZXN1bHQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0 UmVzdWx0LmgKaW5kZXggMTBhMTk0MzZiNGJhYzY1NjI5MDZiMjQxYTcwZDFkNTg1MjAwMDJmMi4u YzBmYmYzYTU3OWRhNjhmOTJmMmE5ZjdkZGM1NGM4MmU5MzhmOTg1YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5oCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHly aWdodCAoQykgMjAwNiBBcHBsZSBJbmMuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMTQsIDIw MjAgQXBwbGUgSW5jLgogICogQ29weXJpZ2h0IChDKSAyMDEyIE5va2lhIENvcnBvcmF0aW9uIGFu ZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKQogICoKICAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNv ZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKQEAgLTIxLDE0ICsyMSwxMCBA QAogCiAjcHJhZ21hIG9uY2UKIAotI2luY2x1ZGUgIkZsb2F0UmVjdC5oIgogI2luY2x1ZGUgIkhp dFRlc3RMb2NhdGlvbi5oIgogI2luY2x1ZGUgIkhpdFRlc3RSZXF1ZXN0LmgiCi0jaW5jbHVkZSAi TGF5b3V0UmVjdC5oIgotI2luY2x1ZGUgPG1lbW9yeT4KICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5o PgogI2luY2x1ZGUgPHd0Zi9MaXN0SGFzaFNldC5oPgotI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4K IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC00NCw3ICs0MCw3IEBAIGVudW0gY2xhc3MgSGl0 VGVzdFByb2dyZXNzIHsgU3RvcCwgQ29udGludWUgfTsKIGNsYXNzIEhpdFRlc3RSZXN1bHQgewog ICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgotICAgIHR5cGVkZWYgTGlzdEhh c2hTZXQ8UmVmUHRyPE5vZGU+PiBOb2RlU2V0OworICAgIHVzaW5nIE5vZGVTZXQgPSBMaXN0SGFz aFNldDxSZWZQdHI8Tm9kZT4+OwogCiAgICAgV0VCQ09SRV9FWFBPUlQgSGl0VGVzdFJlc3VsdCgp OwogICAgIFdFQkNPUkVfRVhQT1JUIGV4cGxpY2l0IEhpdFRlc3RSZXN1bHQoY29uc3QgTGF5b3V0 UG9pbnQmKTsKQEAgLTUzLDE0ICs0OSwyNSBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQg ZXhwbGljaXQgSGl0VGVzdFJlc3VsdChjb25zdCBIaXRUZXN0TG9jYXRpb24mKTsKICAgICBXRUJD T1JFX0VYUE9SVCBIaXRUZXN0UmVzdWx0KGNvbnN0IEhpdFRlc3RSZXN1bHQmKTsKICAgICBXRUJD T1JFX0VYUE9SVCB+SGl0VGVzdFJlc3VsdCgpOworCiAgICAgV0VCQ09SRV9FWFBPUlQgSGl0VGVz dFJlc3VsdCYgb3BlcmF0b3I9KGNvbnN0IEhpdFRlc3RSZXN1bHQmKTsKIAorICAgIFdFQkNPUkVf RVhQT1JUIHZvaWQgc2V0SW5uZXJOb2RlKE5vZGUqKTsKICAgICBOb2RlKiBpbm5lck5vZGUoKSBj b25zdCB7IHJldHVybiBtX2lubmVyTm9kZS5nZXQoKTsgfQorCisgICAgdm9pZCBzZXRJbm5lck5v blNoYXJlZE5vZGUoTm9kZSopOwogICAgIE5vZGUqIGlubmVyTm9uU2hhcmVkTm9kZSgpIGNvbnN0 IHsgcmV0dXJuIG1faW5uZXJOb25TaGFyZWROb2RlLmdldCgpOyB9CisKICAgICBXRUJDT1JFX0VY UE9SVCBFbGVtZW50KiBpbm5lck5vblNoYXJlZEVsZW1lbnQoKSBjb25zdDsKKworICAgIHZvaWQg c2V0VVJMRWxlbWVudChFbGVtZW50Kik7CiAgICAgRWxlbWVudCogVVJMRWxlbWVudCgpIGNvbnN0 IHsgcmV0dXJuIG1faW5uZXJVUkxFbGVtZW50LmdldCgpOyB9CisKKyAgICB2b2lkIHNldFNjcm9s bGJhcihTY3JvbGxiYXIqKTsKICAgICBTY3JvbGxiYXIqIHNjcm9sbGJhcigpIGNvbnN0IHsgcmV0 dXJuIG1fc2Nyb2xsYmFyLmdldCgpOyB9CisKICAgICBib29sIGlzT3ZlcldpZGdldCgpIGNvbnN0 IHsgcmV0dXJuIG1faXNPdmVyV2lkZ2V0OyB9CisgICAgdm9pZCBzZXRJc092ZXJXaWRnZXQoYm9v bCBpc092ZXJXaWRnZXQpIHsgbV9pc092ZXJXaWRnZXQgPSBpc092ZXJXaWRnZXQ7IH0KIAogICAg IFdFQkNPUkVfRVhQT1JUIFN0cmluZyBsaW5rU3VnZ2VzdGVkRmlsZW5hbWUoKSBjb25zdDsKIApA QCAtODQsMTIgKzkxLDYgQEAgcHVibGljOgogCiAgICAgY29uc3QgSGl0VGVzdExvY2F0aW9uJiBo aXRUZXN0TG9jYXRpb24oKSBjb25zdCB7IHJldHVybiBtX2hpdFRlc3RMb2NhdGlvbjsgfQogCi0g ICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRJbm5lck5vZGUoTm9kZSopOwotICAgIHZvaWQgc2V0 SW5uZXJOb25TaGFyZWROb2RlKE5vZGUqKTsKLSAgICB2b2lkIHNldFVSTEVsZW1lbnQoRWxlbWVu dCopOwotICAgIHZvaWQgc2V0U2Nyb2xsYmFyKFNjcm9sbGJhciopOwotICAgIHZvaWQgc2V0SXNP dmVyV2lkZ2V0KGJvb2wgYikgeyBtX2lzT3ZlcldpZGdldCA9IGI7IH0KLQogICAgIFdFQkNPUkVf RVhQT1JUIEZyYW1lKiB0YXJnZXRGcmFtZSgpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIGJv b2wgaXNTZWxlY3RlZCgpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyBzZWxlY3Rl ZFRleHQoKSBjb25zdDsKQEAgLTE1OCw3ICsxNTksNyBAQCBwcml2YXRlOgogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgLy8gZGV0ZXJtaW5lIHdoZXJlIGluc2lkZSB0aGUgcmVuZGVyZXIg d2UgaGl0IG9uIHN1YnNlcXVlbnQgb3BlcmF0aW9ucy4KICAgICBSZWZQdHI8RWxlbWVudD4gbV9p bm5lclVSTEVsZW1lbnQ7CiAgICAgUmVmUHRyPFNjcm9sbGJhcj4gbV9zY3JvbGxiYXI7Ci0gICAg Ym9vbCBtX2lzT3ZlcldpZGdldDsgLy8gUmV0dXJucyB0cnVlIGlmIHdlIGFyZSBvdmVyIGEgd2lk Z2V0IChhbmQgbm90IGluIHRoZSBib3JkZXIvcGFkZGluZyBhcmVhIG9mIGEgUmVuZGVyV2lkZ2V0 IGZvciBleGFtcGxlKS4KKyAgICBib29sIG1faXNPdmVyV2lkZ2V0IHsgZmFsc2UgfTsgLy8gUmV0 dXJucyB0cnVlIGlmIHdlIGFyZSBvdmVyIGEgd2lkZ2V0IChhbmQgbm90IGluIHRoZSBib3JkZXIv cGFkZGluZyBhcmVhIG9mIGEgUmVuZGVyV2lkZ2V0IGZvciBleGFtcGxlKS4KIAogICAgIG11dGFi bGUgc3RkOjp1bmlxdWVfcHRyPE5vZGVTZXQ+IG1fbGlzdEJhc2VkVGVzdFJlc3VsdDsKIH07Cg== 391800 2020-02-26 16:13:29 -0800 2020-02-27 09:34:42 -0800 Patch bug-208269-20200226161328.patch text/plain 6130 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDM4NjhiN2RkM2EwMGJj ZDQ4ZTBkMDM4YjMxMjk3NWY1NWM0NGVkNC4uMDYyZmZhYTdjMDNkNmJjNThkMzUxN2QzOTI2MTI3 NDQwMWY3OThkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAyLTI2ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwIEhpdFRlc3RS ZXN1bHQue2gsIGNwcH0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwODI2OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTk4MjQxODY+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIG1vZGVybiBDKysg ZmVhdHVyZXMgdG8gcmVtb3ZlIGR1cGxpY2F0ZSBjb2RlLgorCisgICAgICAgICogcmVuZGVyaW5n L0hpdFRlc3RMb2NhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIaXRUZXN0TG9jYXRpb246 OkhpdFRlc3RMb2NhdGlvbik6CisgICAgICAgICogcmVuZGVyaW5nL0hpdFRlc3RMb2NhdGlvbi5o OgorICAgICAgICAqIHJlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNwcDogUmVtb3ZlIHVubmVjZXNz YXJ5ICNpbmNsdWRlcy4KKyAgICAgICAgKiByZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5oOiBSZW1v dmUgdW5uZWNlc3NhcnkgI2luY2x1ZGVzLiAKKyAgICAgICAgKFdlYkNvcmU6OkhpdFRlc3RSZXN1 bHQ6OnNldElzT3ZlcldpZGdldCk6CisKIDIwMjAtMDItMjYgIERhbmllbCBCYXRlcyAgPGRhYmF0 ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIENsZWFuIHVwIEhpdFRlc3RMb2NhdGlvbi5oCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5jcHAKaW5kZXggYjNjNDAwNzkwMmRm NjA0ODYyYTVhYzdjMjk5OGNiYWQ3M2YxMTJlNy4uODIyMDQyNGEyMjc1MGE3ZTgyZjQ2MzM4NTBh MDNkYWE2Y2Y0N2Q2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRl c3RSZXN1bHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0 LmNwcApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDgsIDIw MTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA2 LCAyMDA4LCAyMDExLTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29w eXJpZ2h0IChDKSAyMDEyIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgt aWVzKQogICoKICAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlz dHJpYnV0ZSBpdCBhbmQvb3IKQEAgLTI4LDIwICsyOCwxNSBAQAogI2luY2x1ZGUgIkZpbGUuaCIK ICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lU2VsZWN0aW9uLmgiCi0jaW5jbHVk ZSAiRnJhbWVUcmVlLmgiCiAjaW5jbHVkZSAiSFRNTEFuY2hvckVsZW1lbnQuaCIKICNpbmNsdWRl ICJIVE1MQXR0YWNobWVudEVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MRW1iZWRFbGVtZW50Lmgi CiAjaW5jbHVkZSAiSFRNTEltYWdlRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxJbnB1dEVsZW1l bnQuaCIKLSNpbmNsdWRlICJIVE1MTWVkaWFFbGVtZW50LmgiCi0jaW5jbHVkZSAiSFRNTE5hbWVz LmgiCiAjaW5jbHVkZSAiSFRNTE9iamVjdEVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MUGFyc2Vy SWRpb21zLmgiCi0jaW5jbHVkZSAiSFRNTFBsdWdJbkltYWdlRWxlbWVudC5oIgogI2luY2x1ZGUg IkhUTUxUZXh0QXJlYUVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MVmlkZW9FbGVtZW50LmgiCi0j aW5jbHVkZSAiSGl0VGVzdExvY2F0aW9uLmgiCiAjaW5jbHVkZSAiUHNldWRvRWxlbWVudC5oIgog I2luY2x1ZGUgIlJlbmRlckJsb2NrRmxvdy5oIgogI2luY2x1ZGUgIlJlbmRlckltYWdlLmgiCkBA IC01OSwyOSArNTQsMjMgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1c2luZyBuYW1lc3BhY2Ug SFRNTE5hbWVzOwogCi1IaXRUZXN0UmVzdWx0OjpIaXRUZXN0UmVzdWx0KCkKLSAgICA6IG1faXNP dmVyV2lkZ2V0KGZhbHNlKQotewotfQorSGl0VGVzdFJlc3VsdDo6SGl0VGVzdFJlc3VsdCgpID0g ZGVmYXVsdDsKIAogSGl0VGVzdFJlc3VsdDo6SGl0VGVzdFJlc3VsdChjb25zdCBMYXlvdXRQb2lu dCYgcG9pbnQpCiAgICAgOiBtX2hpdFRlc3RMb2NhdGlvbihwb2ludCkKICAgICAsIG1fcG9pbnRJ bklubmVyTm9kZUZyYW1lKHBvaW50KQotICAgICwgbV9pc092ZXJXaWRnZXQoZmFsc2UpCiB7CiB9 CiAKIEhpdFRlc3RSZXN1bHQ6OkhpdFRlc3RSZXN1bHQoY29uc3QgTGF5b3V0UG9pbnQmIGNlbnRl clBvaW50LCB1bnNpZ25lZCB0b3BQYWRkaW5nLCB1bnNpZ25lZCByaWdodFBhZGRpbmcsIHVuc2ln bmVkIGJvdHRvbVBhZGRpbmcsIHVuc2lnbmVkIGxlZnRQYWRkaW5nKQogICAgIDogbV9oaXRUZXN0 TG9jYXRpb24oY2VudGVyUG9pbnQsIHRvcFBhZGRpbmcsIHJpZ2h0UGFkZGluZywgYm90dG9tUGFk ZGluZywgbGVmdFBhZGRpbmcpCiAgICAgLCBtX3BvaW50SW5Jbm5lck5vZGVGcmFtZShjZW50ZXJQ b2ludCkKLSAgICAsIG1faXNPdmVyV2lkZ2V0KGZhbHNlKQogewogfQogCiBIaXRUZXN0UmVzdWx0 OjpIaXRUZXN0UmVzdWx0KGNvbnN0IEhpdFRlc3RMb2NhdGlvbiYgb3RoZXIpCiAgICAgOiBtX2hp dFRlc3RMb2NhdGlvbihvdGhlcikKICAgICAsIG1fcG9pbnRJbklubmVyTm9kZUZyYW1lKG1faGl0 VGVzdExvY2F0aW9uLnBvaW50KCkpCi0gICAgLCBtX2lzT3ZlcldpZGdldChmYWxzZSkKIHsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuaCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmgKaW5kZXggMTBhMTk0MzZi NGJhYzY1NjI5MDZiMjQxYTcwZDFkNTg1MjAwMDJmMi4uYzBmYmYzYTU3OWRhNjhmOTJmMmE5Zjdk ZGM1NGM4MmU5MzhmOTg1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hp dFRlc3RSZXN1bHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3Vs dC5oCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNiBBcHBsZSBJbmMu CisgKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMTQsIDIwMjAgQXBwbGUgSW5jLgogICogQ29weXJp Z2h0IChDKSAyMDEyIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVz KQogICoKICAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJp YnV0ZSBpdCBhbmQvb3IKQEAgLTIxLDE0ICsyMSwxMCBAQAogCiAjcHJhZ21hIG9uY2UKIAotI2lu Y2x1ZGUgIkZsb2F0UmVjdC5oIgogI2luY2x1ZGUgIkhpdFRlc3RMb2NhdGlvbi5oIgogI2luY2x1 ZGUgIkhpdFRlc3RSZXF1ZXN0LmgiCi0jaW5jbHVkZSAiTGF5b3V0UmVjdC5oIgotI2luY2x1ZGUg PG1lbW9yeT4KICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0Zi9MaXN0SGFz aFNldC5oPgotI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewog CkBAIC00NCw3ICs0MCw3IEBAIGVudW0gY2xhc3MgSGl0VGVzdFByb2dyZXNzIHsgU3RvcCwgQ29u dGludWUgfTsKIGNsYXNzIEhpdFRlc3RSZXN1bHQgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NB VEVEOwogcHVibGljOgotICAgIHR5cGVkZWYgTGlzdEhhc2hTZXQ8UmVmUHRyPE5vZGU+PiBOb2Rl U2V0OworICAgIHVzaW5nIE5vZGVTZXQgPSBMaXN0SGFzaFNldDxSZWZQdHI8Tm9kZT4+OwogCiAg ICAgV0VCQ09SRV9FWFBPUlQgSGl0VGVzdFJlc3VsdCgpOwogICAgIFdFQkNPUkVfRVhQT1JUIGV4 cGxpY2l0IEhpdFRlc3RSZXN1bHQoY29uc3QgTGF5b3V0UG9pbnQmKTsKQEAgLTUzLDE0ICs0OSwy NSBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgZXhwbGljaXQgSGl0VGVzdFJlc3VsdChj b25zdCBIaXRUZXN0TG9jYXRpb24mKTsKICAgICBXRUJDT1JFX0VYUE9SVCBIaXRUZXN0UmVzdWx0 KGNvbnN0IEhpdFRlc3RSZXN1bHQmKTsKICAgICBXRUJDT1JFX0VYUE9SVCB+SGl0VGVzdFJlc3Vs dCgpOworCiAgICAgV0VCQ09SRV9FWFBPUlQgSGl0VGVzdFJlc3VsdCYgb3BlcmF0b3I9KGNvbnN0 IEhpdFRlc3RSZXN1bHQmKTsKIAorICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0SW5uZXJOb2Rl KE5vZGUqKTsKICAgICBOb2RlKiBpbm5lck5vZGUoKSBjb25zdCB7IHJldHVybiBtX2lubmVyTm9k ZS5nZXQoKTsgfQorCisgICAgdm9pZCBzZXRJbm5lck5vblNoYXJlZE5vZGUoTm9kZSopOwogICAg IE5vZGUqIGlubmVyTm9uU2hhcmVkTm9kZSgpIGNvbnN0IHsgcmV0dXJuIG1faW5uZXJOb25TaGFy ZWROb2RlLmdldCgpOyB9CisKICAgICBXRUJDT1JFX0VYUE9SVCBFbGVtZW50KiBpbm5lck5vblNo YXJlZEVsZW1lbnQoKSBjb25zdDsKKworICAgIHZvaWQgc2V0VVJMRWxlbWVudChFbGVtZW50Kik7 CiAgICAgRWxlbWVudCogVVJMRWxlbWVudCgpIGNvbnN0IHsgcmV0dXJuIG1faW5uZXJVUkxFbGVt ZW50LmdldCgpOyB9CisKKyAgICB2b2lkIHNldFNjcm9sbGJhcihTY3JvbGxiYXIqKTsKICAgICBT Y3JvbGxiYXIqIHNjcm9sbGJhcigpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsYmFyLmdldCgpOyB9 CisKICAgICBib29sIGlzT3ZlcldpZGdldCgpIGNvbnN0IHsgcmV0dXJuIG1faXNPdmVyV2lkZ2V0 OyB9CisgICAgdm9pZCBzZXRJc092ZXJXaWRnZXQoYm9vbCBpc092ZXJXaWRnZXQpIHsgbV9pc092 ZXJXaWRnZXQgPSBpc092ZXJXaWRnZXQ7IH0KIAogICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyBs aW5rU3VnZ2VzdGVkRmlsZW5hbWUoKSBjb25zdDsKIApAQCAtODQsMTIgKzkxLDYgQEAgcHVibGlj OgogCiAgICAgY29uc3QgSGl0VGVzdExvY2F0aW9uJiBoaXRUZXN0TG9jYXRpb24oKSBjb25zdCB7 IHJldHVybiBtX2hpdFRlc3RMb2NhdGlvbjsgfQogCi0gICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBz ZXRJbm5lck5vZGUoTm9kZSopOwotICAgIHZvaWQgc2V0SW5uZXJOb25TaGFyZWROb2RlKE5vZGUq KTsKLSAgICB2b2lkIHNldFVSTEVsZW1lbnQoRWxlbWVudCopOwotICAgIHZvaWQgc2V0U2Nyb2xs YmFyKFNjcm9sbGJhciopOwotICAgIHZvaWQgc2V0SXNPdmVyV2lkZ2V0KGJvb2wgYikgeyBtX2lz T3ZlcldpZGdldCA9IGI7IH0KLQogICAgIFdFQkNPUkVfRVhQT1JUIEZyYW1lKiB0YXJnZXRGcmFt ZSgpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNTZWxlY3RlZCgpIGNvbnN0Owog ICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyBzZWxlY3RlZFRleHQoKSBjb25zdDsKQEAgLTE1OCw3 ICsxNTksNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gZGV0 ZXJtaW5lIHdoZXJlIGluc2lkZSB0aGUgcmVuZGVyZXIgd2UgaGl0IG9uIHN1YnNlcXVlbnQgb3Bl cmF0aW9ucy4KICAgICBSZWZQdHI8RWxlbWVudD4gbV9pbm5lclVSTEVsZW1lbnQ7CiAgICAgUmVm UHRyPFNjcm9sbGJhcj4gbV9zY3JvbGxiYXI7Ci0gICAgYm9vbCBtX2lzT3ZlcldpZGdldDsgLy8g UmV0dXJucyB0cnVlIGlmIHdlIGFyZSBvdmVyIGEgd2lkZ2V0IChhbmQgbm90IGluIHRoZSBib3Jk ZXIvcGFkZGluZyBhcmVhIG9mIGEgUmVuZGVyV2lkZ2V0IGZvciBleGFtcGxlKS4KKyAgICBib29s IG1faXNPdmVyV2lkZ2V0IHsgZmFsc2UgfTsgLy8gUmV0dXJucyB0cnVlIGlmIHdlIGFyZSBvdmVy IGEgd2lkZ2V0IChhbmQgbm90IGluIHRoZSBib3JkZXIvcGFkZGluZyBhcmVhIG9mIGEgUmVuZGVy V2lkZ2V0IGZvciBleGFtcGxlKS4KIAogICAgIG11dGFibGUgc3RkOjp1bmlxdWVfcHRyPE5vZGVT ZXQ+IG1fbGlzdEJhc2VkVGVzdFJlc3VsdDsKIH07Cg==