169277 2017-03-07 06:08:45 -0800 Differentiate between pending head and body stylesheets in Style::Scope 2017-03-23 09:41:08 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 149157 1 koivisto webkit-unassigned webkit-bug-importer oldest_to_newest 1284282 0 koivisto 2017-03-07 06:08:45 -0800 For future use. Also tightens typing. 1284292 1 303648 koivisto 2017-03-07 06:39:53 -0800 Created attachment 303648 patch 1284304 2 303648 kling 2017-03-07 07:51:14 -0800 Comment on attachment 303648 patch r=me 1284336 3 koivisto 2017-03-07 08:55:30 -0800 https://trac.webkit.org/r213515 1290476 4 webkit-bug-importer 2017-03-23 09:37:53 -0700 <rdar://problem/31221162> 303648 2017-03-07 06:39:53 -0800 2017-03-07 07:51:14 -0800 patch pending-stylesheet-sets.patch text/plain 9555 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMzUxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDE3LTAzLTA3ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBEaWZmZXJlbnRpYXRlIGJldHdl ZW4gcGVuZGluZyBoZWFkIGFuZCBib2R5IHN0eWxlc2hlZXRzIGluIFN0eWxlOjpTY29wZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY5Mjc3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3BsaXQgcGVuZGlu ZyBzdHlsZXNoZWV0IG5vZGUgc2V0IGludG8gc2VwYXJhdGUgc2V0cyBmb3IgaGVhZCBhbmQgYm9k eSBlbGVtZW50cyBhbmQgcHJvY2Vzc2luZyBpbnN0cnVjdGlvbnMuCisKKyAgICAgICAgVGhpcyB0 aWdodGVucyB0eXBpbmcgYW5kIHdpbGwgYWxzbyBiZSB1c2VmdWwgbGF0ZXIuCisKKyAgICAgICAg KiBzdHlsZS9TdHlsZVNjb3BlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZTo6 flNjb3BlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZTo6YWRkUGVuZGluZ1NoZWV0 KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZTo6cmVtb3ZlUGVuZGluZ1NoZWV0KToK KyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZTo6ZGlkUmVtb3ZlUGVuZGluZ1N0eWxlc2hl ZXQpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlNjb3BlOjpoYXNQZW5kaW5nU2hlZXQpOgor ICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlNjb3BlOjpoYXNQZW5kaW5nU2hlZXRJbkJvZHkpOgor ICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlNjb3BlOjpoYXNQcm9jZXNzaW5nSW5zdHJ1Y3Rpb25X aXRoUGVuZGluZ1NoZWV0KTogRGVsZXRlZC4KKyAgICAgICAgKiBzdHlsZS9TdHlsZVNjb3BlLmg6 CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2NvcGU6Omhhc1BlbmRpbmdTaGVldCk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2NvcGU6Omhhc1BlbmRpbmdTaGVldHMpOiBE ZWxldGVkLgorICAgICAgICAqIHN0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlN0eWxlOjpoYXNMb2FkaW5nU3R5bGVzaGVldCk6CisKKyAgICAgICAgICAgIEp1 c3QgdGVzdCBmb3IgYm9keSBzdHlsZXNoZWV0cy4KKworICAgICAgICAoV2ViQ29yZTo6U3R5bGU6 OlRyZWVSZXNvbHZlcjo6cmVzb2x2ZSk6CisKKyAgICAgICAgICAgIFRyZWF0IGFsbCBiZWZvcmUt Ym9keSBzdHlsZXNoZWV0cyB1bmlmb3JtbHkuCisKIDIwMTctMDMtMDcgIEFuZHkgRXN0ZXMgIDxh ZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyMTM0MTIpOiBKUEVHIHBy ZW11bHRpcGxpY2F0aW9uIHRlc3RzIGZhaWwgdW5kZXIgR3VhcmRNYWxsb2MKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3N0eWxlL1N0eWxlU2NvcGUuY3BwCShyZXZpc2lvbiAyMTM0NDYpCisrKyBTb3VyY2UvV2Vi Q29yZS9zdHlsZS9TdHlsZVNjb3BlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIsNiArMzIsNyBA QAogI2luY2x1ZGUgIkVsZW1lbnQuaCIKICNpbmNsdWRlICJFbGVtZW50Q2hpbGRJdGVyYXRvci5o IgogI2luY2x1ZGUgIkV4dGVuc2lvblN0eWxlU2hlZXRzLmgiCisjaW5jbHVkZSAiSFRNTEhlYWRF bGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTElGcmFtZUVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1M TGlua0VsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MU2xvdEVsZW1lbnQuaCIKQEAgLTcyLDcgKzcz LDcgQEAgU2NvcGU6OlNjb3BlKFNoYWRvd1Jvb3QmIHNoYWRvd1Jvb3QpCiAKIFNjb3BlOjp+U2Nv cGUoKQogewotICAgIEFTU0VSVChtX25vZGVzV2l0aFBlbmRpbmdTaGVldHMuaXNFbXB0eSgpKTsK KyAgICBBU1NFUlQoIWhhc1BlbmRpbmdTaGVldHMoKSk7CiB9CiAKIGJvb2wgU2NvcGU6OnNob3Vs ZFVzZVNoYXJlZFVzZXJBZ2VudFNoYWRvd1RyZWVTdHlsZVJlc29sdmVyKCkgY29uc3QKQEAgLTE3 MiwyMCArMTczLDQ4IEBAIHZvaWQgU2NvcGU6OnNldFNlbGVjdGVkU3R5bGVzaGVldFNldE5hbWUK ICAgICBkaWRDaGFuZ2VBY3RpdmVTdHlsZVNoZWV0Q2FuZGlkYXRlcygpOwogfQogCi12b2lkIFNj b3BlOjphZGRQZW5kaW5nU2hlZXQoY29uc3QgTm9kZSYgbm9kZSkKKwordm9pZCBTY29wZTo6YWRk UGVuZGluZ1NoZWV0KGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQpCiB7Ci0gICAgQVNTRVJUKCFtX25v ZGVzV2l0aFBlbmRpbmdTaGVldHMuY29udGFpbnMoJm5vZGUpKTsKKyAgICBBU1NFUlQoIWhhc1Bl bmRpbmdTaGVldChlbGVtZW50KSk7CiAKLSAgICBtX25vZGVzV2l0aFBlbmRpbmdTaGVldHMuYWRk KCZub2RlKTsKKyAgICBib29sIGlzSW5IZWFkID0gYW5jZXN0b3JzT2ZUeXBlPEhUTUxIZWFkRWxl bWVudD4oZWxlbWVudCkuZmlyc3QoKTsKKyAgICBpZiAoaXNJbkhlYWQpCisgICAgICAgIG1faGVh ZEVsZW1lbnRzV2l0aFBlbmRpbmdTaGVldHMuYWRkKCZlbGVtZW50KTsKKyAgICBlbHNlCisgICAg ICAgIG1fYm9keUVsZW1lbnRzV2l0aFBlbmRpbmdTaGVldHMuYWRkKCZlbGVtZW50KTsKIH0KIAog Ly8gVGhpcyBtZXRob2QgaXMgY2FsbGVkIHdoZW5ldmVyIGEgdG9wLWxldmVsIHN0eWxlc2hlZXQg aGFzIGZpbmlzaGVkIGxvYWRpbmcuCi12b2lkIFNjb3BlOjpyZW1vdmVQZW5kaW5nU2hlZXQoY29u c3QgTm9kZSYgbm9kZSkKK3ZvaWQgU2NvcGU6OnJlbW92ZVBlbmRpbmdTaGVldChjb25zdCBFbGVt ZW50JiBlbGVtZW50KQoreworICAgIEFTU0VSVChoYXNQZW5kaW5nU2hlZXQoZWxlbWVudCkpOwor CisgICAgaWYgKCFtX2hlYWRFbGVtZW50c1dpdGhQZW5kaW5nU2hlZXRzLnJlbW92ZSgmZWxlbWVu dCkpCisgICAgICAgIG1fYm9keUVsZW1lbnRzV2l0aFBlbmRpbmdTaGVldHMucmVtb3ZlKCZlbGVt ZW50KTsKKworICAgIGRpZFJlbW92ZVBlbmRpbmdTdHlsZXNoZWV0KCk7Cit9CisKK3ZvaWQgU2Nv cGU6OmFkZFBlbmRpbmdTaGVldChjb25zdCBQcm9jZXNzaW5nSW5zdHJ1Y3Rpb24mIHByb2Nlc3Np bmdJbnN0cnVjdGlvbikKK3sKKyAgICBBU1NFUlQoIW1fcHJvY2Vzc2luZ0luc3RydWN0aW9uc1dp dGhQZW5kaW5nU2hlZXRzLmNvbnRhaW5zKCZwcm9jZXNzaW5nSW5zdHJ1Y3Rpb24pKTsKKworICAg IG1fcHJvY2Vzc2luZ0luc3RydWN0aW9uc1dpdGhQZW5kaW5nU2hlZXRzLmFkZCgmcHJvY2Vzc2lu Z0luc3RydWN0aW9uKTsKK30KKwordm9pZCBTY29wZTo6cmVtb3ZlUGVuZGluZ1NoZWV0KGNvbnN0 IFByb2Nlc3NpbmdJbnN0cnVjdGlvbiYgcHJvY2Vzc2luZ0luc3RydWN0aW9uKQogewotICAgIEFT U0VSVChtX25vZGVzV2l0aFBlbmRpbmdTaGVldHMuY29udGFpbnMoJm5vZGUpKTsKKyAgICBBU1NF UlQobV9wcm9jZXNzaW5nSW5zdHJ1Y3Rpb25zV2l0aFBlbmRpbmdTaGVldHMuY29udGFpbnMoJnBy b2Nlc3NpbmdJbnN0cnVjdGlvbikpOworCisgICAgbV9wcm9jZXNzaW5nSW5zdHJ1Y3Rpb25zV2l0 aFBlbmRpbmdTaGVldHMucmVtb3ZlKCZwcm9jZXNzaW5nSW5zdHJ1Y3Rpb24pOwogCi0gICAgbV9u b2Rlc1dpdGhQZW5kaW5nU2hlZXRzLnJlbW92ZSgmbm9kZSk7Ci0gICAgaWYgKCFtX25vZGVzV2l0 aFBlbmRpbmdTaGVldHMuaXNFbXB0eSgpKQorICAgIGRpZFJlbW92ZVBlbmRpbmdTdHlsZXNoZWV0 KCk7Cit9CisKK3ZvaWQgU2NvcGU6OmRpZFJlbW92ZVBlbmRpbmdTdHlsZXNoZWV0KCkKK3sKKyAg ICBpZiAoaGFzUGVuZGluZ1NoZWV0cygpKQogICAgICAgICByZXR1cm47CiAKICAgICBkaWRDaGFu Z2VBY3RpdmVTdHlsZVNoZWV0Q2FuZGlkYXRlcygpOwpAQCAtMTk0LDE5ICsyMjMsMTQgQEAgdm9p ZCBTY29wZTo6cmVtb3ZlUGVuZGluZ1NoZWV0KGNvbnN0IE5vZAogICAgICAgICBtX2RvY3VtZW50 LmRpZFJlbW92ZUFsbFBlbmRpbmdTdHlsZXNoZWV0KCk7CiB9CiAKLWJvb2wgU2NvcGU6Omhhc1By b2Nlc3NpbmdJbnN0cnVjdGlvbldpdGhQZW5kaW5nU2hlZXQoKQorYm9vbCBTY29wZTo6aGFzUGVu ZGluZ1NoZWV0KGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKCFt X3NoYWRvd1Jvb3QpOworICAgIHJldHVybiBtX2hlYWRFbGVtZW50c1dpdGhQZW5kaW5nU2hlZXRz LmNvbnRhaW5zKCZlbGVtZW50KSB8fCBoYXNQZW5kaW5nU2hlZXRJbkJvZHkoZWxlbWVudCk7Cit9 CiAKLSAgICBmb3IgKGF1dG8qIGNoaWxkID0gbV9kb2N1bWVudC5maXJzdENoaWxkKCk7IGNoaWxk OyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7Ci0gICAgICAgIGlmIChpczxFbGVtZW50 PigqY2hpbGQpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBpZiAobV9ub2Rl c1dpdGhQZW5kaW5nU2hlZXRzLmNvbnRhaW5zKGNoaWxkKSkgewotICAgICAgICAgICAgQVNTRVJU KGlzPFByb2Nlc3NpbmdJbnN0cnVjdGlvbj4oKmNoaWxkKSk7Ci0gICAgICAgICAgICByZXR1cm4g dHJ1ZTsKLSAgICAgICAgfQotICAgIH0KLSAgICByZXR1cm4gZmFsc2U7Citib29sIFNjb3BlOjpo YXNQZW5kaW5nU2hlZXRJbkJvZHkoY29uc3QgRWxlbWVudCYgZWxlbWVudCkgY29uc3QKK3sKKyAg ICByZXR1cm4gbV9ib2R5RWxlbWVudHNXaXRoUGVuZGluZ1NoZWV0cy5jb250YWlucygmZWxlbWVu dCk7CiB9CiAKIHZvaWQgU2NvcGU6OmFkZFN0eWxlU2hlZXRDYW5kaWRhdGVOb2RlKE5vZGUmIG5v ZGUsIGJvb2wgY3JlYXRlZEJ5UGFyc2VyKQpJbmRleDogU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5 bGVTY29wZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUu aAkocmV2aXNpb24gMjEzNDQ2KQorKysgU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZS5o CSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0Myw3IEBAIGNsYXNzIENTU1N0eWxlU2hlZXQ7CiBj bGFzcyBEb2N1bWVudDsKIGNsYXNzIEVsZW1lbnQ7CiBjbGFzcyBOb2RlOworY2xhc3MgUHJvY2Vz c2luZ0luc3RydWN0aW9uOwogY2xhc3MgU3R5bGVSZXNvbHZlcjsKIGNsYXNzIFN0eWxlU2hlZXQ7 CiBjbGFzcyBTdHlsZVNoZWV0Q29udGVudHM7CkBAIC04MiwxMSArODMsMTUgQEAgcHVibGljOgog ICAgIHZvaWQgc2V0UHJlZmVycmVkU3R5bGVzaGVldFNldE5hbWUoY29uc3QgU3RyaW5nJik7CiAg ICAgdm9pZCBzZXRTZWxlY3RlZFN0eWxlc2hlZXRTZXROYW1lKGNvbnN0IFN0cmluZyYpOwogCi0g ICAgdm9pZCBhZGRQZW5kaW5nU2hlZXQoY29uc3QgTm9kZSYpOwotICAgIHZvaWQgcmVtb3ZlUGVu ZGluZ1NoZWV0KGNvbnN0IE5vZGUmKTsKLSAgICBib29sIGhhc1BlbmRpbmdTaGVldChjb25zdCBO b2RlJiBub2RlKSBjb25zdCB7IHJldHVybiBtX25vZGVzV2l0aFBlbmRpbmdTaGVldHMuY29udGFp bnMoJm5vZGUpOyB9Ci0gICAgYm9vbCBoYXNQcm9jZXNzaW5nSW5zdHJ1Y3Rpb25XaXRoUGVuZGlu Z1NoZWV0KCk7Ci0gICAgYm9vbCBoYXNQZW5kaW5nU2hlZXRzKCkgY29uc3QgeyByZXR1cm4gIW1f bm9kZXNXaXRoUGVuZGluZ1NoZWV0cy5pc0VtcHR5KCk7IH0KKyAgICB2b2lkIGFkZFBlbmRpbmdT aGVldChjb25zdCBFbGVtZW50Jik7CisgICAgdm9pZCByZW1vdmVQZW5kaW5nU2hlZXQoY29uc3Qg RWxlbWVudCYpOworICAgIHZvaWQgYWRkUGVuZGluZ1NoZWV0KGNvbnN0IFByb2Nlc3NpbmdJbnN0 cnVjdGlvbiYpOworICAgIHZvaWQgcmVtb3ZlUGVuZGluZ1NoZWV0KGNvbnN0IFByb2Nlc3NpbmdJ bnN0cnVjdGlvbiYpOworICAgIGJvb2wgaGFzUGVuZGluZ1NoZWV0cygpIGNvbnN0OworICAgIGJv b2wgaGFzUGVuZGluZ1NoZWV0c0JlZm9yZUJvZHkoKSBjb25zdDsKKyAgICBib29sIGhhc1BlbmRp bmdTaGVldHNJbkJvZHkoKSBjb25zdDsKKyAgICBib29sIGhhc1BlbmRpbmdTaGVldChjb25zdCBF bGVtZW50JikgY29uc3Q7CisgICAgYm9vbCBoYXNQZW5kaW5nU2hlZXRJbkJvZHkoY29uc3QgRWxl bWVudCYpIGNvbnN0OwogCiAgICAgYm9vbCB1c2VzU3R5bGVCYXNlZEVkaXRhYmlsaXR5KCkgeyBy ZXR1cm4gbV91c2VzU3R5bGVCYXNlZEVkaXRhYmlsaXR5OyB9CiAKQEAgLTExNSw2ICsxMjAsOCBA QCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGJvb2wgc2hvdWxkVXNlU2hhcmVkVXNlckFnZW50U2hh ZG93VHJlZVN0eWxlUmVzb2x2ZXIoKSBjb25zdDsKIAorICAgIHZvaWQgZGlkUmVtb3ZlUGVuZGlu Z1N0eWxlc2hlZXQoKTsKKwogICAgIGVudW0gY2xhc3MgVXBkYXRlVHlwZSB7IEFjdGl2ZVNldCwg Q29udGVudHNPckludGVycHJldGF0aW9uIH07CiAgICAgdm9pZCB1cGRhdGVBY3RpdmVTdHlsZVNo ZWV0cyhVcGRhdGVUeXBlKTsKICAgICB2b2lkIHNjaGVkdWxlVXBkYXRlKFVwZGF0ZVR5cGUpOwpA QCAtMTQzLDcgKzE1MCw2IEBAIHByaXZhdGU6CiAgICAgVmVjdG9yPFJlZlB0cjxTdHlsZVNoZWV0 Pj4gbV9zdHlsZVNoZWV0c0ZvclN0eWxlU2hlZXRMaXN0OwogICAgIFZlY3RvcjxSZWZQdHI8Q1NT U3R5bGVTaGVldD4+IG1fYWN0aXZlU3R5bGVTaGVldHM7CiAKLQogICAgIFRpbWVyIG1fcGVuZGlu Z1VwZGF0ZVRpbWVyOwogCiAgICAgbXV0YWJsZSBzdGQ6OnVuaXF1ZV9wdHI8SGFzaFNldDxjb25z dCBDU1NTdHlsZVNoZWV0Kj4+IG1fd2Vha0NvcHlPZkFjdGl2ZVN0eWxlU2hlZXRMaXN0Rm9yRmFz dExvb2t1cDsKQEAgLTE1Miw3ICsxNTgsOSBAQCBwcml2YXRlOgogICAgIC8vIFNoZWV0cyBsb2Fk ZWQgdXNpbmcgdGhlIEBpbXBvcnQgZGlyZWN0aXZlIGFyZSBub3QgaW5jbHVkZWQgaW4gdGhpcyBj b3VudC4KICAgICAvLyBXZSB1c2UgdGhpcyBjb3VudCBvZiBwZW5kaW5nIHNoZWV0cyB0byBkZXRl Y3Qgd2hlbiB3ZSBjYW4gYmVnaW4gYXR0YWNoaW5nCiAgICAgLy8gZWxlbWVudHMgYW5kIHdoZW4g aXQgaXMgc2FmZSB0byBleGVjdXRlIHNjcmlwdHMuCi0gICAgSGFzaFNldDxjb25zdCBOb2RlKj4g bV9ub2Rlc1dpdGhQZW5kaW5nU2hlZXRzOworICAgIEhhc2hTZXQ8Y29uc3QgUHJvY2Vzc2luZ0lu c3RydWN0aW9uKj4gbV9wcm9jZXNzaW5nSW5zdHJ1Y3Rpb25zV2l0aFBlbmRpbmdTaGVldHM7Cisg ICAgSGFzaFNldDxjb25zdCBFbGVtZW50Kj4gbV9oZWFkRWxlbWVudHNXaXRoUGVuZGluZ1NoZWV0 czsKKyAgICBIYXNoU2V0PGNvbnN0IEVsZW1lbnQqPiBtX2JvZHlFbGVtZW50c1dpdGhQZW5kaW5n U2hlZXRzOwogCiAgICAgYm9vbCBtX2RpZFVwZGF0ZUFjdGl2ZVN0eWxlU2hlZXRzIHsgZmFsc2Ug fTsKIApAQCAtMTY4LDYgKzE3NiwyMSBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9pc1VwZGF0aW5n U3R5bGVSZXNvbHZlciB7IGZhbHNlIH07CiB9OwogCitpbmxpbmUgYm9vbCBTY29wZTo6aGFzUGVu ZGluZ1NoZWV0cygpIGNvbnN0Cit7CisgICAgcmV0dXJuIGhhc1BlbmRpbmdTaGVldHNCZWZvcmVC b2R5KCkgfHwgIW1fYm9keUVsZW1lbnRzV2l0aFBlbmRpbmdTaGVldHMuaXNFbXB0eSgpOworfQor CitpbmxpbmUgYm9vbCBTY29wZTo6aGFzUGVuZGluZ1NoZWV0c0JlZm9yZUJvZHkoKSBjb25zdAor eworICAgIHJldHVybiAhbV9oZWFkRWxlbWVudHNXaXRoUGVuZGluZ1NoZWV0cy5pc0VtcHR5KCkg fHwgIW1fcHJvY2Vzc2luZ0luc3RydWN0aW9uc1dpdGhQZW5kaW5nU2hlZXRzLmlzRW1wdHkoKTsK K30KKworaW5saW5lIGJvb2wgU2NvcGU6Omhhc1BlbmRpbmdTaGVldHNJbkJvZHkoKSBjb25zdAor eworICAgIHJldHVybiAhbV9ib2R5RWxlbWVudHNXaXRoUGVuZGluZ1NoZWV0cy5pc0VtcHR5KCk7 Cit9CisKIGlubGluZSB2b2lkIFNjb3BlOjpmbHVzaFBlbmRpbmdVcGRhdGUoKQogewogICAgIGlm IChtX2hhc0Rlc2NlbmRhbnRXaXRoUGVuZGluZ1VwZGF0ZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAJKHJldmlzaW9uIDIxMzQ0NikKKysrIFNvdXJj ZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzYxLDE0ICszNjEsMTQgQEAgc3RhdGljIHZvaWQgY2xlYXJOZWVkc1N0eWxlUmVzb2x1dGlvbihF bAogCiBzdGF0aWMgYm9vbCBoYXNMb2FkaW5nU3R5bGVzaGVldChjb25zdCBTdHlsZTo6U2NvcGUm IHN0eWxlU2NvcGUsIGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQsIGJvb2wgY2hlY2tEZXNjZW5kYW50 cykKIHsKLSAgICBpZiAoIXN0eWxlU2NvcGUuaGFzUGVuZGluZ1NoZWV0cygpKQorICAgIGlmICgh c3R5bGVTY29wZS5oYXNQZW5kaW5nU2hlZXRzSW5Cb2R5KCkpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKLSAgICBpZiAoc3R5bGVTY29wZS5oYXNQZW5kaW5nU2hlZXQoZWxlbWVudCkpCisgICAgaWYg KHN0eWxlU2NvcGUuaGFzUGVuZGluZ1NoZWV0SW5Cb2R5KGVsZW1lbnQpKQogICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICBpZiAoIWNoZWNrRGVzY2VuZGFudHMpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICBmb3IgKGF1dG8mIGRlc2NlbmRhbnQgOiBkZXNjZW5kYW50c09mVHlwZTxFbGVtZW50 PihlbGVtZW50KSkgewotICAgICAgICBpZiAoc3R5bGVTY29wZS5oYXNQZW5kaW5nU2hlZXQoZGVz Y2VuZGFudCkpCisgICAgICAgIGlmIChzdHlsZVNjb3BlLmhhc1BlbmRpbmdTaGVldEluQm9keShk ZXNjZW5kYW50KSkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH07CiAgICAgcmV0dXJu IGZhbHNlOwpAQCAtNDgyLDcgKzQ4Miw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxVcGRhdGU+IFRyZWVS ZXNvbHZlcjo6cmUKICAgICBpZiAoIWRvY3VtZW50RWxlbWVudC0+Y2hpbGROZWVkc1N0eWxlUmVj YWxjKCkgJiYgIWRvY3VtZW50RWxlbWVudC0+bmVlZHNTdHlsZVJlY2FsYygpKQogICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKIAotICAgIG1fZGlkU2VlUGVuZGluZ1N0eWxlc2hlZXQgPSBtX2RvY3Vt ZW50LnN0eWxlU2NvcGUoKS5oYXNQcm9jZXNzaW5nSW5zdHJ1Y3Rpb25XaXRoUGVuZGluZ1NoZWV0 KCk7CisgICAgbV9kaWRTZWVQZW5kaW5nU3R5bGVzaGVldCA9IG1fZG9jdW1lbnQuc3R5bGVTY29w ZSgpLmhhc1BlbmRpbmdTaGVldHNCZWZvcmVCb2R5KCk7CiAKICAgICBtX3VwZGF0ZSA9IHN0ZDo6 bWFrZV91bmlxdWU8VXBkYXRlPihtX2RvY3VtZW50KTsKICAgICBtX3Njb3BlU3RhY2suYXBwZW5k KGFkb3B0UmVmKCpuZXcgU2NvcGUobV9kb2N1bWVudCkpKTsK