138911 2014-11-19 20:45:03 -0800 Web Inspector: do not show invalid specificity for dynamic cases of :matches() 2014-11-20 20:30:52 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin oldest_to_newest 1050040 0 benjamin 2014-11-19 20:45:03 -0800 Web Inspector: do not show invalid specificity for dynamic cases of :matches() 1050041 1 241922 benjamin 2014-11-19 20:48:10 -0800 Created attachment 241922 Patch 1050310 2 241922 joepeck 2014-11-20 16:46:58 -0800 Comment on attachment 241922 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241922&action=review > Source/WebCore/css/CSSSelector.cpp:179 > + staticSpecificity = CSSSelector::addSpecificities(staticSpecificity, functionalPseudoClassStaticSpecificity(firstSimpleSelector, ok)); > + return staticSpecificity; One line? 1050362 3 benjamin 2014-11-20 20:30:52 -0800 Committed r176436: <http://trac.webkit.org/changeset/176436> 241922 2014-11-19 20:48:10 -0800 2014-11-20 16:46:58 -0800 Patch bug-138911-20141119204824.patch text/plain 8909 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQ0N2Y2ZGQ4MGVjODhj YWViMTMwZjA5OWQxMzI4MGM0MGEwN2Y4OC4uMmE3ZTNjMjA2ZDE3MTliYjk3ZDM4MjMxMWIwMzc5 ZWYxYjc1YjhkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTExLTE5ICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBkbyBub3Qgc2hvdyBpbnZhbGlkIHNwZWNpZmljaXR5IGZvciBkeW5hbWljIGNhc2VzIG9m IDptYXRjaGVzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzODkxMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogY3NzL0NTU1NlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNpbXBsZVNlbGVj dG9yRnVuY3Rpb25hbFBzZXVkb0NsYXNzU3RhdGljU3BlY2lmaWNpdHkpOgorICAgICAgICAoV2Vi Q29yZTo6ZnVuY3Rpb25hbFBzZXVkb0NsYXNzU3RhdGljU3BlY2lmaWNpdHkpOgorICAgICAgICAo V2ViQ29yZTo6c3RhdGljU3BlY2lmaWNpdHlJbnRlcm5hbCk6CisgICAgICAgIChXZWJDb3JlOjpD U1NTZWxlY3Rvcjo6c3RhdGljU3BlY2lmaWNpdHkpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU2Vs ZWN0b3I6OnNwZWNpZmljaXR5KTogRGVsZXRlZC4KKyAgICAgICAgKiBjc3MvQ1NTU2VsZWN0b3Iu aDoKKyAgICAgICAgQWRkIGFuIGFkZGl0aW9uYWwgY29tcHV0YXRpb24gcGF0aCBmb3IgdGhlIGlu c3BlY3Rvci4KKworICAgICAgICBUaGUgcmVndWxhciBwYXRoIGlnbm9yZXMgZXZlcnl0aGluZyBp bnNpZGUgZnVuY3Rpb24gcHNldWRvIGNsYXNzZXMuCisgICAgICAgIFRoaXMgbmV3IHBhdGggdGFr ZXMgdGhlIHN0YXRpYyBzcGVjaWZpY2l0eSBvZiB0aGUgcmVndWxhciBwYXRoLCB0aGVuIGV2YWx1 YXRlCisgICAgICAgIHJlY3Vyc2l2ZWx5IGFsbCB0aGUgc2VsZWN0b3IgbGlzdHMgaW5zaWRlIGFu eSBsZXZlbCBvZiA6bWF0Y2hlcygpLgorCisgICAgICAgIElmIHR3byBjb21wbGV4IHNlbGVjdG9y IG9mIHNlbGVjdG9yIGxpc3QgZG8gbm90IGhhdmUgdGhlIHNhbWUgc3BlY2lmaWNpdHksCisgICAg ICAgIHdlIGJhaWwgb3V0IGFuZCByZWZ1c2UgdG8gY29tcHV0ZSBhIHN0YXRpYyBzcGVjaWZpY2l0 eSByZXByZXNlbnRpbmcgdGhlIHNlbGVjdG9yLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvclN0eWxlU2hlZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YnVpbGRPYmplY3RGb3JTZWxl Y3RvckhlbHBlcik6CisgICAgICAgIChXZWJDb3JlOjpzZWxlY3RvcnNGcm9tU291cmNlKToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclN0eWxlU2hlZXQ6OmJ1aWxkT2JqZWN0Rm9yU2VsZWN0 b3IpOgorICAgICAgICBEbyBub3QgYWRkIHRoZSBjb21wbGV4aXR5IHRvIHRoZSBpbnNwZWN0b3In cyBDU1NTZWxlY3RvciBzdHJ1Y3R1cmUgd2hlbmV2ZXIKKyAgICAgICAgaXQgaXMgZHluYW1pYy4K KwogMjAxNC0xMS0xOSAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZW1vdmUgSW5zcGVjdG9yQ1NTQWdlbnQ6OmJ1aWxkQXJyYXlGb3JSdWxlTGlzdCgp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU2VsZWN0b3IuY3BwIGIvU291cmNl L1dlYkNvcmUvY3NzL0NTU1NlbGVjdG9yLmNwcAppbmRleCBhZWU1MTAyNjM2ZGJhZjI5ODk3Yjhl ZmExYTY1OTlkNWQ0YzI3NThjLi42MGFlNmNiZWMzZmVkYmEzYjVlMzlkMmExNWE5ZjU5MDA1OGJl OWJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU2VsZWN0b3IuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTZWxlY3Rvci5jcHAKQEAgLTc4LDE0ICs3OCw2IEBAIHN0 YXRpYyB1bnNpZ25lZCBtYXhTcGVjaWZpY2l0eShjb25zdCBDU1NTZWxlY3Rvckxpc3QmIHNlbGVj dG9yTGlzdCkKICAgICByZXR1cm4gbWF4U3BlY2lmaWNpdHk7CiB9CiAKLXVuc2lnbmVkIENTU1Nl bGVjdG9yOjpzcGVjaWZpY2l0eSgpIGNvbnN0Ci17Ci0gICAgaWYgKGlzRm9yUGFnZSgpKQotICAg ICAgICByZXR1cm4gc3BlY2lmaWNpdHlGb3JQYWdlKCkgJiBtYXhWYWx1ZU1hc2s7Ci0KLSAgICBy ZXR1cm4gc2VsZWN0b3JTcGVjaWZpY2l0eSgqdGhpcywgZmFsc2UpOwotfQotCiBzdGF0aWMgdW5z aWduZWQgc2ltcGxlU2VsZWN0b3JTcGVjaWZpY2l0eUludGVybmFsKGNvbnN0IENTU1NlbGVjdG9y JiBzaW1wbGVTZWxlY3RvciwgYm9vbCBpc0NvbXB1dGluZ01heGltdW1TcGVjaWZpY2l0eSkKIHsK ICAgICBBU1NFUlRfV0lUSF9NRVNTQUdFKCFzaW1wbGVTZWxlY3Rvci5pc0ZvclBhZ2UoKSwgIkF0 IHRoZSB0aW1lIG9mIHRoaXMgd3JpdGluZywgcGFnZSBzZWxlY3RvcnMgYXJlIG5vdCB0cmVhdGVk IGFzIHJlYWwgc2VsZWN0b3JzIHRoYXQgYXJlIG1hdGNoZWQuIFRoZSB2YWx1ZSBjb21wdXRlZCBo ZXJlIG9ubHkgYWNjb3VudCBmb3IgcmVhbCBzZWxlY3RvcnMuIik7CkBAIC0xNDAsNiArMTMyLDU5 IEBAIHVuc2lnbmVkIENTU1NlbGVjdG9yOjpzaW1wbGVTZWxlY3RvclNwZWNpZmljaXR5KCkgY29u c3QKICAgICByZXR1cm4gc2ltcGxlU2VsZWN0b3JTcGVjaWZpY2l0eUludGVybmFsKCp0aGlzLCBm YWxzZSk7CiB9CiAKK3N0YXRpYyB1bnNpZ25lZCBzdGF0aWNTcGVjaWZpY2l0eUludGVybmFsKGNv bnN0IENTU1NlbGVjdG9yJiBmaXJzdFNpbXBsZVNlbGVjdG9yLCBib29sJiBvayk7CisKK3N0YXRp YyB1bnNpZ25lZCBzaW1wbGVTZWxlY3RvckZ1bmN0aW9uYWxQc2V1ZG9DbGFzc1N0YXRpY1NwZWNp ZmljaXR5KGNvbnN0IENTU1NlbGVjdG9yJiBzaW1wbGVTZWxlY3RvciwgYm9vbCYgb2spCit7Cisj aWYgRU5BQkxFKENTU19TRUxFQ1RPUlNfTEVWRUw0KQorICAgIGlmIChzaW1wbGVTZWxlY3Rvci5t YXRjaCgpID09IENTU1NlbGVjdG9yOjpQc2V1ZG9DbGFzcykgeworICAgICAgICBpZiAoc2ltcGxl U2VsZWN0b3IucHNldWRvQ2xhc3NUeXBlKCkgPT0gQ1NTU2VsZWN0b3I6OlBzZXVkb0NsYXNzTWF0 Y2hlcykgeworICAgICAgICAgICAgY29uc3QgQ1NTU2VsZWN0b3JMaXN0JiBzZWxlY3Rvckxpc3Qg PSAqc2ltcGxlU2VsZWN0b3Iuc2VsZWN0b3JMaXN0KCk7CisgICAgICAgICAgICBjb25zdCBDU1NT ZWxlY3RvciYgZmlyc3RTdWJzZWxlY3RvciA9ICpzZWxlY3Rvckxpc3QuZmlyc3QoKTsKKworICAg ICAgICAgICAgdW5zaWduZWQgaW5pdGlhbFNwZWNpZmljaXR5ID0gc3RhdGljU3BlY2lmaWNpdHlJ bnRlcm5hbChmaXJzdFN1YnNlbGVjdG9yLCBvayk7CisgICAgICAgICAgICBpZiAoIW9rKQorICAg ICAgICAgICAgICAgIHJldHVybiAwOworCisgICAgICAgICAgICBjb25zdCBDU1NTZWxlY3Rvciog c3Vic2VsZWN0b3IgPSAmZmlyc3RTdWJzZWxlY3RvcjsKKyAgICAgICAgICAgIHdoaWxlICgoc3Vi c2VsZWN0b3IgPSBDU1NTZWxlY3Rvckxpc3Q6Om5leHQoc3Vic2VsZWN0b3IpKSkgeworICAgICAg ICAgICAgICAgIHVuc2lnbmVkIHN1YlNlbGVjdG9yU3BlY2lmaWNpdHkgPSBzdGF0aWNTcGVjaWZp Y2l0eUludGVybmFsKCpzdWJzZWxlY3Rvciwgb2spOworICAgICAgICAgICAgICAgIGlmIChpbml0 aWFsU3BlY2lmaWNpdHkgIT0gc3ViU2VsZWN0b3JTcGVjaWZpY2l0eSkKKyAgICAgICAgICAgICAg ICAgICAgb2sgPSBmYWxzZTsKKyAgICAgICAgICAgICAgICBpZiAoIW9rKQorICAgICAgICAgICAg ICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHJldHVybiBpbml0 aWFsU3BlY2lmaWNpdHk7CisgICAgICAgIH0KKyAgICB9CisjZW5kaWYKKyAgICByZXR1cm4gMDsK K30KKworc3RhdGljIHVuc2lnbmVkIGZ1bmN0aW9uYWxQc2V1ZG9DbGFzc1N0YXRpY1NwZWNpZmlj aXR5KGNvbnN0IENTU1NlbGVjdG9yJiBmaXJzdFNpbXBsZVNlbGVjdG9yLCBib29sJiBvaykKK3sK KyAgICB1bnNpZ25lZCB0b3RhbCA9IDA7CisgICAgZm9yIChjb25zdCBDU1NTZWxlY3Rvciogc2Vs ZWN0b3IgPSAmZmlyc3RTaW1wbGVTZWxlY3Rvcjsgc2VsZWN0b3I7IHNlbGVjdG9yID0gc2VsZWN0 b3ItPnRhZ0hpc3RvcnkoKSkgeworICAgICAgICB0b3RhbCA9IENTU1NlbGVjdG9yOjphZGRTcGVj aWZpY2l0aWVzKHRvdGFsLCBzaW1wbGVTZWxlY3RvckZ1bmN0aW9uYWxQc2V1ZG9DbGFzc1N0YXRp Y1NwZWNpZmljaXR5KCpzZWxlY3Rvciwgb2spKTsKKyAgICAgICAgaWYgKCFvaykKKyAgICAgICAg ICAgIHJldHVybiAwOworICAgIH0KKyAgICByZXR1cm4gdG90YWw7Cit9CisKK3N0YXRpYyB1bnNp Z25lZCBzdGF0aWNTcGVjaWZpY2l0eUludGVybmFsKGNvbnN0IENTU1NlbGVjdG9yJiBmaXJzdFNp bXBsZVNlbGVjdG9yLCBib29sJiBvaykKK3sKKyAgICB1bnNpZ25lZCBzdGF0aWNTcGVjaWZpY2l0 eSA9IHNlbGVjdG9yU3BlY2lmaWNpdHkoZmlyc3RTaW1wbGVTZWxlY3RvciwgZmFsc2UpOworICAg IHN0YXRpY1NwZWNpZmljaXR5ID0gQ1NTU2VsZWN0b3I6OmFkZFNwZWNpZmljaXRpZXMoc3RhdGlj U3BlY2lmaWNpdHksIGZ1bmN0aW9uYWxQc2V1ZG9DbGFzc1N0YXRpY1NwZWNpZmljaXR5KGZpcnN0 U2ltcGxlU2VsZWN0b3IsIG9rKSk7CisgICAgcmV0dXJuIHN0YXRpY1NwZWNpZmljaXR5OworfQor Cit1bnNpZ25lZCBDU1NTZWxlY3Rvcjo6c3RhdGljU3BlY2lmaWNpdHkoYm9vbCAmb2spIGNvbnN0 Cit7CisgICAgb2sgPSB0cnVlOworICAgIHJldHVybiBzdGF0aWNTcGVjaWZpY2l0eUludGVybmFs KCp0aGlzLCBvayk7Cit9CisKIHVuc2lnbmVkIENTU1NlbGVjdG9yOjphZGRTcGVjaWZpY2l0aWVz KHVuc2lnbmVkIGEsIHVuc2lnbmVkIGIpCiB7CiAgICAgdW5zaWduZWQgdG90YWwgPSBhOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1NlbGVjdG9yLmggYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTU2VsZWN0b3IuaAppbmRleCAyZGY1N2UzZWRmYzQ4ZDU1YzEwM2QwM2QxNjMyMmU3 MGVhZmEzYjBhLi41YTZkOGMwOGYxMmFhNTVjMDJiYjNhZjljZDAzODgyNTc3M2M4YzFiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU2VsZWN0b3IuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTU2VsZWN0b3IuaApAQCAtNTgsNyArNTgsNyBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBjbGFzc01hc2sgPSAweGZmMDA7CiAg ICAgICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBlbGVtZW50TWFzayA9IDB4ZmY7CiAKLSAgICAg ICAgdW5zaWduZWQgc3BlY2lmaWNpdHkoKSBjb25zdDsKKyAgICAgICAgdW5zaWduZWQgc3RhdGlj U3BlY2lmaWNpdHkoYm9vbCYgb2spIGNvbnN0OwogICAgICAgICB1bnNpZ25lZCBzcGVjaWZpY2l0 eUZvclBhZ2UoKSBjb25zdDsKICAgICAgICAgdW5zaWduZWQgc2ltcGxlU2VsZWN0b3JTcGVjaWZp Y2l0eSgpIGNvbnN0OwogICAgICAgICBzdGF0aWMgdW5zaWduZWQgYWRkU3BlY2lmaWNpdGllcyh1 bnNpZ25lZCwgdW5zaWduZWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclN0eWxlU2hlZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvclN0eWxlU2hlZXQuY3BwCmluZGV4IDVhZGRiMTJmZmQ1ZTA5YjI4MWE0YWM5Yjg4ODMwMGEz ZDE5MTgyMmIuLjcwZjA4ZDI4YzVmYTUzNmMzM2JiOWZjY2VhMzAwY2RhMGQ0YTFhZjggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHAKQEAg LTk5MSwxOCArOTkxLDIzIEBAIFBhc3NSZWZQdHI8SW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpD U1NTdHlsZVNoZWV0SGVhZGVyPiBJbnNwZWN0b3JTdHlsZVNoZWV0OjpiCiAgICAgICAgIC5yZWxl YXNlKCk7CiB9CiAKLXN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNTUzo6 Q1NTU2VsZWN0b3I+IGJ1aWxkT2JqZWN0Rm9yU2VsZWN0b3JIZWxwZXIoY29uc3QgU3RyaW5nJiBz ZWxlY3RvclRleHQsIHVuc2lnbmVkIHNwZWNpZmljaXR5KQorc3RhdGljIFBhc3NSZWZQdHI8SW5z cGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpDU1NTZWxlY3Rvcj4gYnVpbGRPYmplY3RGb3JTZWxlY3Rv ckhlbHBlcihjb25zdCBTdHJpbmcmIHNlbGVjdG9yVGV4dCwgY29uc3QgQ1NTU2VsZWN0b3ImIHNl bGVjdG9yKQogewotICAgIFJlZlB0cjxJbnNwZWN0b3I6OlByb3RvY29sOjpDU1M6OkNTU1NlbGVj dG9yPiBzZWxlY3RvciA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNTUzo6Q1NTU2VsZWN0b3I6OmNy ZWF0ZSgpCisgICAgUmVmUHRyPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNTUzo6Q1NTU2VsZWN0b3I+ IGluc3BlY3RvclNlbGVjdG9yID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpDU1NTZWxlY3Rv cjo6Y3JlYXRlKCkKICAgICAgICAgLnNldFRleHQoc2VsZWN0b3JUZXh0KTsKIAotICAgIFJlZlB0 cjxJbnNwZWN0b3I6OlByb3RvY29sOjpBcnJheTxpbnQ+PiB0dXBsZSA9IEluc3BlY3Rvcjo6UHJv dG9jb2w6OkFycmF5PGludD46OmNyZWF0ZSgpOwotICAgIHR1cGxlLT5hZGRJdGVtKHN0YXRpY19j YXN0PGludD4oKHNwZWNpZmljaXR5ICYgQ1NTU2VsZWN0b3I6OmlkTWFzaykgPj4gMTYpKTsKLSAg ICB0dXBsZS0+YWRkSXRlbShzdGF0aWNfY2FzdDxpbnQ+KChzcGVjaWZpY2l0eSAmIENTU1NlbGVj dG9yOjpjbGFzc01hc2spID4+IDgpKTsKLSAgICB0dXBsZS0+YWRkSXRlbShzdGF0aWNfY2FzdDxp bnQ+KHNwZWNpZmljaXR5ICYgQ1NTU2VsZWN0b3I6OmVsZW1lbnRNYXNrKSk7Ci0gICAgc2VsZWN0 b3ItPnNldFNwZWNpZmljaXR5KHR1cGxlLnJlbGVhc2UoKSk7CisgICAgYm9vbCBvazsKKyAgICB1 bnNpZ25lZCBzcGVjaWZpY2l0eSA9IHNlbGVjdG9yLnN0YXRpY1NwZWNpZmljaXR5KG9rKTsKIAot ICAgIHJldHVybiBzZWxlY3Rvci5yZWxlYXNlKCk7CisgICAgaWYgKG9rKSB7CisgICAgICAgIFJl ZlB0cjxJbnNwZWN0b3I6OlByb3RvY29sOjpBcnJheTxpbnQ+PiB0dXBsZSA9IEluc3BlY3Rvcjo6 UHJvdG9jb2w6OkFycmF5PGludD46OmNyZWF0ZSgpOworICAgICAgICB0dXBsZS0+YWRkSXRlbShz dGF0aWNfY2FzdDxpbnQ+KChzcGVjaWZpY2l0eSAmIENTU1NlbGVjdG9yOjppZE1hc2spID4+IDE2 KSk7CisgICAgICAgIHR1cGxlLT5hZGRJdGVtKHN0YXRpY19jYXN0PGludD4oKHNwZWNpZmljaXR5 ICYgQ1NTU2VsZWN0b3I6OmNsYXNzTWFzaykgPj4gOCkpOworICAgICAgICB0dXBsZS0+YWRkSXRl bShzdGF0aWNfY2FzdDxpbnQ+KHNwZWNpZmljaXR5ICYgQ1NTU2VsZWN0b3I6OmVsZW1lbnRNYXNr KSk7CisgICAgICAgIGluc3BlY3RvclNlbGVjdG9yLT5zZXRTcGVjaWZpY2l0eSh0dXBsZS5yZWxl YXNlKCkpOworICAgIH0KKworICAgIHJldHVybiBpbnNwZWN0b3JTZWxlY3Rvci5yZWxlYXNlKCk7 CiB9CiAKIHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkFycmF5PEluc3Bl Y3Rvcjo6UHJvdG9jb2w6OkNTUzo6Q1NTU2VsZWN0b3I+PiBzZWxlY3RvcnNGcm9tU291cmNlKGNv bnN0IENTU1J1bGVTb3VyY2VEYXRhKiBzb3VyY2VEYXRhLCBjb25zdCBTdHJpbmcmIHNoZWV0VGV4 dCwgY29uc3QgQ1NTU2VsZWN0b3JMaXN0JiBzZWxlY3Rvckxpc3QpCkBAIC0xMDE4LDcgKzEwMjMs NyBAQCBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlByb3RvY29sOjpBcnJheTxJbnNwZWN0 b3I6OlByb3RvY29sOjpDU1M6OkNTU1NlbGVjdAogCiAgICAgICAgIC8vIFdlIGRvbid0IHdhbnQg dG8gc2VlIGFueSBjb21tZW50cyBpbiB0aGUgc2VsZWN0b3IgY29tcG9uZW50cywgb25seSB0aGUg bWVhbmluZ2Z1bCBwYXJ0cy4KICAgICAgICAgcmVwbGFjZShzZWxlY3RvclRleHQsIGNvbW1lbnQs IFN0cmluZygpKTsKLSAgICAgICAgcmVzdWx0LT5hZGRJdGVtKGJ1aWxkT2JqZWN0Rm9yU2VsZWN0 b3JIZWxwZXIoc2VsZWN0b3JUZXh0LnN0cmlwV2hpdGVTcGFjZSgpLCBzZWxlY3Rvci0+c3BlY2lm aWNpdHkoKSkpOworICAgICAgICByZXN1bHQtPmFkZEl0ZW0oYnVpbGRPYmplY3RGb3JTZWxlY3Rv ckhlbHBlcihzZWxlY3RvclRleHQuc3RyaXBXaGl0ZVNwYWNlKCksICpzZWxlY3RvcikpOwogCiAg ICAgICAgIHNlbGVjdG9yID0gQ1NTU2VsZWN0b3JMaXN0OjpuZXh0KHNlbGVjdG9yKTsKICAgICB9 CkBAIC0xMDI3LDcgKzEwMzIsNyBAQCBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlByb3Rv Y29sOjpBcnJheTxJbnNwZWN0b3I6OlByb3RvY29sOjpDU1M6OkNTU1NlbGVjdAogCiBQYXNzUmVm UHRyPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNTUzo6Q1NTU2VsZWN0b3I+IEluc3BlY3RvclN0eWxl U2hlZXQ6OmJ1aWxkT2JqZWN0Rm9yU2VsZWN0b3IoY29uc3QgQ1NTU2VsZWN0b3IqIHNlbGVjdG9y KQogewotICAgIHJldHVybiBidWlsZE9iamVjdEZvclNlbGVjdG9ySGVscGVyKHNlbGVjdG9yLT5z ZWxlY3RvclRleHQoKSwgc2VsZWN0b3ItPnNwZWNpZmljaXR5KCkpOworICAgIHJldHVybiBidWls ZE9iamVjdEZvclNlbGVjdG9ySGVscGVyKHNlbGVjdG9yLT5zZWxlY3RvclRleHQoKSwgKnNlbGVj dG9yKTsKIH0KIAogUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlByb3RvY29sOjpDU1M6OlNlbGVjdG9y TGlzdD4gSW5zcGVjdG9yU3R5bGVTaGVldDo6YnVpbGRPYmplY3RGb3JTZWxlY3Rvckxpc3QoQ1NT U3R5bGVSdWxlKiBydWxlKQo=