81892 2012-03-22 05:11:40 -0700 Web Inspector: dispatch styleSheetChanged event synchronously. 2012-03-22 05:57:02 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 585135 0 pfeldman 2012-03-22 05:11:40 -0700 Today, backend generates stylesheet change event synchronously from within set* command. But CSSStyleModel defers its dispatching until the stylesheet content is available. This prevents us from ignoring update events from within commands that initiated those updates. This change makes stylesheet change event dispatch synchronously and delegates stylesheet content fetching to the event client. 585139 1 133227 pfeldman 2012-03-22 05:16:47 -0700 Created attachment 133227 Patch 585181 2 pfeldman 2012-03-22 05:57:02 -0700 Committed r111677: <http://trac.webkit.org/changeset/111677> 133227 2012-03-22 05:16:47 -0700 2012-03-22 05:50:22 -0700 Patch bug-81892-20120322161645.patch text/plain 13049 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ZmNDAzOGVkZTgwMDli OGE0YmQxMmFlNWNmN2RkMWIzMGJiZGU3YS4uMjdmY2I0NDQ5ZmQxMGQ4NDhjNGMzNTk1YjhlNjg2 ZTUyYTBkZDlkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTAzLTIyICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGRpc3BhdGNoIHN0eWxlU2hlZXRDaGFuZ2VkIGV2ZW50IHN5bmNocm9ub3VzbHkuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTg5MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRvZGF5LCBiYWNrZW5k IGdlbmVyYXRlcyBzdHlsZXNoZWV0IGNoYW5nZSBldmVudCBzeW5jaHJvbm91c2x5IGZyb20gd2l0 aGluIHNldCogY29tbWFuZC4KKyAgICAgICAgQnV0IENTU1N0eWxlTW9kZWwgZGVmZXJzIGl0cyBk aXNwYXRjaGluZyB1bnRpbCB0aGUgc3R5bGVzaGVldCBjb250ZW50IGlzIGF2YWlsYWJsZS4gVGhp cworICAgICAgICBwcmV2ZW50cyB1cyBmcm9tIGlnbm9yaW5nIHVwZGF0ZSBldmVudHMgZnJvbSB3 aXRoaW4gY29tbWFuZHMgdGhhdCBpbml0aWF0ZWQgdGhvc2UgdXBkYXRlcy4KKworICAgICAgICBU aGlzIGNoYW5nZSBtYWtlcyBzdHlsZXNoZWV0IGNoYW5nZSBldmVudCBkaXNwYXRjaCBzeW5jaHJv bm91c2x5IGFuZCBkZWxlZ2F0ZXMgc3R5bGVzaGVldAorICAgICAgICBjb250ZW50IGZldGNoaW5n IHRvIHRoZSBldmVudCBjbGllbnQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NT U1N0eWxlTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90 b3R5cGUuX2ZpcmVTdHlsZVNoZWV0Q2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NT U3R5bGVEZWNsYXJhdGlvbi5wcm90b3R5cGUuaW5zZXJ0UHJvcGVydHlBdCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbFJlc291cmNlQmluZGluZy5wcm90b3R5cGUuc2V0Q29u dGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbFJlc291cmNlQmluZGlu Zy5wcm90b3R5cGUuX2lubmVyU2V0Q29udGVudC5jYWxsYmFja1dyYXBwZXIpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWxSZXNvdXJjZUJpbmRpbmcucHJvdG90eXBlLl9pbm5l clNldENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWxSZXNvdXJj ZUJpbmRpbmcucHJvdG90eXBlLl9zdHlsZVNoZWV0Q2hhbmdlZC5jYWxsYmFjayk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbFJlc291cmNlQmluZGluZy5wcm90b3R5cGUuX3N0 eWxlU2hlZXRDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsUmVz b3VyY2VCaW5kaW5nLnByb3RvdHlwZS5faW5uZXJTdHlsZVNoZWV0Q2hhbmdlZCk6CisKIDIwMTIt MDMtMjEgIElhbiBWb2xsaWNrICA8dm9sbGlja0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2No cm9taXVtXSB0aW1pbmcgZnVuY3Rpb25zIGFyZSBnZXR0aW5nIGluY29ycmVjdGx5IGFwcGxpZWQg Zm9yIGFjY2VsZXJhdGVkIGNzcyB0cmFuc2l0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCmluZGV4IGIyNzdiYmU2MTVlMzgy NjA3MTcxYWI4ZmI2MTczMGNlMTUwNTEzNDMuLmJjZWUwMWQ1N2UzZGY1ZGE5NjNiNGQ3ZWNjYTEz ODVhM2YxZmM4YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvQ1NTU3R5bGVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0NTU1N0eWxlTW9kZWwuanMKQEAgLTI2OCwxNyArMjY4LDExIEBAIFdlYkluc3BlY3Rvci5D U1NTdHlsZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAg ICB2YXIgbWFqb3JDaGFuZ2UgPSB0aGlzLl9wZW5kaW5nQ29tbWFuZHNNYWpvclN0YXRlW3RoaXMu X3BlbmRpbmdDb21tYW5kc01ham9yU3RhdGUubGVuZ3RoIC0gMV07Ci0gICAgICAgIAorCiAgICAg ICAgIGlmICghbWFqb3JDaGFuZ2UgfHwgIXN0eWxlU2hlZXRJZCB8fCAhdGhpcy5oYXNFdmVudExp c3RlbmVycyhXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5FdmVudHMuU3R5bGVTaGVldENoYW5n ZWQpKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKGVy cm9yLCBjb250ZW50KQotICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoIWVycm9yKQotICAgICAg ICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5DU1NT dHlsZU1vZGVsLkV2ZW50cy5TdHlsZVNoZWV0Q2hhbmdlZCwgeyBzdHlsZVNoZWV0SWQ6IHN0eWxl U2hlZXRJZCwgY29udGVudDogY29udGVudCwgbWFqb3JDaGFuZ2U6IG1ham9yQ2hhbmdlIH0pOwot ICAgICAgICB9Ci0KLSAgICAgICAgQ1NTQWdlbnQuZ2V0U3R5bGVTaGVldFRleHQoc3R5bGVTaGVl dElkLCBjYWxsYmFjay5iaW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9M aXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwuRXZlbnRzLlN0eWxlU2hlZXRDaGFu Z2VkLCB7IHN0eWxlU2hlZXRJZDogc3R5bGVTaGVldElkLCBtYWpvckNoYW5nZTogbWFqb3JDaGFu Z2UgfSk7CiAgICAgfSwKIAogICAgIHNldFN0eWxlU2hlZXRUZXh0OiBmdW5jdGlvbihzdHlsZVNo ZWV0SWQsIG5ld1RleHQsIG1ham9yQ2hhbmdlLCB1c2VyQ2FsbGJhY2spCkBAIC00OTYsNyArNDkw LDcgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb24ucHJvdG90eXBlID0gewogICAg ICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAgICAgaWYgKGVycm9yKSB7Ci0gICAgICAg ICAgICAgICAgY29uc29sZS5lcnJvcihKU09OLnN0cmluZ2lmeShlcnJvcikpOworICAgICAgICAg ICAgICAgIGNvbnNvbGUuZXJyb3IoZXJyb3IpOwogICAgICAgICAgICAgICAgIHVzZXJDYWxsYmFj ayhudWxsKTsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgdXNlckNhbGxi YWNrKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uLnBhcnNlUGF5bG9hZChwYXlsb2Fk KSk7CkBAIC04MTEsNiArODA1LDkgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWxSZXNvdXJj ZUJpbmRpbmcgPSBmdW5jdGlvbihjc3NNb2RlbCkKIFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVs UmVzb3VyY2VCaW5kaW5nLnByb3RvdHlwZSA9IHsKICAgICBzZXRDb250ZW50OiBmdW5jdGlvbihy ZXNvdXJjZSwgY29udGVudCwgbWFqb3JDaGFuZ2UsIHVzZXJDYWxsYmFjaykKICAgICB7CisgICAg ICAgIGlmIChtYWpvckNoYW5nZSAmJiByZXNvdXJjZS50eXBlID09PSBXZWJJbnNwZWN0b3IuUmVz b3VyY2UuVHlwZS5TdHlsZXNoZWV0KQorICAgICAgICAgICAgcmVzb3VyY2UuYWRkUmV2aXNpb24o Y29udGVudCk7CisKICAgICAgICAgaWYgKHRoaXMuX3VybFRvU3R5bGVTaGVldElkW3Jlc291cmNl LnVybF0pIHsKICAgICAgICAgICAgIHRoaXMuX2lubmVyU2V0Q29udGVudChyZXNvdXJjZS51cmws IGNvbnRlbnQsIG1ham9yQ2hhbmdlLCB1c2VyQ2FsbGJhY2ssIG51bGwpOwogICAgICAgICAgICAg cmV0dXJuOwpAQCAtODQzLDcgKzg0MCwxNSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbFJl c291cmNlQmluZGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgdXNlckNhbGxiYWNr KCJObyBzdHlsZXNoZWV0IGZvdW5kOiAiICsgdXJsKTsKICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgfQotICAgICAgICB0aGlzLl9jc3NNb2RlbC5zZXRTdHlsZVNoZWV0VGV4dChzdHlsZVNo ZWV0SWQsIGNvbnRlbnQsIG1ham9yQ2hhbmdlLCB1c2VyQ2FsbGJhY2spOworCisgICAgICAgIHRo aXMuX2lzU2V0dGluZ0NvbnRlbnQgPSB0cnVlOworICAgICAgICBmdW5jdGlvbiBjYWxsYmFja1dy YXBwZXIoZXJyb3IpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmICh1c2VyQ2FsbGJhY2spCisg ICAgICAgICAgICAgICAgdXNlckNhbGxiYWNrKGVycm9yKTsKKyAgICAgICAgICAgIGRlbGV0ZSB0 aGlzLl9pc1NldHRpbmdDb250ZW50OworICAgICAgICB9CisgICAgICAgIHRoaXMuX2Nzc01vZGVs LnNldFN0eWxlU2hlZXRUZXh0KHN0eWxlU2hlZXRJZCwgY29udGVudCwgbWFqb3JDaGFuZ2UsIGNh bGxiYWNrV3JhcHBlci5iaW5kKHRoaXMpKTsKICAgICB9LAogCiAgICAgX2xvYWRTdHlsZVNoZWV0 SGVhZGVyczogZnVuY3Rpb24oY2FsbGJhY2spCkBAIC04NjcsNyArODcyLDIyIEBAIFdlYkluc3Bl Y3Rvci5DU1NTdHlsZU1vZGVsUmVzb3VyY2VCaW5kaW5nLnByb3RvdHlwZSA9IHsKIAogICAgIF9z dHlsZVNoZWV0Q2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB2YXIgc3R5 bGVTaGVldElkID0gZXZlbnQuZGF0YS5zdHlsZVNoZWV0SWQ7CisgICAgICAgIGlmICh0aGlzLl9p c1NldHRpbmdDb250ZW50KQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGlmICghZXZl bnQuZGF0YS5tYWpvckNoYW5nZSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBmdW5j dGlvbiBjYWxsYmFjayhlcnJvciwgY29udGVudCkKKyAgICAgICAgeworICAgICAgICAgICAgaWYg KCFlcnJvcikKKyAgICAgICAgICAgICAgICB0aGlzLl9pbm5lclN0eWxlU2hlZXRDaGFuZ2VkKGV2 ZW50LmRhdGEuc3R5bGVTaGVldElkLCBjb250ZW50KTsKKyAgICAgICAgfQorICAgICAgICBDU1NB Z2VudC5nZXRTdHlsZVNoZWV0VGV4dChldmVudC5kYXRhLnN0eWxlU2hlZXRJZCwgY2FsbGJhY2su YmluZCh0aGlzKSk7CisgICAgfSwKKworICAgIF9pbm5lclN0eWxlU2hlZXRDaGFuZ2VkOiBmdW5j dGlvbihzdHlsZVNoZWV0SWQsIGNvbnRlbnQpCisgICAgewogICAgICAgICBmdW5jdGlvbiBzZXRD b250ZW50KCkKICAgICAgICAgewogICAgICAgICAgICAgdmFyIHVybCA9IHRoaXMuX3N0eWxlU2hl ZXRJZFRvVVJMW3N0eWxlU2hlZXRJZF07CkBAIC04NzUsMTIgKzg5NSw4IEBAIFdlYkluc3BlY3Rv ci5DU1NTdHlsZU1vZGVsUmVzb3VyY2VCaW5kaW5nLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg ICAgICByZXR1cm47CiAKICAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IFdlYkluc3BlY3Rvci5y ZXNvdXJjZUZvclVSTCh1cmwpOwotICAgICAgICAgICAgaWYgKCFyZXNvdXJjZSB8fCByZXNvdXJj ZS50eXBlICE9PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5TdHlsZXNoZWV0KQotICAgICAg ICAgICAgICAgIHJldHVybjsKLQotICAgICAgICAgICAgdmFyIG1ham9yQ2hhbmdlID0gZXZlbnQu ZGF0YS5tYWpvckNoYW5nZTsKLSAgICAgICAgICAgIGlmIChtYWpvckNoYW5nZSkKLSAgICAgICAg ICAgICAgICByZXNvdXJjZS5hZGRSZXZpc2lvbihldmVudC5kYXRhLmNvbnRlbnQpOworICAgICAg ICAgICAgaWYgKHJlc291cmNlICYmIHJlc291cmNlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5SZXNv dXJjZS5UeXBlLlN0eWxlc2hlZXQpCisgICAgICAgICAgICAgICAgcmVzb3VyY2UuYWRkUmV2aXNp b24oY29udGVudCk7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoIXRoaXMuX3N0eWxlU2hlZXRJ ZFRvVVJMW3N0eWxlU2hlZXRJZF0pIHsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjZGZkYzZhMDEzYzk5MzNmNWFjZjgwNTE0 MTUwZmZmM2EyNzhlNDMxLi40MDc4ZDhhZjU1ZDZkOWYwNGNmYTlkZDUwZDgxNzhjODZiNTJjZjhk IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDMtMjIgIFBhdmVsIEZlbGRtYW4gIDxwZmVs ZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogZGlzcGF0Y2ggc3R5 bGVTaGVldENoYW5nZWQgZXZlbnQgc3luY2hyb25vdXNseS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxODkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJj ZXMtdGVzdC5qczoKKyAgICAgICAgKGluaXRpYWxpemVfUmVzb3VyY2VUZXN0Lkluc3BlY3RvclRl c3Quc2hvd1Jlc291cmNlLmNhbGxiYWNrV3JhcHBlcik6CisgICAgICAgIChpbml0aWFsaXplX1Jl c291cmNlVGVzdC5JbnNwZWN0b3JUZXN0LnNob3dSZXNvdXJjZS5zaG93UmVzb3VyY2VDYWxsYmFj ay52aXNpdCk6CisgICAgICAgIChpbml0aWFsaXplX1Jlc291cmNlVGVzdC5JbnNwZWN0b3JUZXN0 LnNob3dSZXNvdXJjZS5zaG93UmVzb3VyY2VDYWxsYmFjayk6CisgICAgICAgIChpbml0aWFsaXpl X1Jlc291cmNlVGVzdC5JbnNwZWN0b3JUZXN0LnNob3dSZXNvdXJjZSk6CisgICAgICAgIChpbml0 aWFsaXplX1Jlc291cmNlVGVzdCk6CisgICAgICAgICogaW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMt aGlzdG9yeS5odG1sOgorCiAyMDEyLTAzLTIyICBNaWhhaSBCYWxhbiAgPG1pYmFsYW5AYWRvYmUu Y29tPgogCiAgICAgICAgIFtDU1NSZWdpb25zXSBBZGQgcmVnaW9uIHN0eWxpbmcgdGVzdCBmb3Ig cmVnaW9uIGNzcyBydWxlcyBzcGVjaWZpY2l0eS9wb3NpdGlvbgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzLXRlc3QuanMgYi9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZXMtdGVzdC5qcwppbmRleCAzYTlhZDI1NTg5 M2EyYWIxNmViMDdkMWE1NTNkOWI0YTAxZmRkOTkwLi40MWY5YmNhZjk0MzAxYmE3ZTViNjNhMDU2 NmQxMWNjZDUyOGY2NjkzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3Bl Y3Rvci9yZXNvdXJjZXMtdGVzdC5qcworKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3Bl Y3Rvci9yZXNvdXJjZXMtdGVzdC5qcwpAQCAtNjEsNiArNjEsMTUgQEAgSW5zcGVjdG9yVGVzdC5y dW5BZnRlclJlc291cmNlc0FyZUZpbmlzaGVkID0gZnVuY3Rpb24ocmVzb3VyY2VVUkxzLCBjYWxs YmFjaykKIAogSW5zcGVjdG9yVGVzdC5zaG93UmVzb3VyY2UgPSBmdW5jdGlvbihyZXNvdXJjZVVS TCwgY2FsbGJhY2spCiB7CisgICAgdmFyIHJlcG9ydGVkID0gZmFsc2U7CisgICAgZnVuY3Rpb24g Y2FsbGJhY2tXcmFwcGVyKHNvdXJjZUZyYW1lKQorICAgIHsKKyAgICAgICAgaWYgKHJlcG9ydGVk KQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBjYWxsYmFjayhzb3VyY2VGcmFtZSk7Cisg ICAgICAgIHJlcG9ydGVkID0gdHJ1ZTsKKyAgICB9CisKICAgICBmdW5jdGlvbiBzaG93UmVzb3Vy Y2VDYWxsYmFjaygpCiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9k ZWwuZm9yQWxsUmVzb3VyY2VzKHZpc2l0KTsKQEAgLTcwLDkgKzc5LDkgQEAgSW5zcGVjdG9yVGVz dC5zaG93UmVzb3VyY2UgPSBmdW5jdGlvbihyZXNvdXJjZVVSTCwgY2FsbGJhY2spCiAgICAgICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMuc2hvd1Jlc291cmNlKHJlc291 cmNlLCAxKTsKICAgICAgICAgICAgICAgICB2YXIgc291cmNlRnJhbWUgPSBXZWJJbnNwZWN0b3Iu cGFuZWxzLnJlc291cmNlcy5fcmVzb3VyY2VWaWV3Rm9yUmVzb3VyY2UocmVzb3VyY2UpOwogICAg ICAgICAgICAgICAgIGlmIChzb3VyY2VGcmFtZS5sb2FkZWQpCi0gICAgICAgICAgICAgICAgICAg IGNhbGxiYWNrKHNvdXJjZUZyYW1lKTsKKyAgICAgICAgICAgICAgICAgICAgY2FsbGJhY2tXcmFw cGVyKHNvdXJjZUZyYW1lKTsKICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAg ICAgIHNvdXJjZUZyYW1lLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1l LkV2ZW50cy5Mb2FkZWQsIGNhbGxiYWNrLmJpbmQobnVsbCwgc291cmNlRnJhbWUpKTsKKyAgICAg ICAgICAgICAgICAgICAgc291cmNlRnJhbWUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu U291cmNlRnJhbWUuRXZlbnRzLkxvYWRlZCwgY2FsbGJhY2tXcmFwcGVyLmJpbmQobnVsbCwgc291 cmNlRnJhbWUpKTsKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAgIH0K ICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9zdHls ZXMtaGlzdG9yeS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3N0 eWxlcy1oaXN0b3J5LWV4cGVjdGVkLnR4dAppbmRleCBjZTM3ODQ1ZDljM2IxNDVhMjc5NmRjMjQw NzE2NThmNGNjOTE1YzkyLi42ODhlNGIyMzFjNzkzNjhmNjYwOTJkY2RhODFlZGQ1MTYwZDNlZTFl IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1oaXN0b3J5 LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1o aXN0b3J5LWV4cGVjdGVkLnR4dApAQCAtNSwxNCArNSwxNCBAQCBSdW5uaW5nOiB0ZXN0U2V0VXAK IAogUnVubmluZzogdGVzdFNldFJlc291cmNlQ29udGVudE1pbm9yCiBIaXN0b3J5IGxlbmd0aDog MAotCi1SdW5uaW5nOiB0ZXN0U2V0UmVzb3VyY2VDb250ZW50TWFqb3IKIEl0ZW0gPHRpcD46CiBi b2R5IHsKICAgbWFyZ2luOiAxMHB4OwogICBwYWRkaW5nOiAxMHB4OwogfQogCisKK1J1bm5pbmc6 IHRlc3RTZXRSZXNvdXJjZUNvbnRlbnRNYWpvcgogSGlzdG9yeSBsZW5ndGg6IDEKIEl0ZW0gMDoK IGJvZHkgewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMt aGlzdG9yeS5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMtaGlzdG9y eS5odG1sCmluZGV4IDQ2ODk1MzI1ODI5NDNmOGM3YmYxYjYzNTM4M2EzYjQ4OGFjNWM0OTUuLmNi ZTc2MjZjM2QxOTcwYjhhZDI4YzIzZDhhOGZiMzFjYjdiOTJmZmQgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVzLWhpc3RvcnkuaHRtbAorKysgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1oaXN0b3J5Lmh0bWwKQEAgLTI2LDcgKzI2LDYg QEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAgICAgICAgICAgIGlmIChyZXNvdXJjZS51cmwu aW5kZXhPZigic3R5bGVzLWhpc3RvcnkuY3NzIikgPT09IC0xKQogICAgICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgICAgICBzdHlsZVJlc291cmNlID0gcmVzb3Vy Y2U7Ci0gICAgICAgICAgICAgICAgICAgIHN0eWxlUmVzb3VyY2UuYWRkRXZlbnRMaXN0ZW5lcihX ZWJJbnNwZWN0b3IuUmVzb3VyY2UuRXZlbnRzLlJldmlzaW9uQWRkZWQsIGR1bXBIaXN0b3J5KTsK ICAgICAgICAgICAgICAgICAgICAgbmV4dCgpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAg ICAgICAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuZm9yQWxsUmVzb3VyY2VzKHZp c2l0UmVzb3VyY2UpOwpAQCAtMzQsMTggKzMzLDEyIEBAIGZ1bmN0aW9uIHRlc3QoKQogCiAgICAg ICAgICAgICBmdW5jdGlvbiB0ZXN0U2V0UmVzb3VyY2VDb250ZW50TWlub3IobmV4dCkKICAgICAg ICAgICAgIHsKLSAgICAgICAgICAgICAgICBmdW5jdGlvbiBjYWxsYmFjaygpCi0gICAgICAgICAg ICAgICAgewotICAgICAgICAgICAgICAgICAgICBkdW1wSGlzdG9yeSgpOwotICAgICAgICAgICAg ICAgICAgICBuZXh0KCk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIHN0eWxl UmVzb3VyY2Uuc2V0Q29udGVudCgiYm9keSB7XG4gIG1hcmdpbjogMTVweDtcbiAgcGFkZGluZzog MTBweDtcbn0iLCBmYWxzZSwgY2FsbGJhY2spOworICAgICAgICAgICAgICAgIHN0eWxlUmVzb3Vy Y2Uuc2V0Q29udGVudCgiYm9keSB7XG4gIG1hcmdpbjogMTVweDtcbiAgcGFkZGluZzogMTBweDtc bn0iLCBmYWxzZSwgZHVtcEhpc3RvcnkobmV4dCkpOwogICAgICAgICAgICAgfSwKIAogICAgICAg ICAgICAgZnVuY3Rpb24gdGVzdFNldFJlc291cmNlQ29udGVudE1ham9yKG5leHQpCiAgICAgICAg ICAgICB7Ci0gICAgICAgICAgICAgICAgd2FpdEZvclJldmlzaW9uKG5leHQpOwotICAgICAgICAg ICAgICAgIHN0eWxlUmVzb3VyY2Uuc2V0Q29udGVudCgiYm9keSB7XG4gIG1hcmdpbjogMjBweDtc biAgcGFkZGluZzogMTBweDtcbn0iLCB0cnVlKTsKKyAgICAgICAgICAgICAgICBzdHlsZVJlc291 cmNlLnNldENvbnRlbnQoImJvZHkge1xuICBtYXJnaW46IDIwcHg7XG4gIHBhZGRpbmc6IDEwcHg7 XG59IiwgdHJ1ZSwgZHVtcEhpc3RvcnkobmV4dCkpOwogICAgICAgICAgICAgfSwKIAogICAgICAg ICAgICAgZnVuY3Rpb24gdGVzdFNldENvbnRlbnRWaWFNb2RlbE1pbm9yKG5leHQpCkBAIC01Niwx MyArNDksNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAg ICAgICAgICAgIHZhciBzdHlsZSA9IHN0eWxlU2hlZXQucnVsZXNbMF0uc3R5bGU7CiAgICAgICAg ICAgICAgICAgICAgIHZhciBwcm9wZXJ0eSA9IHN0eWxlLmdldExpdmVQcm9wZXJ0eSgibWFyZ2lu Iik7Ci0gICAgICAgICAgICAgICAgICAgIHByb3BlcnR5LnNldFRleHQoIm1hcmdpbjoyNXB4OyIs IGZhbHNlLCB0cnVlLCBzdGVwMik7Ci0gICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAg ICAgZnVuY3Rpb24gc3RlcDIoKQotICAgICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAg ICAgZHVtcEhpc3RvcnkoKTsKLSAgICAgICAgICAgICAgICAgICAgbmV4dCgpOworICAgICAgICAg ICAgICAgICAgICBwcm9wZXJ0eS5zZXRUZXh0KCJtYXJnaW46MjVweDsiLCBmYWxzZSwgdHJ1ZSwg ZHVtcEhpc3RvcnkobmV4dCkpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0sCiAK QEAgLTc0LDggKzYxLDggQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAgICAgICAgewogICAg ICAgICAgICAgICAgICAgICB2YXIgc3R5bGUgPSBzdHlsZVNoZWV0LnJ1bGVzWzBdLnN0eWxlOwog ICAgICAgICAgICAgICAgICAgICB2YXIgcHJvcGVydHkgPSBzdHlsZS5nZXRMaXZlUHJvcGVydHko Im1hcmdpbiIpOwotICAgICAgICAgICAgICAgICAgICB3YWl0Rm9yUmV2aXNpb24obmV4dCk7CiAg ICAgICAgICAgICAgICAgICAgIHByb3BlcnR5LnNldFRleHQoIm1hcmdpbjozMHB4OyIsIHRydWUs IHRydWUpOworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LnJ1bkFmdGVyUGVuZGlu Z0Rpc3BhdGNoZXMoZHVtcEhpc3RvcnkobmV4dCkpOwogICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIH0KICAgICAgICAgXSk7CkBAIC0xMDQsMjggKzkxLDI0IEBAIGZ1bmN0aW9uIHRlc3Qo KQogICAgICAgICB9CiAgICAgfQogCi0gICAgZnVuY3Rpb24gZHVtcEhpc3RvcnkoKQorICAgIGZ1 bmN0aW9uIGR1bXBIaXN0b3J5KG5leHQpCiAgICAgewotICAgICAgICBJbnNwZWN0b3JUZXN0LmFk ZFJlc3VsdCgiSGlzdG9yeSBsZW5ndGg6ICIgKyBzdHlsZVJlc291cmNlLmhpc3RvcnkubGVuZ3Ro KTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzdHlsZVJlc291cmNlLmhpc3RvcnkubGVu Z3RoOyArK2kpCi0gICAgICAgICAgICBzdHlsZVJlc291cmNlLmhpc3RvcnlbaV0ucmVxdWVzdENv bnRlbnQoZHVtcFJldmlzaW9uLmJpbmQodGhpcywgaSkpOwotICAgICAgICBzdHlsZVJlc291cmNl LnJlcXVlc3RDb250ZW50KGR1bXBSZXZpc2lvbi5iaW5kKHRoaXMsICI8dGlwPiIpKTsKLQotICAg ICAgICB2YXIgY29weSA9IHBlbmRpbmdDYWxsYmFja3Muc2xpY2UoKTsKLSAgICAgICAgcGVuZGlu Z0NhbGxiYWNrcyA9IFtdOwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNvcHkubGVuZ3Ro OyArK2kpCi0gICAgICAgICAgICBjb3B5W2ldKCk7CisgICAgICAgIGZ1bmN0aW9uIHJlc3VsdCgp CisgICAgICAgIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJIaXN0b3J5 IGxlbmd0aDogIiArIHN0eWxlUmVzb3VyY2UuaGlzdG9yeS5sZW5ndGgpOworICAgICAgICAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCBzdHlsZVJlc291cmNlLmhpc3RvcnkubGVuZ3RoOyArK2kpCisg ICAgICAgICAgICAgICAgc3R5bGVSZXNvdXJjZS5oaXN0b3J5W2ldLnJlcXVlc3RDb250ZW50KGR1 bXBSZXZpc2lvbi5iaW5kKHRoaXMsIGksIG51bGwpKTsKKyAgICAgICAgICAgIHN0eWxlUmVzb3Vy Y2UucmVxdWVzdENvbnRlbnQoZHVtcFJldmlzaW9uLmJpbmQodGhpcywgIjx0aXA+IiwgbmV4dCkp OworICAgICAgICB9CisgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfQogCi0gICAgZnVuY3Rp b24gZHVtcFJldmlzaW9uKGluZGV4LCBjb250ZW50KQorICAgIGZ1bmN0aW9uIGR1bXBSZXZpc2lv bihpbmRleCwgbmV4dCwgY29udGVudCkKICAgICB7CiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRk UmVzdWx0KCJJdGVtICIgKyBpbmRleCArICI6Iik7CiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRk UmVzdWx0KGNvbnRlbnQpOwotICAgIH0KLQotICAgIGZ1bmN0aW9uIHdhaXRGb3JSZXZpc2lvbihj YWxsYmFjaykKLSAgICB7Ci0gICAgICAgIHBlbmRpbmdDYWxsYmFja3MucHVzaChjYWxsYmFjayk7 CisgICAgICAgIGlmIChuZXh0KQorICAgICAgICAgICAgbmV4dCgpOwogICAgIH0KIH0KIAo=