145495 2015-05-30 21:21:34 -0700 Make FrameLoader methods that take PassRefPtr<Event> take raw pointers instead 2015-06-01 10:18:34 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson beidson ap commit-queue esprehn+autocc gyuyoung.kim japhet oldest_to_newest 1098378 0 beidson 2015-05-30 21:21:34 -0700 Make FrameLoader methods that take PassRefPtr<Event> take raw pointers instead Ownership of the event is rarely actually being transferred, and the code paths are definitely not hot, so we're not actually worried about ref churn. But this will make the related code cleaner and less likely to run across bizarre correctness issues like that found in https://bugs.webkit.org/show_bug.cgi?id=145472 and fixed in http://trac.webkit.org/changeset/185033 1098379 1 253970 beidson 2015-05-30 21:23:54 -0700 Created attachment 253970 Patch v1 1098384 2 253970 commit-queue 2015-05-30 22:53:28 -0700 Comment on attachment 253970 Patch v1 Clearing flags on attachment: 253970 Committed r185037: <http://trac.webkit.org/changeset/185037> 1098385 3 commit-queue 2015-05-30 22:53:32 -0700 All reviewed patches have been landed. Closing bug. 1098520 4 253970 darin 2015-06-01 10:10:09 -0700 Comment on attachment 253970 Patch v1 These should be references unless the event can be null. 1098526 5 beidson 2015-06-01 10:18:34 -0700 (In reply to comment #4) > Comment on attachment 253970 [details] > Patch v1 > > These should be references unless the event can be null. The event can be null. 253970 2015-05-30 21:23:54 -0700 2015-05-30 22:53:28 -0700 Patch v1 patch text/plain 10450 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjNTY4NWUwLi42MGVkYjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjYg QEAKIDIwMTUtMDUtMzAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIE1ha2UgRnJhbWVMb2FkZXIgbWV0aG9kcyB0aGF0IHRha2UgUGFzc1JlZlB0cjxFdmVudD4g dGFrZSByYXcgcG9pbnRlcnMgaW5zdGVhZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0NTQ5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoTm8gY2hhbmdlIGluIGJlaGF2aW9yKS4K KworICAgICAgICBJbiBtb3N0IGNhc2VzIG93bmVyc2hpcCBvZiB0aGUgRXZlbnQgaXMgbm90IGFj dHVhbGx5IGJlaW5nIHRyYW5zZmVycmVkLCBhbmQgdGhlc2UgZnVuY3Rpb25zIGFyZSBhbGwgcmFy ZWx5IGNhbGxlZCBhbnl3YXlzLgorICAgICAgICAKKyAgICAgICAgKiBodG1sL0hUTUxMaW5rRWxl bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTGlua0VsZW1lbnQ6OmhhbmRsZUNsaWNr KToKKyAgICAgICAgCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lTG9hZGVyOjp1cmxTZWxlY3RlZCk6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZUxvYWRlcjo6bG9hZEZyYW1lUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxv YWRlcjo6bG9hZFVSTCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZFBvc3RS ZXF1ZXN0KToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuaDoKKworMjAxNS0wNS0zMCAg QnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAgICAgICAgRml4IFdpbmRvd3Mg dGVzdHMgYnJva2VuIGJ5IHIxODUwMDcuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDU0NzIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MTGlua0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTGlua0VsZW1l bnQuY3BwCmluZGV4IGIyOWI0MjUuLjFlZGZmZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTExpbmtFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxM aW5rRWxlbWVudC5jcHAKQEAgLTQ0MSw3ICs0NDEsNyBAQCB2b2lkIEhUTUxMaW5rRWxlbWVudDo6 aGFuZGxlQ2xpY2soRXZlbnQmIGV2ZW50KQogICAgIEZyYW1lKiBmcmFtZSA9IGRvY3VtZW50KCku ZnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1cm47Ci0gICAgZnJhbWUtPmxv YWRlcigpLnVybFNlbGVjdGVkKHVybCwgdGFyZ2V0KCksIFBhc3NSZWZQdHI8RXZlbnQ+KCZldmVu dCksIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8sIE1heWJlU2VuZFJl ZmVycmVyKTsKKyAgICBmcmFtZS0+bG9hZGVyKCkudXJsU2VsZWN0ZWQodXJsLCB0YXJnZXQoKSwg JmV2ZW50LCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5vLCBNYXliZVNl bmRSZWZlcnJlcik7CiB9CiAKIFVSTCBIVE1MTGlua0VsZW1lbnQ6OmhyZWYoKSBjb25zdApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggMjViMDg2YS4uNjUyMWEzYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0zMTcsMTQgKzMxNywxNCBAQCB2 b2lkIEZyYW1lTG9hZGVyOjpjaGFuZ2VMb2NhdGlvbihjb25zdCBGcmFtZUxvYWRSZXF1ZXN0JiBy ZXF1ZXN0KQogICAgIHVybFNlbGVjdGVkKHJlcXVlc3QsIG51bGxwdHIpOwogfQogCi12b2lkIEZy YW1lTG9hZGVyOjp1cmxTZWxlY3RlZChjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBwYXNz ZWRUYXJnZXQsIFBhc3NSZWZQdHI8RXZlbnQ+IHRyaWdnZXJpbmdFdmVudCwgTG9ja0hpc3Rvcnkg bG9ja0hpc3RvcnksIExvY2tCYWNrRm9yd2FyZExpc3QgbG9ja0JhY2tGb3J3YXJkTGlzdCwgU2hv dWxkU2VuZFJlZmVycmVyIHNob3VsZFNlbmRSZWZlcnJlcikKK3ZvaWQgRnJhbWVMb2FkZXI6OnVy bFNlbGVjdGVkKGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHBhc3NlZFRhcmdldCwgRXZl bnQqIHRyaWdnZXJpbmdFdmVudCwgTG9ja0hpc3RvcnkgbG9ja0hpc3RvcnksIExvY2tCYWNrRm9y d2FyZExpc3QgbG9ja0JhY2tGb3J3YXJkTGlzdCwgU2hvdWxkU2VuZFJlZmVycmVyIHNob3VsZFNl bmRSZWZlcnJlcikKIHsKICAgICBOZXdGcmFtZU9wZW5lclBvbGljeSBuZXdGcmFtZU9wZW5lclBv bGljeSA9IHNob3VsZFNlbmRSZWZlcnJlciA9PSBOZXZlclNlbmRSZWZlcnJlciA/IE5ld0ZyYW1l T3BlbmVyUG9saWN5OjpTdXBwcmVzcyA6IE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpBbGxvdzsKIAog ICAgIHVybFNlbGVjdGVkKEZyYW1lTG9hZFJlcXVlc3QobV9mcmFtZS5kb2N1bWVudCgpLT5zZWN1 cml0eU9yaWdpbigpLCBSZXNvdXJjZVJlcXVlc3QodXJsKSwgcGFzc2VkVGFyZ2V0LCBsb2NrSGlz dG9yeSwgbG9ja0JhY2tGb3J3YXJkTGlzdCwgc2hvdWxkU2VuZFJlZmVycmVyLCBBbGxvd05hdmln YXRpb25Ub0ludmFsaWRVUkw6OlllcywgbmV3RnJhbWVPcGVuZXJQb2xpY3ksIERvTm90UmVwbGFj ZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMKSwgdHJpZ2dlcmluZ0V2ZW50KTsKIH0KIAotdm9pZCBG cmFtZUxvYWRlcjo6dXJsU2VsZWN0ZWQoY29uc3QgRnJhbWVMb2FkUmVxdWVzdCYgcGFzc2VkUmVx dWVzdCwgUGFzc1JlZlB0cjxFdmVudD4gdHJpZ2dlcmluZ0V2ZW50KQordm9pZCBGcmFtZUxvYWRl cjo6dXJsU2VsZWN0ZWQoY29uc3QgRnJhbWVMb2FkUmVxdWVzdCYgcGFzc2VkUmVxdWVzdCwgRXZl bnQqIHRyaWdnZXJpbmdFdmVudCkKIHsKICAgICBSZWY8RnJhbWU+IHByb3RlY3QobV9mcmFtZSk7 CiAgICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZVJlcXVlc3QocGFzc2VkUmVxdWVzdCk7CkBAIC0x MTQxLDcgKzExNDEsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpzZXR1cEZvclJlcGxhY2UoKQogICAg IGRldGFjaENoaWxkcmVuKCk7CiB9CiAKLXZvaWQgRnJhbWVMb2FkZXI6OmxvYWRGcmFtZVJlcXVl c3QoY29uc3QgRnJhbWVMb2FkUmVxdWVzdCYgcmVxdWVzdCwgUGFzc1JlZlB0cjxFdmVudD4gZXZl bnQsIFBhc3NSZWZQdHI8Rm9ybVN0YXRlPiBmb3JtU3RhdGUpCit2b2lkIEZyYW1lTG9hZGVyOjps b2FkRnJhbWVSZXF1ZXN0KGNvbnN0IEZyYW1lTG9hZFJlcXVlc3QmIHJlcXVlc3QsIEV2ZW50KiBl dmVudCwgUGFzc1JlZlB0cjxGb3JtU3RhdGU+IGZvcm1TdGF0ZSkKIHsgICAgCiAgICAgLy8gUHJv dGVjdCBmcmFtZSBmcm9tIGdldHRpbmcgYmxvd24gYXdheSBpbnNpZGUgZGlzcGF0Y2hCZWZvcmVM b2FkRXZlbnQgaW4gbG9hZFdpdGhEb2N1bWVudExvYWRlci4KICAgICBSZWY8RnJhbWU+IHByb3Rl Y3QobV9mcmFtZSk7CkBAIC0xMTg3LDcgKzExODcsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2Fk RnJhbWVSZXF1ZXN0KGNvbnN0IEZyYW1lTG9hZFJlcXVlc3QmIHJlcXVlc3QsIFBhc3NSZWZQdHI8 RQogICAgIH0KIH0KIAotdm9pZCBGcmFtZUxvYWRlcjo6bG9hZFVSTChjb25zdCBGcmFtZUxvYWRS ZXF1ZXN0JiBmcmFtZUxvYWRSZXF1ZXN0LCBjb25zdCBTdHJpbmcmIHJlZmVycmVyLCBGcmFtZUxv YWRUeXBlIG5ld0xvYWRUeXBlLCBQYXNzUmVmUHRyPEV2ZW50PiBldmVudCwgUGFzc1JlZlB0cjxG b3JtU3RhdGU+IHBycEZvcm1TdGF0ZSkKK3ZvaWQgRnJhbWVMb2FkZXI6OmxvYWRVUkwoY29uc3Qg RnJhbWVMb2FkUmVxdWVzdCYgZnJhbWVMb2FkUmVxdWVzdCwgY29uc3QgU3RyaW5nJiByZWZlcnJl ciwgRnJhbWVMb2FkVHlwZSBuZXdMb2FkVHlwZSwgRXZlbnQqIGV2ZW50LCBQYXNzUmVmUHRyPEZv cm1TdGF0ZT4gcHJwRm9ybVN0YXRlKQogewogICAgIGlmIChtX2luU3RvcEFsbExvYWRlcnMpCiAg ICAgICAgIHJldHVybjsKQEAgLTEyMzAsNyArMTIzMCw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6Omxv YWRVUkwoY29uc3QgRnJhbWVMb2FkUmVxdWVzdCYgZnJhbWVMb2FkUmVxdWVzdCwgY29uc3QgU3Ry aW5nCiAgICAgaWYgKG1fcGFnZURpc21pc3NhbEV2ZW50QmVpbmdEaXNwYXRjaGVkICE9IE5vRGlz bWlzc2FsKQogICAgICAgICByZXR1cm47CiAKLSAgICBOYXZpZ2F0aW9uQWN0aW9uIGFjdGlvbihy ZXF1ZXN0LCBuZXdMb2FkVHlwZSwgaXNGb3JtU3VibWlzc2lvbiwgZXZlbnQuZ2V0KCkpOworICAg IE5hdmlnYXRpb25BY3Rpb24gYWN0aW9uKHJlcXVlc3QsIG5ld0xvYWRUeXBlLCBpc0Zvcm1TdWJt aXNzaW9uLCBldmVudCk7CiAKICAgICBpZiAoIXRhcmdldEZyYW1lICYmICFmcmFtZU5hbWUuaXNF bXB0eSgpKSB7CiAgICAgICAgIHBvbGljeUNoZWNrZXIoKS5jaGVja05ld1dpbmRvd1BvbGljeShh Y3Rpb24sIHJlcXVlc3QsIGZvcm1TdGF0ZS5yZWxlYXNlKCksIGZyYW1lTmFtZSwgW3RoaXMsIGFs bG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCwgb3BlbmVyUG9saWN5XShjb25zdCBSZXNvdXJjZVJl cXVlc3QmIHJlcXVlc3QsIFBhc3NSZWZQdHI8Rm9ybVN0YXRlPiBmb3JtU3RhdGUsIGNvbnN0IFN0 cmluZyYgZnJhbWVOYW1lLCBjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiBhY3Rpb24sIGJvb2wgc2hv dWxkQ29udGludWUpIHsKQEAgLTI2MTgsNyArMjYxOCw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmFk ZEhUVFBPcmlnaW5JZk5lZWRlZChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN0cmlu ZyYKICAgICByZXF1ZXN0LnNldEhUVFBPcmlnaW4ob3JpZ2luKTsKIH0KIAotdm9pZCBGcmFtZUxv YWRlcjo6bG9hZFBvc3RSZXF1ZXN0KGNvbnN0IEZyYW1lTG9hZFJlcXVlc3QmIHJlcXVlc3QsIGNv bnN0IFN0cmluZyYgcmVmZXJyZXIsIEZyYW1lTG9hZFR5cGUgbG9hZFR5cGUsIFBhc3NSZWZQdHI8 RXZlbnQ+IGV2ZW50LCBQYXNzUmVmUHRyPEZvcm1TdGF0ZT4gcHJwRm9ybVN0YXRlKQordm9pZCBG cmFtZUxvYWRlcjo6bG9hZFBvc3RSZXF1ZXN0KGNvbnN0IEZyYW1lTG9hZFJlcXVlc3QmIHJlcXVl c3QsIGNvbnN0IFN0cmluZyYgcmVmZXJyZXIsIEZyYW1lTG9hZFR5cGUgbG9hZFR5cGUsIEV2ZW50 KiBldmVudCwgUGFzc1JlZlB0cjxGb3JtU3RhdGU+IHBycEZvcm1TdGF0ZSkKIHsKICAgICBSZWZQ dHI8Rm9ybVN0YXRlPiBmb3JtU3RhdGUgPSBwcnBGb3JtU3RhdGU7CiAKQEAgLTI2NDMsNyArMjY0 Myw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRQb3N0UmVxdWVzdChjb25zdCBGcmFtZUxvYWRS ZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTdHJpbmcmCiAgICAgd29ya2luZ1Jlc291cmNlUmVxdWVz dC5zZXRIVFRQQ29udGVudFR5cGUoY29udGVudFR5cGUpOwogICAgIGFkZEV4dHJhRmllbGRzVG9S ZXF1ZXN0KHdvcmtpbmdSZXNvdXJjZVJlcXVlc3QsIGxvYWRUeXBlLCB0cnVlKTsKIAotICAgIE5h dmlnYXRpb25BY3Rpb24gYWN0aW9uKHdvcmtpbmdSZXNvdXJjZVJlcXVlc3QsIGxvYWRUeXBlLCB0 cnVlLCBldmVudC5nZXQoKSk7CisgICAgTmF2aWdhdGlvbkFjdGlvbiBhY3Rpb24od29ya2luZ1Jl c291cmNlUmVxdWVzdCwgbG9hZFR5cGUsIHRydWUsIGV2ZW50KTsKIAogICAgIGlmICghZnJhbWVO YW1lLmlzRW1wdHkoKSkgewogICAgICAgICAvLyBUaGUgc2VhcmNoIGZvciBhIHRhcmdldCBmcmFt ZSBpcyBkb25lIGVhcmxpZXIgaW4gdGhlIGNhc2Ugb2YgZm9ybSBzdWJtaXNzaW9uLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAppbmRleCBhZTNiMWJjLi5hYmVmODQzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuaApAQCAtMTA5LDcgKzEwOSw3IEBAIHB1YmxpYzoKIAogICAg IC8vIEZJWE1FOiBUaGVzZSBhcmUgYWxsIGZ1bmN0aW9ucyB3aGljaCBzdGFydCBsb2Fkcy4gV2Ug aGF2ZSB0b28gbWFueS4KICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGxvYWRVUkxJbnRvQ2hpbGRG cmFtZShjb25zdCBVUkwmLCBjb25zdCBTdHJpbmcmIHJlZmVyZXIsIEZyYW1lKik7Ci0gICAgV0VC Q09SRV9FWFBPUlQgdm9pZCBsb2FkRnJhbWVSZXF1ZXN0KGNvbnN0IEZyYW1lTG9hZFJlcXVlc3Qm LCBQYXNzUmVmUHRyPEV2ZW50PiwgUGFzc1JlZlB0cjxGb3JtU3RhdGU+KTsgLy8gQ2FsbGVkIGJ5 IHN1Ym1pdEZvcm0sIGNhbGxzIGxvYWRQb3N0UmVxdWVzdCBhbmQgbG9hZFVSTC4KKyAgICBXRUJD T1JFX0VYUE9SVCB2b2lkIGxvYWRGcmFtZVJlcXVlc3QoY29uc3QgRnJhbWVMb2FkUmVxdWVzdCYs IEV2ZW50KiwgUGFzc1JlZlB0cjxGb3JtU3RhdGU+KTsgLy8gQ2FsbGVkIGJ5IHN1Ym1pdEZvcm0s IGNhbGxzIGxvYWRQb3N0UmVxdWVzdCBhbmQgbG9hZFVSTC4KIAogICAgIFdFQkNPUkVfRVhQT1JU IHZvaWQgbG9hZChjb25zdCBGcmFtZUxvYWRSZXF1ZXN0Jik7CiAKQEAgLTExOSw3ICsxMTksNyBA QCBwdWJsaWM6CiAgICAgdW5zaWduZWQgbG9uZyBsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5KGNv bnN0IFJlc291cmNlUmVxdWVzdCYsIFN0b3JlZENyZWRlbnRpYWxzLCBDbGllbnRDcmVkZW50aWFs UG9saWN5LCBSZXNvdXJjZUVycm9yJiwgUmVzb3VyY2VSZXNwb25zZSYsIFJlZlB0cjxTaGFyZWRC dWZmZXI+JiBkYXRhKTsKIAogICAgIHZvaWQgY2hhbmdlTG9jYXRpb24oY29uc3QgRnJhbWVMb2Fk UmVxdWVzdCYpOwotICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgdXJsU2VsZWN0ZWQoY29uc3QgVVJM JiwgY29uc3QgU3RyaW5nJiB0YXJnZXQsIFBhc3NSZWZQdHI8RXZlbnQ+LCBMb2NrSGlzdG9yeSwg TG9ja0JhY2tGb3J3YXJkTGlzdCwgU2hvdWxkU2VuZFJlZmVycmVyKTsKKyAgICBXRUJDT1JFX0VY UE9SVCB2b2lkIHVybFNlbGVjdGVkKGNvbnN0IFVSTCYsIGNvbnN0IFN0cmluZyYgdGFyZ2V0LCBF dmVudCosIExvY2tIaXN0b3J5LCBMb2NrQmFja0ZvcndhcmRMaXN0LCBTaG91bGRTZW5kUmVmZXJy ZXIpOwogICAgIHZvaWQgc3VibWl0Rm9ybShQYXNzUmVmUHRyPEZvcm1TdWJtaXNzaW9uPik7CiAK ICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHJlbG9hZChib29sIGVuZFRvRW5kUmVsb2FkID0gZmFs c2UpOwpAQCAtMzQ0LDcgKzM0NCw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGRpc3BhdGNoRGlk Q29tbWl0TG9hZCgpOwogCi0gICAgdm9pZCB1cmxTZWxlY3RlZChjb25zdCBGcmFtZUxvYWRSZXF1 ZXN0JiwgUGFzc1JlZlB0cjxFdmVudD4pOworICAgIHZvaWQgdXJsU2VsZWN0ZWQoY29uc3QgRnJh bWVMb2FkUmVxdWVzdCYsIEV2ZW50Kik7CiAKICAgICB2b2lkIGxvYWRXaXRoRG9jdW1lbnRMb2Fk ZXIoRG9jdW1lbnRMb2FkZXIqLCBGcmFtZUxvYWRUeXBlLCBQYXNzUmVmUHRyPEZvcm1TdGF0ZT4s IEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCk7IC8vIENhbGxzIGNvbnRpbnVlTG9hZEFmdGVy TmF2aWdhdGlvblBvbGljeQogICAgIHZvaWQgbG9hZChEb2N1bWVudExvYWRlciopOyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIENhbGxz IGxvYWRXaXRoRG9jdW1lbnRMb2FkZXIgICAKQEAgLTM1Miw4ICszNTIsOCBAQCBwcml2YXRlOgog ICAgIHZvaWQgbG9hZFdpdGhOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYs IGNvbnN0IE5hdmlnYXRpb25BY3Rpb24mLCAgICAgIC8vIENhbGxzIGxvYWRXaXRoRG9jdW1lbnRM b2FkZXIKICAgICAgICAgTG9ja0hpc3RvcnksIEZyYW1lTG9hZFR5cGUsIFBhc3NSZWZQdHI8Rm9y bVN0YXRlPiwgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMKTsKIAotICAgIHZvaWQgbG9hZFBv c3RSZXF1ZXN0KGNvbnN0IEZyYW1lTG9hZFJlcXVlc3QmLCBjb25zdCBTdHJpbmcmIHJlZmVycmVy LCBGcmFtZUxvYWRUeXBlLCBQYXNzUmVmUHRyPEV2ZW50PiwgUGFzc1JlZlB0cjxGb3JtU3RhdGU+ KTsKLSAgICB2b2lkIGxvYWRVUkwoY29uc3QgRnJhbWVMb2FkUmVxdWVzdCYsIGNvbnN0IFN0cmlu ZyYgcmVmZXJyZXIsIEZyYW1lTG9hZFR5cGUsIFBhc3NSZWZQdHI8RXZlbnQ+LCBQYXNzUmVmUHRy PEZvcm1TdGF0ZT4pOworICAgIHZvaWQgbG9hZFBvc3RSZXF1ZXN0KGNvbnN0IEZyYW1lTG9hZFJl cXVlc3QmLCBjb25zdCBTdHJpbmcmIHJlZmVycmVyLCBGcmFtZUxvYWRUeXBlLCBFdmVudCosIFBh c3NSZWZQdHI8Rm9ybVN0YXRlPik7CisgICAgdm9pZCBsb2FkVVJMKGNvbnN0IEZyYW1lTG9hZFJl cXVlc3QmLCBjb25zdCBTdHJpbmcmIHJlZmVycmVyLCBGcmFtZUxvYWRUeXBlLCBFdmVudCosIFBh c3NSZWZQdHI8Rm9ybVN0YXRlPik7CiAKICAgICBib29sIHNob3VsZFJlbG9hZChjb25zdCBVUkwm IGN1cnJlbnRVUkwsIGNvbnN0IFVSTCYgZGVzdGluYXRpb25VUkwpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NmRiOWEyOS4uZjUzMzM3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE1LTA1LTMw ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIEZyYW1l TG9hZGVyIG1ldGhvZHMgdGhhdCB0YWtlIFBhc3NSZWZQdHI8RXZlbnQ+IHRha2UgcmF3IHBvaW50 ZXJzIGluc3RlYWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDU0OTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZTo6bmF2aWdhdGVUb1BERkxpbmtXaXRoU2ltdWxhdGVkQ2xpY2spOgorCiAyMDE1LTA1 LTI5ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogQ3Jhc2ggY2xvc2luZyBhIHJlbGF0ZWQgdGFiIHdpdGggV2ViIEluc3BlY3Rv ciBvcGVuIHdoaWxlIHBhZ2UgaXMgcmVmcmVzaGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IGQ1NjRiYjcuLmQ4MWRiOGUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTExMDgsNyAr MTEwOCw3IEBAIHZvaWQgV2ViUGFnZTo6bmF2aWdhdGVUb1BERkxpbmtXaXRoU2ltdWxhdGVkQ2xp Y2soY29uc3QgU3RyaW5nJiB1cmwsIEludFBvaW50IGRvCiAKICAgICBjb25zdCBpbnQgc2luZ2xl Q2xpY2sgPSAxOwogICAgIFJlZlB0cjxNb3VzZUV2ZW50PiBtb3VzZUV2ZW50ID0gTW91c2VFdmVu dDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5jbGlja0V2ZW50LCB0cnVlLCB0cnVlLCBjdXJyZW50VGlt ZSgpLCBudWxscHRyLCBzaW5nbGVDbGljaywgc2NyZWVuUG9pbnQueCgpLCBzY3JlZW5Qb2ludC55 KCksIGRvY3VtZW50UG9pbnQueCgpLCBkb2N1bWVudFBvaW50LnkoKSwgZmFsc2UsIGZhbHNlLCBm YWxzZSwgZmFsc2UsIDAsIG51bGxwdHIsIDAsIG51bGxwdHIpOwotICAgIG1haW5GcmFtZS0+bG9h ZGVyKCkudXJsU2VsZWN0ZWQobWFpbkZyYW1lRG9jdW1lbnQtPmNvbXBsZXRlVVJMKHVybCksIGVt cHR5U3RyaW5nKCksIG1vdXNlRXZlbnQucmVsZWFzZSgpLCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tC YWNrRm9yd2FyZExpc3Q6Ok5vLCBTaG91bGRTZW5kUmVmZXJyZXI6Ok1heWJlU2VuZFJlZmVycmVy KTsKKyAgICBtYWluRnJhbWUtPmxvYWRlcigpLnVybFNlbGVjdGVkKG1haW5GcmFtZURvY3VtZW50 LT5jb21wbGV0ZVVSTCh1cmwpLCBlbXB0eVN0cmluZygpLCBtb3VzZUV2ZW50LmdldCgpLCBMb2Nr SGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5vLCBTaG91bGRTZW5kUmVmZXJyZXI6 Ok1heWJlU2VuZFJlZmVycmVyKTsKIH0KIAogdm9pZCBXZWJQYWdlOjpzdG9wTG9hZGluZ0ZyYW1l KHVpbnQ2NF90IGZyYW1lSUQpCg==