92642 2012-07-30 05:57:31 -0700 [Bindings]Remove custom JS/V8 bindings for WebSocket::close() using [Clamp] 2012-07-30 09:33:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 code.vineet code.vineet abarth haraken japhet jochen ojan toyoshim webkit.review.bot oldest_to_newest 681933 0 code.vineet 2012-07-30 05:57:31 -0700 With support of [Clamp] as extended attribute we can replace custom bindings from WebSocket::close(). Spec for WebSocket::close() : http://www.whatwg.org/specs/web-apps/current-work/multipage/network.html#websocket 681942 1 155278 code.vineet 2012-07-30 06:07:52 -0700 Created attachment 155278 patch_for_review 681943 2 155278 code.vineet 2012-07-30 06:08:42 -0700 Comment on attachment 155278 patch_for_review View in context: https://bugs.webkit.org/attachment.cgi?id=155278&action=review > Source/WebCore/ChangeLog:22 > + (GenerateParametersCheck): I apologize for this, its regression from my previous patch :( 681961 3 155278 haraken 2012-07-30 06:25:30 -0700 Comment on attachment 155278 patch_for_review View in context: https://bugs.webkit.org/attachment.cgi?id=155278&action=review LGTM, this is a great progress. > Source/WebCore/Modules/websockets/WebSocket.idl:76 > + void close(in [Clamp, Optional] unsigned short code, in [Optional] DOMString reason) raises(DOMException); BTW, isn't it allowed to change the value of WebSocketChannel::CloseEventCodeNotSpecified from -1 to 0? If we can change it to 0, we can make the binding code clearer: by specifying [Optional=DefaultIsUndefined] for 'code' and [Optional=DefaultIsNullString] for 'reason', we can remove close(ExceptionCode& ec) and close(int code, ExceptionCode& ec). 681964 4 155278 haraken 2012-07-30 06:29:23 -0700 Comment on attachment 155278 patch_for_review > BTW, isn't it allowed to change the value of WebSocketChannel::CloseEventCodeNotSpecified from -1 to 0? Sorry, I was misunderstanding. Please ignore the comment:) 681973 5 code.vineet 2012-07-30 06:42:57 -0700 (In reply to comment #4) > (From update of attachment 155278 [details]) > > BTW, isn't it allowed to change the value of WebSocketChannel::CloseEventCodeNotSpecified from -1 to 0? > > Sorry, I was misunderstanding. Please ignore the comment:) > BTW, isn't it allowed to change the value of WebSocketChannel::CloseEventCodeNotSpecified from -1 to 0? > > If we can change it to 0, we can make the binding code clearer: by specifying [Optional=DefaultIsUndefined] for 'code' and [Optional=DefaultIsNullString] for 'reason', we can remove close(ExceptionCode& ec) and close(int code, ExceptionCode& ec). As per the http://tools.ietf.org/html/rfc6455#section-7.4.1 we can change "-1" to "0" as 0-999 are not in used. But I am really not sure if this doesn't breaks existing behaviour of chrome as it might be based on this code(websocket.h). Shall we check with chromium peoples ? 681975 6 code.vineet 2012-07-30 06:45:01 -0700 (In reply to comment #5) > As per the http://tools.ietf.org/html/rfc6455#section-7.4.1 we can change "-1" to "0" as 0-999 are not in used. > But I am really not sure if this doesn't breaks existing behaviour of chrome as it might be based on this code(websocket.h). Shall we check with chromium peoples > ? Rather we should use 0 than -1 as the spec itself says it should be unsigned void close([Clamp] optional unsigned short code, optional DOMString reason); 681976 7 haraken 2012-07-30 06:47:12 -0700 (In reply to comment #6) > (In reply to comment #5) > > As per the http://tools.ietf.org/html/rfc6455#section-7.4.1 we can change "-1" to "0" as 0-999 are not in used. > > But I am really not sure if this doesn't breaks existing behaviour of chrome as it might be based on this code(websocket.h). Shall we check with chromium peoples > > ? > > Rather we should use 0 than -1 as the spec itself says it should be unsigned > > void close([Clamp] optional unsigned short code, optional DOMString reason); Oh, good point. toyoshim: Do you have any concern about changing the default 'code' value from -1 to 0? vineetc: Either way let's fix the problem in a follow-up patch:) 681980 8 155278 code.vineet 2012-07-30 06:52:58 -0700 Comment on attachment 155278 patch_for_review > vineetc: Either way let's fix the problem in a follow-up patch:) Oke we will address/discuss this in another thread. Thanks.. 681989 9 toyoshim 2012-07-30 07:07:21 -0700 > toyoshim: Do you have any concern about changing the default 'code' value from -1 to 0? In WebSocket::close(), code and reason are defined as "optional". Originally, this out of range value -1 is used to detect the case there values are omitted. Another concern is that this value is exported via WebKit API. $ git grep CloseEventCodeNotSpecified (snip) WebKit/chromium/public/WebSocket.h: CloseEventCodeNotSpecified = -1, This value is used in chromium side to support PPAPI bindings. Changing this value will break some chromium unit tests temporally, but I can fix them in chromium side. Anyway, I should disable these tests temporally, so please ping me before landing this change. 681993 10 toyoshim 2012-07-30 07:13:03 -0700 Ah, it's no problem to land this change without changing CloseEventCodeNotSpecified. Vineet, thank you for supporting clamp and revise WebSocket to use it. 682083 11 155278 webkit.review.bot 2012-07-30 09:33:13 -0700 Comment on attachment 155278 patch_for_review Clearing flags on attachment: 155278 Committed r124034: <http://trac.webkit.org/changeset/124034> 682084 12 webkit.review.bot 2012-07-30 09:33:17 -0700 All reviewed patches have been landed. Closing bug. 155278 2012-07-30 06:07:52 -0700 2012-07-30 09:33:12 -0700 patch_for_review websocket_001.diff text/plain 10286 code.vineet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNDAxNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA3LTMwICBWaW5lZXQg Q2hhdWRoYXJ5ICA8cmdmNzQ4QG1vdG9yb2xhLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI2NDIKKyAgICAgICAgW0JpbmRpbmdzXVJlbW92 ZSBjdXN0b20gSlMvVjggYmluZGluZ3MgZm9yIFdlYlNvY2tldDo6Y2xvc2UoKSB1c2luZyBbQ2xh bXBdCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2l0 aCBzdXBwb3J0IG9mIFtDbGFtcF0gYXMgZXh0ZW5kZWQgYXR0cmlidXRlIHdlIGNhbiByZXBsYWNl IGN1c3RvbSBiaW5kaW5ncyBmcm9tIFdlYlNvY2tldDo6Y2xvc2UoKS4KKyAgICAgICAgU3BlYyBm b3IgV2ViU29ja2V0OjpjbG9zZSgpIDogaHR0cDovL3d3dy53aGF0d2cub3JnL3NwZWNzL3dlYi1h cHBzL2N1cnJlbnQtd29yay9tdWx0aXBhZ2UvbmV0d29yay5odG1sI3dlYnNvY2tldAorCisgICAg ICAgIE5vIG5ldyB0ZXN0cy4gVGhlcmUgc2hvdWxkIGJlIG5vIGJlaGF2aW91cmFsIGNoYW5nZXMg CisgICAgICAgIEV4aXN0aW5nIHRlc3RzIHVuZGVyIGh0dHAvd2Vic29ja2V0L3Rlc3RzL2h5Ymkv IHNob3VsZCBjb3ZlciB0aGlzLgorCisgICAgICAgICogTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNv Y2tldC5oOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29ja2V0OjpjbG9zZSk6CisgICAgICAgICog TW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldC5pZGw6IFVzZWQgW0NsYW1wXS4KKyAgICAgICAg KiBiaW5kaW5ncy9qcy9KU1dlYlNvY2tldEN1c3RvbS5jcHA6IFJlbW92ZWQgY3VzdG9tIGNhbGwg Y2xvc2UoKS4KKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMv Q29kZUdlbmVyYXRvckpTLnBtOgorICAgICAgICAoR2VuZXJhdGVQYXJhbWV0ZXJzQ2hlY2spOgor ICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtOgorICAgICAgICAo R2VuZXJhdGVQYXJhbWV0ZXJzQ2hlY2spOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVz dC9KUy9KU1Rlc3RPYmouY3BwOgorICAgICAgICAoV2ViQ29yZTo6anNUZXN0T2JqUHJvdG90eXBl RnVuY3Rpb25DbGFzc01ldGhvZFdpdGhDbGFtcCk6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0 cy90ZXN0L1Y4L1Y4VGVzdE9iai5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXN0T2JqVjhJbnRl cm5hbDo6Y2xhc3NNZXRob2RXaXRoQ2xhbXBDYWxsYmFjayk6CisgICAgICAgICogYmluZGluZ3Mv djgvY3VzdG9tL1Y4V2ViU29ja2V0Q3VzdG9tLmNwcDogUmVtb3ZlZCBjdXN0b20gY2FsbCBjbG9z ZSgpLgorICAgICAgICAoV2ViQ29yZSk6CisKIDIwMTItMDctMjYgIFl1cnkgU2VtaWtoYXRza3kg IDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogbWFrZSBNZW1v cnlJbnN0cnVtZW50YXRpb24gbWV0aG9kcyBwcml2YXRlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3dlYnNvY2tldHMvV2ViU29ja2V0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldC5oCShyZXZpc2lvbiAxMjM5OTkpCisrKyBT b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29ja2V0LmgJKHdvcmtpbmcgY29w eSkKQEAgLTM4LDYgKzM4LDcgQEAKICNpbmNsdWRlICJFdmVudE5hbWVzLmgiCiAjaW5jbHVkZSAi RXZlbnRUYXJnZXQuaCIKICNpbmNsdWRlICJLVVJMLmgiCisjaW5jbHVkZSAiV2ViU29ja2V0Q2hh bm5lbC5oIgogI2luY2x1ZGUgIldlYlNvY2tldENoYW5uZWxDbGllbnQuaCIKICNpbmNsdWRlIDx3 dGYvRm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KQEAgLTczLDYgKzc0LDggQEAg cHVibGljOgogICAgIGJvb2wgc2VuZChCbG9iKiwgRXhjZXB0aW9uQ29kZSYpOwogCiAgICAgdm9p ZCBjbG9zZShpbnQgY29kZSwgY29uc3QgU3RyaW5nJiByZWFzb24sIEV4Y2VwdGlvbkNvZGUmKTsK KyAgICB2b2lkIGNsb3NlKEV4Y2VwdGlvbkNvZGUmIGVjKSB7IGNsb3NlKFdlYlNvY2tldENoYW5u ZWw6OkNsb3NlRXZlbnRDb2RlTm90U3BlY2lmaWVkLCBTdHJpbmcoKSwgZWMpOyB9CisgICAgdm9p ZCBjbG9zZShpbnQgY29kZSwgRXhjZXB0aW9uQ29kZSYgZWMpIHsgY2xvc2UoY29kZSwgU3RyaW5n KCksIGVjKTsgfQogCiAgICAgY29uc3QgS1VSTCYgdXJsKCkgY29uc3Q7CiAgICAgU3RhdGUgcmVh ZHlTdGF0ZSgpIGNvbnN0OwpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRz L1dlYlNvY2tldC5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJz b2NrZXRzL1dlYlNvY2tldC5pZGwJKHJldmlzaW9uIDEyMzk5OSkKKysrIFNvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2NrZXQuaWRsCSh3b3JraW5nIGNvcHkpCkBAIC03Myw4 ICs3Myw3IEBAIG1vZHVsZSB3ZWJzb2NrZXRzIHsKICAgICAgICAgLy8gYm9vbGVhbiBzZW5kKGlu IERPTVN0cmluZyBkYXRhKSByYWlzZXMoRE9NRXhjZXB0aW9uKTsKICAgICAgICAgW0N1c3RvbV0g Ym9vbGVhbiBzZW5kKGluIERPTVN0cmluZyBkYXRhKSByYWlzZXMoRE9NRXhjZXB0aW9uKTsKIAot ICAgICAgICAvLyBGSVhNRTogSW1wbGVtZW50IGFuZCBhcHBseSBbQ2xhbXBdIGF0dHJpYnV0ZSBp bnN0ZWFkIG9mIFtDdXN0b21dLgotICAgICAgICBbQ3VzdG9tXSB2b2lkIGNsb3NlKGluIFtPcHRp b25hbF0gdW5zaWduZWQgc2hvcnQgY29kZSwgaW4gW09wdGlvbmFsXSBET01TdHJpbmcgcmVhc29u KSByYWlzZXMoRE9NRXhjZXB0aW9uKTsKKyAgICAgICAgdm9pZCBjbG9zZShpbiBbQ2xhbXAsIE9w dGlvbmFsXSB1bnNpZ25lZCBzaG9ydCBjb2RlLCBpbiBbT3B0aW9uYWxdIERPTVN0cmluZyByZWFz b24pIHJhaXNlcyhET01FeGNlcHRpb24pOwogCiAgICAgICAgIC8vIEV2ZW50VGFyZ2V0IGludGVy ZmFjZQogICAgICAgICB2b2lkIGFkZEV2ZW50TGlzdGVuZXIoaW4gRE9NU3RyaW5nIHR5cGUsCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1dlYlNvY2tldEN1c3RvbS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNXZWJTb2NrZXRDdXN0b20u Y3BwCShyZXZpc2lvbiAxMjM5OTkpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1dl YlNvY2tldEN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNiwzOCArMTE2LDYgQEAgSlNW YWx1ZSBKU1dlYlNvY2tldDo6c2VuZChFeGVjU3RhdGUqIGV4ZQogICAgIHJldHVybiBqc0Jvb2xl YW4ocmVzdWx0KTsKIH0KIAotSlNWYWx1ZSBKU1dlYlNvY2tldDo6Y2xvc2UoRXhlY1N0YXRlKiBl eGVjKQotewotICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgaW1wbGVtZW50IFtDbGFtcF0gZm9yIElE TCBiaW5kaW5nIGNvZGUgZ2VuZXJhdG9yLCBhbmQKLSAgICAvLyByZW1vdmUgdGhpcyBjdXN0b20g bWV0aG9kLgotICAgIFdlYlNvY2tldCogd2ViU29ja2V0ID0gc3RhdGljX2Nhc3Q8V2ViU29ja2V0 Kj4oaW1wbCgpKTsKLSAgICBzaXplX3QgYXJndW1lbnRDb3VudCA9IGV4ZWMtPmFyZ3VtZW50Q291 bnQoKTsKLSAgICBpbnQgY29kZSA9IFdlYlNvY2tldENoYW5uZWw6OkNsb3NlRXZlbnRDb2RlTm90 U3BlY2lmaWVkOwotICAgIFN0cmluZyByZWFzb24gPSAiIjsKLSAgICBpZiAoYXJndW1lbnRDb3Vu dCA+PSAxKSB7Ci0gICAgICAgIEpTVmFsdWUgdiA9IGV4ZWMtPmFyZ3VtZW50KDApOwotICAgICAg ICBkb3VibGUgeCA9IHYudG9OdW1iZXIoZXhlYyk7Ci0gICAgICAgIGRvdWJsZSBtYXhWYWx1ZSA9 IHN0YXRpY19jYXN0PGRvdWJsZT4oc3RkOjpudW1lcmljX2xpbWl0czx1aW50MTZfdD46Om1heCgp KTsKLSAgICAgICAgZG91YmxlIG1pblZhbHVlID0gc3RhdGljX2Nhc3Q8ZG91YmxlPihzdGQ6Om51 bWVyaWNfbGltaXRzPHVpbnQxNl90Pjo6bWluKCkpOwotICAgICAgICBpZiAoaXNuYW4oeCkpCi0g ICAgICAgICAgICB4ID0gMC4wOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB4ID0gY2xhbXBU byh4LCBtaW5WYWx1ZSwgbWF4VmFsdWUpOwotICAgICAgICBjb2RlID0gY2xhbXBUb0ludGVnZXIo eCk7Ci0gICAgICAgIGlmIChhcmd1bWVudENvdW50ID49IDIpIHsKLSAgICAgICAgICAgIHJlYXNv biA9IHVzdHJpbmdUb1N0cmluZyhleGVjLT5hcmd1bWVudCgxKS50b1N0cmluZyhleGVjKS0+dmFs dWUoZXhlYykpOwotICAgICAgICAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKSB7Ci0gICAg ICAgICAgICAgICAgc2V0RE9NRXhjZXB0aW9uKGV4ZWMsIFNZTlRBWF9FUlIpOwotICAgICAgICAg ICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0g ICAgfQotICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwotICAgIHdlYlNvY2tldC0+Y2xvc2UoY29k ZSwgcmVhc29uLCBlYyk7Ci0gICAgc2V0RE9NRXhjZXB0aW9uKGV4ZWMsIGVjKTsKLSAgICByZXR1 cm4ganNVbmRlZmluZWQoKTsKLX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBt Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVy YXRvckpTLnBtCShyZXZpc2lvbiAxMjM5OTkpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQkod29ya2luZyBjb3B5KQpAQCAtMjYxMyw3ICsyNjEz LDcgQEAgc3ViIEdlbmVyYXRlUGFyYW1ldGVyc0NoZWNrCiAgICAgICAgICAgICAgICAgcHVzaChA JG91dHB1dEFycmF5LCAiICAgIGRvdWJsZSAkbmF0aXZlVmFsdWUgPSBleGVjLT5hcmd1bWVudCgk YXJnc0luZGV4KS50b051bWJlcihleGVjKTtcbiIpOwogICAgICAgICAgICAgICAgIHB1c2goQCRv dXRwdXRBcnJheSwgIiAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpXG4iKTsKICAgICAgICAg ICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNv ZGUoanNVbmRlZmluZWQoKSk7XG5cbiIpOwotICAgICAgICAgICAgICAgIHB1c2goQCRvdXRwdXRB cnJheSwgIiAgICBpZiAoIWlzbmFuKG9iakFyZ3NTaG9ydE5hdGl2ZVZhbHVlKSlcbiIpOworICAg ICAgICAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIiAgICBpZiAoIWlzbmFuKCRuYXRpdmVW YWx1ZSkpXG4iKTsKICAgICAgICAgICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgICAg ICRuYW1lID0gY2xhbXBUbzwkYXJnVHlwZT4oJG5hdGl2ZVZhbHVlKTtcblxuIik7CiAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICAjIElmIHRoZSAiU3RyaWN0VHlwZUNoZWNraW5nIiBleHRl bmRlZCBhdHRyaWJ1dGUgaXMgcHJlc2VudCwgYW5kIHRoZSBhcmd1bWVudCdzIHR5cGUgaXMgYW4K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBt Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVy YXRvclY4LnBtCShyZXZpc2lvbiAxMjM5OTkpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQkod29ya2luZyBjb3B5KQpAQCAtMTY4Myw3ICsxNjgz LDcgQEAgc3ViIEdlbmVyYXRlUGFyYW1ldGVyc0NoZWNrCiAgICAgICAgIH0gZWxzaWYgKCRwYXJh bWV0ZXItPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDbGFtcCJ9KSB7CiAgICAgICAgICAgICAgICAg bXkgJG5hdGl2ZVZhbHVlID0gIiR7cGFyYW1ldGVyTmFtZX1OYXRpdmVWYWx1ZSI7CiAgICAgICAg ICAgICAgICAgbXkgJHBhcmFtVHlwZSA9ICRwYXJhbWV0ZXItPnR5cGU7Ci0gICAgICAgICAgICAg ICAgJHBhcmFtZXRlckNoZWNrU3RyaW5nIC49ICIgICAgJHBhcmFtVHlwZSAkcGFyYW1ldGVyTmFt ZSA9IDBcbiI7CisgICAgICAgICAgICAgICAgJHBhcmFtZXRlckNoZWNrU3RyaW5nIC49ICIgICAg JHBhcmFtVHlwZSAkcGFyYW1ldGVyTmFtZSA9IDA7XG4iOwogICAgICAgICAgICAgICAgICRwYXJh bWV0ZXJDaGVja1N0cmluZyAuPSAiICAgIEVYQ0VQVElPTl9CTE9DSyhkb3VibGUsICRuYXRpdmVW YWx1ZSwgYXJnc1skcGFyYW1JbmRleF0tPk51bWJlclZhbHVlKCkpO1xuIjsKICAgICAgICAgICAg ICAgICAkcGFyYW1ldGVyQ2hlY2tTdHJpbmcgLj0gIiAgICBpZiAoIWlzbmFuKCRuYXRpdmVWYWx1 ZSkpXG4iOwogICAgICAgICAgICAgICAgICRwYXJhbWV0ZXJDaGVja1N0cmluZyAuPSAiICAgICAg ICAkcGFyYW1ldGVyTmFtZSA9IGNsYW1wVG88JHBhcmFtVHlwZT4oJG5hdGl2ZVZhbHVlKTtcbiI7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0T2Jq LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3Qv SlMvSlNUZXN0T2JqLmNwcAkocmV2aXNpb24gMTIzOTk5KQorKysgU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdE9iai5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIz NjksNyArMjM2OSw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHIK ICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjpl bmNvZGUoanNVbmRlZmluZWQoKSk7CiAKLSAgICBpZiAoIWlzbmFuKG9iakFyZ3NTaG9ydE5hdGl2 ZVZhbHVlKSkKKyAgICBpZiAoIWlzbmFuKG9iakFyZ3NMb25nTmF0aXZlVmFsdWUpKQogICAgICAg ICBvYmpBcmdzTG9uZyA9IGNsYW1wVG88dW5zaWduZWQgbG9uZz4ob2JqQXJnc0xvbmdOYXRpdmVW YWx1ZSk7CiAKICAgICBpbXBsLT5jbGFzc01ldGhvZFdpdGhDbGFtcChvYmpBcmdzU2hvcnQsIG9i akFyZ3NMb25nKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9W OC9WOFRlc3RPYmouY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwCShyZXZpc2lvbiAxMjM5OTkpCisrKyBTb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T2JqLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTcyOCwxMSArMTcyOCwxMSBAQCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+ IGNsYXNzTWV0aG9kCiAgICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPCAyKQogICAgICAgICByZXR1cm4g VjhQcm94eTo6dGhyb3dOb3RFbm91Z2hBcmd1bWVudHNFcnJvcihhcmdzLkdldElzb2xhdGUoKSk7 CiAgICAgVGVzdE9iaiogaW1wID0gVjhUZXN0T2JqOjp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsK LSAgICB1bnNpZ25lZCBzaG9ydCBvYmpBcmdzU2hvcnQgPSAwCisgICAgdW5zaWduZWQgc2hvcnQg b2JqQXJnc1Nob3J0ID0gMDsKICAgICBFWENFUFRJT05fQkxPQ0soZG91YmxlLCBvYmpBcmdzU2hv cnROYXRpdmVWYWx1ZSwgYXJnc1swXS0+TnVtYmVyVmFsdWUoKSk7CiAgICAgaWYgKCFpc25hbihv YmpBcmdzU2hvcnROYXRpdmVWYWx1ZSkpCiAgICAgICAgIG9iakFyZ3NTaG9ydCA9IGNsYW1wVG88 dW5zaWduZWQgc2hvcnQ+KG9iakFyZ3NTaG9ydE5hdGl2ZVZhbHVlKTsKLSAgICB1bnNpZ25lZCBs b25nIG9iakFyZ3NMb25nID0gMAorICAgIHVuc2lnbmVkIGxvbmcgb2JqQXJnc0xvbmcgPSAwOwog ICAgIEVYQ0VQVElPTl9CTE9DSyhkb3VibGUsIG9iakFyZ3NMb25nTmF0aXZlVmFsdWUsIGFyZ3Nb MV0tPk51bWJlclZhbHVlKCkpOwogICAgIGlmICghaXNuYW4ob2JqQXJnc0xvbmdOYXRpdmVWYWx1 ZSkpCiAgICAgICAgIG9iakFyZ3NMb25nID0gY2xhbXBUbzx1bnNpZ25lZCBsb25nPihvYmpBcmdz TG9uZ05hdGl2ZVZhbHVlKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOFdlYlNvY2tldEN1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4V2ViU29ja2V0Q3VzdG9tLmNwcAkocmV2aXNpb24gMTIzOTk5KQor KysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4V2ViU29ja2V0Q3VzdG9tLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTQ0LDM4ICsxNDQsNiBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gVjhXZWJTb2NrZXQ6OnNlbmRDCiAgICAgcmV0dXJuIHY4Qm9vbGVhbihyZXN1bHQsIGFyZ3Mu R2V0SXNvbGF0ZSgpKTsKIH0KIAotdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4V2ViU29ja2V0Ojpj bG9zZUNhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpCi17Ci0gICAgLy8gRklYTUU6 IFdlIHNob3VsZCBpbXBsZW1lbnQgW0NsYW1wXSBmb3IgSURMIGJpbmRpbmcgY29kZSBnZW5lcmF0 b3IsIGFuZAotICAgIC8vIHJlbW92ZSB0aGlzIGN1c3RvbSBtZXRob2QuCi0gICAgV2ViU29ja2V0 KiB3ZWJTb2NrZXQgPSB0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsKLSAgICBpbnQgYXJndW1lbnRD b3VudCA9IGFyZ3MuTGVuZ3RoKCk7Ci0gICAgaW50IGNvZGUgPSBXZWJTb2NrZXRDaGFubmVsOjpD bG9zZUV2ZW50Q29kZU5vdFNwZWNpZmllZDsKLSAgICBTdHJpbmcgcmVhc29uID0gIiI7Ci0gICAg aWYgKGFyZ3VtZW50Q291bnQgPj0gMSkgewotICAgICAgICBkb3VibGUgeCA9IGFyZ3NbMF0tPk51 bWJlclZhbHVlKCk7Ci0gICAgICAgIGRvdWJsZSBtYXhWYWx1ZSA9IHN0YXRpY19jYXN0PGRvdWJs ZT4oc3RkOjpudW1lcmljX2xpbWl0czx1aW50MTZfdD46Om1heCgpKTsKLSAgICAgICAgZG91Ymxl IG1pblZhbHVlID0gc3RhdGljX2Nhc3Q8ZG91YmxlPihzdGQ6Om51bWVyaWNfbGltaXRzPHVpbnQx Nl90Pjo6bWluKCkpOwotICAgICAgICBpZiAoaXNuYW4oeCkpCi0gICAgICAgICAgICB4ID0gMC4w OwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB4ID0gY2xhbXBUbyh4LCBtaW5WYWx1ZSwgbWF4 VmFsdWUpOwotICAgICAgICBjb2RlID0gY2xhbXBUb0ludGVnZXIoeCk7Ci0gICAgICAgIGlmIChh cmd1bWVudENvdW50ID49IDIpIHsKLSAgICAgICAgICAgIHY4OjpUcnlDYXRjaCB0cnlDYXRjaDsK LSAgICAgICAgICAgIHY4OjpIYW5kbGU8djg6OlN0cmluZz4gcmVhc29uVmFsdWUgPSBhcmdzWzFd LT5Ub1N0cmluZygpOwotICAgICAgICAgICAgaWYgKHRyeUNhdGNoLkhhc0NhdWdodCgpKQotICAg ICAgICAgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKHRyeUNhdGNoLkV4Y2VwdGlvbigpLCBhcmdz LkdldElzb2xhdGUoKSk7Ci0gICAgICAgICAgICByZWFzb24gPSB0b1dlYkNvcmVTdHJpbmcocmVh c29uVmFsdWUpOwotICAgICAgICB9Ci0gICAgfQotICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwot ICAgIHdlYlNvY2tldC0+Y2xvc2UoY29kZSwgcmVhc29uLCBlYyk7Ci0gICAgaWYgKGVjKQotICAg ICAgICByZXR1cm4gdGhyb3dFcnJvcihlYywgYXJncy5HZXRJc29sYXRlKCkpOwotICAgIHJldHVy biB2ODo6VW5kZWZpbmVkKCk7Ci19Ci0KIH0gIC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRp ZiAgLy8gRU5BQkxFKFdFQl9TT0NLRVRTKQo=