103662 2012-11-29 12:43:53 -0800 [V8] DOM callbacks shouldn't reimplement ScopedPersistent they should use it 2012-11-29 15:00:07 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abarth abarth adamk eric haraken japhet webkit.review.bot oldest_to_newest 779342 0 abarth 2012-11-29 12:43:53 -0800 [V8] DOM callbacks shouldn't reimplement ScopedPersistent they should use it 779345 1 176792 abarth 2012-11-29 12:45:19 -0800 Created attachment 176792 Patch 779356 2 176792 adamk 2012-11-29 12:51:49 -0800 Comment on attachment 176792 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=176792&action=review > Source/WebCore/bindings/scripts/CodeGeneratorV8.pm:3360 > + m_callback.get().MakeWeak(this, &${v8InterfaceName}::weakCallback); Nit, you can use operator-> here 779403 3 abarth 2012-11-29 13:38:21 -0800 (In reply to comment #2) > (From update of attachment 176792 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=176792&action=review > > > Source/WebCore/bindings/scripts/CodeGeneratorV8.pm:3360 > > + m_callback.get().MakeWeak(this, &${v8InterfaceName}::weakCallback); > > Nit, you can use operator-> here I need to call a function on the Handle itself, not the underlying object. I'm pretty sure I made -> give you back the underlying object. 779406 4 abarth 2012-11-29 13:43:55 -0800 In file included from gen/webkit/bindings/V8DerivedSources02.cpp:45: gen/webcore/bindings/V8NavigatorUserMediaErrorCallback.cpp:46:17: error: no member named 'MakeWeak' in 'v8::Object' m_callback->MakeWeak(this, &V8NavigatorUserMediaErrorCallback::weakCallback); ~~~~~~~~~~ ^ In file included from gen/webkit/bindings/V8DerivedSources02.cpp:49: 779408 5 176792 eric 2012-11-29 13:45:53 -0800 Comment on attachment 176792 Patch LGTM. 779469 6 176792 webkit.review.bot 2012-11-29 15:00:03 -0800 Comment on attachment 176792 Patch Clearing flags on attachment: 176792 Committed r136168: <http://trac.webkit.org/changeset/136168> 779470 7 webkit.review.bot 2012-11-29 15:00:07 -0800 All reviewed patches have been landed. Closing bug. 176792 2012-11-29 12:45:19 -0800 2012-11-29 15:00:03 -0800 Patch bug-103662-20121129124255.patch text/plain 11022 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2MTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmY1Njc5ODkwMjgzMWEw ZjRiYTg3MDA5OGUwNmU2ZDRkNzZkNjRhYS4uMzlhNDc0YWU1NDZiYjUyYWIzNDEyNjBkNDY5MzMx MGU0MmU1YmE3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTExLTI5ICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1Y4XSBET00gY2FsbGJhY2tz IHNob3VsZG4ndCByZWltcGxlbWVudCBTY29wZWRQZXJzaXN0ZW50IHRoZXkgc2hvdWxkIHVzZSBp dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzNjYy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBw YXRjaCByZXBsYWNlcyB5ZXQgYW5vdGhlciBpbnN0YW5jZSBvZiB0aGUgU2NvcGVkUGVyc2lzdGVu dAorICAgICAgICBwYXR0ZXJuIHdpdGggU2NvcGVkUGVyc2lzdGVudC4KKworICAgICAgICAqIGJp bmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtOgorICAgICAgICAoR2VuZXJhdGVDYWxs YmFja0hlYWRlcik6CisgICAgICAgIChHZW5lcmF0ZUNhbGxiYWNrSW1wbGVtZW50YXRpb24pOgor ICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1c3RvbVNRTFN0YXRlbWVudEVycm9yQ2Fs bGJhY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhTUUxTdGF0ZW1lbnRFcnJvckNhbGxiYWNr OjpoYW5kbGVFdmVudCk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4TXV0YXRpb25D YWxsYmFja0N1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOE11dGF0aW9uQ2FsbGJhY2s6 OmhhbmRsZUV2ZW50KToKKwogMjAxMi0xMS0yOSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUu Y29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMjc3MTg4NT4gU3VwcG9ydCBydWJ5LXBv c2l0aW9uOiB7YmVmb3JlLCBhZnRlcn0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KaW5kZXggOGFkYjBjZWZmMTM1YmQzNGZiYTQxNzU1 M2YzNGE4ZmU0MTI0YjgzNy4uN2E2ZmRmMjBlMDg4Mjc4OGQxYWNlZjFkZDI2MWVlOGQ4ZjdlZmZi MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJh dG9yVjgucG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJh dG9yVjgucG0KQEAgLTMyNjMsNiArMzI2Myw3IEBAIHN1YiBHZW5lcmF0ZUNhbGxiYWNrSGVhZGVy CiAgICAgbXkgQHVuc29ydGVkSW5jbHVkZXMgPSAoKTsKICAgICBwdXNoKEB1bnNvcnRlZEluY2x1 ZGVzLCAiI2luY2x1ZGUgXCJBY3RpdmVET01DYWxsYmFjay5oXCIiKTsKICAgICBwdXNoKEB1bnNv cnRlZEluY2x1ZGVzLCAiI2luY2x1ZGUgXCIkaW50ZXJmYWNlTmFtZS5oXCIiKTsKKyAgICBwdXNo KEB1bnNvcnRlZEluY2x1ZGVzLCAiI2luY2x1ZGUgXCJTY29wZWRQZXJzaXN0ZW50LmhcIiIpOwog ICAgIHB1c2goQHVuc29ydGVkSW5jbHVkZXMsICIjaW5jbHVkZSBcIldvcmxkQ29udGV4dEhhbmRs ZS5oXCIiKTsKICAgICBwdXNoKEB1bnNvcnRlZEluY2x1ZGVzLCAiI2luY2x1ZGUgPHY4Lmg+Iik7 CiAgICAgcHVzaChAdW5zb3J0ZWRJbmNsdWRlcywgIiNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPiIp OwpAQCAtMzMxNSwxMiArMzMxNiwxMCBAQCBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIHdlYWtD YWxsYmFjayh2ODo6UGVyc2lzdGVudDx2ODo6VmFsdWU+IHdyYXBwZXIsIHZvaWQqIHBhcmFtZXRl cikKICAgICB7CiAgICAgICAgICR7djhJbnRlcmZhY2VOYW1lfSogb2JqZWN0ID0gc3RhdGljX2Nh c3Q8JHt2OEludGVyZmFjZU5hbWV9Kj4ocGFyYW1ldGVyKTsKLSAgICAgICAgb2JqZWN0LT5tX2Nh bGxiYWNrLkRpc3Bvc2UoKTsKLSAgICAgICAgb2JqZWN0LT5tX2NhbGxiYWNrLkNsZWFyKCk7Cisg ICAgICAgIG9iamVjdC0+bV9jYWxsYmFjay5jbGVhcigpOwogICAgIH0KIAotICAgIC8vIEZJWE1F OiBtX2NhbGxiYWNrIHNob3VsZCBiZSBhIFNjb3BlZFBlcnNpc3RlbnQuCi0gICAgdjg6OlBlcnNp c3RlbnQ8djg6Ok9iamVjdD4gbV9jYWxsYmFjazsKKyAgICBTY29wZWRQZXJzaXN0ZW50PHY4OjpP YmplY3Q+IG1fY2FsbGJhY2s7CiAgICAgV29ybGRDb250ZXh0SGFuZGxlIG1fd29ybGRDb250ZXh0 OwogfTsKIApAQCAtMzM1MiwxOSArMzM1MSwxNyBAQCBzdWIgR2VuZXJhdGVDYWxsYmFja0ltcGxl bWVudGF0aW9uCiAgICAgcHVzaChAaW1wbENvbnRlbnQsIDw8RU5EKTsKICR7djhJbnRlcmZhY2VO YW1lfTo6JHt2OEludGVyZmFjZU5hbWV9KHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gY2FsbGJhY2ss IFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4g b3duZXIpCiAgICAgOiBBY3RpdmVET01DYWxsYmFjayhjb250ZXh0KQotICAgICwgbV9jYWxsYmFj ayh2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0Pjo6TmV3KGNhbGxiYWNrKSkKKyAgICAsIG1fY2Fs bGJhY2soY2FsbGJhY2spCiAgICAgLCBtX3dvcmxkQ29udGV4dChVc2VDdXJyZW50V29ybGQpCiB7 Ci0gICAgaWYgKCFvd25lci5Jc0VtcHR5KCkpIHsKLSAgICAgICAgb3duZXItPlNldEhpZGRlblZh bHVlKFY4SGlkZGVuUHJvcGVydHlOYW1lOjpjYWxsYmFjaygpLCBjYWxsYmFjayk7Ci0gICAgICAg IG1fY2FsbGJhY2suTWFrZVdlYWsodGhpcywgJiR7djhJbnRlcmZhY2VOYW1lfTo6d2Vha0NhbGxi YWNrKTsKLSAgICB9CisgICAgaWYgKG93bmVyLklzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOwor ICAgIG93bmVyLT5TZXRIaWRkZW5WYWx1ZShWOEhpZGRlblByb3BlcnR5TmFtZTo6Y2FsbGJhY2so KSwgY2FsbGJhY2spOworICAgIG1fY2FsbGJhY2suZ2V0KCkuTWFrZVdlYWsodGhpcywgJiR7djhJ bnRlcmZhY2VOYW1lfTo6d2Vha0NhbGxiYWNrKTsKIH0KIAogJHt2OEludGVyZmFjZU5hbWV9Ojp+ JHt2OEludGVyZmFjZU5hbWV9KCkKIHsKLSAgICBpZiAoIW1fY2FsbGJhY2suSXNFbXB0eSgpKQot ICAgICAgICBtX2NhbGxiYWNrLkRpc3Bvc2UoKTsKIH0KIAogRU5ECkBAIC0zNDM0LDExICszNDMx LDExIEBAIEVORAogICAgICAgICAgICAgICAgIGZvcmVhY2ggbXkgJHBhcmFtIChAcGFyYW1zKSB7 CiAgICAgICAgICAgICAgICAgICAgIG5leHQgaWYgJHBhcmFtLT50eXBlIG5lICR0aGlzVHlwZTsK ICAgICAgICAgICAgICAgICAgICAgbXkgJHBhcmFtTmFtZSA9ICRwYXJhbS0+bmFtZTsKLSAgICAg ICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgcmV0dXJuICFpbnZva2VDYWxs YmFjayhtX2NhbGxiYWNrLCB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+OjpDYXN0KCR7cGFyYW1OYW1l fUhhbmRsZSksICIgLiBzY2FsYXIoQHBhcmFtcykgLiAiLCBhcmd2LCBjYWxsYmFja1JldHVyblZh bHVlLCBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpO1xuIik7CisgICAgICAgICAgICAgICAgICAg IHB1c2goQGltcGxDb250ZW50LCAiICAgIHJldHVybiAhaW52b2tlQ2FsbGJhY2sobV9jYWxsYmFj ay5nZXQoKSwgdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdCgke3BhcmFtTmFtZX1IYW5kbGUp LCAiIC4gc2NhbGFyKEBwYXJhbXMpIC4gIiwgYXJndiwgY2FsbGJhY2tSZXR1cm5WYWx1ZSwgc2Ny aXB0RXhlY3V0aW9uQ29udGV4dCgpKTtcbiIpOwogICAgICAgICAgICAgICAgICAgICBsYXN0Owog ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAg cHVzaChAaW1wbENvbnRlbnQsICIgICAgcmV0dXJuICFpbnZva2VDYWxsYmFjayhtX2NhbGxiYWNr LCAiIC4gc2NhbGFyKEBwYXJhbXMpIC4gIiwgYXJndiwgY2FsbGJhY2tSZXR1cm5WYWx1ZSwgc2Ny aXB0RXhlY3V0aW9uQ29udGV4dCgpKTtcbiIpOworICAgICAgICAgICAgICAgIHB1c2goQGltcGxD b250ZW50LCAiICAgIHJldHVybiAhaW52b2tlQ2FsbGJhY2sobV9jYWxsYmFjay5nZXQoKSwgIiAu IHNjYWxhcihAcGFyYW1zKSAuICIsIGFyZ3YsIGNhbGxiYWNrUmV0dXJuVmFsdWUsIHNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQoKSk7XG4iKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHB1c2go QGltcGxDb250ZW50LCAifVxuIik7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RDYWxsYmFjay5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0Q2FsbGJhY2suY3BwCmluZGV4 IDhmYTQ4NDVlZGEyOTIwMzVjNDk3YjJmZWEwZTg0ZmE2YTNhYjZhYWIuLjMzMmU0NzBjY2Q0N2E0 NDZiYmU4YzMyNmZmNTFhZjEzYTkwNGY2NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RDYWxsYmFjay5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdENhbGxiYWNrLmNwcApAQCAtNDEs MTkgKzQxLDE3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogVjhUZXN0Q2FsbGJhY2s6OlY4VGVz dENhbGxiYWNrKHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gY2FsbGJhY2ssIFNjcmlwdEV4ZWN1dGlv bkNvbnRleHQqIGNvbnRleHQsIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gb3duZXIpCiAgICAgOiBB Y3RpdmVET01DYWxsYmFjayhjb250ZXh0KQotICAgICwgbV9jYWxsYmFjayh2ODo6UGVyc2lzdGVu dDx2ODo6T2JqZWN0Pjo6TmV3KGNhbGxiYWNrKSkKKyAgICAsIG1fY2FsbGJhY2soY2FsbGJhY2sp CiAgICAgLCBtX3dvcmxkQ29udGV4dChVc2VDdXJyZW50V29ybGQpCiB7Ci0gICAgaWYgKCFvd25l ci5Jc0VtcHR5KCkpIHsKLSAgICAgICAgb3duZXItPlNldEhpZGRlblZhbHVlKFY4SGlkZGVuUHJv cGVydHlOYW1lOjpjYWxsYmFjaygpLCBjYWxsYmFjayk7Ci0gICAgICAgIG1fY2FsbGJhY2suTWFr ZVdlYWsodGhpcywgJlY4VGVzdENhbGxiYWNrOjp3ZWFrQ2FsbGJhY2spOwotICAgIH0KKyAgICBp ZiAob3duZXIuSXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisgICAgb3duZXItPlNldEhpZGRl blZhbHVlKFY4SGlkZGVuUHJvcGVydHlOYW1lOjpjYWxsYmFjaygpLCBjYWxsYmFjayk7CisgICAg bV9jYWxsYmFjay5nZXQoKS5NYWtlV2Vhayh0aGlzLCAmVjhUZXN0Q2FsbGJhY2s6OndlYWtDYWxs YmFjayk7CiB9CiAKIFY4VGVzdENhbGxiYWNrOjp+VjhUZXN0Q2FsbGJhY2soKQogewotICAgIGlm ICghbV9jYWxsYmFjay5Jc0VtcHR5KCkpCi0gICAgICAgIG1fY2FsbGJhY2suRGlzcG9zZSgpOwog fQogCiAvLyBGdW5jdGlvbnMKQEAgLTc1LDcgKzczLDcgQEAgYm9vbCBWOFRlc3RDYWxsYmFjazo6 Y2FsbGJhY2tXaXRoTm9QYXJhbSgpCiAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+ICphcmd2ID0g MDsKIAogICAgIGJvb2wgY2FsbGJhY2tSZXR1cm5WYWx1ZSA9IGZhbHNlOwotICAgIHJldHVybiAh aW52b2tlQ2FsbGJhY2sobV9jYWxsYmFjaywgMCwgYXJndiwgY2FsbGJhY2tSZXR1cm5WYWx1ZSwg c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpKTsKKyAgICByZXR1cm4gIWludm9rZUNhbGxiYWNrKG1f Y2FsbGJhY2suZ2V0KCksIDAsIGFyZ3YsIGNhbGxiYWNrUmV0dXJuVmFsdWUsIHNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQoKSk7CiB9CiAKIGJvb2wgVjhUZXN0Q2FsbGJhY2s6OmNhbGxiYWNrV2l0aENs YXNzMVBhcmFtKENsYXNzMSogY2xhc3MxUGFyYW0pCkBAIC0xMDMsNyArMTAxLDcgQEAgYm9vbCBW OFRlc3RDYWxsYmFjazo6Y2FsbGJhY2tXaXRoQ2xhc3MxUGFyYW0oQ2xhc3MxKiBjbGFzczFQYXJh bSkKICAgICB9OwogCiAgICAgYm9vbCBjYWxsYmFja1JldHVyblZhbHVlID0gZmFsc2U7Ci0gICAg cmV0dXJuICFpbnZva2VDYWxsYmFjayhtX2NhbGxiYWNrLCAxLCBhcmd2LCBjYWxsYmFja1JldHVy blZhbHVlLCBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpOworICAgIHJldHVybiAhaW52b2tlQ2Fs bGJhY2sobV9jYWxsYmFjay5nZXQoKSwgMSwgYXJndiwgY2FsbGJhY2tSZXR1cm5WYWx1ZSwgc2Ny aXB0RXhlY3V0aW9uQ29udGV4dCgpKTsKIH0KIAogYm9vbCBWOFRlc3RDYWxsYmFjazo6Y2FsbGJh Y2tXaXRoQ2xhc3MyUGFyYW0oQ2xhc3MyKiBjbGFzczJQYXJhbSwgY29uc3QgU3RyaW5nJiBzdHJB cmcpCkBAIC0xMzgsNyArMTM2LDcgQEAgYm9vbCBWOFRlc3RDYWxsYmFjazo6Y2FsbGJhY2tXaXRo Q2xhc3MyUGFyYW0oQ2xhc3MyKiBjbGFzczJQYXJhbSwgY29uc3QgU3RyaW5nJgogICAgIH07CiAK ICAgICBib29sIGNhbGxiYWNrUmV0dXJuVmFsdWUgPSBmYWxzZTsKLSAgICByZXR1cm4gIWludm9r ZUNhbGxiYWNrKG1fY2FsbGJhY2ssIDIsIGFyZ3YsIGNhbGxiYWNrUmV0dXJuVmFsdWUsIHNjcmlw dEV4ZWN1dGlvbkNvbnRleHQoKSk7CisgICAgcmV0dXJuICFpbnZva2VDYWxsYmFjayhtX2NhbGxi YWNrLmdldCgpLCAyLCBhcmd2LCBjYWxsYmFja1JldHVyblZhbHVlLCBzY3JpcHRFeGVjdXRpb25D b250ZXh0KCkpOwogfQogCiBib29sIFY4VGVzdENhbGxiYWNrOjpjYWxsYmFja1dpdGhTdHJpbmdM aXN0KFJlZlB0cjxET01TdHJpbmdMaXN0PiBsaXN0UGFyYW0pCkBAIC0xNjYsNyArMTY0LDcgQEAg Ym9vbCBWOFRlc3RDYWxsYmFjazo6Y2FsbGJhY2tXaXRoU3RyaW5nTGlzdChSZWZQdHI8RE9NU3Ry aW5nTGlzdD4gbGlzdFBhcmFtKQogICAgIH07CiAKICAgICBib29sIGNhbGxiYWNrUmV0dXJuVmFs dWUgPSBmYWxzZTsKLSAgICByZXR1cm4gIWludm9rZUNhbGxiYWNrKG1fY2FsbGJhY2ssIDEsIGFy Z3YsIGNhbGxiYWNrUmV0dXJuVmFsdWUsIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSk7CisgICAg cmV0dXJuICFpbnZva2VDYWxsYmFjayhtX2NhbGxiYWNrLmdldCgpLCAxLCBhcmd2LCBjYWxsYmFj a1JldHVyblZhbHVlLCBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpOwogfQogCiBib29sIFY4VGVz dENhbGxiYWNrOjpjYWxsYmFja1dpdGhCb29sZWFuKGJvb2wgYm9vbFBhcmFtKQpAQCAtMTk0LDcg KzE5Miw3IEBAIGJvb2wgVjhUZXN0Q2FsbGJhY2s6OmNhbGxiYWNrV2l0aEJvb2xlYW4oYm9vbCBi b29sUGFyYW0pCiAgICAgfTsKIAogICAgIGJvb2wgY2FsbGJhY2tSZXR1cm5WYWx1ZSA9IGZhbHNl OwotICAgIHJldHVybiAhaW52b2tlQ2FsbGJhY2sobV9jYWxsYmFjaywgMSwgYXJndiwgY2FsbGJh Y2tSZXR1cm5WYWx1ZSwgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpKTsKKyAgICByZXR1cm4gIWlu dm9rZUNhbGxiYWNrKG1fY2FsbGJhY2suZ2V0KCksIDEsIGFyZ3YsIGNhbGxiYWNrUmV0dXJuVmFs dWUsIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSk7CiB9CiAKIGJvb2wgVjhUZXN0Q2FsbGJhY2s6 OmNhbGxiYWNrUmVxdWlyZXNUaGlzVG9QYXNzKENsYXNzOCogY2xhc3M4UGFyYW0sIFRoaXNDbGFz cyogdGhpc0NsYXNzUGFyYW0pCkBAIC0yMzEsNyArMjI5LDcgQEAgYm9vbCBWOFRlc3RDYWxsYmFj azo6Y2FsbGJhY2tSZXF1aXJlc1RoaXNUb1Bhc3MoQ2xhc3M4KiBjbGFzczhQYXJhbSwgVGhpc0Ns YXNzKgogICAgIH07CiAKICAgICBib29sIGNhbGxiYWNrUmV0dXJuVmFsdWUgPSBmYWxzZTsKLSAg ICByZXR1cm4gIWludm9rZUNhbGxiYWNrKG1fY2FsbGJhY2ssIHY4OjpIYW5kbGU8djg6Ok9iamVj dD46OkNhc3QodGhpc0NsYXNzUGFyYW1IYW5kbGUpLCAyLCBhcmd2LCBjYWxsYmFja1JldHVyblZh bHVlLCBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpOworICAgIHJldHVybiAhaW52b2tlQ2FsbGJh Y2sobV9jYWxsYmFjay5nZXQoKSwgdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdCh0aGlzQ2xh c3NQYXJhbUhhbmRsZSksIDIsIGFyZ3YsIGNhbGxiYWNrUmV0dXJuVmFsdWUsIHNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQoKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RDYWxsYmFjay5o IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdENhbGxiYWNr LmgKaW5kZXggNWVkYjFmOWU1M2VkOGQzZDBmZTlkMDkzNTdmYWU2YmJkNjMyNzVhNy4uMTNiZTA2 NDJhOWNjMjcxNjAyZmNhMGJiNTRlOTE1NDA5MDYwOTJjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdENhbGxiYWNrLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdENhbGxiYWNrLmgKQEAg LTI0LDYgKzI0LDcgQEAKICNkZWZpbmUgVjhUZXN0Q2FsbGJhY2tfaAogCiAjaW5jbHVkZSAiQWN0 aXZlRE9NQ2FsbGJhY2suaCIKKyNpbmNsdWRlICJTY29wZWRQZXJzaXN0ZW50LmgiCiAjaW5jbHVk ZSAiVGVzdENhbGxiYWNrLmgiCiAjaW5jbHVkZSAiV29ybGRDb250ZXh0SGFuZGxlLmgiCiAjaW5j bHVkZSA8djguaD4KQEAgLTYwLDEyICs2MSwxMCBAQCBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lk IHdlYWtDYWxsYmFjayh2ODo6UGVyc2lzdGVudDx2ODo6VmFsdWU+IHdyYXBwZXIsIHZvaWQqIHBh cmFtZXRlcikKICAgICB7CiAgICAgICAgIFY4VGVzdENhbGxiYWNrKiBvYmplY3QgPSBzdGF0aWNf Y2FzdDxWOFRlc3RDYWxsYmFjayo+KHBhcmFtZXRlcik7Ci0gICAgICAgIG9iamVjdC0+bV9jYWxs YmFjay5EaXNwb3NlKCk7Ci0gICAgICAgIG9iamVjdC0+bV9jYWxsYmFjay5DbGVhcigpOworICAg ICAgICBvYmplY3QtPm1fY2FsbGJhY2suY2xlYXIoKTsKICAgICB9CiAKLSAgICAvLyBGSVhNRTog bV9jYWxsYmFjayBzaG91bGQgYmUgYSBTY29wZWRQZXJzaXN0ZW50LgotICAgIHY4OjpQZXJzaXN0 ZW50PHY4OjpPYmplY3Q+IG1fY2FsbGJhY2s7CisgICAgU2NvcGVkUGVyc2lzdGVudDx2ODo6T2Jq ZWN0PiBtX2NhbGxiYWNrOwogICAgIFdvcmxkQ29udGV4dEhhbmRsZSBtX3dvcmxkQ29udGV4dDsK IH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1 c3RvbVNRTFN0YXRlbWVudEVycm9yQ2FsbGJhY2suY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvdjgvY3VzdG9tL1Y4Q3VzdG9tU1FMU3RhdGVtZW50RXJyb3JDYWxsYmFjay5jcHAKaW5kZXgg Yjk3ZjdkNzZiNmNjNjRkYzNjYTc0NWRkODhlNzE1NDliMzQzNTkyNy4uNzk1MjM5OGRhMzRlZTM1 YWY1ZmVlZmM0MGJmYWJjNjM0NjY2MWMyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9tU1FMU3RhdGVtZW50RXJyb3JDYWxsYmFjay5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9tU1FMU3RhdGVtZW50 RXJyb3JDYWxsYmFjay5jcHAKQEAgLTczLDcgKzczLDcgQEAgYm9vbCBWOFNRTFN0YXRlbWVudEVy cm9yQ2FsbGJhY2s6OmhhbmRsZUV2ZW50KFNRTFRyYW5zYWN0aW9uKiB0cmFuc2FjdGlvbiwgU1FM RXIKICAgICAvLyBzdGF0ZW1lbnQsIGlmIGFueSwgb3Igb250byB0aGUgbmV4dCBvdmVyYWxsIHN0 ZXAgb3RoZXJ3aXNlLiBPdGhlcndpc2UsCiAgICAgLy8gdGhlIGVycm9yIGNhbGxiYWNrIGRpZCBu b3QgcmV0dXJuIGZhbHNlLCBvciB0aGVyZSB3YXMgbm8gZXJyb3IgY2FsbGJhY2suCiAgICAgLy8g SnVtcCB0byB0aGUgbGFzdCBzdGVwIGluIHRoZSBvdmVyYWxsIHN0ZXBzLgotICAgIHJldHVybiBp bnZva2VDYWxsYmFjayhtX2NhbGxiYWNrLCAyLCBhcmd2LCBjYWxsYmFja1JldHVyblZhbHVlLCBz Y3JpcHRFeGVjdXRpb25Db250ZXh0KCkpIHx8IGNhbGxiYWNrUmV0dXJuVmFsdWU7CisgICAgcmV0 dXJuIGludm9rZUNhbGxiYWNrKG1fY2FsbGJhY2suZ2V0KCksIDIsIGFyZ3YsIGNhbGxiYWNrUmV0 dXJuVmFsdWUsIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSkgfHwgY2FsbGJhY2tSZXR1cm5WYWx1 ZTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4TXV0YXRpb25DYWxsYmFja0N1c3RvbS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNdXRhdGlvbkNhbGxiYWNrQ3VzdG9tLmNw cAppbmRleCBlZTNlNjgwMjI0ZDgyOTkyZWFjZTgwM2NkODY0ZGRlMmE2MTZiOTg0Li5iOGU4ZDA5 YzQ4Y2FjNWY1ZmQ1OThjNGU5NzFmNTEwN2I2ZjEyMGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNdXRhdGlvbkNhbGxiYWNrQ3VzdG9tLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNdXRhdGlvbkNhbGxiYWNrQ3Vz dG9tLmNwcApAQCAtODMsNyArODMsNyBAQCBib29sIFY4TXV0YXRpb25DYWxsYmFjazo6aGFuZGxl RXZlbnQoTXV0YXRpb25SZWNvcmRBcnJheSogbXV0YXRpb25zLCBNdXRhdGlvbk9icwogICAgIH07 CiAKICAgICBib29sIGNhbGxiYWNrUmV0dXJuVmFsdWUgPSBmYWxzZTsKLSAgICByZXR1cm4gIWlu dm9rZUNhbGxiYWNrKG1fY2FsbGJhY2ssIHY4OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3Qob2Jz ZXJ2ZXJIYW5kbGUpLCAyLCBhcmd2LCBjYWxsYmFja1JldHVyblZhbHVlLCBzY3JpcHRFeGVjdXRp b25Db250ZXh0KCkpOworICAgIHJldHVybiAhaW52b2tlQ2FsbGJhY2sobV9jYWxsYmFjay5nZXQo KSwgdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChvYnNlcnZlckhhbmRsZSksIDIsIGFyZ3Ys IGNhbGxiYWNrUmV0dXJuVmFsdWUsIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSk7CiB9CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUK