79085 2012-02-21 00:37:45 -0800 [V8] Web Inspector: simplify worker debugger implementation 2012-02-21 01:09:36 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 560721 0 yurys 2012-02-21 00:37:45 -0800 Now that each worker runs in its own isolate we can simplify debugger code a bit. 560722 1 127930 yurys 2012-02-21 00:39:29 -0800 Created attachment 127930 Patch 560733 2 yurys 2012-02-21 01:09:36 -0800 Committed r108324: <http://trac.webkit.org/changeset/108324> 127930 2012-02-21 00:39:29 -0800 2012-02-21 00:40:53 -0800 Patch bug-79085-20120221123927.patch text/plain 9414 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4MjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmRmODJiN2Y5MzYyZmNh ZWJhMzEwYjU0OTg2NDVmZTlkMGRiZTM2Yy4uMmFjNGU3MGVmM2FiZmM0NzEzODViMTI3NWM5MThl MDBiMThlYmQzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTAyLTIxICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtWOF0gV2ViIElu c3BlY3Rvcjogc2ltcGxpZnkgd29ya2VyIGRlYnVnZ2VyIGltcGxlbWVudGF0aW9uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTA4NQorCisgICAgICAg IFRoZXJlIGlzIG9uZSBpbnN0YW5jZSBvZiBXb3JrZXJTY3JpcHREZWJ1Z1NlcnZlciBwZXIgd29y a2VyIHRocmVhZC4gV2UgZG9uJ3QKKyAgICAgICAgbmVlZCB0byByZXNvbHZlIFdvcmtlckNvbnRl eHQgZnJvbSBWODo6Q29udGV4dCBhbnltb3JlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogYmluZGluZ3MvdjgvV29ya2VyU2NyaXB0RGVidWdTZXJ2 ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyU2NyaXB0RGVidWdTZXJ2ZXI6Oldvcmtl clNjcmlwdERlYnVnU2VydmVyKToKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclNjcmlwdERlYnVn U2VydmVyOjphZGRMaXN0ZW5lcik6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJTY3JpcHREZWJ1 Z1NlcnZlcjo6cmVtb3ZlTGlzdGVuZXIpOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyU2NyaXB0 RGVidWdTZXJ2ZXI6OmdldERlYnVnTGlzdGVuZXJGb3JDb250ZXh0KToKKyAgICAgICAgKFdlYkNv cmU6OldvcmtlclNjcmlwdERlYnVnU2VydmVyOjpydW5NZXNzYWdlTG9vcE9uUGF1c2UpOgorICAg ICAgICAqIGJpbmRpbmdzL3Y4L1dvcmtlclNjcmlwdERlYnVnU2VydmVyLmg6CisgICAgICAgIChX b3JrZXJTY3JpcHREZWJ1Z1NlcnZlcik6CisgICAgICAgICogaW5zcGVjdG9yL1dvcmtlckRlYnVn Z2VyQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyRGVidWdnZXJBZ2VudDo6V29y a2VyRGVidWdnZXJBZ2VudCk6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJEZWJ1Z2dlckFnZW50 OjpzdGFydExpc3RlbmluZ1NjcmlwdERlYnVnU2VydmVyKToKKyAgICAgICAgKFdlYkNvcmU6Oldv cmtlckRlYnVnZ2VyQWdlbnQ6OnN0b3BMaXN0ZW5pbmdTY3JpcHREZWJ1Z1NlcnZlcik6CisKIDIw MTItMDItMTcgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgW0Nocm9taXVtXSBXZWIgSW5zcGVjdG9yOiB0ZXJtaW5hdGVkIHdvcmtlcnMgYXJlIG5vdCBy ZW1vdmVkIGZyb20gZGVkaWNhdGVkIHdvcmtlciBsaXN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9Xb3JrZXJTY3JpcHREZWJ1Z1NlcnZlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9Xb3JrZXJTY3JpcHREZWJ1Z1NlcnZlci5jcHAKaW5kZXggNThkNjMx MWU0YzhhZGQ0NjFmNjY3NWEwMzgzYWU4MGJmMjA1OTMwMy4uNjhmZWQ0OGY5NmNiYTMxNTUyY2Uy NWQ4YmI4ZTQyNjk4Y2VlMTBjMiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1dvcmtlclNjcmlwdERlYnVnU2VydmVyLmNwcApAQCAtMzQsOSArMzQsNiBAQAogI2lm IEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKSAmJiBFTkFCTEUoV09SS0VSUykKIAogI2luY2x1 ZGUgIlNjcmlwdERlYnVnTGlzdGVuZXIuaCIKLSNpbmNsdWRlICJWOERPTVdyYXBwZXIuaCIKLSNp bmNsdWRlICJWOERlZGljYXRlZFdvcmtlckNvbnRleHQuaCIKLSNpbmNsdWRlICJWOFNoYXJlZFdv cmtlckNvbnRleHQuaCIKICNpbmNsdWRlICJXb3JrZXJDb250ZXh0LmgiCiAjaW5jbHVkZSAiV29y a2VyQ29udGV4dEV4ZWN1dGlvblByb3h5LmgiCiAjaW5jbHVkZSAiV29ya2VyRGVidWdnZXJBZ2Vu dC5oIgpAQCAtNDYsNTAgKzQzLDI4IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGlj IFdvcmtlckNvbnRleHQqIHJldHJpZXZlV29ya2VyQ29udGV4dCh2ODo6SGFuZGxlPHY4OjpDb250 ZXh0PiBjb250ZXh0KQotewotICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZ2xvYmFsID0gY29u dGV4dC0+R2xvYmFsKCk7Ci0gICAgQVNTRVJUKCFnbG9iYWwuSXNFbXB0eSgpKTsKLQotICAgIHY4 OjpIYW5kbGU8djg6Ok9iamVjdD4gcHJvdG90eXBlID0gdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6 Q2FzdChnbG9iYWwtPkdldFByb3RvdHlwZSgpKTsKLSAgICBBU1NFUlQoIXByb3RvdHlwZS5Jc0Vt cHR5KCkpOwotCi0gICAgcHJvdG90eXBlID0gdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChw cm90b3R5cGUtPkdldFByb3RvdHlwZSgpKTsKLSAgICBBU1NFUlQoIXByb3RvdHlwZS5Jc0VtcHR5 KCkpOwotCi0gICAgV3JhcHBlclR5cGVJbmZvKiB0eXBlSW5mbyA9IFY4RE9NV3JhcHBlcjo6ZG9t V3JhcHBlclR5cGUocHJvdG90eXBlKTsKLSAgICBpZiAoJlY4RGVkaWNhdGVkV29ya2VyQ29udGV4 dDo6aW5mbyA9PSB0eXBlSW5mbykKLSAgICAgICAgcmV0dXJuIFY4RGVkaWNhdGVkV29ya2VyQ29u dGV4dDo6dG9OYXRpdmUocHJvdG90eXBlKTsKLSNpZiBFTkFCTEUoU0hBUkVEX1dPUktFUlMpCi0g ICAgaWYgKCZWOFNoYXJlZFdvcmtlckNvbnRleHQ6OmluZm8gPT0gdHlwZUluZm8pCi0gICAgICAg IHJldHVybiBWOFNoYXJlZFdvcmtlckNvbnRleHQ6OnRvTmF0aXZlKHByb3RvdHlwZSk7Ci0jZW5k aWYKLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gMDsKLX0KLQotV29ya2Vy U2NyaXB0RGVidWdTZXJ2ZXI6OldvcmtlclNjcmlwdERlYnVnU2VydmVyKCkKK1dvcmtlclNjcmlw dERlYnVnU2VydmVyOjpXb3JrZXJTY3JpcHREZWJ1Z1NlcnZlcihXb3JrZXJDb250ZXh0KiB3b3Jr ZXJDb250ZXh0KQogICAgIDogU2NyaXB0RGVidWdTZXJ2ZXIoKQotICAgICwgbV9wYXVzZWRXb3Jr ZXJDb250ZXh0KDApCisgICAgLCBtX2xpc3RlbmVyKDApCisgICAgLCBtX3dvcmtlckNvbnRleHQo d29ya2VyQ29udGV4dCkKIHsKIH0KIAotdm9pZCBXb3JrZXJTY3JpcHREZWJ1Z1NlcnZlcjo6YWRk TGlzdGVuZXIoU2NyaXB0RGVidWdMaXN0ZW5lciogbGlzdGVuZXIsIFdvcmtlckNvbnRleHQqIHdv cmtlckNvbnRleHQpCit2b2lkIFdvcmtlclNjcmlwdERlYnVnU2VydmVyOjphZGRMaXN0ZW5lcihT Y3JpcHREZWJ1Z0xpc3RlbmVyKiBsaXN0ZW5lcikKIHsKICAgICB2ODo6SGFuZGxlU2NvcGUgc2Nv cGU7CiAgICAgdjg6OkxvY2FsPHY4OjpDb250ZXh0PiBkZWJ1Z2dlckNvbnRleHQgPSB2ODo6RGVi dWc6OkdldERlYnVnQ29udGV4dCgpOwogICAgIHY4OjpDb250ZXh0OjpTY29wZSBjb250ZXh0U2Nv cGUoZGVidWdnZXJDb250ZXh0KTsKIAotICAgIGlmICghbV9saXN0ZW5lcnNNYXAuc2l6ZSgpKSB7 Ci0gICAgICAgIC8vIEZJWE1FOiBzeW5jaHJvbml6ZSBhY2Nlc3MgdG8gdGhpcyBjb2RlLgotICAg ICAgICBlbnN1cmVEZWJ1Z2dlclNjcmlwdENvbXBpbGVkKCk7Ci0gICAgICAgIEFTU0VSVCghbV9k ZWJ1Z2dlclNjcmlwdC5nZXQoKS0+SXNVbmRlZmluZWQoKSk7Ci0gICAgICAgIHY4OjpEZWJ1Zzo6 U2V0RGVidWdFdmVudExpc3RlbmVyMigmV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXI6OnY4RGVidWdF dmVudENhbGxiYWNrLCB2ODo6RXh0ZXJuYWw6Ok5ldyh0aGlzKSk7Ci0gICAgfQotICAgIG1fbGlz dGVuZXJzTWFwLnNldCh3b3JrZXJDb250ZXh0LCBsaXN0ZW5lcik7CisgICAgQVNTRVJUKCFtX2xp c3RlbmVyKTsKKyAgICBtX2xpc3RlbmVyID0gbGlzdGVuZXI7CisKKyAgICBlbnN1cmVEZWJ1Z2dl clNjcmlwdENvbXBpbGVkKCk7CisgICAgQVNTRVJUKCFtX2RlYnVnZ2VyU2NyaXB0LmdldCgpLT5J c1VuZGVmaW5lZCgpKTsKKyAgICB2ODo6RGVidWc6OlNldERlYnVnRXZlbnRMaXN0ZW5lcjIoJldv cmtlclNjcmlwdERlYnVnU2VydmVyOjp2OERlYnVnRXZlbnRDYWxsYmFjaywgdjg6OkV4dGVybmFs OjpOZXcodGhpcykpOwogICAgIAogICAgIC8vIFRPRE86IFNob3VsZCB3ZSByZW1vdmUgfHByb3h5 fD8gSXQgbG9va3MgbGlrZSB1bnVzZWQgbm93LgotICAgIFdvcmtlckNvbnRleHRFeGVjdXRpb25Q cm94eSogcHJveHkgPSB3b3JrZXJDb250ZXh0LT5zY3JpcHQoKS0+cHJveHkoKTsKKyAgICBXb3Jr ZXJDb250ZXh0RXhlY3V0aW9uUHJveHkqIHByb3h5ID0gbV93b3JrZXJDb250ZXh0LT5zY3JpcHQo KS0+cHJveHkoKTsKICAgICBpZiAoIXByb3h5KQogICAgICAgICByZXR1cm47CiAKQEAgLTEwNCw0 NSArNzksMzEgQEAgdm9pZCBXb3JrZXJTY3JpcHREZWJ1Z1NlcnZlcjo6YWRkTGlzdGVuZXIoU2Ny aXB0RGVidWdMaXN0ZW5lciogbGlzdGVuZXIsIFdvcmtlckMKICAgICAgICAgZGlzcGF0Y2hEaWRQ YXJzZVNvdXJjZShsaXN0ZW5lciwgdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChzY3JpcHRz QXJyYXktPkdldCh2ODo6SW50ZWdlcjo6TmV3KGkpKSkpOwogfQogCi12b2lkIFdvcmtlclNjcmlw dERlYnVnU2VydmVyOjpyZW1vdmVMaXN0ZW5lcihTY3JpcHREZWJ1Z0xpc3RlbmVyKiBsaXN0ZW5l ciwgV29ya2VyQ29udGV4dCogd29ya2VyQ29udGV4dCkKK3ZvaWQgV29ya2VyU2NyaXB0RGVidWdT ZXJ2ZXI6OnJlbW92ZUxpc3RlbmVyKFNjcmlwdERlYnVnTGlzdGVuZXIqIGxpc3RlbmVyKQogewot ICAgIGlmICghbV9saXN0ZW5lcnNNYXAuY29udGFpbnMod29ya2VyQ29udGV4dCkpCi0gICAgICAg IHJldHVybjsKLQotICAgIGlmIChtX3BhdXNlZFdvcmtlckNvbnRleHQgPT0gd29ya2VyQ29udGV4 dCkKLSAgICAgICAgY29udGludWVQcm9ncmFtKCk7Ci0KLSAgICBtX2xpc3RlbmVyc01hcC5yZW1v dmUod29ya2VyQ29udGV4dCk7Ci0KLSAgICBpZiAobV9saXN0ZW5lcnNNYXAuaXNFbXB0eSgpKQot ICAgICAgICB2ODo6RGVidWc6OlNldERlYnVnRXZlbnRMaXN0ZW5lcjIoMCk7CisgICAgQVNTRVJU KG1fbGlzdGVuZXIgPT0gbGlzdGVuZXIpOworICAgIGNvbnRpbnVlUHJvZ3JhbSgpOworICAgIG1f bGlzdGVuZXIgPSAwOworICAgIHY4OjpEZWJ1Zzo6U2V0RGVidWdFdmVudExpc3RlbmVyMigwKTsK IH0KIAotU2NyaXB0RGVidWdMaXN0ZW5lciogV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXI6OmdldERl YnVnTGlzdGVuZXJGb3JDb250ZXh0KHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IGNvbnRleHQpCitT Y3JpcHREZWJ1Z0xpc3RlbmVyKiBXb3JrZXJTY3JpcHREZWJ1Z1NlcnZlcjo6Z2V0RGVidWdMaXN0 ZW5lckZvckNvbnRleHQodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4pCiB7Ci0gICAgV29ya2VyQ29u dGV4dCogd29ya2VyQ29udGV4dCA9IHJldHJpZXZlV29ya2VyQ29udGV4dChjb250ZXh0KTsKLSAg ICBpZiAoIXdvcmtlckNvbnRleHQpCi0gICAgICAgIHJldHVybiAwOwotICAgIHJldHVybiBtX2xp c3RlbmVyc01hcC5nZXQod29ya2VyQ29udGV4dCk7CisgICAgLy8gVGhlcmUgaXMgb25seSBvbmUg d29ya2VyIGNvbnRleHQgaW4gaXNvbGF0ZS4KKyAgICByZXR1cm4gbV9saXN0ZW5lcjsKIH0KIAot dm9pZCBXb3JrZXJTY3JpcHREZWJ1Z1NlcnZlcjo6cnVuTWVzc2FnZUxvb3BPblBhdXNlKHY4OjpI YW5kbGU8djg6OkNvbnRleHQ+IGNvbnRleHQpCit2b2lkIFdvcmtlclNjcmlwdERlYnVnU2VydmVy OjpydW5NZXNzYWdlTG9vcE9uUGF1c2Uodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4pCiB7Ci0gICAg V29ya2VyQ29udGV4dCogd29ya2VyQ29udGV4dCA9IHJldHJpZXZlV29ya2VyQ29udGV4dChjb250 ZXh0KTsKLSAgICBXb3JrZXJUaHJlYWQqIHdvcmtlclRocmVhZCA9IHdvcmtlckNvbnRleHQtPnRo cmVhZCgpOwotCi0gICAgbV9wYXVzZWRXb3JrZXJDb250ZXh0ID0gd29ya2VyQ29udGV4dDsKLQog ICAgIE1lc3NhZ2VRdWV1ZVdhaXRSZXN1bHQgcmVzdWx0OwogICAgIGRvIHsKLSAgICAgICAgcmVz dWx0ID0gd29ya2VyVGhyZWFkLT5ydW5Mb29wKCkucnVuSW5Nb2RlKHdvcmtlckNvbnRleHQsIFdv cmtlckRlYnVnZ2VyQWdlbnQ6OmRlYnVnZ2VyVGFza01vZGUpOworICAgICAgICByZXN1bHQgPSBt X3dvcmtlckNvbnRleHQtPnRocmVhZCgpLT5ydW5Mb29wKCkucnVuSW5Nb2RlKG1fd29ya2VyQ29u dGV4dCwgV29ya2VyRGVidWdnZXJBZ2VudDo6ZGVidWdnZXJUYXNrTW9kZSk7CiAgICAgLy8gS2Vl cCB3YWl0aW5nIHVudGlsIGV4ZWN1dGlvbiBpcyByZXN1bWVkLgogICAgIH0gd2hpbGUgKHJlc3Vs dCA9PSBNZXNzYWdlUXVldWVNZXNzYWdlUmVjZWl2ZWQgJiYgaXNQYXVzZWQoKSk7Ci0gICAgbV9w YXVzZWRXb3JrZXJDb250ZXh0ID0gMDsKICAgICAKICAgICAvLyBUaGUgbGlzdGVuZXIgbWF5IGhh dmUgYmVlbiByZW1vdmVkIGluIHRoZSBuZXN0ZWQgbG9vcC4KLSAgICBpZiAoU2NyaXB0RGVidWdM aXN0ZW5lciogbGlzdGVuZXIgPSBtX2xpc3RlbmVyc01hcC5nZXQod29ya2VyQ29udGV4dCkpCi0g ICAgICAgIGxpc3RlbmVyLT5kaWRDb250aW51ZSgpOworICAgIGlmIChtX2xpc3RlbmVyKQorICAg ICAgICBtX2xpc3RlbmVyLT5kaWRDb250aW51ZSgpOwogfQogCiB2b2lkIFdvcmtlclNjcmlwdERl YnVnU2VydmVyOjpxdWl0TWVzc2FnZUxvb3BPblBhdXNlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmtlclNjcmlwdERlYnVnU2VydmVyLmggYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9Xb3JrZXJTY3JpcHREZWJ1Z1NlcnZlci5oCmluZGV4IDYyNjRjNjhj YmYyNmY3MzVjOWMyM2NhMjk3ODZiZGRjZDRlMDkyN2EuLjc3YThmZDMyYjQyMDdiMDc4Y2QxZmM5 MTQxYTRiMTg2MTcxZWMwODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1dvcmtlclNjcmlwdERlYnVnU2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXIuaApAQCAtNDIsMTEgKzQyLDExIEBAIGNsYXNzIFdv cmtlckNvbnRleHQ7CiBjbGFzcyBXb3JrZXJTY3JpcHREZWJ1Z1NlcnZlciA6IHB1YmxpYyBTY3Jp cHREZWJ1Z1NlcnZlciB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoV29ya2VyU2NyaXB0RGVi dWdTZXJ2ZXIpOwogcHVibGljOgotICAgIFdvcmtlclNjcmlwdERlYnVnU2VydmVyKCk7CisgICAg ZXhwbGljaXQgV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXIoV29ya2VyQ29udGV4dCopOwogICAgIH5X b3JrZXJTY3JpcHREZWJ1Z1NlcnZlcigpIHsgfQogCi0gICAgdm9pZCBhZGRMaXN0ZW5lcihTY3Jp cHREZWJ1Z0xpc3RlbmVyKiwgV29ya2VyQ29udGV4dCopOwotICAgIHZvaWQgcmVtb3ZlTGlzdGVu ZXIoU2NyaXB0RGVidWdMaXN0ZW5lciosIFdvcmtlckNvbnRleHQqKTsKKyAgICB2b2lkIGFkZExp c3RlbmVyKFNjcmlwdERlYnVnTGlzdGVuZXIqKTsKKyAgICB2b2lkIHJlbW92ZUxpc3RlbmVyKFNj cmlwdERlYnVnTGlzdGVuZXIqKTsKIAogcHJpdmF0ZToKICAgICB2aXJ0dWFsIFNjcmlwdERlYnVn TGlzdGVuZXIqIGdldERlYnVnTGlzdGVuZXJGb3JDb250ZXh0KHY4OjpIYW5kbGU8djg6OkNvbnRl eHQ+KTsKQEAgLTU0LDggKzU0LDggQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgcXVpdE1l c3NhZ2VMb29wT25QYXVzZSgpOwogCiAgICAgdHlwZWRlZiBIYXNoTWFwPFdvcmtlckNvbnRleHQq LCBTY3JpcHREZWJ1Z0xpc3RlbmVyKj4gTGlzdGVuZXJzTWFwOwotICAgIExpc3RlbmVyc01hcCBt X2xpc3RlbmVyc01hcDsKLSAgICBXb3JrZXJDb250ZXh0KiBtX3BhdXNlZFdvcmtlckNvbnRleHQ7 CisgICAgU2NyaXB0RGVidWdMaXN0ZW5lciogbV9saXN0ZW5lcjsKKyAgICBXb3JrZXJDb250ZXh0 KiBtX3dvcmtlckNvbnRleHQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV29ya2VyRGVidWdnZXJBZ2VudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV29ya2VyRGVidWdnZXJBZ2VudC5jcHAKaW5kZXggMzFm ZGY0OWJmYmVjNDA1MTA3ZTBmN2I5ZjNiNGNlNTkyZjRiZTFjOS4uMTE0YTk1MjBhNjIwOWJjMGI2 Mzg4YzAwODk0ZDBhMjEyNTM4NGQ4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL1dvcmtlckRlYnVnZ2VyQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9Xb3JrZXJEZWJ1Z2dlckFnZW50LmNwcApAQCAtNDYsNiArNDYsNyBAQCBQYXNzT3duUHRyPFdv cmtlckRlYnVnZ2VyQWdlbnQ+IFdvcmtlckRlYnVnZ2VyQWdlbnQ6OmNyZWF0ZShJbnN0cnVtZW50 aW5nQWdlbnRzKgogCiBXb3JrZXJEZWJ1Z2dlckFnZW50OjpXb3JrZXJEZWJ1Z2dlckFnZW50KElu c3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMsIEluc3BlY3RvclN0YXRlKiBp bnNwZWN0b3JTdGF0ZSwgV29ya2VyQ29udGV4dCogaW5zcGVjdGVkV29ya2VyQ29udGV4dCwgSW5q ZWN0ZWRTY3JpcHRNYW5hZ2VyKiBpbmplY3RlZFNjcmlwdE1hbmFnZXIpCiAgICAgOiBJbnNwZWN0 b3JEZWJ1Z2dlckFnZW50KGluc3RydW1lbnRpbmdBZ2VudHMsIGluc3BlY3RvclN0YXRlLCBpbmpl Y3RlZFNjcmlwdE1hbmFnZXIpCisgICAgLCBtX3NjcmlwdERlYnVnU2VydmVyKGluc3BlY3RlZFdv cmtlckNvbnRleHQpCiAgICAgLCBtX2luc3BlY3RlZFdvcmtlckNvbnRleHQoaW5zcGVjdGVkV29y a2VyQ29udGV4dCkKIHsKIH0KQEAgLTU2LDEyICs1NywxMiBAQCBXb3JrZXJEZWJ1Z2dlckFnZW50 Ojp+V29ya2VyRGVidWdnZXJBZ2VudCgpCiAKIHZvaWQgV29ya2VyRGVidWdnZXJBZ2VudDo6c3Rh cnRMaXN0ZW5pbmdTY3JpcHREZWJ1Z1NlcnZlcigpCiB7Ci0gICAgc2NyaXB0RGVidWdTZXJ2ZXIo KS5hZGRMaXN0ZW5lcih0aGlzLCBtX2luc3BlY3RlZFdvcmtlckNvbnRleHQpOworICAgIHNjcmlw dERlYnVnU2VydmVyKCkuYWRkTGlzdGVuZXIodGhpcyk7CiB9CiAKIHZvaWQgV29ya2VyRGVidWdn ZXJBZ2VudDo6c3RvcExpc3RlbmluZ1NjcmlwdERlYnVnU2VydmVyKCkKIHsKLSAgICBzY3JpcHRE ZWJ1Z1NlcnZlcigpLnJlbW92ZUxpc3RlbmVyKHRoaXMsIG1faW5zcGVjdGVkV29ya2VyQ29udGV4 dCk7CisgICAgc2NyaXB0RGVidWdTZXJ2ZXIoKS5yZW1vdmVMaXN0ZW5lcih0aGlzKTsKIH0KIAog V29ya2VyU2NyaXB0RGVidWdTZXJ2ZXImIFdvcmtlckRlYnVnZ2VyQWdlbnQ6OnNjcmlwdERlYnVn U2VydmVyKCkK