156916 2016-04-22 10:18:05 -0700 Modern IDB: Rework the ownership/RefCounting model of IDBConnectionToServer and IDBConnectionProxy 2016-04-22 11:06:10 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 149953 1 beidson beidson alecflett cdumez commit-queue esprehn+autocc jsbell kangil.han oldest_to_newest 1186294 0 beidson 2016-04-22 10:18:05 -0700 Modern IDB: Rework the ownership/RefCounting model of IDBConnectionToServer and IDBConnectionProxy The ConnectionToServer should own its own ConnectionProxy, and ref()'ing the proxy should simply ref() the connection itself. 1186296 1 277070 beidson 2016-04-22 10:20:56 -0700 Created attachment 277070 Patch v1 1186301 2 277070 thorton 2016-04-22 10:28:46 -0700 Comment on attachment 277070 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=277070&action=review > Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp:51 > + m_proxy = std::make_unique<IDBConnectionProxy>(*this); Can't you do this in the initializer list? I feel like e.g. WebPageProxy does. 1186302 3 beidson 2016-04-22 10:29:45 -0700 (In reply to comment #2) > Comment on attachment 277070 [details] > Patch v1 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=277070&action=review > > > Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp:51 > > + m_proxy = std::make_unique<IDBConnectionProxy>(*this); > > Can't you do this in the initializer list? I feel like e.g. WebPageProxy > does. Yah. 1186325 4 beidson 2016-04-22 11:04:41 -0700 Build breakage was due to missing an exported header from WebCore. Fixed. Also, had to reorder one clause in WK2 to make the identifier available at the time the connection is created. 1186326 5 beidson 2016-04-22 11:06:10 -0700 http://trac.webkit.org/changeset/199882 277070 2016-04-22 10:20:56 -0700 2016-04-22 10:28:46 -0700 Patch v1 patch text/plain 8661 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjZWRjNmE2Li43OWJkOTk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTYtMDQtMjIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIE1vZGVybiBJREI6IFJld29yayB0aGUgb3duZXJzaGlwL1JlZkNvdW50aW5nIG1vZGVsIG9m IElEQkNvbm5lY3Rpb25Ub1NlcnZlciBhbmQgSURCQ29ubmVjdGlvblByb3h5LgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2OTE2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChObyBi ZWhhdmlvciBjaGFuZ2UpLgorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCRmFjdG9y eS5jcHA6IFJlbW92ZSB1bm5lZWRlZCBpbmNsdWRlLgorICAgICAgICAKKyAgICAgICAgKiBNb2R1 bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCQ29ubmVjdGlvblByb3h5LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OklEQkNsaWVudDo6SURCQ29ubmVjdGlvblByb3h5OjpyZWYpOiBSZWYgdGhlIENvbm5l Y3Rpb25Ub1NlcnZlci4KKyAgICAgICAgKFdlYkNvcmU6OklEQkNsaWVudDo6SURCQ29ubmVjdGlv blByb3h5OjpkZXJlZik6IERlcmVmIGl0LgorICAgICAgICAoV2ViQ29yZTo6SURCQ2xpZW50OjpJ REJDb25uZWN0aW9uUHJveHk6OmNvbm5lY3Rpb25Ub1NlcnZlcik6CisgICAgICAgIChXZWJDb3Jl OjpJREJDbGllbnQ6OklEQkNvbm5lY3Rpb25Qcm94eTo6b3BlbkRhdGFiYXNlKToKKyAgICAgICAg KFdlYkNvcmU6OklEQkNsaWVudDo6SURCQ29ubmVjdGlvblByb3h5OjpkZWxldGVEYXRhYmFzZSk6 CisgICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6OklEQkNvbm5lY3Rpb25Qcm94eTo6Y3JlYXRl KTogRGVsZXRlZC4KKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCQ29ubmVj dGlvblByb3h5Lmg6CisgICAgICAgIAorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL2NsaWVu dC9JREJDb25uZWN0aW9uVG9TZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCQ2xpZW50 OjpJREJDb25uZWN0aW9uVG9TZXJ2ZXI6OklEQkNvbm5lY3Rpb25Ub1NlcnZlcik6IENyZWF0ZSBh IHByb3h5IG93bmVkIGJ5IHRoaXMuCisgICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6OklEQkNv bm5lY3Rpb25Ub1NlcnZlcjo6cHJveHkpOiBFeHBvc2UgaXQuCisgICAgICAgICogTW9kdWxlcy9p bmRleGVkZGIvY2xpZW50L0lEQkNvbm5lY3Rpb25Ub1NlcnZlci5oOgorICAgICAgICAKKyAgICAg ICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmlkYkNv bm5lY3Rpb25Qcm94eSk6CisKIDIwMTYtMDQtMjEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBw bGUuY29tPgogCiAgICAgICAgIE1vZGVybiBJREIgKFdvcmtlcnMpOiBHZXQgdGhlIElEQkNvbm5l Y3Rpb25Qcm94eSBmcm9tIHRoZSBEb2N1bWVudCB0byB0aGUgV29ya2VyR2xvYmFsU2NvcGUuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJGYWN0b3J5LmNw cCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkZhY3RvcnkuY3BwCmluZGV4 IGVhYjY4ODkuLjAxZmI0MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQkZhY3RvcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL0lEQkZhY3RvcnkuY3BwCkBAIC0zMiw3ICszMiw2IEBACiAjaW5jbHVkZSAiRXhjZXB0aW9u Q29kZS5oIgogI2luY2x1ZGUgIklEQkJpbmRpbmdVdGlsaXRpZXMuaCIKICNpbmNsdWRlICJJREJD b25uZWN0aW9uUHJveHkuaCIKLSNpbmNsdWRlICJJREJDb25uZWN0aW9uVG9TZXJ2ZXIuaCIKICNp bmNsdWRlICJJREJEYXRhYmFzZUlkZW50aWZpZXIuaCIKICNpbmNsdWRlICJJREJLZXkuaCIKICNp bmNsdWRlICJJREJPcGVuREJSZXF1ZXN0LmgiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCQ29ubmVjdGlvblByb3h5LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJDb25uZWN0aW9uUHJveHkuY3BwCmlu ZGV4IGRlZTRhNWUuLjkxZDU3NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL2NsaWVudC9JREJDb25uZWN0aW9uUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJDb25uZWN0aW9uUHJveHkuY3BwCkBAIC0z NCwxMSArMzQsNiBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIElEQkNsaWVudCB7 CiAKLVJlZjxJREJDb25uZWN0aW9uUHJveHk+IElEQkNvbm5lY3Rpb25Qcm94eTo6Y3JlYXRlKElE QkNvbm5lY3Rpb25Ub1NlcnZlciYgY29ubmVjdGlvbikKLXsKLSAgICByZXR1cm4gYWRvcHRSZWYo Km5ldyBJREJDb25uZWN0aW9uUHJveHkoY29ubmVjdGlvbikpOwotfQotCiBJREJDb25uZWN0aW9u UHJveHk6OklEQkNvbm5lY3Rpb25Qcm94eShJREJDb25uZWN0aW9uVG9TZXJ2ZXImIGNvbm5lY3Rp b24pCiAgICAgOiBtX2Nvbm5lY3Rpb25Ub1NlcnZlcihjb25uZWN0aW9uKQogICAgICwgbV9zZXJ2 ZXJDb25uZWN0aW9uSWRlbnRpZmllcihjb25uZWN0aW9uLmlkZW50aWZpZXIoKSkKQEAgLTQ2LDEz ICs0MSwyMyBAQCBJREJDb25uZWN0aW9uUHJveHk6OklEQkNvbm5lY3Rpb25Qcm94eShJREJDb25u ZWN0aW9uVG9TZXJ2ZXImIGNvbm5lY3Rpb24pCiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsK IH0KIAordm9pZCBJREJDb25uZWN0aW9uUHJveHk6OnJlZigpCit7CisgICAgbV9jb25uZWN0aW9u VG9TZXJ2ZXIucmVmKCk7Cit9CisKK3ZvaWQgSURCQ29ubmVjdGlvblByb3h5OjpkZXJlZigpCit7 CisgICAgbV9jb25uZWN0aW9uVG9TZXJ2ZXIuZGVyZWYoKTsKK30KKwogLy8gRklYTUU6IFRlbXBv cmFyaWx5IHJlcXVpcmVkIGR1cmluZyBicmluZ3VwIG9mIElEQi1pbi1Xb3JrZXJzLgogLy8gT25j ZSBhbGwgSURCIG9iamVjdCByZWxpYW5jZSBvbiB0aGUgSURCQ29ubmVjdGlvblRvU2VydmVyIGhh cyBiZWVuIHNoaWZ0ZWQgdG8gcmVsaWFuY2Ugb24KIC8vIElEQkNvbm5lY3Rpb25Qcm94eSwgcmVt b3ZlIHRoaXMuCiBJREJDb25uZWN0aW9uVG9TZXJ2ZXImIElEQkNvbm5lY3Rpb25Qcm94eTo6Y29u bmVjdGlvblRvU2VydmVyKCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIHJl dHVybiBtX2Nvbm5lY3Rpb25Ub1NlcnZlci5nZXQoKTsKKyAgICByZXR1cm4gbV9jb25uZWN0aW9u VG9TZXJ2ZXI7CiB9CiAKIFJlZlB0cjxJREJPcGVuREJSZXF1ZXN0PiBJREJDb25uZWN0aW9uUHJv eHk6Om9wZW5EYXRhYmFzZShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBjb25zdCBJ REJEYXRhYmFzZUlkZW50aWZpZXImIGRhdGFiYXNlSWRlbnRpZmllciwgdWludDY0X3QgdmVyc2lv bikKQEAgLTYyLDcgKzY3LDcgQEAgUmVmUHRyPElEQk9wZW5EQlJlcXVlc3Q+IElEQkNvbm5lY3Rp b25Qcm94eTo6b3BlbkRhdGFiYXNlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQKICAgICAgICAgcmV0 dXJuIG51bGxwdHI7CiAKICAgICBhdXRvIHJlcXVlc3QgPSBJREJPcGVuREJSZXF1ZXN0OjpjcmVh dGVPcGVuUmVxdWVzdChjb250ZXh0LCAqdGhpcywgZGF0YWJhc2VJZGVudGlmaWVyLCB2ZXJzaW9u KTsKLSAgICBtX2Nvbm5lY3Rpb25Ub1NlcnZlci0+b3BlbkRhdGFiYXNlKHJlcXVlc3QuZ2V0KCkp OworICAgIG1fY29ubmVjdGlvblRvU2VydmVyLm9wZW5EYXRhYmFzZShyZXF1ZXN0LmdldCgpKTsK ICAgICByZXR1cm4gV1RGTW92ZShyZXF1ZXN0KTsKIH0KIApAQCAtNzMsNyArNzgsNyBAQCBSZWZQ dHI8SURCT3BlbkRCUmVxdWVzdD4gSURCQ29ubmVjdGlvblByb3h5OjpkZWxldGVEYXRhYmFzZShT Y3JpcHRFeGVjdXRpb25Db250ZQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIGF1dG8g cmVxdWVzdCA9IElEQk9wZW5EQlJlcXVlc3Q6OmNyZWF0ZURlbGV0ZVJlcXVlc3QoY29udGV4dCwg KnRoaXMsIGRhdGFiYXNlSWRlbnRpZmllcik7Ci0gICAgbV9jb25uZWN0aW9uVG9TZXJ2ZXItPmRl bGV0ZURhdGFiYXNlKHJlcXVlc3QuZ2V0KCkpOworICAgIG1fY29ubmVjdGlvblRvU2VydmVyLmRl bGV0ZURhdGFiYXNlKHJlcXVlc3QuZ2V0KCkpOwogICAgIHJldHVybiBXVEZNb3ZlKHJlcXVlc3Qp OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGll bnQvSURCQ29ubmVjdGlvblByb3h5LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9jbGllbnQvSURCQ29ubmVjdGlvblByb3h5LmgKaW5kZXggNjhhZTQxYS4uZWY1YmI3NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQkNvbm5l Y3Rpb25Qcm94eS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVu dC9JREJDb25uZWN0aW9uUHJveHkuaApAQCAtMjgsNiArMjgsNyBAQAogI2lmIEVOQUJMRShJTkRF WEVEX0RBVEFCQVNFKQogCiAjaW5jbHVkZSAiSURCQ29ubmVjdGlvblRvU2VydmVyLmgiCisjaW5j bHVkZSA8d3RmL1JlZlB0ci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTM3LDkgKzM4 LDExIEBAIGNsYXNzIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ7CiAKIG5hbWVzcGFjZSBJREJDbGll bnQgewogCi1jbGFzcyBJREJDb25uZWN0aW9uUHJveHkgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNv dW50ZWQ8SURCQ29ubmVjdGlvblByb3h5PiB7CitjbGFzcyBJREJDb25uZWN0aW9uVG9TZXJ2ZXI7 CisKK2NsYXNzIElEQkNvbm5lY3Rpb25Qcm94eSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZjxJ REJDb25uZWN0aW9uUHJveHk+IGNyZWF0ZShJREJDb25uZWN0aW9uVG9TZXJ2ZXImKTsKKyAgICBJ REJDb25uZWN0aW9uUHJveHkoSURCQ29ubmVjdGlvblRvU2VydmVyJik7CiAKICAgICBSZWZQdHI8 SURCT3BlbkRCUmVxdWVzdD4gb3BlbkRhdGFiYXNlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBj b25zdCBJREJEYXRhYmFzZUlkZW50aWZpZXImLCB1aW50NjRfdCB2ZXJzaW9uKTsKICAgICBSZWZQ dHI8SURCT3BlbkRCUmVxdWVzdD4gZGVsZXRlRGF0YWJhc2UoU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCYsIGNvbnN0IElEQkRhdGFiYXNlSWRlbnRpZmllciYpOwpAQCAtNTEsMTAgKzU0LDExIEBAIHB1 YmxpYzoKICAgICAvLyBJREJDb25uZWN0aW9uUHJveHksIHJlbW92ZSB0aGlzLgogICAgIElEQkNv bm5lY3Rpb25Ub1NlcnZlciYgY29ubmVjdGlvblRvU2VydmVyKCk7CiAKLXByaXZhdGU6Ci0gICAg SURCQ29ubmVjdGlvblByb3h5KElEQkNvbm5lY3Rpb25Ub1NlcnZlciYpOworICAgIHZvaWQgcmVm KCk7CisgICAgdm9pZCBkZXJlZigpOwogCi0gICAgUmVmPElEQkNvbm5lY3Rpb25Ub1NlcnZlcj4g bV9jb25uZWN0aW9uVG9TZXJ2ZXI7Citwcml2YXRlOgorICAgIElEQkNvbm5lY3Rpb25Ub1NlcnZl ciYgbV9jb25uZWN0aW9uVG9TZXJ2ZXI7CiAgICAgdWludDY0X3QgbV9zZXJ2ZXJDb25uZWN0aW9u SWRlbnRpZmllcjsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL2NsaWVudC9JREJDb25uZWN0aW9uVG9TZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQkNvbm5lY3Rpb25Ub1NlcnZlci5jcHAKaW5kZXgg ODNhYzNmNy4uNzMyZjUzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvY2xpZW50L0lEQkNvbm5lY3Rpb25Ub1NlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQkNvbm5lY3Rpb25Ub1NlcnZlci5jcHAKQEAg LTI4LDYgKzI4LDcgQEAKIAogI2lmIEVOQUJMRShJTkRFWEVEX0RBVEFCQVNFKQogCisjaW5jbHVk ZSAiSURCQ29ubmVjdGlvblByb3h5LmgiCiAjaW5jbHVkZSAiSURCRGF0YWJhc2UuaCIKICNpbmNs dWRlICJJREJLZXlSYW5nZURhdGEuaCIKICNpbmNsdWRlICJJREJPcGVuREJSZXF1ZXN0LmgiCkBA IC00Nyw2ICs0OCw3IEBAIFJlZjxJREJDb25uZWN0aW9uVG9TZXJ2ZXI+IElEQkNvbm5lY3Rpb25U b1NlcnZlcjo6Y3JlYXRlKElEQkNvbm5lY3Rpb25Ub1NlcnZlckRlCiBJREJDb25uZWN0aW9uVG9T ZXJ2ZXI6OklEQkNvbm5lY3Rpb25Ub1NlcnZlcihJREJDb25uZWN0aW9uVG9TZXJ2ZXJEZWxlZ2F0 ZSYgZGVsZWdhdGUpCiAgICAgOiBtX2RlbGVnYXRlKGRlbGVnYXRlKQogeworICAgIG1fcHJveHkg PSBzdGQ6Om1ha2VfdW5pcXVlPElEQkNvbm5lY3Rpb25Qcm94eT4oKnRoaXMpOwogfQogCiB1aW50 NjRfdCBJREJDb25uZWN0aW9uVG9TZXJ2ZXI6OmlkZW50aWZpZXIoKSBjb25zdApAQCAtNTQsNiAr NTYsMTIgQEAgdWludDY0X3QgSURCQ29ubmVjdGlvblRvU2VydmVyOjppZGVudGlmaWVyKCkgY29u c3QKICAgICByZXR1cm4gbV9kZWxlZ2F0ZS0+aWRlbnRpZmllcigpOwogfQogCitJREJDb25uZWN0 aW9uUHJveHkmIElEQkNvbm5lY3Rpb25Ub1NlcnZlcjo6cHJveHkoKQoreworICAgIEFTU0VSVCht X3Byb3h5KTsKKyAgICByZXR1cm4gKm1fcHJveHk7Cit9CisKIHZvaWQgSURCQ29ubmVjdGlvblRv U2VydmVyOjpkZWxldGVEYXRhYmFzZShJREJPcGVuREJSZXF1ZXN0JiByZXF1ZXN0KQogewogICAg IExPRyhJbmRleGVkREIsICJJREJDb25uZWN0aW9uVG9TZXJ2ZXI6OmRlbGV0ZURhdGFiYXNlIC0g JXMiLCByZXF1ZXN0LmRhdGFiYXNlSWRlbnRpZmllcigpLmRlYnVnU3RyaW5nKCkudXRmOCgpLmRh dGEoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGll bnQvSURCQ29ubmVjdGlvblRvU2VydmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9jbGllbnQvSURCQ29ubmVjdGlvblRvU2VydmVyLmgKaW5kZXggZTliMmI3Ny4uYjAxNDQx YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lE QkNvbm5lY3Rpb25Ub1NlcnZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL2NsaWVudC9JREJDb25uZWN0aW9uVG9TZXJ2ZXIuaApAQCAtMjcsNiArMjcsNyBAQAogCiAj aWYgRU5BQkxFKElOREVYRURfREFUQUJBU0UpCiAKKyNpbmNsdWRlICJJREJDb25uZWN0aW9uUHJv eHkuaCIKICNpbmNsdWRlICJJREJDb25uZWN0aW9uVG9TZXJ2ZXJEZWxlZ2F0ZS5oIgogI2luY2x1 ZGUgIklEQlJlc291cmNlSWRlbnRpZmllci5oIgogI2luY2x1ZGUgIlRyYW5zYWN0aW9uT3BlcmF0 aW9uLmgiCkBAIC01Niw2ICs1Nyw4IEBAIHB1YmxpYzoKIAogICAgIHVpbnQ2NF90IGlkZW50aWZp ZXIoKSBjb25zdDsKIAorICAgIElEQkNvbm5lY3Rpb25Qcm94eSYgcHJveHkoKTsKKwogICAgIHZv aWQgZGVsZXRlRGF0YWJhc2UoSURCT3BlbkRCUmVxdWVzdCYpOwogICAgIFdFQkNPUkVfRVhQT1JU IHZvaWQgZGlkRGVsZXRlRGF0YWJhc2UoY29uc3QgSURCUmVzdWx0RGF0YSYpOwogCkBAIC0xMzYs NiArMTM5LDggQEAgcHJpdmF0ZToKICAgICBIYXNoTWFwPElEQlJlc291cmNlSWRlbnRpZmllciwg UmVmUHRyPElEQlRyYW5zYWN0aW9uPj4gbV9jb21taXR0aW5nVHJhbnNhY3Rpb25zOwogICAgIEhh c2hNYXA8SURCUmVzb3VyY2VJZGVudGlmaWVyLCBSZWZQdHI8SURCVHJhbnNhY3Rpb24+PiBtX2Fi b3J0aW5nVHJhbnNhY3Rpb25zOwogICAgIEhhc2hNYXA8SURCUmVzb3VyY2VJZGVudGlmaWVyLCBS ZWZQdHI8VHJhbnNhY3Rpb25PcGVyYXRpb24+PiBtX2FjdGl2ZU9wZXJhdGlvbnM7CisKKyAgICBz dGQ6OnVuaXF1ZV9wdHI8SURCQ29ubmVjdGlvblByb3h5PiBtX3Byb3h5OwogfTsKIAogfSAvLyBu YW1lc3BhY2UgSURCQ2xpZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCAyY2ViZmU3Li5h MGI0YTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTMxMTYsNyArMzExNiw3IEBAIElE QkNsaWVudDo6SURCQ29ubmVjdGlvblByb3h5KiBEb2N1bWVudDo6aWRiQ29ubmVjdGlvblByb3h5 KCkKICAgICAgICAgaWYgKCFjdXJyZW50UGFnZSkKICAgICAgICAgICAgIHJldHVybiBudWxscHRy OwogCi0gICAgICAgIG1faWRiQ29ubmVjdGlvblByb3h5ID0gSURCQ2xpZW50OjpJREJDb25uZWN0 aW9uUHJveHk6OmNyZWF0ZShjdXJyZW50UGFnZS0+aWRiQ29ubmVjdGlvbigpKTsKKyAgICAgICAg bV9pZGJDb25uZWN0aW9uUHJveHkgPSAmY3VycmVudFBhZ2UtPmlkYkNvbm5lY3Rpb24oKS5wcm94 eSgpOwogICAgIH0KIAogICAgIHJldHVybiBtX2lkYkNvbm5lY3Rpb25Qcm94eS5nZXQoKTsK