25944 2009-05-21 13:15:27 -0700 [V8] Remove the uses of V8 Locker in worker execution code. 2009-05-26 16:00:43 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 jianli webkit-unassigned dglazkov jianli oldest_to_newest 122399 0 jianli 2009-05-21 13:15:27 -0700 Remove the uses of V8 Locker in worker execution code. 122411 1 30553 jianli 2009-05-21 13:40:36 -0700 Created attachment 30553 Proposed Patch 122651 2 30553 eric 2009-05-22 07:06:52 -0700 Comment on attachment 30553 Proposed Patch Your ChangeLog needs explanation as to why this change is correct and necessary. Is this possible to test? If so it needs a test case. If not, then the ChangeLog needs and explanation of why it's not possible to test, and possibly a link to a bug requesting additional features in our testing framework. Since it's not possible to run DumpRenderTree with V8 such a bug would be against test_shell in the Chromium tree. Thanks for the patch! Dimitri is probably your best reviewer for actual content however. Above was mostly just me applying standard patch review policy. :) 122746 3 30596 jianli 2009-05-22 16:29:56 -0700 Created attachment 30596 Proposed Patch I've changed the ChangeLog per your feedback. Thanks. 123204 4 jianli 2009-05-26 16:00:43 -0700 Committed as http://trac.webkit.org/changeset/44162 30553 2009-05-21 13:40:36 -0700 2009-05-22 16:29:56 -0700 Proposed Patch 25944 text/plain 4276 jianli ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDRkZmZmOC4uM2U2YjJhYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAwOS0wNS0yMSAgSmlhbiBMaSAgPGpp YW5saUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1OTQ0 CisgICAgICAgIFJlbW92ZSB0aGUgdXNlcyBvZiBWOCBMb2NrZXIgaW4gd29ya2VyIGV4ZWN1dGlv biBjb2RlLgorCisgICAgICAgICogYmluZGluZ3MvdjgvVjhXb3JrZXJDb250ZXh0RXZlbnRMaXN0 ZW5lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOFdvcmtlckNvbnRleHRFdmVudExpc3RlbmVy OjpoYW5kbGVFdmVudCk6CisgICAgICAgICogYmluZGluZ3MvdjgvV29ya2VyQ29udGV4dEV4ZWN1 dGlvblByb3h5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlckNvbnRleHRFeGVjdXRpb25Q cm94eTo6ZGlzcG9zZSk6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJDb250ZXh0RXhlY3V0aW9u UHJveHk6OmluaXRWOElmTmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlckNvbnRleHRF eGVjdXRpb25Qcm94eTo6ZXZhbHVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyQ29udGV4 dEV4ZWN1dGlvblByb3h5OjpmaW5kT3JDcmVhdGVFdmVudExpc3RlbmVySGVscGVyKToKKyAgICAg ICAgKFdlYkNvcmU6OldvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eTo6UmVtb3ZlRXZlbnRMaXN0 ZW5lcik6CisKIDIwMDktMDUtMjEgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgS2lsemVyLgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9iaW5kaW5ncy92OC9WOFdvcmtlckNvbnRleHRFdmVudExpc3RlbmVyLmNwcCBiL1dlYkNv cmUvYmluZGluZ3MvdjgvVjhXb3JrZXJDb250ZXh0RXZlbnRMaXN0ZW5lci5jcHAKaW5kZXggYmM5 YmM0MC4uOWJiNDhmYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFdvcmtlckNv bnRleHRFdmVudExpc3RlbmVyLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4V29ya2Vy Q29udGV4dEV2ZW50TGlzdGVuZXIuY3BwCkBAIC02Miw3ICs2Miw2IEBAIHZvaWQgVjhXb3JrZXJD b250ZXh0RXZlbnRMaXN0ZW5lcjo6aGFuZGxlRXZlbnQoRXZlbnQqIGV2ZW50LCBib29sIGlzV2lu ZG93RXZlbnQpCiAgICAgLy8gU2VlIGlzc3VlIDg4OTgyOS4KICAgICBSZWZQdHI8VjhBYnN0cmFj dEV2ZW50TGlzdGVuZXI+IHByb3RlY3QodGhpcyk7CiAKLSAgICB2ODo6TG9ja2VyIGxvY2tlcjsK ICAgICB2ODo6SGFuZGxlU2NvcGUgaGFuZGxlU2NvcGU7CiAKICAgICB2ODo6SGFuZGxlPHY4OjpD b250ZXh0PiBjb250ZXh0ID0gbV9wcm94eS0+R2V0Q29udGV4dCgpOwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9iaW5kaW5ncy92OC9Xb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHkuY3BwIGIvV2ViQ29y ZS9iaW5kaW5ncy92OC9Xb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHkuY3BwCmluZGV4IDViYjFl MWUuLjU5NDdhMWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvV29ya2VyQ29udGV4 dEV4ZWN1dGlvblByb3h5LmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmtlckNvbnRl eHRFeGVjdXRpb25Qcm94eS5jcHAKQEAgLTEwNywxMSArMTA3LDcgQEAgdm9pZCBXb3JrZXJDb250 ZXh0RXhlY3V0aW9uUHJveHk6OmRpc3Bvc2UoKQogICAgICAgICBmb3IgKFY4RXZlbnRMaXN0ZW5l ckxpc3Q6Oml0ZXJhdG9yIGl0ZXJhdG9yKG1fbGlzdGVuZXJzLT5iZWdpbigpKTsgaXRlcmF0b3Ig IT0gbV9saXN0ZW5lcnMtPmVuZCgpOyArK2l0ZXJhdG9yKQogICAgICAgICAgICBzdGF0aWNfY2Fz dDxWOFdvcmtlckNvbnRleHRFdmVudExpc3RlbmVyKj4oKml0ZXJhdG9yKS0+ZGlzY29ubmVjdCgp OwogCi0gICAgICAgIHsKLSAgICAgICAgICAgIC8vIE5lZWQgdG8gdXNlIGxvY2sgc2luY2UgVjhF dmVudExpc3RlbmVyTGlzdDo6Y2xlYXIoKSBjcmVhdGVzIEhhbmRsZVNjb3BlLgotICAgICAgICAg ICAgdjg6OkxvY2tlciBsb2NrZXI7Ci0gICAgICAgICAgICBtX2xpc3RlbmVycy0+Y2xlYXIoKTsK LSAgICAgICAgfQorICAgICAgICBtX2xpc3RlbmVycy0+Y2xlYXIoKTsKICAgICB9CiAKICAgICAv LyBEZXRhY2ggYWxsIGV2ZW50cyBmcm9tIHRoZWlyIEpTIHdyYXBwZXJzLgpAQCAtMTQ1LDggKzE0 MSw2IEBAIHZvaWQgV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5Ojppbml0VjhJZk5lZWRlZCgp CiB7CiAgICAgc3RhdGljIGJvb2wgdjhJbml0aWFsaXplZCA9IGZhbHNlOwogCi0gICAgLy8gVXNl IHY4OjpMb2NrZXIgdG8gZ3VhcmFudGVlIHRoYXQgb25seSBvbmUgdGhyZWFkIGNhbiBlbnRlciB0 aGUgZm9sbG93aW5nIG9uZS10aW1lIGluaXRpYWxpemF0aW9uIGNvZGUuCi0gICAgdjg6OkxvY2tl ciBsb2NrZXI7CiAgICAgaWYgKHY4SW5pdGlhbGl6ZWQpCiAgICAgICAgIHJldHVybjsKIApAQCAt MTU3LDEwICsxNTEsNiBAQCB2b2lkIFdvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eTo6aW5pdFY4 SWZOZWVkZWQoKQogICAgIC8vIFNldCB1cCB0aGUgaGFuZGxlciBmb3IgVjggZXJyb3IgbWVzc2Fn ZS4KICAgICB2ODo6Vjg6OkFkZE1lc3NhZ2VMaXN0ZW5lcihoYW5kbGVDb25zb2xlTWVzc2FnZSk7 CiAKLSAgICAvLyBFbmFibGUgcHJlZW1wdGlvbiBzbyB0aGF0IG9uZSB3b3JrZXIgd2lsbCBub3Qg YmUgYmxvY2tlZCBieSBhbm90aGVyIGxvbmctcnVubmluZyB3b3JrZXIuCi0gICAgY29uc3QgaW50 IHdvcmtlclRocmVhZFByZWVtcHRpb25JbnRlcnZhbE1zID0gMTAwOwotICAgIHY4OjpMb2NrZXI6 OlN0YXJ0UHJlZW1wdGlvbih3b3JrZXJUaHJlYWRQcmVlbXB0aW9uSW50ZXJ2YWxNcyk7Ci0KICAg ICB2OEluaXRpYWxpemVkID0gdHJ1ZTsKIH0KIApAQCAtMzQ3LDcgKzMzNyw2IEBAIGJvb2wgV29y a2VyQ29udGV4dEV4ZWN1dGlvblByb3h5Ojpmb3JnZXRWOEV2ZW50T2JqZWN0KEV2ZW50KiBldmVu dCkKIAogdjg6OkxvY2FsPHY4OjpWYWx1ZT4gV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5Ojpl dmFsdWF0ZShjb25zdCBTdHJpbmcmIHNjcmlwdCwgY29uc3QgU3RyaW5nJiBmaWxlTmFtZSwgaW50 IGJhc2VMaW5lKQogewotICAgIHY4OjpMb2NrZXIgbG9ja2VyOwogICAgIHY4OjpIYW5kbGVTY29w ZSBoczsKIAogICAgIGluaXRDb250ZXh0SWZOZWVkZWQoKTsKQEAgLTQwNSwxMSArMzk0LDcgQEAg UGFzc1JlZlB0cjxWOEV2ZW50TGlzdGVuZXI+IFdvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eTo6 ZmluZE9yQ3JlYXRlRXZlbnRMaXN0ZW4KICAgICAgICAgbmV3TGlzdGVuZXIgPSBWOFdvcmtlckNv bnRleHRPYmplY3RFdmVudExpc3RlbmVyOjpjcmVhdGUodGhpcywgdjg6OkxvY2FsPHY4OjpPYmpl Y3Q+OjpDYXN0KG9iamVjdCksIGlzSW5saW5lKTsKICAgICBlbHNlCiAgICAgICAgIG5ld0xpc3Rl bmVyID0gVjhXb3JrZXJDb250ZXh0RXZlbnRMaXN0ZW5lcjo6Y3JlYXRlKHRoaXMsIHY4OjpMb2Nh bDx2ODo6T2JqZWN0Pjo6Q2FzdChvYmplY3QpLCBpc0lubGluZSk7Ci0gICAgewotICAgICAgICAv LyBOZWVkIHRvIHVzZSBsb2NrIHNpbmNlIFY4RXZlbnRMaXN0ZW5lckxpc3Q6OmFkZCgpIGNyZWF0 ZXMgSGFuZGxlU2NvcGUuCi0gICAgICAgIHY4OjpMb2NrZXIgbG9ja2VyOwotICAgICAgICBtX2xp c3RlbmVycy0+YWRkKG5ld0xpc3RlbmVyLmdldCgpKTsKLSAgICB9CisgICAgbV9saXN0ZW5lcnMt PmFkZChuZXdMaXN0ZW5lci5nZXQoKSk7CiAKICAgICByZXR1cm4gbmV3TGlzdGVuZXIucmVsZWFz ZSgpOwogfQpAQCAtNDI2LDggKzQxMSw2IEBAIFBhc3NSZWZQdHI8VjhFdmVudExpc3RlbmVyPiBX b3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6OmZpbmRPckNyZWF0ZU9iamVjdEV2ZW50CiAKIHZv aWQgV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5OjpSZW1vdmVFdmVudExpc3RlbmVyKFY4RXZl bnRMaXN0ZW5lciogbGlzdGVuZXIpCiB7Ci0gICAgLy8gTmVlZCB0byB1c2UgbG9jayBzaW5jZSBW OEV2ZW50TGlzdGVuZXJMaXN0OjpyZW1vdmUoKSBjcmVhdGVzIEhhbmRsZVNjb3BlLgotICAgIHY4 OjpMb2NrZXIgbG9ja2VyOwogICAgIG1fbGlzdGVuZXJzLT5yZW1vdmUobGlzdGVuZXIpOwogfQog Cg== 30596 2009-05-22 16:29:56 -0700 2009-05-26 12:58:52 -0700 Proposed Patch 25944_2 text/plain 4589 jianli ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDRkZmZmOC4uZjQ1Yjg3MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAwOS0wNS0yMSAgSmlhbiBMaSAgPGpp YW5saUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1OTQ0 CisgICAgICAgIFJlbW92ZSB0aGUgdXNlcyBvZiBWOCBMb2NrZXIgaW4gd29ya2VyIGV4ZWN1dGlv biBjb2RlLiBObyBhZGRpdGlvbmFsIHRlc3QgaXMgbmVlZGVkLgorICAgICAgICBUaGUgbm9ybWFs IFdlYktpdCBsYXlvdXQgdGVzdHMgc2hvdWxkIGNvdmVyIGl0LiBIb3dldmVyLCBsYXlvdXQgdGVz dHMgdGhhdCBzdGFydAorICAgICAgICBtdWx0aXBsZSB3b3JrZXJzIHdpbGwgZmFpbCB0byBwYXNz IGR1ZSB0byB0ZXN0IHNoZWxsIGxpbWl0YXRpb24gaW4gQ2hyb21pdW0uIFRvIGNvdmVyCisgICAg ICAgIHRoaXMsIFVJIHRlc3RzIHdpbGwgYmUgYWRkZWQgKGh0dHA6Ly9jb2RlLmdvb2dsZS5jb20v cC9jaHJvbWl1bS9pc3N1ZXMvZGV0YWlsP2lkPTEyNTU0KS4KKworICAgICAgICAqIGJpbmRpbmdz L3Y4L1Y4V29ya2VyQ29udGV4dEV2ZW50TGlzdGVuZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 VjhXb3JrZXJDb250ZXh0RXZlbnRMaXN0ZW5lcjo6aGFuZGxlRXZlbnQpOgorICAgICAgICAqIGJp bmRpbmdzL3Y4L1dvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6OmRpc3Bvc2UpOgorICAgICAgICAoV2Vi Q29yZTo6V29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5Ojppbml0VjhJZk5lZWRlZCk6CisgICAg ICAgIChXZWJDb3JlOjpXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6OmV2YWx1YXRlKToKKyAg ICAgICAgKFdlYkNvcmU6OldvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eTo6ZmluZE9yQ3JlYXRl RXZlbnRMaXN0ZW5lckhlbHBlcik6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJDb250ZXh0RXhl Y3V0aW9uUHJveHk6OlJlbW92ZUV2ZW50TGlzdGVuZXIpOgorCiAyMDA5LTA1LTIxICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERh dmlkIEtpbHplci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhXb3JrZXJDb250 ZXh0RXZlbnRMaXN0ZW5lci5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4V29ya2VyQ29udGV4 dEV2ZW50TGlzdGVuZXIuY3BwCmluZGV4IGJjOWJjNDAuLjliYjQ4ZmIgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvYmluZGluZ3MvdjgvVjhXb3JrZXJDb250ZXh0RXZlbnRMaXN0ZW5lci5jcHAKKysrIGIv V2ViQ29yZS9iaW5kaW5ncy92OC9WOFdvcmtlckNvbnRleHRFdmVudExpc3RlbmVyLmNwcApAQCAt NjIsNyArNjIsNiBAQCB2b2lkIFY4V29ya2VyQ29udGV4dEV2ZW50TGlzdGVuZXI6OmhhbmRsZUV2 ZW50KEV2ZW50KiBldmVudCwgYm9vbCBpc1dpbmRvd0V2ZW50KQogICAgIC8vIFNlZSBpc3N1ZSA4 ODk4MjkuCiAgICAgUmVmUHRyPFY4QWJzdHJhY3RFdmVudExpc3RlbmVyPiBwcm90ZWN0KHRoaXMp OwogCi0gICAgdjg6OkxvY2tlciBsb2NrZXI7CiAgICAgdjg6OkhhbmRsZVNjb3BlIGhhbmRsZVNj b3BlOwogCiAgICAgdjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gY29udGV4dCA9IG1fcHJveHktPkdl dENvbnRleHQoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvV29ya2VyQ29udGV4 dEV4ZWN1dGlvblByb3h5LmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvV29ya2VyQ29udGV4dEV4 ZWN1dGlvblByb3h5LmNwcAppbmRleCA1YmIxZTFlLi41OTQ3YTFlIDEwMDY0NAotLS0gYS9XZWJD b3JlL2JpbmRpbmdzL3Y4L1dvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eS5jcHAKKysrIGIvV2Vi Q29yZS9iaW5kaW5ncy92OC9Xb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHkuY3BwCkBAIC0xMDcs MTEgKzEwNyw3IEBAIHZvaWQgV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5OjpkaXNwb3NlKCkK ICAgICAgICAgZm9yIChWOEV2ZW50TGlzdGVuZXJMaXN0OjppdGVyYXRvciBpdGVyYXRvcihtX2xp c3RlbmVycy0+YmVnaW4oKSk7IGl0ZXJhdG9yICE9IG1fbGlzdGVuZXJzLT5lbmQoKTsgKytpdGVy YXRvcikKICAgICAgICAgICAgc3RhdGljX2Nhc3Q8VjhXb3JrZXJDb250ZXh0RXZlbnRMaXN0ZW5l cio+KCppdGVyYXRvciktPmRpc2Nvbm5lY3QoKTsKIAotICAgICAgICB7Ci0gICAgICAgICAgICAv LyBOZWVkIHRvIHVzZSBsb2NrIHNpbmNlIFY4RXZlbnRMaXN0ZW5lckxpc3Q6OmNsZWFyKCkgY3Jl YXRlcyBIYW5kbGVTY29wZS4KLSAgICAgICAgICAgIHY4OjpMb2NrZXIgbG9ja2VyOwotICAgICAg ICAgICAgbV9saXN0ZW5lcnMtPmNsZWFyKCk7Ci0gICAgICAgIH0KKyAgICAgICAgbV9saXN0ZW5l cnMtPmNsZWFyKCk7CiAgICAgfQogCiAgICAgLy8gRGV0YWNoIGFsbCBldmVudHMgZnJvbSB0aGVp ciBKUyB3cmFwcGVycy4KQEAgLTE0NSw4ICsxNDEsNiBAQCB2b2lkIFdvcmtlckNvbnRleHRFeGVj dXRpb25Qcm94eTo6aW5pdFY4SWZOZWVkZWQoKQogewogICAgIHN0YXRpYyBib29sIHY4SW5pdGlh bGl6ZWQgPSBmYWxzZTsKIAotICAgIC8vIFVzZSB2ODo6TG9ja2VyIHRvIGd1YXJhbnRlZSB0aGF0 IG9ubHkgb25lIHRocmVhZCBjYW4gZW50ZXIgdGhlIGZvbGxvd2luZyBvbmUtdGltZSBpbml0aWFs aXphdGlvbiBjb2RlLgotICAgIHY4OjpMb2NrZXIgbG9ja2VyOwogICAgIGlmICh2OEluaXRpYWxp emVkKQogICAgICAgICByZXR1cm47CiAKQEAgLTE1NywxMCArMTUxLDYgQEAgdm9pZCBXb3JrZXJD b250ZXh0RXhlY3V0aW9uUHJveHk6OmluaXRWOElmTmVlZGVkKCkKICAgICAvLyBTZXQgdXAgdGhl IGhhbmRsZXIgZm9yIFY4IGVycm9yIG1lc3NhZ2UuCiAgICAgdjg6OlY4OjpBZGRNZXNzYWdlTGlz dGVuZXIoaGFuZGxlQ29uc29sZU1lc3NhZ2UpOwogCi0gICAgLy8gRW5hYmxlIHByZWVtcHRpb24g c28gdGhhdCBvbmUgd29ya2VyIHdpbGwgbm90IGJlIGJsb2NrZWQgYnkgYW5vdGhlciBsb25nLXJ1 bm5pbmcgd29ya2VyLgotICAgIGNvbnN0IGludCB3b3JrZXJUaHJlYWRQcmVlbXB0aW9uSW50ZXJ2 YWxNcyA9IDEwMDsKLSAgICB2ODo6TG9ja2VyOjpTdGFydFByZWVtcHRpb24od29ya2VyVGhyZWFk UHJlZW1wdGlvbkludGVydmFsTXMpOwotCiAgICAgdjhJbml0aWFsaXplZCA9IHRydWU7CiB9CiAK QEAgLTM0Nyw3ICszMzcsNiBAQCBib29sIFdvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eTo6Zm9y Z2V0VjhFdmVudE9iamVjdChFdmVudCogZXZlbnQpCiAKIHY4OjpMb2NhbDx2ODo6VmFsdWU+IFdv cmtlckNvbnRleHRFeGVjdXRpb25Qcm94eTo6ZXZhbHVhdGUoY29uc3QgU3RyaW5nJiBzY3JpcHQs IGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGludCBiYXNlTGluZSkKIHsKLSAgICB2ODo6TG9ja2Vy IGxvY2tlcjsKICAgICB2ODo6SGFuZGxlU2NvcGUgaHM7CiAKICAgICBpbml0Q29udGV4dElmTmVl ZGVkKCk7CkBAIC00MDUsMTEgKzM5NCw3IEBAIFBhc3NSZWZQdHI8VjhFdmVudExpc3RlbmVyPiBX b3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6OmZpbmRPckNyZWF0ZUV2ZW50TGlzdGVuCiAgICAg ICAgIG5ld0xpc3RlbmVyID0gVjhXb3JrZXJDb250ZXh0T2JqZWN0RXZlbnRMaXN0ZW5lcjo6Y3Jl YXRlKHRoaXMsIHY4OjpMb2NhbDx2ODo6T2JqZWN0Pjo6Q2FzdChvYmplY3QpLCBpc0lubGluZSk7 CiAgICAgZWxzZQogICAgICAgICBuZXdMaXN0ZW5lciA9IFY4V29ya2VyQ29udGV4dEV2ZW50TGlz dGVuZXI6OmNyZWF0ZSh0aGlzLCB2ODo6TG9jYWw8djg6Ok9iamVjdD46OkNhc3Qob2JqZWN0KSwg aXNJbmxpbmUpOwotICAgIHsKLSAgICAgICAgLy8gTmVlZCB0byB1c2UgbG9jayBzaW5jZSBWOEV2 ZW50TGlzdGVuZXJMaXN0OjphZGQoKSBjcmVhdGVzIEhhbmRsZVNjb3BlLgotICAgICAgICB2ODo6 TG9ja2VyIGxvY2tlcjsKLSAgICAgICAgbV9saXN0ZW5lcnMtPmFkZChuZXdMaXN0ZW5lci5nZXQo KSk7Ci0gICAgfQorICAgIG1fbGlzdGVuZXJzLT5hZGQobmV3TGlzdGVuZXIuZ2V0KCkpOwogCiAg ICAgcmV0dXJuIG5ld0xpc3RlbmVyLnJlbGVhc2UoKTsKIH0KQEAgLTQyNiw4ICs0MTEsNiBAQCBQ YXNzUmVmUHRyPFY4RXZlbnRMaXN0ZW5lcj4gV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5Ojpm aW5kT3JDcmVhdGVPYmplY3RFdmVudAogCiB2b2lkIFdvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94 eTo6UmVtb3ZlRXZlbnRMaXN0ZW5lcihWOEV2ZW50TGlzdGVuZXIqIGxpc3RlbmVyKQogewotICAg IC8vIE5lZWQgdG8gdXNlIGxvY2sgc2luY2UgVjhFdmVudExpc3RlbmVyTGlzdDo6cmVtb3ZlKCkg Y3JlYXRlcyBIYW5kbGVTY29wZS4KLSAgICB2ODo6TG9ja2VyIGxvY2tlcjsKICAgICBtX2xpc3Rl bmVycy0+cmVtb3ZlKGxpc3RlbmVyKTsKIH0KIAo=