189528 2018-09-11 15:53:11 -0700 Expose fewer of URL's internal members 2018-09-15 08:27:47 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez commit-queue darin dbates ews-watchlist japhet webkit-bug-importer oldest_to_newest 1458746 0 achristensen 2018-09-11 15:53:11 -0700 Expose fewer of URL's internal members 1458747 1 349484 achristensen 2018-09-11 15:53:41 -0700 Created attachment 349484 Patch 1459004 2 349557 achristensen 2018-09-12 10:16:50 -0700 Created attachment 349557 Patch 1459087 3 349557 commit-queue 2018-09-12 14:01:13 -0700 Comment on attachment 349557 Patch Clearing flags on attachment: 349557 Committed r235949: <https://trac.webkit.org/changeset/235949> 1459088 4 commit-queue 2018-09-12 14:01:15 -0700 All reviewed patches have been landed. Closing bug. 1459089 5 webkit-bug-importer 2018-09-12 14:03:34 -0700 <rdar://problem/44393455> 1459621 6 349557 darin 2018-09-13 18:55:01 -0700 Comment on attachment 349557 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=349557&action=review > Source/WebCore/platform/URL.cpp:434 > +unsigned URL::hostStart() const > +{ > + return (m_passwordEnd == m_userStart) ? m_passwordEnd : m_passwordEnd + 1; > +} What is the value in de-inlining this? Does it improve performance or code size or something? 1459794 7 achristensen 2018-09-14 10:53:01 -0700 It's now only used in URL.cpp. Moving it makes URL.h less of a mess, and I believe it would always be inlined in release builds. 1460034 8 darin 2018-09-15 08:27:47 -0700 (In reply to Alex Christensen from comment #7) > It's now only used in URL.cpp. Moving it makes URL.h less of a mess, and I > believe it would always be inlined in release builds. Makes sense. I have to remember that in modern times the inline keyword now means "OK to have this in a header / multiple translation units" rather than literally "compile this function inline". Which means we probably *never* need to specify inline for a function template. 349484 2018-09-11 15:53:41 -0700 2018-09-12 10:16:48 -0700 Patch bug-189528-20180911155341.patch text/plain 4682 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNTkxNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA5LTExICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRXhwb3NlIGZl d2VyIG9mIFVSTCdzIGludGVybmFsIG1lbWJlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTUyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVT dG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnVybEhvc3RIYXNoKToKKyAgICAgICAgKiBw bGF0Zm9ybS9VUkwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VVJMOjpob3N0U3RhcnQgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6cHJvdG9jb2xIb3N0QW5kUG9ydEFyZUVxdWFsKToKKyAgICAg ICAgKFdlYkNvcmU6Omhvc3RzQXJlRXF1YWwpOgorICAgICAgICAqIHBsYXRmb3JtL1VSTC5oOgor ICAgICAgICAoV2ViQ29yZTo6VVJMOjpob3N0U3RhcnQgY29uc3QpOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6VVJMOjpob3N0RW5kIGNvbnN0KTogRGVsZXRlZC4KKwogMjAxOC0wOS0xMSAg UGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkcmVzc2lu ZyBwb3N0LXJldmlldyBmZWVkYmFjayBvbiByMjM1NjE5LgpJbmRleDogU291cmNlL1dlYkNvcmUv bG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZVN0b3JhZ2Uu Y3BwCShyZXZpc2lvbiAyMzU5MTIpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUv QXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NCwxNSArODQs MTAgQEAgcHJpdmF0ZToKIAogc3RhdGljIHVuc2lnbmVkIHVybEhvc3RIYXNoKGNvbnN0IFVSTCYg dXJsKQogewotICAgIHVuc2lnbmVkIGhvc3RTdGFydCA9IHVybC5ob3N0U3RhcnQoKTsKLSAgICB1 bnNpZ25lZCBob3N0RW5kID0gdXJsLmhvc3RFbmQoKTsKLQotICAgIGNvbnN0IFN0cmluZyYgdXJs U3RyaW5nID0gdXJsLnN0cmluZygpOwotCi0gICAgaWYgKHVybFN0cmluZy5pczhCaXQoKSkKLSAg ICAgICAgcmV0dXJuIEFscmVhZHlIYXNoZWQ6OmF2b2lkRGVsZXRlZFZhbHVlKFN0cmluZ0hhc2hl cjo6Y29tcHV0ZUhhc2hBbmRNYXNrVG9wOEJpdHModXJsU3RyaW5nLmNoYXJhY3RlcnM4KCkgKyBo b3N0U3RhcnQsIGhvc3RFbmQgLSBob3N0U3RhcnQpKTsKLSAgICAKLSAgICByZXR1cm4gQWxyZWFk eUhhc2hlZDo6YXZvaWREZWxldGVkVmFsdWUoU3RyaW5nSGFzaGVyOjpjb21wdXRlSGFzaEFuZE1h c2tUb3A4Qml0cyh1cmxTdHJpbmcuY2hhcmFjdGVyczE2KCkgKyBob3N0U3RhcnQsIGhvc3RFbmQg LSBob3N0U3RhcnQpKTsKKyAgICBTdHJpbmdWaWV3IGhvc3QgPSB1cmwuaG9zdCgpOworICAgIGlm IChob3N0LmlzOEJpdCgpKQorICAgICAgICByZXR1cm4gQWxyZWFkeUhhc2hlZDo6YXZvaWREZWxl dGVkVmFsdWUoU3RyaW5nSGFzaGVyOjpjb21wdXRlSGFzaEFuZE1hc2tUb3A4Qml0cyhob3N0LmNo YXJhY3RlcnM4KCksIGhvc3QubGVuZ3RoKCkpKTsKKyAgICByZXR1cm4gQWxyZWFkeUhhc2hlZDo6 YXZvaWREZWxldGVkVmFsdWUoU3RyaW5nSGFzaGVyOjpjb21wdXRlSGFzaEFuZE1hc2tUb3A4Qml0 cyhob3N0LmNoYXJhY3RlcnMxNigpLCBob3N0Lmxlbmd0aCgpKSk7CiB9CiAKIEFwcGxpY2F0aW9u Q2FjaGVHcm91cCogQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OmxvYWRDYWNoZUdyb3VwKGNvbnN0 IFVSTCYgbWFuaWZlc3RVUkwpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkwuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5jcHAJKHJldmlzaW9u IDIzNTkxMikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTQyNyw3ICs0MjcsMTIgQEAgc3RhdGljIGJvb2wgYXBwZW5kRW5jb2RlZEhvc3RuYW1l KFVDaGFyQgogICAgIH0KICAgICByZXR1cm4gZmFsc2U7CiB9Ci0gICAgCisKK3Vuc2lnbmVkIFVS TDo6aG9zdFN0YXJ0KCkgY29uc3QKK3sKKyAgICByZXR1cm4gKG1fcGFzc3dvcmRFbmQgPT0gbV91 c2VyU3RhcnQpID8gbV9wYXNzd29yZEVuZCA6IG1fcGFzc3dvcmRFbmQgKyAxOworfQorCiB2b2lk IFVSTDo6c2V0SG9zdChjb25zdCBTdHJpbmcmIHMpCiB7CiAgICAgaWYgKCFtX2lzVmFsaWQpCkBA IC03NDIsOSArNzQ3LDkgQEAgYm9vbCBwcm90b2NvbEhvc3RBbmRQb3J0QXJlRXF1YWwoY29uc3Qg VQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICB1bnNpZ25lZCBob3N0U3RhcnRBID0gYS5o b3N0U3RhcnQoKTsKLSAgICB1bnNpZ25lZCBob3N0TGVuZ3RoQSA9IGEuaG9zdEVuZCgpIC0gaG9z dFN0YXJ0QTsKKyAgICB1bnNpZ25lZCBob3N0TGVuZ3RoQSA9IGEubV9ob3N0RW5kIC0gaG9zdFN0 YXJ0QTsKICAgICB1bnNpZ25lZCBob3N0U3RhcnRCID0gYi5ob3N0U3RhcnQoKTsKLSAgICB1bnNp Z25lZCBob3N0TGVuZ3RoQiA9IGIuaG9zdEVuZCgpIC0gYi5ob3N0U3RhcnQoKTsKKyAgICB1bnNp Z25lZCBob3N0TGVuZ3RoQiA9IGIubV9ob3N0RW5kIC0gYi5ob3N0U3RhcnQoKTsKICAgICBpZiAo aG9zdExlbmd0aEEgIT0gaG9zdExlbmd0aEIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAt NzY5LDkgKzc3NCw5IEBAIGJvb2wgcHJvdG9jb2xIb3N0QW5kUG9ydEFyZUVxdWFsKGNvbnN0IFUK IGJvb2wgaG9zdHNBcmVFcXVhbChjb25zdCBVUkwmIGEsIGNvbnN0IFVSTCYgYikKIHsKICAgICB1 bnNpZ25lZCBob3N0U3RhcnRBID0gYS5ob3N0U3RhcnQoKTsKLSAgICB1bnNpZ25lZCBob3N0TGVu Z3RoQSA9IGEuaG9zdEVuZCgpIC0gaG9zdFN0YXJ0QTsKKyAgICB1bnNpZ25lZCBob3N0TGVuZ3Ro QSA9IGEubV9ob3N0RW5kIC0gaG9zdFN0YXJ0QTsKICAgICB1bnNpZ25lZCBob3N0U3RhcnRCID0g Yi5ob3N0U3RhcnQoKTsKLSAgICB1bnNpZ25lZCBob3N0TGVuZ3RoQiA9IGIuaG9zdEVuZCgpIC0g aG9zdFN0YXJ0QjsKKyAgICB1bnNpZ25lZCBob3N0TGVuZ3RoQiA9IGIubV9ob3N0RW5kIC0gaG9z dFN0YXJ0QjsKICAgICBpZiAoaG9zdExlbmd0aEEgIT0gaG9zdExlbmd0aEIpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJMLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJMLmgJKHJldmlzaW9uIDIzNTkxMikK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzQs OSArMTc0LDYgQEAgcHVibGljOgogCiAgICAgV0VCQ09SRV9FWFBPUlQgZnJpZW5kIGJvb2wgcHJv dG9jb2xIb3N0QW5kUG9ydEFyZUVxdWFsKGNvbnN0IFVSTCYsIGNvbnN0IFVSTCYpOwogCi0gICAg dW5zaWduZWQgaG9zdFN0YXJ0KCkgY29uc3Q7Ci0gICAgdW5zaWduZWQgaG9zdEVuZCgpIGNvbnN0 OwotCiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIGJvb2wgaG9zdElzSVBBZGRyZXNzKFN0cmlu Z1ZpZXcpOwogCiAgICAgdW5zaWduZWQgcGF0aFN0YXJ0KCkgY29uc3Q7CkBAIC0yMTcsNiArMjE0 LDcgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgYm9vbCBwcm90b2NvbElzKGNvbnN0IFN0cmluZyYs IGNvbnN0IGNoYXIqKTsKICAgICB2b2lkIGluaXQoY29uc3QgVVJMJiwgY29uc3QgU3RyaW5nJiwg Y29uc3QgVGV4dEVuY29kaW5nJik7CiAgICAgdm9pZCBjb3B5VG9CdWZmZXIoVmVjdG9yPGNoYXIs IDUxMj4mIGJ1ZmZlcikgY29uc3Q7CisgICAgdW5zaWduZWQgaG9zdFN0YXJ0KCkgY29uc3Q7CiAK ICAgICBTdHJpbmcgbV9zdHJpbmc7CiAKQEAgLTM5NCwxNiArMzkyLDYgQEAgaW5saW5lIGJvb2wg VVJMOjpwcm90b2NvbElzSW5IVFRQRmFtaWx5KAogICAgIHJldHVybiBtX3Byb3RvY29sSXNJbkhU VFBGYW1pbHk7CiB9CiAKLWlubGluZSB1bnNpZ25lZCBVUkw6Omhvc3RTdGFydCgpIGNvbnN0Ci17 Ci0gICAgcmV0dXJuIChtX3Bhc3N3b3JkRW5kID09IG1fdXNlclN0YXJ0KSA/IG1fcGFzc3dvcmRF bmQgOiBtX3Bhc3N3b3JkRW5kICsgMTsKLX0KLQotaW5saW5lIHVuc2lnbmVkIFVSTDo6aG9zdEVu ZCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1faG9zdEVuZDsKLX0KLQogaW5saW5lIHVuc2lnbmVk IFVSTDo6cGF0aFN0YXJ0KCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9ob3N0RW5kICsgbV9wb3J0 TGVuZ3RoOwo= 349557 2018-09-12 10:16:50 -0700 2018-09-12 14:01:13 -0700 Patch bug-189528-20180912101649.patch text/plain 5136 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNTk0MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA5LTEyICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRXhwb3NlIGZl d2VyIG9mIFVSTCdzIGludGVybmFsIG1lbWJlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTUyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVT dG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnVybEhvc3RIYXNoKToKKyAgICAgICAgKiBw bGF0Zm9ybS9VUkwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VVJMOjpob3N0U3RhcnQgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6cHJvdG9jb2xIb3N0QW5kUG9ydEFyZUVxdWFsKToKKyAgICAg ICAgKFdlYkNvcmU6Omhvc3RzQXJlRXF1YWwpOgorICAgICAgICAqIHBsYXRmb3JtL1VSTC5oOgor ICAgICAgICAoV2ViQ29yZTo6VVJMOjpob3N0U3RhcnQgY29uc3QpOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6VVJMOjpob3N0RW5kIGNvbnN0KTogRGVsZXRlZC4KKwogMjAxOC0wOS0xMiAg RnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbV2lu XVtDbGFuZ10gZXJyb3I6IG5vbi1jb25zdGFudC1leHByZXNzaW9uIGNhbm5vdCBiZSBuYXJyb3dl ZCBmcm9tIHR5cGUgJ2ludCcgdG8gJ1NIT1JUJwpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVy L2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuY3BwCShy ZXZpc2lvbiAyMzU5NDIpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGlj YXRpb25DYWNoZVN0b3JhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NCwxNSArODQsMTAgQEAg cHJpdmF0ZToKIAogc3RhdGljIHVuc2lnbmVkIHVybEhvc3RIYXNoKGNvbnN0IFVSTCYgdXJsKQog ewotICAgIHVuc2lnbmVkIGhvc3RTdGFydCA9IHVybC5ob3N0U3RhcnQoKTsKLSAgICB1bnNpZ25l ZCBob3N0RW5kID0gdXJsLmhvc3RFbmQoKTsKLQotICAgIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5n ID0gdXJsLnN0cmluZygpOwotCi0gICAgaWYgKHVybFN0cmluZy5pczhCaXQoKSkKLSAgICAgICAg cmV0dXJuIEFscmVhZHlIYXNoZWQ6OmF2b2lkRGVsZXRlZFZhbHVlKFN0cmluZ0hhc2hlcjo6Y29t cHV0ZUhhc2hBbmRNYXNrVG9wOEJpdHModXJsU3RyaW5nLmNoYXJhY3RlcnM4KCkgKyBob3N0U3Rh cnQsIGhvc3RFbmQgLSBob3N0U3RhcnQpKTsKLSAgICAKLSAgICByZXR1cm4gQWxyZWFkeUhhc2hl ZDo6YXZvaWREZWxldGVkVmFsdWUoU3RyaW5nSGFzaGVyOjpjb21wdXRlSGFzaEFuZE1hc2tUb3A4 Qml0cyh1cmxTdHJpbmcuY2hhcmFjdGVyczE2KCkgKyBob3N0U3RhcnQsIGhvc3RFbmQgLSBob3N0 U3RhcnQpKTsKKyAgICBTdHJpbmdWaWV3IGhvc3QgPSB1cmwuaG9zdCgpOworICAgIGlmIChob3N0 LmlzOEJpdCgpKQorICAgICAgICByZXR1cm4gQWxyZWFkeUhhc2hlZDo6YXZvaWREZWxldGVkVmFs dWUoU3RyaW5nSGFzaGVyOjpjb21wdXRlSGFzaEFuZE1hc2tUb3A4Qml0cyhob3N0LmNoYXJhY3Rl cnM4KCksIGhvc3QubGVuZ3RoKCkpKTsKKyAgICByZXR1cm4gQWxyZWFkeUhhc2hlZDo6YXZvaWRE ZWxldGVkVmFsdWUoU3RyaW5nSGFzaGVyOjpjb21wdXRlSGFzaEFuZE1hc2tUb3A4Qml0cyhob3N0 LmNoYXJhY3RlcnMxNigpLCBob3N0Lmxlbmd0aCgpKSk7CiB9CiAKIEFwcGxpY2F0aW9uQ2FjaGVH cm91cCogQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OmxvYWRDYWNoZUdyb3VwKGNvbnN0IFVSTCYg bWFuaWZlc3RVUkwpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkwuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5jcHAJKHJldmlzaW9uIDIzNTk0 MikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQyNyw3ICs0MjcsMTIgQEAgc3RhdGljIGJvb2wgYXBwZW5kRW5jb2RlZEhvc3RuYW1lKFVDaGFy QgogICAgIH0KICAgICByZXR1cm4gZmFsc2U7CiB9Ci0gICAgCisKK3Vuc2lnbmVkIFVSTDo6aG9z dFN0YXJ0KCkgY29uc3QKK3sKKyAgICByZXR1cm4gKG1fcGFzc3dvcmRFbmQgPT0gbV91c2VyU3Rh cnQpID8gbV9wYXNzd29yZEVuZCA6IG1fcGFzc3dvcmRFbmQgKyAxOworfQorCiB2b2lkIFVSTDo6 c2V0SG9zdChjb25zdCBTdHJpbmcmIHMpCiB7CiAgICAgaWYgKCFtX2lzVmFsaWQpCkBAIC03NDIs OSArNzQ3LDkgQEAgYm9vbCBwcm90b2NvbEhvc3RBbmRQb3J0QXJlRXF1YWwoY29uc3QgVQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKICAgICB1bnNpZ25lZCBob3N0U3RhcnRBID0gYS5ob3N0U3Rh cnQoKTsKLSAgICB1bnNpZ25lZCBob3N0TGVuZ3RoQSA9IGEuaG9zdEVuZCgpIC0gaG9zdFN0YXJ0 QTsKKyAgICB1bnNpZ25lZCBob3N0TGVuZ3RoQSA9IGEubV9ob3N0RW5kIC0gaG9zdFN0YXJ0QTsK ICAgICB1bnNpZ25lZCBob3N0U3RhcnRCID0gYi5ob3N0U3RhcnQoKTsKLSAgICB1bnNpZ25lZCBo b3N0TGVuZ3RoQiA9IGIuaG9zdEVuZCgpIC0gYi5ob3N0U3RhcnQoKTsKKyAgICB1bnNpZ25lZCBo b3N0TGVuZ3RoQiA9IGIubV9ob3N0RW5kIC0gYi5ob3N0U3RhcnQoKTsKICAgICBpZiAoaG9zdExl bmd0aEEgIT0gaG9zdExlbmd0aEIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtNzY5LDkg Kzc3NCw5IEBAIGJvb2wgcHJvdG9jb2xIb3N0QW5kUG9ydEFyZUVxdWFsKGNvbnN0IFUKIGJvb2wg aG9zdHNBcmVFcXVhbChjb25zdCBVUkwmIGEsIGNvbnN0IFVSTCYgYikKIHsKICAgICB1bnNpZ25l ZCBob3N0U3RhcnRBID0gYS5ob3N0U3RhcnQoKTsKLSAgICB1bnNpZ25lZCBob3N0TGVuZ3RoQSA9 IGEuaG9zdEVuZCgpIC0gaG9zdFN0YXJ0QTsKKyAgICB1bnNpZ25lZCBob3N0TGVuZ3RoQSA9IGEu bV9ob3N0RW5kIC0gaG9zdFN0YXJ0QTsKICAgICB1bnNpZ25lZCBob3N0U3RhcnRCID0gYi5ob3N0 U3RhcnQoKTsKLSAgICB1bnNpZ25lZCBob3N0TGVuZ3RoQiA9IGIuaG9zdEVuZCgpIC0gaG9zdFN0 YXJ0QjsKKyAgICB1bnNpZ25lZCBob3N0TGVuZ3RoQiA9IGIubV9ob3N0RW5kIC0gaG9zdFN0YXJ0 QjsKICAgICBpZiAoaG9zdExlbmd0aEEgIT0gaG9zdExlbmd0aEIpCiAgICAgICAgIHJldHVybiBm YWxzZTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJMLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJMLmgJKHJldmlzaW9uIDIzNTk0MikKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzAsMTMgKzE3 MCw2IEBAIHB1YmxpYzoKIAogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgcmVtb3ZlUXVlcnlBbmRG cmFnbWVudElkZW50aWZpZXIoKTsKIAotICAgIFdFQkNPUkVfRVhQT1JUIGZyaWVuZCBib29sIGVx dWFsSWdub3JpbmdGcmFnbWVudElkZW50aWZpZXIoY29uc3QgVVJMJiwgY29uc3QgVVJMJik7Ci0K LSAgICBXRUJDT1JFX0VYUE9SVCBmcmllbmQgYm9vbCBwcm90b2NvbEhvc3RBbmRQb3J0QXJlRXF1 YWwoY29uc3QgVVJMJiwgY29uc3QgVVJMJik7Ci0KLSAgICB1bnNpZ25lZCBob3N0U3RhcnQoKSBj b25zdDsKLSAgICB1bnNpZ25lZCBob3N0RW5kKCkgY29uc3Q7Ci0KICAgICBXRUJDT1JFX0VYUE9S VCBzdGF0aWMgYm9vbCBob3N0SXNJUEFkZHJlc3MoU3RyaW5nVmlldyk7CiAKICAgICB1bnNpZ25l ZCBwYXRoU3RhcnQoKSBjb25zdDsKQEAgLTIxNyw2ICsyMTAsMTEgQEAgcHJpdmF0ZToKICAgICBz dGF0aWMgYm9vbCBwcm90b2NvbElzKGNvbnN0IFN0cmluZyYsIGNvbnN0IGNoYXIqKTsKICAgICB2 b2lkIGluaXQoY29uc3QgVVJMJiwgY29uc3QgU3RyaW5nJiwgY29uc3QgVGV4dEVuY29kaW5nJik7 CiAgICAgdm9pZCBjb3B5VG9CdWZmZXIoVmVjdG9yPGNoYXIsIDUxMj4mIGJ1ZmZlcikgY29uc3Q7 CisgICAgdW5zaWduZWQgaG9zdFN0YXJ0KCkgY29uc3Q7CisKKyAgICBXRUJDT1JFX0VYUE9SVCBm cmllbmQgYm9vbCBlcXVhbElnbm9yaW5nRnJhZ21lbnRJZGVudGlmaWVyKGNvbnN0IFVSTCYsIGNv bnN0IFVSTCYpOworICAgIFdFQkNPUkVfRVhQT1JUIGZyaWVuZCBib29sIHByb3RvY29sSG9zdEFu ZFBvcnRBcmVFcXVhbChjb25zdCBVUkwmLCBjb25zdCBVUkwmKTsKKyAgICBXRUJDT1JFX0VYUE9S VCBmcmllbmQgYm9vbCBob3N0c0FyZUVxdWFsKGNvbnN0IFVSTCYsIGNvbnN0IFVSTCYpOwogCiAg ICAgU3RyaW5nIG1fc3RyaW5nOwogCkBAIC0zOTQsMTYgKzM5Miw2IEBAIGlubGluZSBib29sIFVS TDo6cHJvdG9jb2xJc0luSFRUUEZhbWlseSgKICAgICByZXR1cm4gbV9wcm90b2NvbElzSW5IVFRQ RmFtaWx5OwogfQogCi1pbmxpbmUgdW5zaWduZWQgVVJMOjpob3N0U3RhcnQoKSBjb25zdAotewot ICAgIHJldHVybiAobV9wYXNzd29yZEVuZCA9PSBtX3VzZXJTdGFydCkgPyBtX3Bhc3N3b3JkRW5k IDogbV9wYXNzd29yZEVuZCArIDE7Ci19Ci0KLWlubGluZSB1bnNpZ25lZCBVUkw6Omhvc3RFbmQo KSBjb25zdAotewotICAgIHJldHVybiBtX2hvc3RFbmQ7Ci19Ci0KIGlubGluZSB1bnNpZ25lZCBV Ukw6OnBhdGhTdGFydCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1faG9zdEVuZCArIG1fcG9ydExl bmd0aDsK