147702 2015-08-05 15:53:59 -0700 Move some more DatabaseBackendBase functions to Database 2015-08-05 15:59:07 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1115148 0 andersca 2015-08-05 15:53:59 -0700 Move some more DatabaseBackendBase functions to Database 1115149 1 258313 andersca 2015-08-05 15:54:41 -0700 Created attachment 258313 Patch 1115151 2 258313 thorton 2015-08-05 15:55:36 -0700 Comment on attachment 258313 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258313&action=review > Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h:-119 > -private: Really? 1115155 3 andersca 2015-08-05 15:59:07 -0700 Committed r187996: <http://trac.webkit.org/changeset/187996> 258313 2015-08-05 15:54:41 -0700 2015-08-05 15:55:36 -0700 Patch bug-147702-20150805155433.patch text/plain 10569 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3OTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzM1ODYwMGQxOTE2YTZh ZTdkNmVjMjQ5MDM3N2U1ODc2YTljNzlkYi4uMTY2YzZjMjBkZDZjYTQwMzQ5ZTcxYzUzZDBhYzU1 OWMzZmQ3YzU3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2IEBACisyMDE1LTA4LTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSBzb21lIG1v cmUgRGF0YWJhc2VCYWNrZW5kQmFzZSBmdW5jdGlvbnMgdG8gRGF0YWJhc2UKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzcwMgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTW9kdWxlcy93ZWJkYXRhYmFz ZS9EYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmb3JtYXRFcnJvck1lc3NhZ2UpOgor ICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2U6OmRpc2FibGVBdXRob3JpemVyKToKKyAgICAgICAg KFdlYkNvcmU6OkRhdGFiYXNlOjplbmFibGVBdXRob3JpemVyKToKKyAgICAgICAgKFdlYkNvcmU6 OkRhdGFiYXNlOjpzZXRBdXRob3JpemVyUGVybWlzc2lvbnMpOgorICAgICAgICAoV2ViQ29yZTo6 RGF0YWJhc2U6Omxhc3RBY3Rpb25DaGFuZ2VkRGF0YWJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6 RGF0YWJhc2U6Omxhc3RBY3Rpb25XYXNJbnNlcnQpOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJh c2U6OnJlc2V0RGVsZXRlcyk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZTo6aGFkRGVsZXRl cyk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZTo6cmVzZXRBdXRob3JpemVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkRhdGFiYXNlOjppbmNyZW1lbnRhbFZhY3V1bUlmTmVlZGVkKToKKyAgICAg ICAgKiBNb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlLmg6CisgICAgICAgICogTW9kdWxlcy93 ZWJkYXRhYmFzZS9EYXRhYmFzZUJhY2tlbmRCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRh dGFiYXNlQmFja2VuZEJhc2U6OmRpc2FibGVBdXRob3JpemVyKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkRhdGFiYXNlQmFja2VuZEJhc2U6OmVuYWJsZUF1dGhvcml6ZXIpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VCYWNrZW5kQmFzZTo6c2V0QXV0aG9yaXplclBl cm1pc3Npb25zKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlQmFja2VuZEJh c2U6Omxhc3RBY3Rpb25DaGFuZ2VkRGF0YWJhc2UpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6RGF0YWJhc2VCYWNrZW5kQmFzZTo6bGFzdEFjdGlvbldhc0luc2VydCk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZUJhY2tlbmRCYXNlOjpyZXNldERlbGV0ZXMpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VCYWNrZW5kQmFzZTo6aGFkRGVsZXRlcyk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZUJhY2tlbmRCYXNlOjpyZXNldEF1 dGhvcml6ZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VCYWNrZW5kQmFz ZTo6aW5jcmVtZW50YWxWYWN1dW1JZk5lZWRlZCk6IERlbGV0ZWQuCisgICAgICAgICogTW9kdWxl cy93ZWJkYXRhYmFzZS9EYXRhYmFzZUJhY2tlbmRCYXNlLmg6CisKIDIwMTUtMDgtMDUgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgbW9yZSBk ZWFkIGRhdGFiYXNlIGNvZGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0NzY5OAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dl YmRhdGFiYXNlL0RhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJh c2UvRGF0YWJhc2UuY3BwCmluZGV4IDgyYTU5ODAwZTFlNzg1OTMxNDNkNDUyZTUyMDA4NzljOWZm ZmI3NzYuLjVhY2QxNDBjNjdkY2JhZGVjMmI0MTU5N2QyZjUwMjczMjlhM2VhNjcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuY3BwCkBAIC0zMSw2 ICszMSw3IEBACiAKICNpbmNsdWRlICJDaGFuZ2VWZXJzaW9uRGF0YS5oIgogI2luY2x1ZGUgIkNo YW5nZVZlcnNpb25XcmFwcGVyLmgiCisjaW5jbHVkZSAiRGF0YWJhc2VBdXRob3JpemVyLmgiCiAj aW5jbHVkZSAiRGF0YWJhc2VDYWxsYmFjay5oIgogI2luY2x1ZGUgIkRhdGFiYXNlQ29udGV4dC5o IgogI2luY2x1ZGUgIkRhdGFiYXNlTWFuYWdlci5oIgpAQCAtNDUsNiArNDYsNyBAQAogI2luY2x1 ZGUgIlNRTFRyYW5zYWN0aW9uLmgiCiAjaW5jbHVkZSAiU1FMVHJhbnNhY3Rpb25DYWxsYmFjay5o IgogI2luY2x1ZGUgIlNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjay5oIgorI2luY2x1ZGUgIlNR TGl0ZURhdGFiYXNlVHJhY2tlci5oIgogI2luY2x1ZGUgIlNRTGl0ZVN0YXRlbWVudC5oIgogI2lu Y2x1ZGUgIlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaCIKICNpbmNsdWRlICJTZWN1cml0eU9yaWdp bi5oIgpAQCAtNTQsMTIgKzU2LDEzIEBACiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgog I2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAotI2lmIFBMQVRGT1JNKElPUykKLSNpbmNs dWRlICJTUUxpdGVEYXRhYmFzZVRyYWNrZXIuaCIKLSNlbmRpZgotCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKK3N0YXRpYyBTdHJpbmcgZm9ybWF0RXJyb3JNZXNzYWdlKGNvbnN0IGNoYXIqIG1lc3Nh Z2UsIGludCBzcWxpdGVFcnJvckNvZGUsIGNvbnN0IGNoYXIqIHNxbGl0ZUVycm9yTWVzc2FnZSkK K3sKKyAgICByZXR1cm4gU3RyaW5nOjpmb3JtYXQoIiVzICglZCAlcykiLCBtZXNzYWdlLCBzcWxp dGVFcnJvckNvZGUsIHNxbGl0ZUVycm9yTWVzc2FnZSk7Cit9CisKIERhdGFiYXNlOjpEYXRhYmFz ZShQYXNzUmVmUHRyPERhdGFiYXNlQ29udGV4dD4gZGF0YWJhc2VDb250ZXh0LCBjb25zdCBTdHJp bmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgZXhwZWN0ZWRWZXJzaW9uLCBjb25zdCBTdHJpbmcmIGRp c3BsYXlOYW1lLCB1bnNpZ25lZCBsb25nIGVzdGltYXRlZFNpemUpCiAgICAgOiBEYXRhYmFzZUJh Y2tlbmRCYXNlKGRhdGFiYXNlQ29udGV4dC5nZXQoKSwgbmFtZSwgZXhwZWN0ZWRWZXJzaW9uLCBk aXNwbGF5TmFtZSwgZXN0aW1hdGVkU2l6ZSkKICAgICAsIG1fdHJhbnNhY3Rpb25JblByb2dyZXNz KGZhbHNlKQpAQCAtMjYwLDYgKzI2Myw1NCBAQCB2b2lkIERhdGFiYXNlOjpyZWFkVHJhbnNhY3Rp b24oUGFzc1JlZlB0cjxTUUxUcmFuc2FjdGlvbkNhbGxiYWNrPiBjYWxsYmFjaywgUGFzcwogICAg IHJ1blRyYW5zYWN0aW9uKGNhbGxiYWNrLCBlcnJvckNhbGxiYWNrLCBzdWNjZXNzQ2FsbGJhY2ss IHRydWUpOwogfQogCit2b2lkIERhdGFiYXNlOjpkaXNhYmxlQXV0aG9yaXplcigpCit7CisgICAg QVNTRVJUKG1fZGF0YWJhc2VBdXRob3JpemVyKTsKKyAgICBtX2RhdGFiYXNlQXV0aG9yaXplci0+ ZGlzYWJsZSgpOworfQorCit2b2lkIERhdGFiYXNlOjplbmFibGVBdXRob3JpemVyKCkKK3sKKyAg ICBBU1NFUlQobV9kYXRhYmFzZUF1dGhvcml6ZXIpOworICAgIG1fZGF0YWJhc2VBdXRob3JpemVy LT5lbmFibGUoKTsKK30KKwordm9pZCBEYXRhYmFzZTo6c2V0QXV0aG9yaXplclBlcm1pc3Npb25z KGludCBwZXJtaXNzaW9ucykKK3sKKyAgICBBU1NFUlQobV9kYXRhYmFzZUF1dGhvcml6ZXIpOwor ICAgIG1fZGF0YWJhc2VBdXRob3JpemVyLT5zZXRQZXJtaXNzaW9ucyhwZXJtaXNzaW9ucyk7Cit9 CisKK2Jvb2wgRGF0YWJhc2U6Omxhc3RBY3Rpb25DaGFuZ2VkRGF0YWJhc2UoKQoreworICAgIEFT U0VSVChtX2RhdGFiYXNlQXV0aG9yaXplcik7CisgICAgcmV0dXJuIG1fZGF0YWJhc2VBdXRob3Jp emVyLT5sYXN0QWN0aW9uQ2hhbmdlZERhdGFiYXNlKCk7Cit9CisKK2Jvb2wgRGF0YWJhc2U6Omxh c3RBY3Rpb25XYXNJbnNlcnQoKQoreworICAgIEFTU0VSVChtX2RhdGFiYXNlQXV0aG9yaXplcik7 CisgICAgcmV0dXJuIG1fZGF0YWJhc2VBdXRob3JpemVyLT5sYXN0QWN0aW9uV2FzSW5zZXJ0KCk7 Cit9CisKK3ZvaWQgRGF0YWJhc2U6OnJlc2V0RGVsZXRlcygpCit7CisgICAgQVNTRVJUKG1fZGF0 YWJhc2VBdXRob3JpemVyKTsKKyAgICBtX2RhdGFiYXNlQXV0aG9yaXplci0+cmVzZXREZWxldGVz KCk7Cit9CisKK2Jvb2wgRGF0YWJhc2U6OmhhZERlbGV0ZXMoKQoreworICAgIEFTU0VSVChtX2Rh dGFiYXNlQXV0aG9yaXplcik7CisgICAgcmV0dXJuIG1fZGF0YWJhc2VBdXRob3JpemVyLT5oYWRE ZWxldGVzKCk7Cit9CisKK3ZvaWQgRGF0YWJhc2U6OnJlc2V0QXV0aG9yaXplcigpCit7CisgICAg aWYgKG1fZGF0YWJhc2VBdXRob3JpemVyKQorICAgICAgICBtX2RhdGFiYXNlQXV0aG9yaXplci0+ cmVzZXQoKTsKK30KKwogdm9pZCBEYXRhYmFzZTo6cnVuVHJhbnNhY3Rpb24oUmVmUHRyPFNRTFRy YW5zYWN0aW9uQ2FsbGJhY2s+JiYgY2FsbGJhY2ssIFJlZlB0cjxTUUxUcmFuc2FjdGlvbkVycm9y Q2FsbGJhY2s+JiYgZXJyb3JDYWxsYmFjaywgUmVmUHRyPFZvaWRDYWxsYmFjaz4mJiBzdWNjZXNz Q2FsbGJhY2ssIGJvb2wgcmVhZE9ubHksIGNvbnN0IENoYW5nZVZlcnNpb25EYXRhKiBjaGFuZ2VW ZXJzaW9uRGF0YSkKIHsKICAgICBSZWZQdHI8U1FMVHJhbnNhY3Rpb24+IHRyYW5zYWN0aW9uID0g U1FMVHJhbnNhY3Rpb246OmNyZWF0ZSgqdGhpcywgV1RGOjptb3ZlKGNhbGxiYWNrKSwgV1RGOjpt b3ZlKHN1Y2Nlc3NDYWxsYmFjayksIGVycm9yQ2FsbGJhY2suY29weVJlZigpLCByZWFkT25seSk7 CkBAIC0zMTAsNiArMzYxLDE5IEBAIFZlY3RvcjxTdHJpbmc+IERhdGFiYXNlOjpwZXJmb3JtR2V0 VGFibGVOYW1lcygpCiAgICAgcmV0dXJuIHRhYmxlTmFtZXM7CiB9CiAKK3ZvaWQgRGF0YWJhc2U6 OmluY3JlbWVudGFsVmFjdXVtSWZOZWVkZWQoKQoreworICAgIFNRTGl0ZVRyYW5zYWN0aW9uSW5Q cm9ncmVzc0F1dG9Db3VudGVyIHRyYW5zYWN0aW9uQ291bnRlcjsKKworICAgIGludDY0X3QgZnJl ZVNwYWNlU2l6ZSA9IG1fc3FsaXRlRGF0YWJhc2UuZnJlZVNwYWNlU2l6ZSgpOworICAgIGludDY0 X3QgdG90YWxTaXplID0gbV9zcWxpdGVEYXRhYmFzZS50b3RhbFNpemUoKTsKKyAgICBpZiAodG90 YWxTaXplIDw9IDEwICogZnJlZVNwYWNlU2l6ZSkgeworICAgICAgICBpbnQgcmVzdWx0ID0gbV9z cWxpdGVEYXRhYmFzZS5ydW5JbmNyZW1lbnRhbFZhY3V1bUNvbW1hbmQoKTsKKyAgICAgICAgaWYg KHJlc3VsdCAhPSBTUUxJVEVfT0spCisgICAgICAgICAgICBsb2dFcnJvck1lc3NhZ2UoZm9ybWF0 RXJyb3JNZXNzYWdlKCJlcnJvciB2YWN1dW1pbmcgZGF0YWJhc2UiLCByZXN1bHQsIG1fc3FsaXRl RGF0YWJhc2UubGFzdEVycm9yTXNnKCkpKTsKKyAgICB9Cit9CisKIHZvaWQgRGF0YWJhc2U6Omxv Z0Vycm9yTWVzc2FnZShjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCiB7CiAgICAgbV9zY3JpcHRFeGVj dXRpb25Db250ZXh0LT5hZGRDb25zb2xlTWVzc2FnZShNZXNzYWdlU291cmNlOjpTdG9yYWdlLCBN ZXNzYWdlTGV2ZWw6OkVycm9yLCBtZXNzYWdlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv d2ViZGF0YWJhc2UvRGF0YWJhc2UuaAppbmRleCBjMTQwN2JlMDU0MWEwN2Q1ZjIyMzRhNjg5ZDM2 MGE0MjM4ZjE3MDRlLi42YjExMWQwODIzNGZkM2FhNThiYmJmYWUwYmE5OWRmZGQ5OTNmM2Q5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZS5oCkBAIC03 Nyw2ICs3NywxNSBAQCBwdWJsaWM6CiAgICAgdm9pZCByZWFkVHJhbnNhY3Rpb24oUGFzc1JlZlB0 cjxTUUxUcmFuc2FjdGlvbkNhbGxiYWNrPiwgUGFzc1JlZlB0cjxTUUxUcmFuc2FjdGlvbkVycm9y Q2FsbGJhY2s+LCBQYXNzUmVmUHRyPFZvaWRDYWxsYmFjaz4gc3VjY2Vzc0NhbGxiYWNrKTsKIAog ICAgIC8vIEludGVybmFsIGVuZ2luZSBzdXBwb3J0CisgICAgdm9pZCBkaXNhYmxlQXV0aG9yaXpl cigpOworICAgIHZvaWQgZW5hYmxlQXV0aG9yaXplcigpOworICAgIHZvaWQgc2V0QXV0aG9yaXpl clBlcm1pc3Npb25zKGludCk7CisgICAgYm9vbCBsYXN0QWN0aW9uQ2hhbmdlZERhdGFiYXNlKCk7 CisgICAgYm9vbCBsYXN0QWN0aW9uV2FzSW5zZXJ0KCk7CisgICAgdm9pZCByZXNldERlbGV0ZXMo KTsKKyAgICBib29sIGhhZERlbGV0ZXMoKTsKKyAgICB2b2lkIHJlc2V0QXV0aG9yaXplcigpOwor CiAgICAgRGF0YWJhc2VDb250ZXh0KiBkYXRhYmFzZUNvbnRleHQoKSBjb25zdCB7IHJldHVybiBt X2RhdGFiYXNlQ29udGV4dC5nZXQoKTsgfQogCiAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCog c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpIHsgcmV0dXJuIG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4 dC5nZXQoKTsgfQpAQCAtOTQsNiArMTAzLDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBw ZXJmb3JtT3BlbkFuZFZlcmlmeShib29sIHNldFZlcnNpb25Jbk5ld0RhdGFiYXNlLCBEYXRhYmFz ZUVycm9yJiwgU3RyaW5nJiBlcnJvck1lc3NhZ2UpOwogICAgIFZlY3RvcjxTdHJpbmc+IHBlcmZv cm1HZXRUYWJsZU5hbWVzKCk7CiAKKyAgICB2b2lkIGluY3JlbWVudGFsVmFjdXVtSWZOZWVkZWQo KTsKKwogcHJpdmF0ZToKICAgICBEYXRhYmFzZShQYXNzUmVmUHRyPERhdGFiYXNlQ29udGV4dD4s IGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiBleHBlY3RlZFZlcnNpb24sIGNvbnN0 IFN0cmluZyYgZGlzcGxheU5hbWUsIHVuc2lnbmVkIGxvbmcgZXN0aW1hdGVkU2l6ZSk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VCYWNr ZW5kQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNl QmFja2VuZEJhc2UuY3BwCmluZGV4IGJlM2Q1ZjlhNzM5ZGQ5NzU2ZWJiZjY5MzY0YWVjYzRlNjEw YjhkZjguLjFmMTQxNzdmYmUyODUyNDNkY2MxMjVhZmE1NDZmZTdjYzAyMzgyODAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VCYWNrZW5kQmFz ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZUJh Y2tlbmRCYXNlLmNwcApAQCAtNTIwLDcwICs1MjAsOSBAQCBib29sIERhdGFiYXNlQmFja2VuZEJh c2U6OmdldEFjdHVhbFZlcnNpb25Gb3JUcmFuc2FjdGlvbihTdHJpbmcgJmFjdHVhbFZlcnNpb24p CiAgICAgcmV0dXJuIGdldFZlcnNpb25Gcm9tRGF0YWJhc2UoYWN0dWFsVmVyc2lvbiwgdHJ1ZSk7 CiB9CiAKLXZvaWQgRGF0YWJhc2VCYWNrZW5kQmFzZTo6ZGlzYWJsZUF1dGhvcml6ZXIoKQotewot ICAgIEFTU0VSVChtX2RhdGFiYXNlQXV0aG9yaXplcik7Ci0gICAgbV9kYXRhYmFzZUF1dGhvcml6 ZXItPmRpc2FibGUoKTsKLX0KLQotdm9pZCBEYXRhYmFzZUJhY2tlbmRCYXNlOjplbmFibGVBdXRo b3JpemVyKCkKLXsKLSAgICBBU1NFUlQobV9kYXRhYmFzZUF1dGhvcml6ZXIpOwotICAgIG1fZGF0 YWJhc2VBdXRob3JpemVyLT5lbmFibGUoKTsKLX0KLQotdm9pZCBEYXRhYmFzZUJhY2tlbmRCYXNl OjpzZXRBdXRob3JpemVyUGVybWlzc2lvbnMoaW50IHBlcm1pc3Npb25zKQotewotICAgIEFTU0VS VChtX2RhdGFiYXNlQXV0aG9yaXplcik7Ci0gICAgbV9kYXRhYmFzZUF1dGhvcml6ZXItPnNldFBl cm1pc3Npb25zKHBlcm1pc3Npb25zKTsKLX0KLQotYm9vbCBEYXRhYmFzZUJhY2tlbmRCYXNlOjps YXN0QWN0aW9uQ2hhbmdlZERhdGFiYXNlKCkKLXsKLSAgICBBU1NFUlQobV9kYXRhYmFzZUF1dGhv cml6ZXIpOwotICAgIHJldHVybiBtX2RhdGFiYXNlQXV0aG9yaXplci0+bGFzdEFjdGlvbkNoYW5n ZWREYXRhYmFzZSgpOwotfQotCi1ib29sIERhdGFiYXNlQmFja2VuZEJhc2U6Omxhc3RBY3Rpb25X YXNJbnNlcnQoKQotewotICAgIEFTU0VSVChtX2RhdGFiYXNlQXV0aG9yaXplcik7Ci0gICAgcmV0 dXJuIG1fZGF0YWJhc2VBdXRob3JpemVyLT5sYXN0QWN0aW9uV2FzSW5zZXJ0KCk7Ci19Ci0KLXZv aWQgRGF0YWJhc2VCYWNrZW5kQmFzZTo6cmVzZXREZWxldGVzKCkKLXsKLSAgICBBU1NFUlQobV9k YXRhYmFzZUF1dGhvcml6ZXIpOwotICAgIG1fZGF0YWJhc2VBdXRob3JpemVyLT5yZXNldERlbGV0 ZXMoKTsKLX0KLQotYm9vbCBEYXRhYmFzZUJhY2tlbmRCYXNlOjpoYWREZWxldGVzKCkKLXsKLSAg ICBBU1NFUlQobV9kYXRhYmFzZUF1dGhvcml6ZXIpOwotICAgIHJldHVybiBtX2RhdGFiYXNlQXV0 aG9yaXplci0+aGFkRGVsZXRlcygpOwotfQotCi12b2lkIERhdGFiYXNlQmFja2VuZEJhc2U6OnJl c2V0QXV0aG9yaXplcigpCi17Ci0gICAgaWYgKG1fZGF0YWJhc2VBdXRob3JpemVyKQotICAgICAg ICBtX2RhdGFiYXNlQXV0aG9yaXplci0+cmVzZXQoKTsKLX0KLQogdW5zaWduZWQgbG9uZyBsb25n IERhdGFiYXNlQmFja2VuZEJhc2U6Om1heGltdW1TaXplKCkgY29uc3QKIHsKICAgICByZXR1cm4g RGF0YWJhc2VUcmFja2VyOjp0cmFja2VyKCkuZ2V0TWF4U2l6ZUZvckRhdGFiYXNlKHN0YXRpY19j YXN0PGNvbnN0IERhdGFiYXNlKj4odGhpcykpOwogfQogCi12b2lkIERhdGFiYXNlQmFja2VuZEJh c2U6OmluY3JlbWVudGFsVmFjdXVtSWZOZWVkZWQoKQotewotICAgIFNRTGl0ZVRyYW5zYWN0aW9u SW5Qcm9ncmVzc0F1dG9Db3VudGVyIHRyYW5zYWN0aW9uQ291bnRlcjsKLQotICAgIGludDY0X3Qg ZnJlZVNwYWNlU2l6ZSA9IG1fc3FsaXRlRGF0YWJhc2UuZnJlZVNwYWNlU2l6ZSgpOwotICAgIGlu dDY0X3QgdG90YWxTaXplID0gbV9zcWxpdGVEYXRhYmFzZS50b3RhbFNpemUoKTsKLSAgICBpZiAo dG90YWxTaXplIDw9IDEwICogZnJlZVNwYWNlU2l6ZSkgewotICAgICAgICBpbnQgcmVzdWx0ID0g bV9zcWxpdGVEYXRhYmFzZS5ydW5JbmNyZW1lbnRhbFZhY3V1bUNvbW1hbmQoKTsKLSAgICAgICAg aWYgKHJlc3VsdCAhPSBTUUxJVEVfT0spCi0gICAgICAgICAgICBtX2Zyb250ZW5kLT5sb2dFcnJv ck1lc3NhZ2UoZm9ybWF0RXJyb3JNZXNzYWdlKCJlcnJvciB2YWN1dW1pbmcgZGF0YWJhc2UiLCBy ZXN1bHQsIG1fc3FsaXRlRGF0YWJhc2UubGFzdEVycm9yTXNnKCkpKTsKLSAgICB9Ci19Ci0KIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv d2ViZGF0YWJhc2UvRGF0YWJhc2VCYWNrZW5kQmFzZS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy93ZWJkYXRhYmFzZS9EYXRhYmFzZUJhY2tlbmRCYXNlLmgKaW5kZXggOTE4YzM0NGU4OTBkNDEw MGI1N2FhNGMzOTgwZWNhY2M3ODg4YzNhYS4uNmFjODBmMTEzYWRlNDE5NTJmMjNiNDI5Zjk2YmY2 NGE0MzUyMzBkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFz ZS9EYXRhYmFzZUJhY2tlbmRCYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJk YXRhYmFzZS9EYXRhYmFzZUJhY2tlbmRCYXNlLmgKQEAgLTY0LDE2ICs2NCw2IEBAIHB1YmxpYzoK ICAgICBTUUxpdGVEYXRhYmFzZSYgc3FsaXRlRGF0YWJhc2UoKSB7IHJldHVybiBtX3NxbGl0ZURh dGFiYXNlOyB9CiAKICAgICB1bnNpZ25lZCBsb25nIGxvbmcgbWF4aW11bVNpemUoKSBjb25zdDsK LSAgICB2b2lkIGluY3JlbWVudGFsVmFjdXVtSWZOZWVkZWQoKTsKLQotICAgIHZvaWQgZGlzYWJs ZUF1dGhvcml6ZXIoKTsKLSAgICB2b2lkIGVuYWJsZUF1dGhvcml6ZXIoKTsKLSAgICB2b2lkIHNl dEF1dGhvcml6ZXJQZXJtaXNzaW9ucyhpbnQgcGVybWlzc2lvbnMpOwotICAgIGJvb2wgbGFzdEFj dGlvbkNoYW5nZWREYXRhYmFzZSgpOwotICAgIGJvb2wgbGFzdEFjdGlvbldhc0luc2VydCgpOwot ICAgIHZvaWQgcmVzZXREZWxldGVzKCk7Ci0gICAgYm9vbCBoYWREZWxldGVzKCk7Ci0gICAgdm9p ZCByZXNldEF1dGhvcml6ZXIoKTsKIAogICAgIERhdGFiYXNlQ29udGV4dCogZGF0YWJhc2VDb250 ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9kYXRhYmFzZUNvbnRleHQuZ2V0KCk7IH0KICAgICB2b2lk IHNldEZyb250ZW5kKERhdGFiYXNlKiBmcm9udGVuZCkgeyBtX2Zyb250ZW5kID0gZnJvbnRlbmQ7 IH0KQEAgLTExNiw3ICsxMDYsNiBAQCBwcm90ZWN0ZWQ6CiAKICAgICBEYXRhYmFzZSogbV9mcm9u dGVuZDsKIAotcHJpdmF0ZToKICAgICBEYXRhYmFzZUd1aWQgbV9ndWlkOwogICAgIGJvb2wgbV9v cGVuZWQ7CiAgICAgYm9vbCBtX25ldzsK