97994 2012-09-30 23:40:38 -0700 Web Inspector: Separate CSSStyleModelResourceBinding into resource and content binding. 2012-10-01 01:46:32 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 731406 0 vsevik 2012-09-30 23:40:38 -0700 Patch to follow 731411 1 166413 vsevik 2012-09-30 23:54:47 -0700 Created attachment 166413 Patch 731483 2 vsevik 2012-10-01 01:46:32 -0700 Committed r130016: <http://trac.webkit.org/changeset/130016> 166413 2012-09-30 23:54:47 -0700 2012-10-01 01:38:55 -0700 Patch bug-97994-20121001105401.patch text/plain 14201 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTI2N2U0ODNiMDA5MTk3 ZjZlOTQ4MjU0NjE3NjdhN2FlMmY5MDgxYy4uNzM2NTA1ZjZhMzcwNDZhOTE4MTA3ZWViNTY1YjQ3 ODQ0NWY2NDYwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA5LTMwICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFNlcGFyYXRlIENTU1N0eWxlTW9kZWxSZXNvdXJjZUJpbmRpbmcgaW50byByZXNvdXJjZSBh bmQgY29udGVudCBiaW5kaW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTc5OTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBFeHRyYWN0ZWQgU3R5bGVDb250ZW50QmluZGluZyBmcm9tIENTU1N0eWxlTW9k ZWxSZXNvdXJjZUJpbmRpbmcuCisgICAgICAgIE5vdyBDU1NTdHlsZU1vZGVsUmVzb3VyY2VCaW5k aW5nIGlzIHJlc3BvbnNpYmxlIGZvciBtYXBwaW5nIGJldHdlZW4gc3R5bGVzaGVldHMgYW5kIHJl c291cmNlcy4KKyAgICAgICAgU3R5bGVDb250ZW50QmluZGluZyBpcyBub3cgcmVzcG9uc2libGUg Zm9yIHN5bmNocm9uaXphdGlvbiBiZXR3ZWVuIHN0eWxlc2hlZXQgY29udGVudCBhbmQgdWlTb3Vy Y2VDb2RlIGNvbnRlbnQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxl TW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbFJlc291cmNlQmlu ZGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbFJlc291cmNlQmluZGlu Zy5wcm90b3R5cGUucmVxdWVzdFN0eWxlU2hlZXRJZEZvclJlc291cmNlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5DU1NTdHlsZU1vZGVsUmVzb3VyY2VCaW5kaW5nLnByb3RvdHlwZS5yZXF1ZXN0 UmVzb3VyY2VVUkxGb3JTdHlsZVNoZWV0SWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvU3R5bGVTb3VyY2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVTb3VyY2UucHJv dG90eXBlLl9jb21taXRJbmNyZW1lbnRhbEVkaXQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvU3R5bGVzU291cmNlTWFwcGluZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHls ZUNvbnRlbnRCaW5kaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZUNvbnRlbnRCaW5k aW5nLnByb3RvdHlwZS5zZXRTdHlsZUNvbnRlbnQuY2FsbGJhY2spOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlN0eWxlQ29udGVudEJpbmRpbmcucHJvdG90eXBlLnNldFN0eWxlQ29udGVudCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVDb250ZW50QmluZGluZy5wcm90b3R5cGUuX2lubmVy U2V0Q29udGVudC5jYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVDb250ZW50 QmluZGluZy5wcm90b3R5cGUuX2lubmVyU2V0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU3R5bGVDb250ZW50QmluZGluZy5wcm90b3R5cGUuX3N0eWxlU2hlZXRDaGFuZ2VkLmNhbGxi YWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZUNvbnRlbnRCaW5kaW5nLnByb3RvdHlw ZS5fc3R5bGVTaGVldENoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlQ29udGVu dEJpbmRpbmcucHJvdG90eXBlLl9pbm5lclN0eWxlU2hlZXRDaGFuZ2VkKToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKwogMjAxMi0wOS0zMCAgR2xlbm4gQWRh bXMgIDxnbGVubkBza3luYXYuY29tPgogCiAgICAgICAgIFNpZ24gaW4gZnJvbnQgb2Yga2V5ZnJh bWUgc2VsZWN0b3IgY2F1c2VzIHN0eWxlc2hlZXQgcGFyc2luZyB0byBhYm9ydApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCmluZGV4 IDcxMWM4NmQxNzAzNmE1NDFlYThmYzFjYzVkYzAyOTVkYzU0ODE0MWQuLmYyYTJmYjVlNmViNmFk MjRiZTU2YTc5NDFlOGZlMTBkZGQxNTBjYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMKQEAgLTM4LDcgKzM4LDcgQEAgV2Vi SW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5fc291cmNlTWFw cGluZ3MgPSB7fTsKICAgICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQuYWRkRXZlbnRMaXN0ZW5lcihX ZWJJbnNwZWN0b3IuRE9NQWdlbnQuRXZlbnRzLlVuZG9SZWRvUmVxdWVzdGVkLCB0aGlzLl91bmRv UmVkb1JlcXVlc3RlZCwgdGhpcyk7CiAgICAgV2ViSW5zcGVjdG9yLmRvbUFnZW50LmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRPTUFnZW50LkV2ZW50cy5VbmRvUmVkb0NvbXBsZXRlZCwg dGhpcy5fdW5kb1JlZG9Db21wbGV0ZWQsIHRoaXMpOwotICAgIHRoaXMuX3Jlc291cmNlQmluZGlu ZyA9IG5ldyBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbFJlc291cmNlQmluZGluZyh0aGlzKTsK KyAgICB0aGlzLl9yZXNvdXJjZUJpbmRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9k ZWxSZXNvdXJjZUJpbmRpbmcoKTsKICAgICB0aGlzLl9uYW1lZEZsb3dDb2xsZWN0aW9ucyA9IHt9 OwogICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5ET01BZ2VudC5FdmVudHMuRG9jdW1lbnRVcGRhdGVkLCB0aGlzLl9yZXNldE5hbWVkRmxvd0Nv bGxlY3Rpb25zLCB0aGlzKTsKICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ1NTRGlzcGF0 Y2hlcihuZXcgV2ViSW5zcGVjdG9yLkNTU0Rpc3BhdGNoZXIodGhpcykpOwpAQCAtMTEwMCwzMCAr MTEwMCw1OSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5wcm90b3R5cGUgPSB7CiAvKioK ICAqIEBjb25zdHJ1Y3RvcgogICovCi1XZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbFJlc291cmNl QmluZGluZyA9IGZ1bmN0aW9uKGNzc01vZGVsKQorV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWxS ZXNvdXJjZUJpbmRpbmcgPSBmdW5jdGlvbigpCiB7Ci0gICAgdGhpcy5fY3NzTW9kZWwgPSBjc3NN b2RlbDsKICAgICB0aGlzLl9mcmFtZUFuZFVSTFRvU3R5bGVTaGVldElkID0ge307CiAgICAgdGhp cy5fc3R5bGVTaGVldElkVG9IZWFkZXIgPSB7fTsKLSAgICB0aGlzLl9jc3NNb2RlbC5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsLkV2ZW50cy5TdHlsZVNoZWV0Q2hh bmdlZCwgdGhpcy5fc3R5bGVTaGVldENoYW5nZWQsIHRoaXMpOwogICAgIFdlYkluc3BlY3Rvci5y ZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRy ZWVNb2RlbC5FdmVudFR5cGVzLkluc3BlY3RlZFVSTENoYW5nZWQsIHRoaXMuX2luc3BlY3RlZFVS TENoYW5nZWQsIHRoaXMpOwogfQogCiBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbFJlc291cmNl QmluZGluZy5wcm90b3R5cGUgPSB7CiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0 b3IuU3R5bGVTb3VyY2V9IHN0eWxlU291cmNlCi0gICAgICogQHBhcmFtIHtzdHJpbmd9IGNvbnRl bnQKLSAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IG1ham9yQ2hhbmdlCi0gICAgICogQHBhcmFtIHtm dW5jdGlvbig/c3RyaW5nKX0gdXNlckNhbGxiYWNrCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0 b3IuUmVzb3VyY2V9IHJlc291cmNlCisgICAgICogQHBhcmFtIHtmdW5jdGlvbig/Q1NTQWdlbnQu U3R5bGVTaGVldElkKX0gY2FsbGJhY2sKICAgICAgKi8KLSAgICBzZXRTdHlsZUNvbnRlbnQ6IGZ1 bmN0aW9uKHN0eWxlU291cmNlLCBjb250ZW50LCBtYWpvckNoYW5nZSwgdXNlckNhbGxiYWNrKQor ICAgIHJlcXVlc3RTdHlsZVNoZWV0SWRGb3JSZXNvdXJjZTogZnVuY3Rpb24ocmVzb3VyY2UsIGNh bGxiYWNrKQogICAgIHsKLSAgICAgICAgdmFyIHJlc291cmNlID0gV2ViSW5zcGVjdG9yLnJlc291 cmNlRm9yVVJMKHN0eWxlU291cmNlLnVybCk7Ci0gICAgICAgIGlmICh0aGlzLl9zdHlsZVNoZWV0 SWRGb3JSZXNvdXJjZShyZXNvdXJjZSkpIHsKLSAgICAgICAgICAgIHRoaXMuX2lubmVyU2V0Q29u dGVudChyZXNvdXJjZSwgY29udGVudCwgbWFqb3JDaGFuZ2UsIHVzZXJDYWxsYmFjaywgbnVsbCk7 Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgIGZ1bmN0aW9uIGlubmVyQ2FsbGJhY2soKQor ICAgICAgICB7CisgICAgICAgICAgICBjYWxsYmFjayh0aGlzLl9zdHlsZVNoZWV0SWRGb3JSZXNv dXJjZShyZXNvdXJjZSkpOwogICAgICAgICB9Ci0gICAgICAgIHRoaXMuX2xvYWRTdHlsZVNoZWV0 SGVhZGVycyh0aGlzLl9pbm5lclNldENvbnRlbnQuYmluZCh0aGlzLCByZXNvdXJjZSwgY29udGVu dCwgbWFqb3JDaGFuZ2UsIHVzZXJDYWxsYmFjaykpOworICAgICAgICAKKyAgICAgICAgaWYgKHRo aXMuX3N0eWxlU2hlZXRJZEZvclJlc291cmNlKHJlc291cmNlKSkKKyAgICAgICAgICAgIGlubmVy Q2FsbGJhY2suY2FsbCh0aGlzKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5fbG9h ZFN0eWxlU2hlZXRIZWFkZXJzKGlubmVyQ2FsbGJhY2suYmluZCh0aGlzKSk7CisgICAgfSwKKwor ICAgIC8qKgorICAgICAqIEBwYXJhbSB7Q1NTQWdlbnQuU3R5bGVTaGVldElkfSBzdHlsZVNoZWV0 SWQKKyAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcpfSBjYWxsYmFjaworICAgICAqLwor ICAgIHJlcXVlc3RSZXNvdXJjZVVSTEZvclN0eWxlU2hlZXRJZDogZnVuY3Rpb24oc3R5bGVTaGVl dElkLCBjYWxsYmFjaykKKyAgICB7CisgICAgICAgIGZ1bmN0aW9uIGlubmVyQ2FsbGJhY2soKQor ICAgICAgICB7CisgICAgICAgICAgICB2YXIgaGVhZGVyID0gdGhpcy5fc3R5bGVTaGVldElkVG9I ZWFkZXJbc3R5bGVTaGVldElkXTsKKyAgICAgICAgICAgIGlmICghaGVhZGVyKSB7CisgICAgICAg ICAgICAgICAgY2FsbGJhY2sobnVsbCk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAg ICAgICAgfQorCisgICAgICAgICAgICB2YXIgZnJhbWUgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VU cmVlTW9kZWwuZnJhbWVGb3JJZChoZWFkZXIuZnJhbWVJZCk7CisgICAgICAgICAgICBpZiAoIWZy YW1lKSB7CisgICAgICAgICAgICAgICAgY2FsbGJhY2sobnVsbCk7CisgICAgICAgICAgICAgICAg cmV0dXJuOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICB2YXIgc3R5bGVTaGVldFVSTCA9 IGhlYWRlci5vcmlnaW4gPT09ICJpbnNwZWN0b3IiID8gdGhpcy5fdmlhSW5zcGVjdG9yUmVzb3Vy Y2VVUkwoaGVhZGVyLnNvdXJjZVVSTCkgOiBoZWFkZXIuc291cmNlVVJMOworICAgICAgICAgICAg Y2FsbGJhY2soc3R5bGVTaGVldFVSTCk7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIGlm ICh0aGlzLl9zdHlsZVNoZWV0SWRUb0hlYWRlcltzdHlsZVNoZWV0SWRdKQorICAgICAgICAgICAg aW5uZXJDYWxsYmFjay5jYWxsKHRoaXMpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlz Ll9sb2FkU3R5bGVTaGVldEhlYWRlcnMoaW5uZXJDYWxsYmFjay5iaW5kKHRoaXMpKTsKICAgICB9 LAogCiAgICAgLyoqCkBAIC0xMTQ2LDM1ICsxMTc1LDYgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxl TW9kZWxSZXNvdXJjZUJpbmRpbmcucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAg ICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5SZXNvdXJjZX0gcmVzb3VyY2UKLSAgICAgKiBAcGFy YW0ge3N0cmluZ30gY29udGVudAotICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gbWFqb3JDaGFuZ2UK LSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcpfSB1c2VyQ2FsbGJhY2sKLSAgICAgKiBA cGFyYW0gez9zdHJpbmd9IGVycm9yCi0gICAgICovCi0gICAgX2lubmVyU2V0Q29udGVudDogZnVu Y3Rpb24ocmVzb3VyY2UsIGNvbnRlbnQsIG1ham9yQ2hhbmdlLCB1c2VyQ2FsbGJhY2ssIGVycm9y KQotICAgIHsKLSAgICAgICAgaWYgKGVycm9yKSB7Ci0gICAgICAgICAgICB1c2VyQ2FsbGJhY2so ZXJyb3IpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgdmFyIHN0 eWxlU2hlZXRJZCA9IHRoaXMuX3N0eWxlU2hlZXRJZEZvclJlc291cmNlKHJlc291cmNlKTsKLSAg ICAgICAgaWYgKCFzdHlsZVNoZWV0SWQpIHsKLSAgICAgICAgICAgIHVzZXJDYWxsYmFjaygiTm8g c3R5bGVzaGVldCBmb3VuZDogIiArIHJlc291cmNlLmZyYW1lSWQgKyAiOiIgKyByZXNvdXJjZS51 cmwpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgdGhpcy5faXNT ZXR0aW5nQ29udGVudCA9IHRydWU7Ci0gICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrV3JhcHBlcihl cnJvcikKLSAgICAgICAgewotICAgICAgICAgICAgdXNlckNhbGxiYWNrKGVycm9yKTsKLSAgICAg ICAgICAgIGRlbGV0ZSB0aGlzLl9pc1NldHRpbmdDb250ZW50OwotICAgICAgICB9Ci0gICAgICAg IHRoaXMuX2Nzc01vZGVsLnNldFN0eWxlU2hlZXRUZXh0KHN0eWxlU2hlZXRJZCwgY29udGVudCwg bWFqb3JDaGFuZ2UsIGNhbGxiYWNrV3JhcHBlci5iaW5kKHRoaXMpKTsKLSAgICB9LAotCi0gICAg LyoqCiAgICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3RyaW5nKX0gY2FsbGJhY2sKICAgICAgKi8K ICAgICBfbG9hZFN0eWxlU2hlZXRIZWFkZXJzOiBmdW5jdGlvbihjYWxsYmFjaykKQEAgLTEyMDUs NjIgKzEyMDUsNiBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbFJlc291cmNlQmluZGluZy5w cm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVj dG9yLkV2ZW50fSBldmVudAotICAgICAqLwotICAgIF9zdHlsZVNoZWV0Q2hhbmdlZDogZnVuY3Rp b24oZXZlbnQpCi0gICAgewotICAgICAgICBpZiAodGhpcy5faXNTZXR0aW5nQ29udGVudCkKLSAg ICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBpZiAoIWV2ZW50LmRhdGEubWFqb3JDaGFuZ2Up Ci0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgLyoqCi0gICAgICAgICAqIEBwYXJhbSB7 P3N0cmluZ30gZXJyb3IKLSAgICAgICAgICogQHBhcmFtIHtzdHJpbmd9IGNvbnRlbnQKLSAgICAg ICAgICovCi0gICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKGVycm9yLCBjb250ZW50KQotICAgICAg ICB7Ci0gICAgICAgICAgICBpZiAoIWVycm9yKQotICAgICAgICAgICAgICAgIHRoaXMuX2lubmVy U3R5bGVTaGVldENoYW5nZWQoZXZlbnQuZGF0YS5zdHlsZVNoZWV0SWQsIGNvbnRlbnQpOwotICAg ICAgICB9Ci0gICAgICAgIENTU0FnZW50LmdldFN0eWxlU2hlZXRUZXh0KGV2ZW50LmRhdGEuc3R5 bGVTaGVldElkLCBjYWxsYmFjay5iaW5kKHRoaXMpKTsKLSAgICB9LAotCi0gICAgLyoqCi0gICAg ICogQHBhcmFtIHtDU1NBZ2VudC5TdHlsZVNoZWV0SWR9IHN0eWxlU2hlZXRJZAotICAgICAqIEBw YXJhbSB7c3RyaW5nfSBjb250ZW50Ci0gICAgICovCi0gICAgX2lubmVyU3R5bGVTaGVldENoYW5n ZWQ6IGZ1bmN0aW9uKHN0eWxlU2hlZXRJZCwgY29udGVudCkKLSAgICB7Ci0gICAgICAgIGZ1bmN0 aW9uIHNldENvbnRlbnQoKQotICAgICAgICB7Ci0gICAgICAgICAgICB2YXIgaGVhZGVyID0gdGhp cy5fc3R5bGVTaGVldElkVG9IZWFkZXJbc3R5bGVTaGVldElkXTsKLSAgICAgICAgICAgIGlmICgh aGVhZGVyKQotICAgICAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICAgICAgdmFyIGZyYW1l ID0gV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLmZyYW1lRm9ySWQoaGVhZGVyLmZyYW1l SWQpOwotICAgICAgICAgICAgaWYgKCFmcmFtZSkKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0K LSAgICAgICAgICAgIHZhciBzdHlsZVNoZWV0VVJMID0gaGVhZGVyLm9yaWdpbiA9PT0gImluc3Bl Y3RvciIgPyB0aGlzLl92aWFJbnNwZWN0b3JSZXNvdXJjZVVSTChoZWFkZXIuc291cmNlVVJMKSA6 IGhlYWRlci5zb3VyY2VVUkw7Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIHZhciB1aVNvdXJj ZUNvZGUgPSBXZWJJbnNwZWN0b3Iud29ya3NwYWNlLnVpU291cmNlQ29kZUZvclVSTChzdHlsZVNo ZWV0VVJMKTsKLSAgICAgICAgICAgIGlmICghdWlTb3VyY2VDb2RlKQotICAgICAgICAgICAgICAg IHJldHVybjsKLQotICAgICAgICAgICAgaWYgKHVpU291cmNlQ29kZS5jb250ZW50VHlwZSgpID09 PSBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5TdHlsZXNoZWV0KQotICAgICAgICAgICAgICAg IHVpU291cmNlQ29kZS5hZGRSZXZpc2lvbihjb250ZW50KTsKLSAgICAgICAgfQotCi0gICAgICAg IGlmICghdGhpcy5fc3R5bGVTaGVldElkVG9IZWFkZXJbc3R5bGVTaGVldElkXSkgewotICAgICAg ICAgICAgdGhpcy5fbG9hZFN0eWxlU2hlZXRIZWFkZXJzKHNldENvbnRlbnQuYmluZCh0aGlzKSk7 Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAgc2V0Q29udGVudC5jYWxs KHRoaXMpOwotICAgIH0sCi0KLSAgICAvKioKICAgICAgKiBAcGFyYW0ge0NTU0FnZW50LlN0eWxl U2hlZXRJZH0gc3R5bGVTaGVldElkCiAgICAgICogQHBhcmFtIHtmdW5jdGlvbig/V2ViSW5zcGVj dG9yLlJlc291cmNlKX0gY2FsbGJhY2sKICAgICAgKi8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVTb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlU291cmNlLmpzCmluZGV4IGI4MTI4MmI5N2NhZWMyYzcz ZTFhODQwZTdhOWM2NDZkNTY0YmM0MDIuLmZkM2JkNTI0MTMyNmEwYzlmYTA2MGM3ODk2MDVlYTli NGJjNmJjZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U3R5bGVTb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T dHlsZVNvdXJjZS5qcwpAQCAtNzEsNyArNzEsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVTb3VyY2Uu cHJvdG90eXBlID0gewogICAgIF9jb21taXRJbmNyZW1lbnRhbEVkaXQ6IGZ1bmN0aW9uKG1ham9y Q2hhbmdlLCBjYWxsYmFjaykKICAgICB7CiAgICAgICAgIHRoaXMuX2NsZWFySW5jcmVtZW50YWxV cGRhdGVUaW1lcigpOwotICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwucmVzb3VyY2VCaW5k aW5nKCkuc2V0U3R5bGVDb250ZW50KHRoaXMsIHRoaXMud29ya2luZ0NvcHkoKSwgbWFqb3JDaGFu Z2UsIGNhbGxiYWNrKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnN0eWxlQ29udGVudEJpbmRpbmcu c2V0U3R5bGVDb250ZW50KHRoaXMsIHRoaXMud29ya2luZ0NvcHkoKSwgbWFqb3JDaGFuZ2UsIGNh bGxiYWNrKTsKICAgICB9LAogCiAgICAgX2NsZWFySW5jcmVtZW50YWxVcGRhdGVUaW1lcjogZnVu Y3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T dHlsZXNTb3VyY2VNYXBwaW5nLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TdHlsZXNTb3VyY2VNYXBwaW5nLmpzCmluZGV4IDA3NjdlOWFlMDVlZTE0N2QwOWUzNjRlM2Q5 MjU1YWI4NzdhZDNiMGEuLmY2NGRjNGI0MDUyYTc5YWQ0MTI3YzU0ZGM5ODgzMTY4YjE0MmQ4ZWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU291 cmNlTWFwcGluZy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0 eWxlc1NvdXJjZU1hcHBpbmcuanMKQEAgLTkzLDMgKzkzLDEwOSBAQCBXZWJJbnNwZWN0b3IuU3R5 bGVzU291cmNlTWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgfQogfQogCisvKioKKyAqIEBjb25z dHJ1Y3RvcgorICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbH0gY3NzTW9kZWwK KyAqLworV2ViSW5zcGVjdG9yLlN0eWxlQ29udGVudEJpbmRpbmcgPSBmdW5jdGlvbihjc3NNb2Rl bCkKK3sKKyAgICB0aGlzLl9jc3NNb2RlbCA9IGNzc01vZGVsOworICAgIHRoaXMuX2Nzc01vZGVs LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwuRXZlbnRzLlN0eWxl U2hlZXRDaGFuZ2VkLCB0aGlzLl9zdHlsZVNoZWV0Q2hhbmdlZCwgdGhpcyk7Cit9CisKK1dlYklu c3BlY3Rvci5TdHlsZUNvbnRlbnRCaW5kaW5nLnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAgICAg KiBAcGFyYW0ge1dlYkluc3BlY3Rvci5TdHlsZVNvdXJjZX0gc3R5bGVTb3VyY2UKKyAgICAgKiBA cGFyYW0ge3N0cmluZ30gY29udGVudAorICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gbWFqb3JDaGFu Z2UKKyAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcpfSB1c2VyQ2FsbGJhY2sKKyAgICAg Ki8KKyAgICBzZXRTdHlsZUNvbnRlbnQ6IGZ1bmN0aW9uKHN0eWxlU291cmNlLCBjb250ZW50LCBt YWpvckNoYW5nZSwgdXNlckNhbGxiYWNrKQorICAgIHsKKyAgICAgICAgdmFyIHJlc291cmNlID0g V2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHN0eWxlU291cmNlLnVybCk7CisgICAgICAgIHRo aXMuX2Nzc01vZGVsLnJlc291cmNlQmluZGluZygpLnJlcXVlc3RTdHlsZVNoZWV0SWRGb3JSZXNv dXJjZShyZXNvdXJjZSwgY2FsbGJhY2suYmluZCh0aGlzKSk7CisKKyAgICAgICAgLyoqCisgICAg ICAgICAqIEBwYXJhbSB7P0NTU0FnZW50LlN0eWxlU2hlZXRJZH0gc3R5bGVTaGVldElkCisgICAg ICAgICAqLworICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhzdHlsZVNoZWV0SWQpCisgICAgICAg IHsKKyAgICAgICAgICAgIGlmICghc3R5bGVTaGVldElkKSB7CisgICAgICAgICAgICAgICAgdXNl ckNhbGxiYWNrKCJObyBzdHlsZXNoZWV0IGZvdW5kOiAiICsgcmVzb3VyY2UuZnJhbWVJZCArICI6 IiArIHJlc291cmNlLnVybCk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAg fQorCisgICAgICAgICAgICB0aGlzLl9pbm5lclNldENvbnRlbnQoc3R5bGVTaGVldElkLCBjb250 ZW50LCBtYWpvckNoYW5nZSwgdXNlckNhbGxiYWNrLCBudWxsKTsKKyAgICAgICAgfQorICAgIH0s CisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0NTU0FnZW50LlN0eWxlU2hlZXRJZH0gc3R5bGVT aGVldElkCisgICAgICogQHBhcmFtIHtzdHJpbmd9IGNvbnRlbnQKKyAgICAgKiBAcGFyYW0ge2Jv b2xlYW59IG1ham9yQ2hhbmdlCisgICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3RyaW5nKX0gdXNl ckNhbGxiYWNrCisgICAgICovCisgICAgX2lubmVyU2V0Q29udGVudDogZnVuY3Rpb24oc3R5bGVT aGVldElkLCBjb250ZW50LCBtYWpvckNoYW5nZSwgdXNlckNhbGxiYWNrKQorICAgIHsKKyAgICAg ICAgdGhpcy5faXNTZXR0aW5nQ29udGVudCA9IHRydWU7CisgICAgICAgIGZ1bmN0aW9uIGNhbGxi YWNrKGVycm9yKQorICAgICAgICB7CisgICAgICAgICAgICB1c2VyQ2FsbGJhY2soZXJyb3IpOwor ICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2lzU2V0dGluZ0NvbnRlbnQ7CisgICAgICAgIH0KKyAg ICAgICAgdGhpcy5fY3NzTW9kZWwuc2V0U3R5bGVTaGVldFRleHQoc3R5bGVTaGVldElkLCBjb250 ZW50LCBtYWpvckNoYW5nZSwgY2FsbGJhY2suYmluZCh0aGlzKSk7CisgICAgfSwKKworICAgIC8q KgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVudAorICAgICAqLworICAg IF9zdHlsZVNoZWV0Q2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICBpZiAo dGhpcy5faXNTZXR0aW5nQ29udGVudCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBp ZiAoIWV2ZW50LmRhdGEubWFqb3JDaGFuZ2UpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAg ICAgLyoqCisgICAgICAgICAqIEBwYXJhbSB7P3N0cmluZ30gZXJyb3IKKyAgICAgICAgICogQHBh cmFtIHtzdHJpbmd9IGNvbnRlbnQKKyAgICAgICAgICovCisgICAgICAgIGZ1bmN0aW9uIGNhbGxi YWNrKGVycm9yLCBjb250ZW50KQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIWVycm9yKQor ICAgICAgICAgICAgICAgIHRoaXMuX2lubmVyU3R5bGVTaGVldENoYW5nZWQoZXZlbnQuZGF0YS5z dHlsZVNoZWV0SWQsIGNvbnRlbnQpOworICAgICAgICB9CisgICAgICAgIENTU0FnZW50LmdldFN0 eWxlU2hlZXRUZXh0KGV2ZW50LmRhdGEuc3R5bGVTaGVldElkLCBjYWxsYmFjay5iaW5kKHRoaXMp KTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtDU1NBZ2VudC5TdHlsZVNoZWV0 SWR9IHN0eWxlU2hlZXRJZAorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBjb250ZW50CisgICAgICov CisgICAgX2lubmVyU3R5bGVTaGVldENoYW5nZWQ6IGZ1bmN0aW9uKHN0eWxlU2hlZXRJZCwgY29u dGVudCkKKyAgICB7CisgICAgICAgIC8qKgorICAgICAgICAgKiBAcGFyYW0gez9zdHJpbmd9IHN0 eWxlU2hlZXRVUkwKKyAgICAgICAgICovCisgICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKHN0eWxl U2hlZXRVUkwpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmICh0eXBlb2Ygc3R5bGVTaGVldFVS TCAhPT0gInN0cmluZyIpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICB2 YXIgdWlTb3VyY2VDb2RlID0gV2ViSW5zcGVjdG9yLndvcmtzcGFjZS51aVNvdXJjZUNvZGVGb3JV Ukwoc3R5bGVTaGVldFVSTCk7CisgICAgICAgICAgICBpZiAoIXVpU291cmNlQ29kZSkKKyAgICAg ICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIGlmICh1aVNvdXJjZUNvZGUuY29udGVu dFR5cGUoKSA9PT0gV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMuU3R5bGVzaGVldCkKKyAgICAg ICAgICAgICAgICB1aVNvdXJjZUNvZGUuYWRkUmV2aXNpb24oY29udGVudCk7CisgICAgICAgIH0K KworICAgICAgICB0aGlzLl9jc3NNb2RlbC5yZXNvdXJjZUJpbmRpbmcoKS5yZXF1ZXN0UmVzb3Vy Y2VVUkxGb3JTdHlsZVNoZWV0SWQoc3R5bGVTaGVldElkLCBjYWxsYmFjay5iaW5kKHRoaXMpKTsK KyAgICB9LAorfQorCisvKioKKyAqIEB0eXBlIHs/V2ViSW5zcGVjdG9yLlN0eWxlQ29udGVudEJp bmRpbmd9CisgKi8KK1dlYkluc3BlY3Rvci5zdHlsZUNvbnRlbnRCaW5kaW5nID0gbnVsbDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXgg ZTc3YTkwYmZhN2JhZjZjNmQ0ZWFmMzFiNjNhZTlmODIxMTU5MWNmYy4uMzJhOTZmNzNiMjEzZGZj MDJjMjBiMjFkMmVhZTM4MmM2MjMzZjhhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTUyMyw2ICs1MjMsNyBAQCBXZWJJbnNwZWN0 b3IuX2RvTG9hZGVkRG9uZVdpdGhDYXBhYmlsaXRpZXMgPSBmdW5jdGlvbigpCiAKICAgICB0aGlz LnNjcmlwdFNuaXBwZXRNb2RlbCA9IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0U25pcHBldE1vZGVs KHRoaXMud29ya3NwYWNlKTsKICAgICBuZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2NyaXB0TWFw cGluZyh0aGlzLndvcmtzcGFjZSk7CisgICAgdGhpcy5zdHlsZUNvbnRlbnRCaW5kaW5nID0gbmV3 IFdlYkluc3BlY3Rvci5TdHlsZUNvbnRlbnRCaW5kaW5nKHRoaXMuY3NzTW9kZWwpOwogICAgIG5l dyBXZWJJbnNwZWN0b3IuTmV0d29ya1VJU291cmNlQ29kZVByb3ZpZGVyKHRoaXMud29ya3NwYWNl KTsKICAgICBuZXcgV2ViSW5zcGVjdG9yLlN0eWxlc1NvdXJjZU1hcHBpbmcodGhpcy53b3Jrc3Bh Y2UpOwogICAgIGlmIChXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5zYXNzLmlzRW5h YmxlZCgpKQo=