152351 2015-12-16 12:12:11 -0800 Modern IDB: Have IDBServerOperations know whether they represent an open or delete request 2015-12-16 12:30:06 -0800 1 1 1 Unclassified WebKit WebCore Misc. Safari 9 Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 1 beidson beidson achristensen alecflett commit-queue jsbell oldest_to_newest 1149717 0 beidson 2015-12-16 12:12:11 -0800 Modern IDB: Have IDBServerOperations know whether they represent an open or delete request 1149718 1 267479 beidson 2015-12-16 12:13:54 -0800 Created attachment 267479 Patch v1 1149720 2 267479 achristensen 2015-12-16 12:24:39 -0800 Comment on attachment 267479 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=267479&action=review > Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp:58 > + m_requestType = requestType; m_requestType(requestType) > Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp:254 > + auto operation = m_currentOperation; > + m_currentOperation = nullptr; WTF::move 1149722 3 beidson 2015-12-16 12:27:18 -0800 (In reply to comment #2) > Comment on attachment 267479 [details] > Patch v1 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=267479&action=review > > > Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp:58 > > + m_requestType = requestType; > > m_requestType(requestType) m_requestType belongs to the super class, so the subclass can't initialize it directly. > > > Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp:254 > > + auto operation = m_currentOperation; > > + m_currentOperation = nullptr; > > WTF::move Will-do 1149723 4 beidson 2015-12-16 12:30:06 -0800 http://trac.webkit.org/changeset/194169 267479 2015-12-16 12:13:54 -0800 2015-12-16 12:24:39 -0800 Patch v1 patch text/plain 13975 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiMjcxMTBjLi41OWVkYWFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDQg QEAKIDIwMTUtMTItMTYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIE1vZGVybiBJREI6IEhhdmUgSURCU2VydmVyT3BlcmF0aW9ucyBrbm93IHdoZXRoZXIgdGhl eSByZXByZXNlbnQgYW4gb3BlbiBvciBkZWxldGUgcmVxdWVzdC4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjM1MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoUmVmYWN0b3IsIGV4 aXN0aW5nIHRlc3RzIHBhc3MpLgorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSW5kZXhl ZERCLmg6CisgICAgICAgIAorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJP cGVuREJSZXF1ZXN0SW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6OklEQk9w ZW5EQlJlcXVlc3Q6OmNyZWF0ZURlbGV0ZVJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6SURC Q2xpZW50OjpJREJPcGVuREJSZXF1ZXN0OjpjcmVhdGVPcGVuUmVxdWVzdCk6CisgICAgICAgIChX ZWJDb3JlOjpJREJDbGllbnQ6OklEQk9wZW5EQlJlcXVlc3Q6OklEQk9wZW5EQlJlcXVlc3QpOgor ICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJPcGVuREJSZXF1ZXN0SW1wbC5o OgorICAgICAgICAKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCUmVxdWVz dEltcGwuaDoKKyAgICAgICAgKFdlYkNvcmU6OklEQkNsaWVudDo6SURCUmVxdWVzdDo6cmVxdWVz dFR5cGUpOgorICAgICAgICAKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURC U2VydmVyT3BlcmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6SURCU2Vy dmVyT3BlcmF0aW9uOjppc09wZW5SZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZl cjo6SURCU2VydmVyT3BlcmF0aW9uOjppc0RlbGV0ZVJlcXVlc3QpOgorICAgICAgICAqIE1vZHVs ZXMvaW5kZXhlZGRiL3NlcnZlci9JREJTZXJ2ZXJPcGVyYXRpb24uaDoKKyAgICAgICAgCisgICAg ICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2U6Om1heWJlRGVsZXRl RGF0YWJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpVbmlxdWVJREJEYXRhYmFz ZTo6aGFuZGxlT3BlbkRhdGFiYXNlT3BlcmF0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpJREJT ZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNlOjpzdGFydFZlcnNpb25DaGFuZ2VUcmFuc2FjdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNlOjpub3RpZnlD b25uZWN0aW9uc09mVmVyc2lvbkNoYW5nZUZvclVwZ3JhZGUpOgorICAgICAgICAoV2ViQ29yZTo6 SURCU2VydmVyOjpVbmlxdWVJREJEYXRhYmFzZTo6b3BlcmF0aW9uQW5kVHJhbnNhY3Rpb25UaW1l ckZpcmVkKToKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0 YWJhc2UuaDoKKyAgICAgICAgCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lE QlJlcXVlc3REYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQlJlcXVlc3REYXRhOjpJREJS ZXF1ZXN0RGF0YSk6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lEQlJlcXVl c3REYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjpJREJSZXF1ZXN0RGF0YTo6aXNPcGVuUmVxdWVz dCk6CisgICAgICAgIChXZWJDb3JlOjpJREJSZXF1ZXN0RGF0YTo6aXNEZWxldGVSZXF1ZXN0KToK KworMjAxNS0xMi0xNiAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAgICAg ICAgTW9kZXJuIElEQjogQ29tYmluZSBoYW5kbGluZyBvcGVuIHJlcXVlc3RzLCBkZWxldGUgcmVx dWVzdHMsIGFuZCB0cmFuc2FjdGlvbnMgaW50byBvbmUgdGltZXIuCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTIzNDQKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSW5kZXhlZERCLmggYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2luZGV4ZWRkYi9JbmRleGVkREIuaAppbmRleCAzNWFhZGIxLi45OWM3MjUwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JbmRleGVkREIuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JbmRleGVkREIuaApAQCAtOTks NiArOTksMTIgQEAgZW51bSBLZXlUeXBlIHsKICAgICBNaW4sCiB9OwogCitlbnVtIGNsYXNzIFJl cXVlc3RUeXBlIHsKKyAgICBPcGVuLAorICAgIERlbGV0ZSwKKyAgICBPdGhlciwKK307CisKIH0g Ly8gbmFtZXNwYWNlIEluZGV4ZWREQgogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCT3BlbkRCUmVx dWVzdEltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lE Qk9wZW5EQlJlcXVlc3RJbXBsLmNwcAppbmRleCBlM2UyZWNkLi5iZDE1MjdjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCT3BlbkRCUmVxdWVz dEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9J REJPcGVuREJSZXF1ZXN0SW1wbC5jcHAKQEAgLTQxLDIwICs0MSwyMSBAQCBuYW1lc3BhY2UgSURC Q2xpZW50IHsKIFJlZjxJREJPcGVuREJSZXF1ZXN0PiBJREJPcGVuREJSZXF1ZXN0OjpjcmVhdGVE ZWxldGVSZXF1ZXN0KElEQkNvbm5lY3Rpb25Ub1NlcnZlciYgY29ubmVjdGlvbiwgU2NyaXB0RXhl Y3V0aW9uQ29udGV4dCogY29udGV4dCwgY29uc3QgSURCRGF0YWJhc2VJZGVudGlmaWVyJiBkYXRh YmFzZUlkZW50aWZpZXIpCiB7CiAgICAgQVNTRVJUKGRhdGFiYXNlSWRlbnRpZmllci5pc1ZhbGlk KCkpOwotICAgIHJldHVybiBhZG9wdFJlZigqbmV3IElEQk9wZW5EQlJlcXVlc3QoY29ubmVjdGlv biwgY29udGV4dCwgZGF0YWJhc2VJZGVudGlmaWVyLCAwKSk7CisgICAgcmV0dXJuIGFkb3B0UmVm KCpuZXcgSURCT3BlbkRCUmVxdWVzdChjb25uZWN0aW9uLCBjb250ZXh0LCBkYXRhYmFzZUlkZW50 aWZpZXIsIDAsIEluZGV4ZWREQjo6UmVxdWVzdFR5cGU6OkRlbGV0ZSkpOwogfQogCiBSZWY8SURC T3BlbkRCUmVxdWVzdD4gSURCT3BlbkRCUmVxdWVzdDo6Y3JlYXRlT3BlblJlcXVlc3QoSURCQ29u bmVjdGlvblRvU2VydmVyJiBjb25uZWN0aW9uLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250 ZXh0LCBjb25zdCBJREJEYXRhYmFzZUlkZW50aWZpZXImIGRhdGFiYXNlSWRlbnRpZmllciwgdWlu dDY0X3QgdmVyc2lvbikKIHsKICAgICBBU1NFUlQoZGF0YWJhc2VJZGVudGlmaWVyLmlzVmFsaWQo KSk7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgSURCT3BlbkRCUmVxdWVzdChjb25uZWN0aW9u LCBjb250ZXh0LCBkYXRhYmFzZUlkZW50aWZpZXIsIHZlcnNpb24pKTsKKyAgICByZXR1cm4gYWRv cHRSZWYoKm5ldyBJREJPcGVuREJSZXF1ZXN0KGNvbm5lY3Rpb24sIGNvbnRleHQsIGRhdGFiYXNl SWRlbnRpZmllciwgdmVyc2lvbiwgSW5kZXhlZERCOjpSZXF1ZXN0VHlwZTo6T3BlbikpOwogfQog ICAgIAotSURCT3BlbkRCUmVxdWVzdDo6SURCT3BlbkRCUmVxdWVzdChJREJDb25uZWN0aW9uVG9T ZXJ2ZXImIGNvbm5lY3Rpb24sIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIGNvbnN0 IElEQkRhdGFiYXNlSWRlbnRpZmllciYgZGF0YWJhc2VJZGVudGlmaWVyLCB1aW50NjRfdCB2ZXJz aW9uKQorSURCT3BlbkRCUmVxdWVzdDo6SURCT3BlbkRCUmVxdWVzdChJREJDb25uZWN0aW9uVG9T ZXJ2ZXImIGNvbm5lY3Rpb24sIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIGNvbnN0 IElEQkRhdGFiYXNlSWRlbnRpZmllciYgZGF0YWJhc2VJZGVudGlmaWVyLCB1aW50NjRfdCB2ZXJz aW9uLCBJbmRleGVkREI6OlJlcXVlc3RUeXBlIHJlcXVlc3RUeXBlKQogICAgIDogSURCUmVxdWVz dChjb25uZWN0aW9uLCBjb250ZXh0KQogICAgICwgbV9kYXRhYmFzZUlkZW50aWZpZXIoZGF0YWJh c2VJZGVudGlmaWVyKQogICAgICwgbV92ZXJzaW9uKHZlcnNpb24pCiB7CisgICAgbV9yZXF1ZXN0 VHlwZSA9IHJlcXVlc3RUeXBlOwogfQogCiBJREJPcGVuREJSZXF1ZXN0Ojp+SURCT3BlbkRCUmVx dWVzdCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGll bnQvSURCT3BlbkRCUmVxdWVzdEltcGwuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL2NsaWVudC9JREJPcGVuREJSZXF1ZXN0SW1wbC5oCmluZGV4IDRmY2I3YTYuLmRhYTlmNmYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJP cGVuREJSZXF1ZXN0SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L2NsaWVudC9JREJPcGVuREJSZXF1ZXN0SW1wbC5oCkBAIC01OCw3ICs1OCw3IEBAIHB1YmxpYzoK ICAgICB2b2lkIGZpcmVFcnJvckFmdGVyVmVyc2lvbkNoYW5nZUNvbXBsZXRpb24oKTsKIAogcHJp dmF0ZToKLSAgICBJREJPcGVuREJSZXF1ZXN0KElEQkNvbm5lY3Rpb25Ub1NlcnZlciYsIFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQqLCBjb25zdCBJREJEYXRhYmFzZUlkZW50aWZpZXImLCB1aW50NjRf dCB2ZXJzaW9uKTsKKyAgICBJREJPcGVuREJSZXF1ZXN0KElEQkNvbm5lY3Rpb25Ub1NlcnZlciYs IFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBjb25zdCBJREJEYXRhYmFzZUlkZW50aWZpZXImLCB1 aW50NjRfdCB2ZXJzaW9uLCBJbmRleGVkREI6OlJlcXVlc3RUeXBlKTsKIAogICAgIHZvaWQgb25F cnJvcihjb25zdCBJREJSZXN1bHREYXRhJik7CiAgICAgdm9pZCBvblN1Y2Nlc3MoY29uc3QgSURC UmVzdWx0RGF0YSYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvY2xpZW50L0lEQlJlcXVlc3RJbXBsLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9jbGllbnQvSURCUmVxdWVzdEltcGwuaAppbmRleCA4ZGZhM2U1Li43ZGRjM2EwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCUmVxdWVz dEltcGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURC UmVxdWVzdEltcGwuaApAQCAtMTAwLDYgKzEwMCw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFNv dXJjZShJREJDdXJzb3ImKTsKICAgICB2b2lkIHNldFZlcnNpb25DaGFuZ2VUcmFuc2FjdGlvbihJ REJUcmFuc2FjdGlvbiYpOwogCisgICAgSW5kZXhlZERCOjpSZXF1ZXN0VHlwZSByZXF1ZXN0VHlw ZSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVxdWVzdFR5cGU7IH0KKwogcHJvdGVjdGVkOgogICAgIElE QlJlcXVlc3QoSURCQ29ubmVjdGlvblRvU2VydmVyJiwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCop OwogICAgIElEQlJlcXVlc3QoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIElEQk9iamVjdFN0b3Jl JiwgSURCVHJhbnNhY3Rpb24mKTsKQEAgLTEyNiw2ICsxMjgsNyBAQCBwcm90ZWN0ZWQ6CiAgICAg Ym9vbCBtX3Nob3VsZEV4cG9zZVRyYW5zYWN0aW9uVG9ET00geyB0cnVlIH07CiAgICAgUmVmUHRy PERPTUVycm9yPiBtX2RvbUVycm9yOwogICAgIElEQkVycm9yIG1faWRiRXJyb3I7CisgICAgSW5k ZXhlZERCOjpSZXF1ZXN0VHlwZSBtX3JlcXVlc3RUeXBlID0geyBJbmRleGVkREI6OlJlcXVlc3RU eXBlOjpPdGhlciB9OwogCiBwcml2YXRlOgogICAgIHZvaWQgb25FcnJvcigpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lEQlNlcnZlck9wZXJh dGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURCU2Vy dmVyT3BlcmF0aW9uLmNwcAppbmRleCA2ODE3NDRhLi4wMTk1ZTE4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURCU2VydmVyT3BlcmF0aW9uLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURCU2VydmVy T3BlcmF0aW9uLmNwcApAQCAtNDQsNiArNDQsMTYgQEAgSURCU2VydmVyT3BlcmF0aW9uOjpJREJT ZXJ2ZXJPcGVyYXRpb24oSURCQ29ubmVjdGlvblRvQ2xpZW50JiBjb25uZWN0aW9uLCBjb25zdAog ewogfQogCitib29sIElEQlNlcnZlck9wZXJhdGlvbjo6aXNPcGVuUmVxdWVzdCgpIGNvbnN0Cit7 CisgICAgcmV0dXJuIG1fcmVxdWVzdERhdGEuaXNPcGVuUmVxdWVzdCgpOworfQorCitib29sIElE QlNlcnZlck9wZXJhdGlvbjo6aXNEZWxldGVSZXF1ZXN0KCkgY29uc3QKK3sKKyAgICByZXR1cm4g bV9yZXF1ZXN0RGF0YS5pc0RlbGV0ZVJlcXVlc3QoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgSURC U2VydmVyCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9JREJTZXJ2ZXJPcGVyYXRpb24uaCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9JREJTZXJ2ZXJPcGVyYXRpb24uaApp bmRleCBjZmVjMDZjLi5hOWY5MTM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9zZXJ2ZXIvSURCU2VydmVyT3BlcmF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lEQlNlcnZlck9wZXJhdGlvbi5oCkBAIC00Myw2 ICs0Myw5IEBAIHB1YmxpYzoKICAgICBJREJDb25uZWN0aW9uVG9DbGllbnQmIGNvbm5lY3Rpb24o KSB7IHJldHVybiBtX2Nvbm5lY3Rpb247IH0KICAgICBjb25zdCBJREJSZXF1ZXN0RGF0YSYgcmVx dWVzdERhdGEoKSBjb25zdCB7IHJldHVybiBtX3JlcXVlc3REYXRhOyB9CiAKKyAgICBib29sIGlz T3BlblJlcXVlc3QoKSBjb25zdDsKKyAgICBib29sIGlzRGVsZXRlUmVxdWVzdCgpIGNvbnN0Owor CiBwcml2YXRlOgogICAgIElEQlNlcnZlck9wZXJhdGlvbihJREJDb25uZWN0aW9uVG9DbGllbnQm LCBjb25zdCBJREJSZXF1ZXN0RGF0YSYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcAppbmRl eCBkZGQ3MTVhLi44M2VkZGNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHAKQEAgLTEwOSw2 ICsxMDksNyBAQCBib29sIFVuaXF1ZUlEQkRhdGFiYXNlOjptYXliZURlbGV0ZURhdGFiYXNlKElE QlNlcnZlck9wZXJhdGlvbiogbmV3ZXN0RGVsZXRlT3BlcgogCiAgICAgZm9yIChhdXRvJiBvcGVy YXRpb24gOiBtX3BlbmRpbmdEZWxldGVEYXRhYmFzZU9wZXJhdGlvbnMpIHsKICAgICAgICAgQVNT RVJUKG1fZGF0YWJhc2VJbmZvKTsKKyAgICAgICAgQVNTRVJUKG9wZXJhdGlvbi0+aXNEZWxldGVS ZXF1ZXN0KCkpOwogICAgICAgICBvcGVyYXRpb24tPmNvbm5lY3Rpb24oKS5kaWREZWxldGVEYXRh YmFzZShJREJSZXN1bHREYXRhOjpkZWxldGVEYXRhYmFzZVN1Y2Nlc3Mob3BlcmF0aW9uLT5yZXF1 ZXN0RGF0YSgpLnJlcXVlc3RJZGVudGlmaWVyKCksICptX2RhdGFiYXNlSW5mbykpOwogICAgIH0K IApAQCAtMTU4LDEwICsxNTksMTAgQEAgdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6aGFuZGxlT3Bl bkRhdGFiYXNlT3BlcmF0aW9ucygpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBBU1NF UlQoIW1fdmVyc2lvbkNoYW5nZU9wZXJhdGlvbik7CisgICAgQVNTRVJUKCFtX2N1cnJlbnRPcGVy YXRpb24pOwogICAgIEFTU0VSVCghbV92ZXJzaW9uQ2hhbmdlRGF0YWJhc2VDb25uZWN0aW9uKTsK IAotICAgIG1fdmVyc2lvbkNoYW5nZU9wZXJhdGlvbiA9IGFkb3B0UmVmKG9wZXJhdGlvbi5sZWFr UmVmKCkpOworICAgIG1fY3VycmVudE9wZXJhdGlvbiA9IFdURjo6bW92ZShvcGVyYXRpb24pOwog ICAgIG1fdmVyc2lvbkNoYW5nZURhdGFiYXNlQ29ubmVjdGlvbiA9IHJhd0Nvbm5lY3Rpb247CiAK ICAgICAvLyAzLjMuNyAidmVyc2lvbmNoYW5nZSIgdHJhbnNhY3Rpb24gc3RlcHMKQEAgLTE3NSw3 ICsxNzYsNyBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpoYW5kbGVPcGVuRGF0YWJhc2VPcGVy YXRpb25zKCkKICAgICBub3RpZnlDb25uZWN0aW9uc09mVmVyc2lvbkNoYW5nZUZvclVwZ3JhZGUo KTsKIAogICAgIC8vIEFuZCB3ZSBub3RpZnkgdGhpcyBPcGVuREJSZXF1ZXN0IHRoYXQgaXQgaXMg YmxvY2tlZCB1bnRpbCB0aG9zZSBjb25uZWN0aW9ucyBjbG9zZS4KLSAgICBtX3ZlcnNpb25DaGFu Z2VEYXRhYmFzZUNvbm5lY3Rpb24tPmNvbm5lY3Rpb25Ub0NsaWVudCgpLm5vdGlmeU9wZW5EQlJl cXVlc3RCbG9ja2VkKG1fdmVyc2lvbkNoYW5nZU9wZXJhdGlvbi0+cmVxdWVzdERhdGEoKS5yZXF1 ZXN0SWRlbnRpZmllcigpLCBtX2RhdGFiYXNlSW5mby0+dmVyc2lvbigpLCByZXF1ZXN0ZWRWZXJz aW9uKTsKKyAgICBtX3ZlcnNpb25DaGFuZ2VEYXRhYmFzZUNvbm5lY3Rpb24tPmNvbm5lY3Rpb25U b0NsaWVudCgpLm5vdGlmeU9wZW5EQlJlcXVlc3RCbG9ja2VkKG1fY3VycmVudE9wZXJhdGlvbi0+ cmVxdWVzdERhdGEoKS5yZXF1ZXN0SWRlbnRpZmllcigpLCBtX2RhdGFiYXNlSW5mby0+dmVyc2lv bigpLCByZXF1ZXN0ZWRWZXJzaW9uKTsKIH0KIAogYm9vbCBVbmlxdWVJREJEYXRhYmFzZTo6aGFz QW55T3BlbkNvbm5lY3Rpb25zKCkgY29uc3QKQEAgLTI0NSwxMSArMjQ2LDEyIEBAIHZvaWQgVW5p cXVlSURCRGF0YWJhc2U6OnN0YXJ0VmVyc2lvbkNoYW5nZVRyYW5zYWN0aW9uKCkKICAgICBMT0co SW5kZXhlZERCLCAiKG1haW4pIFVuaXF1ZUlEQkRhdGFiYXNlOjpzdGFydFZlcnNpb25DaGFuZ2VU cmFuc2FjdGlvbiIpOwogCiAgICAgQVNTRVJUKCFtX3ZlcnNpb25DaGFuZ2VUcmFuc2FjdGlvbik7 Ci0gICAgQVNTRVJUKG1fdmVyc2lvbkNoYW5nZU9wZXJhdGlvbik7CisgICAgQVNTRVJUKG1fY3Vy cmVudE9wZXJhdGlvbik7CisgICAgQVNTRVJUKG1fY3VycmVudE9wZXJhdGlvbi0+aXNPcGVuUmVx dWVzdCgpKTsKICAgICBBU1NFUlQobV92ZXJzaW9uQ2hhbmdlRGF0YWJhc2VDb25uZWN0aW9uKTsK IAotICAgIGF1dG8gb3BlcmF0aW9uID0gbV92ZXJzaW9uQ2hhbmdlT3BlcmF0aW9uOwotICAgIG1f dmVyc2lvbkNoYW5nZU9wZXJhdGlvbiA9IG51bGxwdHI7CisgICAgYXV0byBvcGVyYXRpb24gPSBt X2N1cnJlbnRPcGVyYXRpb247CisgICAgbV9jdXJyZW50T3BlcmF0aW9uID0gbnVsbHB0cjsKIAog ICAgIHVpbnQ2NF90IHJlcXVlc3RlZFZlcnNpb24gPSBvcGVyYXRpb24tPnJlcXVlc3REYXRhKCku cmVxdWVzdGVkVmVyc2lvbigpOwogICAgIGlmICghcmVxdWVzdGVkVmVyc2lvbikKQEAgLTI3NSwx MCArMjc3LDExIEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmJlZ2luVHJhbnNhY3Rpb25JbkJh Y2tpbmdTdG9yZShjb25zdCBJREJUcmFuc2FjdGlvbkluZm8mCiAKIHZvaWQgVW5pcXVlSURCRGF0 YWJhc2U6Om5vdGlmeUNvbm5lY3Rpb25zT2ZWZXJzaW9uQ2hhbmdlRm9yVXBncmFkZSgpCiB7Ci0g ICAgQVNTRVJUKG1fdmVyc2lvbkNoYW5nZU9wZXJhdGlvbik7CisgICAgQVNTRVJUKG1fY3VycmVu dE9wZXJhdGlvbik7CisgICAgQVNTRVJUKG1fY3VycmVudE9wZXJhdGlvbi0+aXNPcGVuUmVxdWVz dCgpKTsKICAgICBBU1NFUlQobV92ZXJzaW9uQ2hhbmdlRGF0YWJhc2VDb25uZWN0aW9uKTsKIAot ICAgIG5vdGlmeUNvbm5lY3Rpb25zT2ZWZXJzaW9uQ2hhbmdlKG1fdmVyc2lvbkNoYW5nZU9wZXJh dGlvbi0+cmVxdWVzdERhdGEoKS5yZXF1ZXN0ZWRWZXJzaW9uKCkpOworICAgIG5vdGlmeUNvbm5l Y3Rpb25zT2ZWZXJzaW9uQ2hhbmdlKG1fY3VycmVudE9wZXJhdGlvbi0+cmVxdWVzdERhdGEoKS5y ZXF1ZXN0ZWRWZXJzaW9uKCkpOwogfQogCiB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpub3RpZnlD b25uZWN0aW9uc09mVmVyc2lvbkNoYW5nZSh1aW50NjRfdCByZXF1ZXN0ZWRWZXJzaW9uKQpAQCAt OTIxLDcgKzkyNCw3IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6Om9wZXJhdGlvbkFuZFRyYW5z YWN0aW9uVGltZXJGaXJlZCgpCiAKICAgICAvLyBJZiB0aGUgZGF0YWJhc2Ugd2FzIG5vdCBkZWxl dGVkIGluIHRoZSBwcmV2aW91cyBzdGVwLCB0cnkgdG8gcnVuIGEgdHJhbnNhY3Rpb24gbm93Lgog ICAgIGlmIChtX3BlbmRpbmdUcmFuc2FjdGlvbnMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGlmICgh aGFzQW55T3BlbkNvbm5lY3Rpb25zKCkgJiYgbV92ZXJzaW9uQ2hhbmdlT3BlcmF0aW9uKSB7Cisg ICAgICAgIGlmICghaGFzQW55T3BlbkNvbm5lY3Rpb25zKCkgJiYgbV9jdXJyZW50T3BlcmF0aW9u KSB7CiAgICAgICAgICAgICBzdGFydFZlcnNpb25DaGFuZ2VUcmFuc2FjdGlvbigpOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuaCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5oCmluZGV4IDVmZmFi ZTcuLmRlODUyNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5oCkBAIC0xNzMsMTEgKzE3MywxMSBA QCBwcml2YXRlOgogICAgIAogICAgIERlcXVlPFJlZjxJREJTZXJ2ZXJPcGVyYXRpb24+PiBtX3Bl bmRpbmdPcGVuRGF0YWJhc2VPcGVyYXRpb25zOwogICAgIERlcXVlPFJlZjxJREJTZXJ2ZXJPcGVy YXRpb24+PiBtX3BlbmRpbmdEZWxldGVEYXRhYmFzZU9wZXJhdGlvbnM7CisgICAgUmVmUHRyPElE QlNlcnZlck9wZXJhdGlvbj4gbV9jdXJyZW50T3BlcmF0aW9uOwogCiAgICAgSGFzaFNldDxSZWZQ dHI8VW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uPj4gbV9vcGVuRGF0YWJhc2VDb25uZWN0aW9u czsKICAgICBIYXNoU2V0PFJlZlB0cjxVbmlxdWVJREJEYXRhYmFzZUNvbm5lY3Rpb24+PiBtX2Ns b3NlUGVuZGluZ0RhdGFiYXNlQ29ubmVjdGlvbnM7CiAKLSAgICBSZWZQdHI8SURCU2VydmVyT3Bl cmF0aW9uPiBtX3ZlcnNpb25DaGFuZ2VPcGVyYXRpb247CiAgICAgUmVmUHRyPFVuaXF1ZUlEQkRh dGFiYXNlQ29ubmVjdGlvbj4gbV92ZXJzaW9uQ2hhbmdlRGF0YWJhc2VDb25uZWN0aW9uOwogICAg IFVuaXF1ZUlEQkRhdGFiYXNlVHJhbnNhY3Rpb24qIG1fdmVyc2lvbkNoYW5nZVRyYW5zYWN0aW9u IHsgbnVsbHB0ciB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9zaGFyZWQvSURCUmVxdWVzdERhdGEuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvc2hhcmVkL0lEQlJlcXVlc3REYXRhLmNwcAppbmRleCBjMDViNWIzYy4uYzExMjE3 ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lE QlJlcXVlc3REYXRhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9z aGFyZWQvSURCUmVxdWVzdERhdGEuY3BwCkBAIC0zOCw2ICszOCw3IEBAIElEQlJlcXVlc3REYXRh OjpJREJSZXF1ZXN0RGF0YShjb25zdCBJREJDbGllbnQ6OklEQkNvbm5lY3Rpb25Ub1NlcnZlciYg Y29ubmVjdGlvCiAgICAgLCBtX3JlcXVlc3RJZGVudGlmaWVyKHN0ZDo6bWFrZV91bmlxdWU8SURC UmVzb3VyY2VJZGVudGlmaWVyPihjb25uZWN0aW9uLCByZXF1ZXN0KSkKICAgICAsIG1fZGF0YWJh c2VJZGVudGlmaWVyKHJlcXVlc3QuZGF0YWJhc2VJZGVudGlmaWVyKCkpCiAgICAgLCBtX3JlcXVl c3RlZFZlcnNpb24ocmVxdWVzdC52ZXJzaW9uKCkpCisgICAgLCBtX3JlcXVlc3RUeXBlKHJlcXVl c3QucmVxdWVzdFR5cGUoKSkKIHsKIH0KIApAQCAtNjIsNiArNjMsNyBAQCBJREJSZXF1ZXN0RGF0 YTo6SURCUmVxdWVzdERhdGEoY29uc3QgSURCUmVxdWVzdERhdGEmIG90aGVyKQogICAgICwgbV9p bmRleFJlY29yZFR5cGUob3RoZXIubV9pbmRleFJlY29yZFR5cGUpCiAgICAgLCBtX2RhdGFiYXNl SWRlbnRpZmllcihvdGhlci5tX2RhdGFiYXNlSWRlbnRpZmllcikKICAgICAsIG1fcmVxdWVzdGVk VmVyc2lvbihvdGhlci5tX3JlcXVlc3RlZFZlcnNpb24pCisgICAgLCBtX3JlcXVlc3RUeXBlKG90 aGVyLm1fcmVxdWVzdFR5cGUpCiB7CiAgICAgaWYgKG90aGVyLm1fcmVxdWVzdElkZW50aWZpZXIp CiAgICAgICAgIG1fcmVxdWVzdElkZW50aWZpZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPElEQlJlc291 cmNlSWRlbnRpZmllcj4oKm90aGVyLm1fcmVxdWVzdElkZW50aWZpZXIpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lEQlJlcXVlc3REYXRhLmgg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURCUmVxdWVzdERhdGEu aAppbmRleCBhMmU2NTQ2Li4zZTEzMTJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURCUmVxdWVzdERhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURCUmVxdWVzdERhdGEuaApAQCAtMzAsNiArMzAs NyBAQAogCiAjaW5jbHVkZSAiSURCRGF0YWJhc2VJZGVudGlmaWVyLmgiCiAjaW5jbHVkZSAiSURC UmVzb3VyY2VJZGVudGlmaWVyLmgiCisjaW5jbHVkZSAiSW5kZXhlZERCLmgiCiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIApAQCAtNjEsNiArNjIsOSBAQCBwdWJsaWM6CiAgICAgY29uc3QgSURCRGF0 YWJhc2VJZGVudGlmaWVyJiBkYXRhYmFzZUlkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBtX2Rh dGFiYXNlSWRlbnRpZmllcjsgfQogICAgIHVpbnQ2NF90IHJlcXVlc3RlZFZlcnNpb24oKSBjb25z dDsKIAorICAgIGJvb2wgaXNPcGVuUmVxdWVzdCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVxdWVzdFR5 cGUgPT0gSW5kZXhlZERCOjpSZXF1ZXN0VHlwZTo6T3BlbjsgfQorICAgIGJvb2wgaXNEZWxldGVS ZXF1ZXN0KCkgY29uc3QgeyByZXR1cm4gbV9yZXF1ZXN0VHlwZSA9PSBJbmRleGVkREI6OlJlcXVl c3RUeXBlOjpEZWxldGU7IH0KKwogICAgIElEQlJlcXVlc3REYXRhIGlzb2xhdGVkQ29weSgpOwog CiBwcml2YXRlOgpAQCAtNzQsNiArNzgsOCBAQCBwcml2YXRlOgogCiAgICAgSURCRGF0YWJhc2VJ ZGVudGlmaWVyIG1fZGF0YWJhc2VJZGVudGlmaWVyOwogICAgIHVpbnQ2NF90IG1fcmVxdWVzdGVk VmVyc2lvbiB7IDAgfTsKKworICAgIEluZGV4ZWREQjo6UmVxdWVzdFR5cGUgbV9yZXF1ZXN0VHlw ZSB7IEluZGV4ZWREQjo6UmVxdWVzdFR5cGU6Ok90aGVyIH07CiB9OwogCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCg==