139455 2014-12-09 11:29:35 -0800 Implement clearing of cookies 2014-12-09 16:13:41 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue kling ossy oldest_to_newest 1053881 0 andersca 2014-12-09 11:29:35 -0800 Implement clearing of cookies 1053889 1 242950 andersca 2014-12-09 11:36:45 -0800 Created attachment 242950 Patch 1053891 2 commit-queue 2014-12-09 11:39:56 -0800 Attachment 242950 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h:65: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h:102: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp:112: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp:115: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp:140: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp:118: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h:56: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 7 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 1053907 3 242950 kling 2014-12-09 12:15:22 -0800 Comment on attachment 242950 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242950&action=review r=me > Source/WebKit2/NetworkProcess/NetworkProcess.cpp:246 > + parentProcessConnection()->send(Messages::NetworkProcessProxy::DidDeleteWebsiteData(callbackID), 0); Can we make parentProcessConnection() return a reference? > Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp:94 > +enum class ProcessAccessType { > + None, > + OnlyIfLaunched, > + Launch, > +}; This is very nifty. 1053911 4 andersca 2014-12-09 12:29:33 -0800 Committed r177032: <http://trac.webkit.org/changeset/177032> 1053980 5 ossy 2014-12-09 16:13:24 -0800 and the buildfix landed in https://trac.webkit.org/changeset/177043 242950 2014-12-09 11:36:45 -0800 2014-12-09 12:15:22 -0800 Patch bug-139455-20141209113725.patch text/plain 22813 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTUzMDE0Y2VlMTg1Yjhk ZTMzNmM3MWM3NzhmNmEwODY0YWFjZDc1Yy4uYWVkYTBlNGI1ZjE2ZWJkYjIyNTRjNTU2NDBiODFh NDUyYzc3OTY0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDcwIEBACiAyMDE0LTEyLTA5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgSW1wbGVtZW50IGNs ZWFyaW5nIG9mIGNvb2tpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzOTQ1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6ZGVsZXRlV2Vic2l0ZURhdGEpOgorICAgICAgICBIYW5k bGUgZGVsZXRpbmcgY29va2llcyBieSBmaW5kaW5nIHRoZSByaWdodCBuZXR3b3JrIHN0b3JhZ2Ug c2Vzc2lvbiBhbmQgZGVsZXRpbmcgdGhlIGNvb2tpZXMgZnJvbSBpdC4KKyAgICAgICAgVGhlbiwg c2VuZCBhIERpZERlbGV0ZVdlYnNpdGVEYXRhIG1lc3NhZ2UgYmFjay4KKworICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmg6CisgICAgICAgIEFkZCBuZXcgbWVtYmVycy4K KworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLm1lc3NhZ2VzLmluOgor ICAgICAgICBBZGQgbmV3IERlbGV0ZVdlYnNpdGVEYXRhIG1lc3NhZ2UuCisKKyAgICAgICAgKiBT aGFyZWQvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFUeXBlcy5oOgorICAgICAgICBNb3ZlIHRoZSB3 ZWJzaXRlIGRhdGEgdHlwZXMgZW51bSB0byBpdHMgb3duIGZpbGUgc28gaXQgY2FuIGJlIHNoYXJl ZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZS5t bToKKyAgICAgICAgKHRvV2Vic2l0ZURhdGFUeXBlcyk6CisgICAgICAgIFVwZGF0ZSBub3cgdGhh dCBXZWJzaXRlRGF0YVR5cGVzIGlzIGl0cyBvd24gZW51bS4KKworICAgICAgICAoLVtfV0tXZWJz aXRlRGF0YVN0b3JlIHJlbW92ZURhdGFPZlR5cGVzOm1vZGlmaWVkU2luY2U6Y29tcGxldGlvbkhh bmRsZXI6XSk6CisgICAgICAgIHJlbW92ZURhdGFNb2RpZmllZFNpbmNlIHdhcyByZW5hbWVkIHRv IHJlbW92ZURhdGEuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vz c1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Z2VuZXJhdGVDYWxsYmFja0lEKToKKyAgICAg ICAgSGVscGVyIGZ1bmN0aW9uIHRvIGNyZWF0ZSBhIGNhbGxiYWNrIElELgorCisgICAgICAgIChX ZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzUHJveHk6On5OZXR3b3JrUHJvY2Vzc1Byb3h5KToKKyAgICAg ICAgQXNzZXJ0IHRoYXQgd2UgaGF2ZSBubyBwZW5kaW5nIGNhbGxiYWNrcy4KKworICAgICAgICAo V2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpkZWxldGVXZWJzaXRlRGF0YSk6CisgICAgICAg IFB1dCB0aGUgY29tcGxldGlvbiBoYW5kbGVyIGluIG91ciBtYXAgYW5kIG1lc3NhZ2UgdGhlIG5l dHdvcmsgcHJvY2Vzcy4KKworICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5Ojpu ZXR3b3JrUHJvY2Vzc0NyYXNoZWRPckZhaWxlZFRvTGF1bmNoKToKKyAgICAgICAgQ2FsbCBhbGwg Y29tcGxldGlvbiBoYW5kbGVycy4KKworICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1By b3h5OjpkaWREZWxldGVXZWJzaXRlRGF0YSk6CisgICAgICAgIEdyYWIgdGhlIGNvbXBsZXRpb24g aGFuZGxlciBhbmQgY2FsbCBpdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdv cmtQcm9jZXNzUHJveHkuaDoKKyAgICAgICAgQWRkIG5ldyBtZW1iZXJzLgorCisgICAgICAgICog VUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAg ICAgQWRkIERpZERlbGV0ZVdlYnNpdGVEYXRhIGNhbGxiYWNrLgorCisgICAgICAgICogVUlQcm9j ZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0Ojpj b21wdXRlTmV0d29ya1Byb2Nlc3NBY2Nlc3NUeXBlKToKKyAgICAgICAgSGVscGVyIGZ1bmN0aW9u IHRoYXQgY29tcHV0ZXMgdGhlIHR5cGUgb2YgcHJvY2VzcyBhY2Nlc3Mgd2UnZCBuZWVkIGZvciB0 aGUgZ2l2ZW4gbWFzayBvZgorICAgICAgICB3ZWJzaXRlIGRhdGEgdHlwZXMuCisKKyAgICAgICAg KFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0YSk6CisgICAgICAgIEdhdGhlciBh bGwgdGhlIG5ldHdvcmsgcHJvY2Vzc2VzIGFuZCBtZXNzYWdlIHRoZW0uIFVzZSBhIGNhbGxiYWNr IGFnZ3JlZ2F0b3Igb2JqZWN0IHRvIHRyYWNrIGNhbGxiYWNrcworICAgICAgICBzbyB3ZSdsbCBj YWxsIHRoZSBjb21wbGV0aW9uIGhhbmRsZXIgb25jZSBhbGwgY2FsbGJhY2tzIGhhdmUgYmVlbiBp bnZva2VkLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3Rv cmUuaDoKKyAgICAgICAgTW92ZSBXZWJzaXRlRGF0YVR5cGVzIHRvIGl0cyBvd24gZmlsZS4KKwor ICAgICAgICAqIFdlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgQWRk IG5ldyBmaWxlcy4KKworMjAxNC0xMi0wOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBw bGUuY29tPgorCiAgICAgICAgIEdpdmUgV2Vic2l0ZURhdGFTdG9yZSBhIHVuaXF1ZSBJRAogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDQ4CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNw cCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAppbmRl eCAxOTBjM2Q2MDFiOWJhNTViZWM3ZDBjNWY4NmQyZDRjMDcyZjMzNWQyLi41NmQ3Y2RkNzVlNjFm MzJjNmVlYTI3YjQ3NWE3OTQ4NGMyM2QwMWY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCkBAIC00Myw4ICs0MywxMCBAQAogI2luY2x1 ZGUgIlN0YXRpc3RpY3NEYXRhLmgiCiAjaW5jbHVkZSAiV2ViQ29udGV4dE1lc3NhZ2VzLmgiCiAj aW5jbHVkZSAiV2ViQ29va2llTWFuYWdlci5oIgorI2luY2x1ZGUgIldlYnNpdGVEYXRhVHlwZXMu aCIKICNpbmNsdWRlIDxXZWJDb3JlL0xvZ2dpbmcuaD4KICNpbmNsdWRlIDxXZWJDb3JlL01lbW9y eVByZXNzdXJlSGFuZGxlci5oPgorI2luY2x1ZGUgPFdlYkNvcmUvUGxhdGZvcm1Db29raWVKYXIu aD4KICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlUmVxdWVzdC5oPgogI2luY2x1ZGUgPFdlYkNv cmUvU2Vzc2lvbklELmg+CiAjaW5jbHVkZSA8d3RmL1J1bkxvb3AuaD4KQEAgLTIzNCw2ICsyMzYs MTYgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6ZGVzdHJveVByaXZhdGVCcm93c2luZ1Nlc3Npb24o U2Vzc2lvbklEIHNlc3Npb25JRCkKICAgICBTZXNzaW9uVHJhY2tlcjo6ZGVzdHJveVNlc3Npb24o c2Vzc2lvbklEKTsKIH0KIAordm9pZCBOZXR3b3JrUHJvY2Vzczo6ZGVsZXRlV2Vic2l0ZURhdGEo V2ViQ29yZTo6U2Vzc2lvbklEIHNlc3Npb25JRCwgdWludDY0X3Qgd2Vic2l0ZURhdGFUeXBlcywg c3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGltZV9wb2ludCBtb2RpZmllZFNpbmNlLCB1aW50 NjRfdCBjYWxsYmFja0lEKQoreworICAgIGlmICh3ZWJzaXRlRGF0YVR5cGVzICYgV2Vic2l0ZURh dGFUeXBlQ29va2llcykgeworICAgICAgICBpZiAoYXV0byogbmV0d29ya1N0b3JhZ2VTZXNzaW9u ID0gU2Vzc2lvblRyYWNrZXI6OnNlc3Npb24oc2Vzc2lvbklEKSkKKyAgICAgICAgICAgIGRlbGV0 ZUFsbENvb2tpZXNNb2RpZmllZFNpbmNlKCpuZXR3b3JrU3RvcmFnZVNlc3Npb24sIG1vZGlmaWVk U2luY2UpOworICAgIH0KKworICAgIHBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmQoTWVz c2FnZXM6Ok5ldHdvcmtQcm9jZXNzUHJveHk6OkRpZERlbGV0ZVdlYnNpdGVEYXRhKGNhbGxiYWNr SUQpLCAwKTsKK30KKwogdm9pZCBOZXR3b3JrUHJvY2Vzczo6ZG93bmxvYWRSZXF1ZXN0KHVpbnQ2 NF90IGRvd25sb2FkSUQsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAgICBk b3dubG9hZE1hbmFnZXIoKS5zdGFydERvd25sb2FkKGRvd25sb2FkSUQsIHJlcXVlc3QpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaCBi L1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmgKaW5kZXggODgz NWExZmNlZDE4NTA3YWJhNWYxNDVjMWUyMWNkNTY2YjJmOTU0ZC4uYjI5MDJkYmM4NzY0YzU1OWFh Yzc0MzAxOTAyZjAzMmQ2MzgzNjU0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUHJvY2Vzcy5oCkBAIC0xMTIsNiArMTEyLDkgQEAgcHJpdmF0ZToKICAgICB2 b2lkIGNyZWF0ZU5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzKCk7CiAgICAgdm9pZCBlbnN1 cmVQcml2YXRlQnJvd3NpbmdTZXNzaW9uKFdlYkNvcmU6OlNlc3Npb25JRCk7CiAgICAgdm9pZCBk ZXN0cm95UHJpdmF0ZUJyb3dzaW5nU2Vzc2lvbihXZWJDb3JlOjpTZXNzaW9uSUQpOworCisgICAg dm9pZCBkZWxldGVXZWJzaXRlRGF0YShXZWJDb3JlOjpTZXNzaW9uSUQsIHVpbnQ2NF90IHdlYnNp dGVEYXRhVHlwZXMsIHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQgbW9kaWZp ZWRTaW5jZSwgdWludDY0X3QgY2FsbGJhY2tJRCk7CisKICAgICB2b2lkIGRvd25sb2FkUmVxdWVz dCh1aW50NjRfdCBkb3dubG9hZElELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmKTsK ICAgICB2b2lkIHJlc3VtZURvd25sb2FkKHVpbnQ2NF90IGRvd25sb2FkSUQsIGNvbnN0IElQQzo6 RGF0YVJlZmVyZW5jZSYgcmVzdW1lRGF0YSwgY29uc3QgU3RyaW5nJiBwYXRoLCBjb25zdCBTYW5k Ym94RXh0ZW5zaW9uOjpIYW5kbGUmKTsKICAgICB2b2lkIGNhbmNlbERvd25sb2FkKHVpbnQ2NF90 IGRvd25sb2FkSUQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1Byb2Nlc3MubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUHJvY2Vzcy5tZXNzYWdlcy5pbgppbmRleCA1NTAzZDhiNWJlY2E0MjY2ZDNjZjUw NDBlYzgxNWU0MzJhN2Q3M2MwLi40ZWNmNzk0N2MwMDQxM2FhMWE0NmI4MGFlNjI5ZWQ0NzcxYzUx YmIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJv Y2Vzcy5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUHJvY2Vzcy5tZXNzYWdlcy5pbgpAQCAtMzcsNiArMzcsOCBAQCBtZXNzYWdlcyAtPiBOZXR3 b3JrUHJvY2VzcyBMZWdhY3lSZWNlaXZlciB7CiAgICAgRW5zdXJlUHJpdmF0ZUJyb3dzaW5nU2Vz c2lvbihXZWJDb3JlOjpTZXNzaW9uSUQgc2Vzc2lvbklEKQogICAgIERlc3Ryb3lQcml2YXRlQnJv d3NpbmdTZXNzaW9uKFdlYkNvcmU6OlNlc3Npb25JRCBzZXNzaW9uSUQpCiAKKyAgICBEZWxldGVX ZWJzaXRlRGF0YShXZWJDb3JlOjpTZXNzaW9uSUQgc2Vzc2lvbklELCB1aW50NjRfdCB3ZWJzaXRl RGF0YVR5cGVzLCBzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50IG1vZGlmaWVk U2luY2UsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCisKICAgICBEb3dubG9hZFJlcXVlc3QodWludDY0 X3QgZG93bmxvYWRJRCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QpCiAgICAgUmVz dW1lRG93bmxvYWQodWludDY0X3QgZG93bmxvYWRJRCwgSVBDOjpEYXRhUmVmZXJlbmNlIHJlc3Vt ZURhdGEsIFN0cmluZyBwYXRoLCBXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5k Ym94RXh0ZW5zaW9uSGFuZGxlKQogICAgIENhbmNlbERvd25sb2FkKHVpbnQ2NF90IGRvd25sb2Fk SUQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2Vic2l0ZURhdGEvV2Vic2l0 ZURhdGFUeXBlcy5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYnNpdGVEYXRhL1dlYnNpdGVE YXRhVHlwZXMuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40MDBiODhlOTc5OGU0Mjc3OGYwMzA1MTczOThmMWM5Y2Y2 Yjc5MTdjCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYnNpdGVE YXRhL1dlYnNpdGVEYXRhVHlwZXMuaApAQCAtMCwwICsxLDM3IEBACisvKgorICogQ29weXJpZ2h0 IChDKSAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBz b3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisg KiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFi b3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQv b3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisg KiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklC VVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVT LCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJ RVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBV UlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRT IENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VT IChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNU SVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBP UiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRI RU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklM SVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2lm bmRlZiBXZWJzaXRlRGF0YVR5cGVzX2gKKyNkZWZpbmUgV2Vic2l0ZURhdGFUeXBlc19oCisKK25h bWVzcGFjZSBXZWJLaXQgeworCitlbnVtIFdlYnNpdGVEYXRhVHlwZXMgeworICAgIFdlYnNpdGVE YXRhVHlwZUNvb2tpZXMgPSAxIDw8IDAsCit9OworCit9OworCisjZW5kaWYgLy8gV2Vic2l0ZURh dGFUeXBlc19oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L19XS1dlYnNpdGVEYXRhU3RvcmUubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL19XS1dlYnNpdGVEYXRhU3RvcmUubW0KaW5kZXggNzFjMjZiZWRiZTBiNzA4MGRmM2MzYjhj YTJlNmFkZTkxYmY0MzgzNy4uOTgzNzdkY2NlZDNhMjIyMTdmYjIyZThhMTcyMmY0ODEzZTAwYzM0 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJz aXRlRGF0YVN0b3JlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev X1dLV2Vic2l0ZURhdGFTdG9yZS5tbQpAQCAtNTIsOSArNTIsOSBAQAogICAgIHJldHVybiBfd2Vi c2l0ZURhdGFTdG9yZS0+aXNOb25QZXJzaXN0ZW50KCk7CiB9CiAKLXN0YXRpYyBXZWJLaXQ6Oldl YnNpdGVEYXRhU3RvcmU6OldlYnNpdGVEYXRhVHlwZXMgdG9XZWJzaXRlRGF0YVR5cGVzKFdLV2Vi c2l0ZURhdGFUeXBlcyB3a1dlYnNpdGVEYXRhVHlwZXMpCitzdGF0aWMgV2ViS2l0OjpXZWJzaXRl RGF0YVR5cGVzIHRvV2Vic2l0ZURhdGFUeXBlcyhXS1dlYnNpdGVEYXRhVHlwZXMgd2tXZWJzaXRl RGF0YVR5cGVzKQogewotICAgIHVzaW5nIFdlYnNpdGVEYXRhVHlwZXMgPSBXZWJLaXQ6OldlYnNp dGVEYXRhU3RvcmU6OldlYnNpdGVEYXRhVHlwZXM7CisgICAgdXNpbmcgV2Vic2l0ZURhdGFUeXBl cyA9IFdlYktpdDo6V2Vic2l0ZURhdGFUeXBlczsKIAogICAgIGludCB3ZWJzaXRlRGF0YVR5cGVz ID0gMDsKIApAQCAtNzUsNyArNzUsNyBAQCBzdGF0aWMgc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9j azo6dGltZV9wb2ludCB0b1N5c3RlbUNsb2NrVGltZShOU0RhdGUgKmRhdGUpCiAtICh2b2lkKXJl bW92ZURhdGFPZlR5cGVzOihXS1dlYnNpdGVEYXRhVHlwZXMpd2Vic2l0ZURhdGFUeXBlcyBtb2Rp ZmllZFNpbmNlOihOU0RhdGUgKilkYXRlIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKSgpKWNv bXBsZXRpb25IYW5kbGVyCiB7CiAgICAgYXV0byBjb21wbGV0aW9uSGFuZGxlckNvcHkgPSBCbG9j a19jb3B5KGNvbXBsZXRpb25IYW5kbGVyKTsKLSAgICBfd2Vic2l0ZURhdGFTdG9yZS0+d2Vic2l0 ZURhdGFTdG9yZSgpLnJlbW92ZURhdGFNb2RpZmllZFNpbmNlKHRvV2Vic2l0ZURhdGFUeXBlcyh3 ZWJzaXRlRGF0YVR5cGVzKSwgdG9TeXN0ZW1DbG9ja1RpbWUoZGF0ZSA/IGRhdGUgOiBbTlNEYXRl IGRpc3RhbnRQYXN0XSksIFtjb21wbGV0aW9uSGFuZGxlckNvcHldIHsKKyAgICBfd2Vic2l0ZURh dGFTdG9yZS0+d2Vic2l0ZURhdGFTdG9yZSgpLnJlbW92ZURhdGEodG9XZWJzaXRlRGF0YVR5cGVz KHdlYnNpdGVEYXRhVHlwZXMpLCB0b1N5c3RlbUNsb2NrVGltZShkYXRlID8gZGF0ZSA6IFtOU0Rh dGUgZGlzdGFudFBhc3RdKSwgW2NvbXBsZXRpb25IYW5kbGVyQ29weV0gewogICAgICAgICBjb21w bGV0aW9uSGFuZGxlckNvcHkoKTsKICAgICAgICAgQmxvY2tfcmVsZWFzZShjb21wbGV0aW9uSGFu ZGxlckNvcHkpOwogICAgIH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAppbmRleCA3MjAyZDM2NDk4YTZiMTVj MTc2YmFjM2E5MTM2ZTNkMmI3N2JhZDM0Li45YjU0ZWU5NzliZmJjZDhlN2FhMmVkYzEzMzFhZDJk MDFlOWE5NWI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9O ZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0 d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcApAQCAtNTEsNiArNTEsMTMgQEAgdXNpbmcgbmFt ZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitzdGF0aWMgdWludDY0X3Qg Z2VuZXJhdGVDYWxsYmFja0lEKCkKK3sKKyAgICBzdGF0aWMgdWludDY0X3QgY2FsbGJhY2tJRDsK KworICAgIHJldHVybiArK2NhbGxiYWNrSUQ7Cit9CisKIFBhc3NSZWZQdHI8TmV0d29ya1Byb2Nl c3NQcm94eT4gTmV0d29ya1Byb2Nlc3NQcm94eTo6Y3JlYXRlKFdlYkNvbnRleHQmIHdlYkNvbnRl eHQpCiB7CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBOZXR3b3JrUHJvY2Vzc1Byb3h5KHdlYkNv bnRleHQpKTsKQEAgLTY2LDYgKzczLDcgQEAgTmV0d29ya1Byb2Nlc3NQcm94eTo6TmV0d29ya1By b2Nlc3NQcm94eShXZWJDb250ZXh0JiB3ZWJDb250ZXh0KQogCiBOZXR3b3JrUHJvY2Vzc1Byb3h5 Ojp+TmV0d29ya1Byb2Nlc3NQcm94eSgpCiB7CisgICAgQVNTRVJUKG1fcGVuZGluZ0RlbGV0ZVdl YnNpdGVEYXRhQ2FsbGJhY2tzLmlzRW1wdHkoKSk7CiB9CiAKIHZvaWQgTmV0d29ya1Byb2Nlc3NQ cm94eTo6Z2V0TGF1bmNoT3B0aW9ucyhQcm9jZXNzTGF1bmNoZXI6OkxhdW5jaE9wdGlvbnMmIGxh dW5jaE9wdGlvbnMpCkBAIC0xMDcsNiArMTE1LDE0IEBAIERvd25sb2FkUHJveHkqIE5ldHdvcmtQ cm9jZXNzUHJveHk6OmNyZWF0ZURvd25sb2FkUHJveHkoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBy CiAgICAgcmV0dXJuIG1fZG93bmxvYWRQcm94eU1hcC0+Y3JlYXRlRG93bmxvYWRQcm94eShtX3dl YkNvbnRleHQsIHJlc291cmNlUmVxdWVzdCk7CiB9CiAKK3ZvaWQgTmV0d29ya1Byb2Nlc3NQcm94 eTo6ZGVsZXRlV2Vic2l0ZURhdGEoV2ViQ29yZTo6U2Vzc2lvbklEIHNlc3Npb25JRCwgV2Vic2l0 ZURhdGFUeXBlcyBkYXRhVHlwZXMsIHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9p bnQgbW9kaWZpZWRTaW5jZSwgIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gY29tcGxldGlvbkhhbmRs ZXIpCit7CisgICAgYXV0byBjYWxsYmFja0lEID0gZ2VuZXJhdGVDYWxsYmFja0lEKCk7CisKKyAg ICBtX3BlbmRpbmdEZWxldGVXZWJzaXRlRGF0YUNhbGxiYWNrcy5hZGQoY2FsbGJhY2tJRCwgV1RG Ojptb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CisgICAgc2VuZChNZXNzYWdlczo6TmV0d29ya1By b2Nlc3M6OkRlbGV0ZVdlYnNpdGVEYXRhKHNlc3Npb25JRCwgZGF0YVR5cGVzLCBtb2RpZmllZFNp bmNlLCBjYWxsYmFja0lEKSwgMCk7Cit9CisKIHZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6bmV0 d29ya1Byb2Nlc3NDcmFzaGVkT3JGYWlsZWRUb0xhdW5jaCgpCiB7CiAgICAgLy8gVGhlIG5ldHdv cmsgcHJvY2VzcyBtdXN0IGhhdmUgY3Jhc2hlZCBvciBleGl0ZWQsIHNlbmQgYW55IHBlbmRpbmcg c3luYyByZXBsaWVzIHdlIG1pZ2h0IGhhdmUuCkBAIC0xMjIsNiArMTM4LDEwIEBAIHZvaWQgTmV0 d29ya1Byb2Nlc3NQcm94eTo6bmV0d29ya1Byb2Nlc3NDcmFzaGVkT3JGYWlsZWRUb0xhdW5jaCgp CiAjZW5kaWYKICAgICB9CiAKKyAgICBmb3IgKGNvbnN0IGF1dG8mIGNhbGxiYWNrIDogbV9wZW5k aW5nRGVsZXRlV2Vic2l0ZURhdGFDYWxsYmFja3MudmFsdWVzKCkpCisgICAgICAgIGNhbGxiYWNr KCk7CisgICAgbV9wZW5kaW5nRGVsZXRlV2Vic2l0ZURhdGFDYWxsYmFja3MuY2xlYXIoKTsKKwog ICAgIC8vIFRlbGwgdGhlIG5ldHdvcmsgcHJvY2VzcyBtYW5hZ2VyIHRvIGZvcmdldCBhYm91dCB0 aGlzIG5ldHdvcmsgcHJvY2VzcyBwcm94eS4gVGhpcyBtYXkgY2F1c2UgdXMgdG8gYmUgZGVsZXRl ZC4KICAgICBtX3dlYkNvbnRleHQubmV0d29ya1Byb2Nlc3NDcmFzaGVkKHRoaXMpOwogfQpAQCAt MTgzLDYgKzIwMywxMiBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OmRpZFJlY2VpdmVBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZSh1aW50NjRfdCBwYWdlSUQsIHVpbgogICAgIHBhZ2UtPmRpZFJl Y2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZVByb3h5KGZyYW1lSUQsIGF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlLnJlbGVhc2UoKSk7CiB9CiAKK3ZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6ZGlk RGVsZXRlV2Vic2l0ZURhdGEodWludDY0X3QgY2FsbGJhY2tJRCkKK3sKKyAgICBhdXRvIGNhbGxi YWNrID0gbV9wZW5kaW5nRGVsZXRlV2Vic2l0ZURhdGFDYWxsYmFja3MudGFrZShjYWxsYmFja0lE KTsKKyAgICBjYWxsYmFjaygpOworfQorCiB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OmRpZEZp bmlzaExhdW5jaGluZyhQcm9jZXNzTGF1bmNoZXIqIGxhdW5jaGVyLCBJUEM6OkNvbm5lY3Rpb246 OklkZW50aWZpZXIgY29ubmVjdGlvbklkZW50aWZpZXIpCiB7CiAgICAgQ2hpbGRQcm9jZXNzUHJv eHk6OmRpZEZpbmlzaExhdW5jaGluZyhsYXVuY2hlciwgY29ubmVjdGlvbklkZW50aWZpZXIpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nl c3NQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nl c3NQcm94eS5oCmluZGV4IGJlYTAxODhjMzJhMGYzNDE1ZDRlMzk1NGQ2ZGNkYzBlOTg5YjQyM2Qu LjNlMjU4MThhZTliZGQyYzEwZGJiNThlNGQyM2ZlYTAzODY3ZmI3M2IgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmgK QEAgLTMyLDYgKzMyLDcgQEAKICNpbmNsdWRlICJDdXN0b21Qcm90b2NvbE1hbmFnZXJQcm94eS5o IgogI2luY2x1ZGUgIlByb2Nlc3NMYXVuY2hlci5oIgogI2luY2x1ZGUgIldlYlByb2Nlc3NQcm94 eU1lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2Vic2l0ZURhdGFUeXBlcy5oIgogI2luY2x1ZGUgPG1l bW9yeT4KICNpbmNsdWRlIDx3dGYvRGVxdWUuaD4KIApAQCAtNDIsNiArNDMsNyBAQAogbmFtZXNw YWNlIFdlYkNvcmUgewogY2xhc3MgQXV0aGVudGljYXRpb25DaGFsbGVuZ2U7CiBjbGFzcyBSZXNv dXJjZVJlcXVlc3Q7CitjbGFzcyBTZXNzaW9uSUQ7CiB9CiAKIG5hbWVzcGFjZSBXZWJLaXQgewpA QCAtNjAsNiArNjIsOCBAQCBwdWJsaWM6CiAKICAgICBEb3dubG9hZFByb3h5KiBjcmVhdGVEb3du bG9hZFByb3h5KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYpOwogCisgICAgdm9pZCBk ZWxldGVXZWJzaXRlRGF0YShXZWJDb3JlOjpTZXNzaW9uSUQsIFdlYnNpdGVEYXRhVHlwZXMsIHN0 ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQgbW9kaWZpZWRTaW5jZSwgc3RkOjpm dW5jdGlvbjx2b2lkICgpPiBjb21wbGV0aW9uSGFuZGxlcik7CisKICNpZiBQTEFURk9STShDT0NP QSkKICAgICB2b2lkIHNldFByb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQoYm9vbCk7CiAjZW5kaWYK QEAgLTg1LDYgKzg5LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZFJlY2VpdmVOZXR3b3JrUHJv Y2Vzc1Byb3h5TWVzc2FnZShJUEM6OkNvbm5lY3Rpb24qLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7 CiAgICAgdm9pZCBkaWRDcmVhdGVOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcyhjb25zdCBJ UEM6OkF0dGFjaG1lbnQmKTsKICAgICB2b2lkIGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxs ZW5nZSh1aW50NjRfdCBwYWdlSUQsIHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OkF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJiwgdWludDY0X3QgY2hhbGxlbmdlSUQpOworICAgIHZvaWQg ZGlkRGVsZXRlV2Vic2l0ZURhdGEodWludDY0X3QgY2FsbGJhY2tJRCk7CiAKICAgICAvLyBQcm9j ZXNzTGF1bmNoZXI6OkNsaWVudAogICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hMYXVuY2hpbmco UHJvY2Vzc0xhdW5jaGVyKiwgSVBDOjpDb25uZWN0aW9uOjpJZGVudGlmaWVyKSBvdmVycmlkZTsK QEAgLTk0LDkgKzk5LDEwIEBAIHByaXZhdGU6CiAgICAgdW5zaWduZWQgbV9udW1QZW5kaW5nQ29u bmVjdGlvblJlcXVlc3RzOwogICAgIERlcXVlPFJlZlB0cjxNZXNzYWdlczo6V2ViUHJvY2Vzc1By b3h5OjpHZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246OkRlbGF5ZWRSZXBseT4+IG1fcGVuZGlu Z0Nvbm5lY3Rpb25SZXBsaWVzOwogCisgICAgSGFzaE1hcDx1aW50NjRfdCwgc3RkOjpmdW5jdGlv bjx2b2lkICgpPj4gbV9wZW5kaW5nRGVsZXRlV2Vic2l0ZURhdGFDYWxsYmFja3M7CisKICAgICBz dGQ6OnVuaXF1ZV9wdHI8RG93bmxvYWRQcm94eU1hcD4gbV9kb3dubG9hZFByb3h5TWFwOwogICAg IEN1c3RvbVByb3RvY29sTWFuYWdlclByb3h5IG1fY3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJveHk7 Ci0gICAgCiAjaWYgUExBVEZPUk0oSU9TKQogICAgIHN0ZDo6dW5pcXVlX3B0cjxQcm9jZXNzQXNz ZXJ0aW9uPiBtX2Fzc2VydGlvbjsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5tZXNzYWdlcy5pbiBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkubWVzc2FnZXMu aW4KaW5kZXggM2I0MWE1NDBhYTE5Y2VhYTYzOTJiNjVkMjY5YWE3YTNkYzM0MDdiNy4uOTNhMzdi NGVjY2YzNDUwMGIxZmNjMzVkMjAzYjI4YTlkNGYzNTMwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5tZXNzYWdlcy5pbgor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5 Lm1lc3NhZ2VzLmluCkBAIC0yNiw2ICsyNiw4IEBAIG1lc3NhZ2VzIC0+IE5ldHdvcmtQcm9jZXNz UHJveHkgTGVnYWN5UmVjZWl2ZXIgewogICAgIERpZENyZWF0ZU5ldHdvcmtDb25uZWN0aW9uVG9X ZWJQcm9jZXNzKElQQzo6QXR0YWNobWVudCBjb25uZWN0aW9uSWRlbnRpZmllcikKIAogICAgIERp ZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSh1aW50NjRfdCBwYWdlSUQsIHVpbnQ2NF90 IGZyYW1lSUQsIFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlIGNoYWxsZW5nZSwgdWlu dDY0X3QgY2hhbGxlbmdlSUQpCisKKyAgICBEaWREZWxldGVXZWJzaXRlRGF0YSh1aW50NjRfdCBj YWxsYmFja0lEKQogfQogCiAjZW5kaWYgLy8gRU5BQkxFKE5FVFdPUktfUFJPQ0VTUykKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0 b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0 YVN0b3JlLmNwcAppbmRleCA3YzllMjQ1MzM1NDVhOWQ0NGRkMTExNWEwYmRkN2ZlYzMwMDBhOGQw Li4zOWI4YTAzYmEyN2VjOTc2NjQ2NTBlODAwYTAyMTQ5NjliMzkyYjNmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3Rv cmUuY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAi V2Vic2l0ZURhdGFTdG9yZS5oIgogCisjaW5jbHVkZSAiV2ViQ29udGV4dC5oIgogI2luY2x1ZGUg PHd0Zi9SdW5Mb29wLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtODYsMTAgKzg3LDkxIEBA IHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlV2ViUGFnZShXZWJQYWdlUHJveHkmIHdlYlBh Z2VQcm94eSkKICAgICBtX3dlYlBhZ2VzLnJlbW92ZSgmd2ViUGFnZVByb3h5KTsKIH0KIAotdm9p ZCBXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhTW9kaWZpZWRTaW5jZShXZWJzaXRlRGF0YVR5 cGVzIGRhdGFUeXBlcywgc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGltZV9wb2ludCwgc3Rk OjpmdW5jdGlvbjx2b2lkICgpPiBjb21wbGV0aW9uSGFuZGxlcikKK2VudW0gY2xhc3MgUHJvY2Vz c0FjY2Vzc1R5cGUgeworICAgIE5vbmUsCisgICAgT25seUlmTGF1bmNoZWQsCisgICAgTGF1bmNo LAorfTsKKworc3RhdGljIFByb2Nlc3NBY2Nlc3NUeXBlIGNvbXB1dGVOZXR3b3JrUHJvY2Vzc0Fj Y2Vzc1R5cGUoV2Vic2l0ZURhdGFUeXBlcyBkYXRhVHlwZXMsIGJvb2wgaXNOb25QZXJzaXN0YW50 U3RvcmUpCit7CisgICAgUHJvY2Vzc0FjY2Vzc1R5cGUgcHJvY2Vzc0FjY2Vzc1R5cGUgPSBQcm9j ZXNzQWNjZXNzVHlwZTo6Tm9uZTsKKworICAgIGlmIChkYXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5 cGVDb29raWVzKSB7CisgICAgICAgIGlmIChpc05vblBlcnNpc3RhbnRTdG9yZSkKKyAgICAgICAg ICAgIHByb2Nlc3NBY2Nlc3NUeXBlID0gc3RkOjptYXgocHJvY2Vzc0FjY2Vzc1R5cGUsIFByb2Nl c3NBY2Nlc3NUeXBlOjpPbmx5SWZMYXVuY2hlZCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg IHByb2Nlc3NBY2Nlc3NUeXBlID0gc3RkOjptYXgocHJvY2Vzc0FjY2Vzc1R5cGUsIFByb2Nlc3NB Y2Nlc3NUeXBlOjpMYXVuY2gpOworICAgIH0KKworICAgIC8vIEZJWE1FOiBIYW5kbGUgY2FjaGVz IGhlcmUgdG9vLgorCisgICAgcmV0dXJuIHByb2Nlc3NBY2Nlc3NUeXBlOworfQorCit2b2lkIFdl YnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEoV2Vic2l0ZURhdGFUeXBlcyBkYXRhVHlwZXMsIHN0 ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQgbW9kaWZpZWRTaW5jZSwgc3RkOjpm dW5jdGlvbjx2b2lkICgpPiBjb21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICAvLyBGSVhNRTogQWN0 dWFsbHkgcmVtb3ZlIGRhdGEuCi0gICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFdURjo6bW92 ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgIHN0cnVjdCBDYWxsYmFja0FnZ3JlZ2F0b3IgOiBw dWJsaWMgUmVmQ291bnRlZDxDYWxsYmFja0FnZ3JlZ2F0b3I+IHsKKyAgICAgICAgZXhwbGljaXQg Q2FsbGJhY2tBZ2dyZWdhdG9yIChzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGNvbXBsZXRpb25IYW5k bGVyKQorICAgICAgICAgICAgOiBjb21wbGV0aW9uSGFuZGxlcihXVEY6Om1vdmUoY29tcGxldGlv bkhhbmRsZXIpKQorICAgICAgICB7CisgICAgICAgIH0KKworICAgICAgICB2b2lkIGFkZFBlbmRp bmdDYWxsYmFjaygpCisgICAgICAgIHsKKyAgICAgICAgICAgIHBlbmRpbmdDYWxsYmFja3MrKzsK KyAgICAgICAgfQorCisgICAgICAgIHZvaWQgcmVtb3ZlUGVuZGluZ0NhbGxiYWNrKCkKKyAgICAg ICAgeworICAgICAgICAgICAgQVNTRVJUKHBlbmRpbmdDYWxsYmFja3MpOworICAgICAgICAgICAg LS1wZW5kaW5nQ2FsbGJhY2tzOworCisgICAgICAgICAgICBjYWxsSWZOZWVkZWQoKTsKKyAgICAg ICAgfQorCisgICAgICAgIHZvaWQgY2FsbElmTmVlZGVkKCkKKyAgICAgICAgeworICAgICAgICAg ICAgaWYgKCFwZW5kaW5nQ2FsbGJhY2tzKQorICAgICAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4o KS5kaXNwYXRjaChXVEY6Om1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICAgICAgfQorCisg ICAgICAgIHVuc2lnbmVkIHBlbmRpbmdDYWxsYmFja3MgPSAwOworICAgICAgICBzdGQ6OmZ1bmN0 aW9uPHZvaWQgKCk+IGNvbXBsZXRpb25IYW5kbGVyOworICAgIH07CisKKyAgICBSZWZQdHI8Q2Fs bGJhY2tBZ2dyZWdhdG9yPiBjYWxsYmFja0FnZ3JlZ2F0b3IgPSBhZG9wdFJlZihuZXcgQ2FsbGJh Y2tBZ2dyZWdhdG9yKFdURjo6bW92ZShjb21wbGV0aW9uSGFuZGxlcikpKTsKKworICAgIGF1dG8g bmV0d29ya1Byb2Nlc3NBY2Nlc3NUeXBlID0gY29tcHV0ZU5ldHdvcmtQcm9jZXNzQWNjZXNzVHlw ZShkYXRhVHlwZXMsIGlzTm9uUGVyc2lzdGVudCgpKTsKKyAgICBpZiAobmV0d29ya1Byb2Nlc3NB Y2Nlc3NUeXBlICE9IFByb2Nlc3NBY2Nlc3NUeXBlOjpOb25lKSB7CisgICAgICAgIEhhc2hTZXQ8 V2ViQ29udGV4dCo+IGNvbnRleHRzOworICAgICAgICBmb3IgKGF1dG8mIHdlYlBhZ2UgOiBtX3dl YlBhZ2VzKQorICAgICAgICAgICAgY29udGV4dHMuYWRkKCZ3ZWJQYWdlLT5wcm9jZXNzKCkuY29u dGV4dCgpKTsKKworICAgICAgICBmb3IgKGF1dG8mIGNvbnRleHQgOiBjb250ZXh0cykgeworICAg ICAgICAgICAgc3dpdGNoIChuZXR3b3JrUHJvY2Vzc0FjY2Vzc1R5cGUpIHsKKyAgICAgICAgICAg IGNhc2UgUHJvY2Vzc0FjY2Vzc1R5cGU6Ok9ubHlJZkxhdW5jaGVkOgorICAgICAgICAgICAgICAg IGlmICghY29udGV4dC0+bmV0d29ya1Byb2Nlc3MoKSkKKyAgICAgICAgICAgICAgICAgICAgY29u dGludWU7CisgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgIGNhc2UgUHJvY2Vz c0FjY2Vzc1R5cGU6OkxhdW5jaDoKKyAgICAgICAgICAgICAgICBjb250ZXh0LT5lbnN1cmVOZXR3 b3JrUHJvY2VzcygpOworICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAgICBjYXNl IFByb2Nlc3NBY2Nlc3NUeXBlOjpOb25lOgorICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBjYWxsYmFja0FnZ3JlZ2F0b3It PmFkZFBlbmRpbmdDYWxsYmFjaygpOworICAgICAgICAgICAgY29udGV4dC0+bmV0d29ya1Byb2Nl c3MoKS0+ZGVsZXRlV2Vic2l0ZURhdGEobV9zZXNzaW9uSUQsIGRhdGFUeXBlcywgbW9kaWZpZWRT aW5jZSwgW2NhbGxiYWNrQWdncmVnYXRvcl0geworICAgICAgICAgICAgICAgIGNhbGxiYWNrQWdn cmVnYXRvci0+cmVtb3ZlUGVuZGluZ0NhbGxiYWNrKCk7CisgICAgICAgICAgICB9KTsKKyAgICAg ICAgfQorICAgIH0KKworICAgIC8vIFRoZXJlJ3MgYSBjaGFuY2UgdGhhdCB3ZSBkb24ndCBoYXZl IGFueSBwZW5kaW5nIGNhbGxiYWNrcy4gSWYgc28sIHdlIHdhbnQgdG8gZGlzcGF0Y2ggdGhlIGNv bXBsZXRpb24gaGFuZGxlciByaWdodCBhd2F5LgorICAgIGNhbGxiYWNrQWdncmVnYXRvci0+Y2Fs bElmTmVlZGVkKCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCmluZGV4IDRjMDIzM2I0MzQxMjlmYzIy ZGE0Y2RlN2Q0NTE3NzBhODI2NTZmZmQuLmViMjE3NTBlNTIwNjExZjdkOTJlOGE3ODkyNTc1Yjk5 Njk3NmU4ZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0 YS9XZWJzaXRlRGF0YVN0b3JlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNp dGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaApAQCAtMjYsNiArMjYsNyBAQAogI2lmbmRlZiBXZWJz aXRlRGF0YVN0b3JlX2gKICNkZWZpbmUgV2Vic2l0ZURhdGFTdG9yZV9oCiAKKyNpbmNsdWRlICJX ZWJzaXRlRGF0YVR5cGVzLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9TZXNzaW9uSUQuaD4KICNpbmNs dWRlIDxmdW5jdGlvbmFsPgogI2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CkBAIC0zOCwxMCArMzks NiBAQCBjbGFzcyBXZWJQYWdlUHJveHk7CiAKIGNsYXNzIFdlYnNpdGVEYXRhU3RvcmUgOiBwdWJs aWMgUmVmQ291bnRlZDxXZWJzaXRlRGF0YVN0b3JlPiB7CiBwdWJsaWM6Ci0gICAgZW51bSBXZWJz aXRlRGF0YVR5cGVzIHsKLSAgICAgICAgV2Vic2l0ZURhdGFUeXBlQ29va2llcyA9IDEgPDwgMCwK LSAgICB9OwotCiAgICAgc3RydWN0IENvbmZpZ3VyYXRpb24gewogICAgIH07CiAgICAgc3RhdGlj IFJlZlB0cjxXZWJzaXRlRGF0YVN0b3JlPiBjcmVhdGVOb25QZXJzaXN0ZW50KCk7CkBAIC01Niw3 ICs1Myw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzTm9uUGVyc2lzdGVudCgpIGNvbnN0IHsgcmV0 dXJuIG1fc2Vzc2lvbklELmlzRXBoZW1lcmFsKCk7IH0KICAgICBXZWJDb3JlOjpTZXNzaW9uSUQg c2Vzc2lvbklEKCkgY29uc3QgeyByZXR1cm4gbV9zZXNzaW9uSUQ7IH0KIAotICAgIHZvaWQgcmVt b3ZlRGF0YU1vZGlmaWVkU2luY2UoV2Vic2l0ZURhdGFUeXBlcywgc3RkOjpjaHJvbm86OnN5c3Rl bV9jbG9jazo6dGltZV9wb2ludCwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBjb21wbGV0aW9uSGFu ZGxlcik7CisgICAgdm9pZCByZW1vdmVEYXRhKFdlYnNpdGVEYXRhVHlwZXMsIHN0ZDo6Y2hyb25v OjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQgbW9kaWZpZWRTaW5jZSwgc3RkOjpmdW5jdGlvbjx2 b2lkICgpPiBjb21wbGV0aW9uSGFuZGxlcik7CiAKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgV2Vi c2l0ZURhdGFTdG9yZShXZWJDb3JlOjpTZXNzaW9uSUQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYktpdDIv V2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IGMxYzNlYjhhY2JmNTI2Mjcx ZWM3OGQxMzEyYTkwZGMzM2NhNWRkOGYuLjBmNWJhZGE2MTJmMGZiMTVhNWY1Y2FkOGQyMTAyNTFh NDU2OWM5MWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3By b2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oKQEAgLTIzOTgsNiArMjM5OCw3IEBACiAJCTFBQkMzREYzMTg5OUU0MzcwMDRG MDYyNiAvKiBOYXZpZ2F0aW9uU3RhdGUubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpj cHA7IHBhdGggPSBOYXZpZ2F0aW9uU3RhdGUubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTFBQkMzREY0MTg5OUU0MzcwMDRGMDYyNiAvKiBOYXZpZ2F0aW9uU3RhdGUuaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gTmF2aWdhdGlvblN0YXRlLmg7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTFBQkMzREZCMTg5OUY1MUMwMDRGMDYyNiAvKiBXS05hdmlnYXRp b25EZWxlZ2F0ZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXS05hdmlnYXRp b25EZWxlZ2F0ZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQUJGNDM3OTFBMzY4 MDUwMDAzRkIwRTYgLyogV2Vic2l0ZURhdGFUeXBlcy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBXZWJzaXRlRGF0YVR5cGVzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTFBQzAyNzNFMTk2NjIyRDYwMEMxMkI3NSAvKiBXZWJQYWdlUHJveHlDb2NvYS5tbSAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFdlYlBhZ2VQcm94eUNvY29hLm1t OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQUMxMzM2NTE4NTY1QjU3MDBGM0VDMDUg LyogVXNlckRhdGEuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gVXNl ckRhdGEuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQUMxMzM2NjE4NTY1QjU3 MDBGM0VDMDUgLyogVXNlckRhdGEuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g VXNlckRhdGEuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTQ0MjMsNiArNDQyNCw3 IEBACiAJCQkJMUFBRTA1OEMxMjc5RENENDAwODUyNDE4IC8qIFBsdWdpbnMgKi8sCiAJCQkJMzcw OTUwNDkxOEE5RkFEMjAwODdBRTVEIC8qIHBvc2l4ICovLAogCQkJCTBGNTk0N0EwMTg3QjNCNzEw MDQzNzg1NyAvKiBTY3JvbGxpbmcgKi8sCisJCQkJMUFCRjQzNzgxQTM2ODAzNTAwM0ZCMEU2IC8q IFdlYnNpdGVEYXRhICovLAogCQkJCUJDNjQ2OTZEMTFEQkU2MDMwMDY0NTVCMCAvKiBBUElBcnJh eS5jcHAgKi8sCiAJCQkJQkM2NDY5NkUxMURCRTYwMzAwNjQ1NUIwIC8qIEFQSUFycmF5LmggKi8s CiAJCQkJMUEzREQyMDUxMjVFNUEyRjAwNDUxNUU2IC8qIEFQSUNsaWVudC5oICovLApAQCAtNDY5 NCw2ICs0Njk2LDE0IEBACiAJCQlwYXRoID0gQ29jb2E7CiAJCQlzb3VyY2VUcmVlID0gIjxncm91 cD4iOwogCQl9OworCQkxQUJGNDM3ODFBMzY4MDM1MDAzRkIwRTYgLyogV2Vic2l0ZURhdGEgKi8g PSB7CisJCQlpc2EgPSBQQlhHcm91cDsKKwkJCWNoaWxkcmVuID0gKAorCQkJCTFBQkY0Mzc5MUEz NjgwNTAwMDNGQjBFNiAvKiBXZWJzaXRlRGF0YVR5cGVzLmggKi8sCisJCQkpOworCQkJcGF0aCA9 IFdlYnNpdGVEYXRhOworCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsKKwkJfTsKIAkJMUFFMDBE NjgxODMyN0MxMjAwMDg3REQ3IC8qIElQQyAqLyA9IHsKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJ Y2hpbGRyZW4gPSAoCg==