100783 2012-10-30 13:34:23 -0700 [BlackBerry] Remove CookieDatabaseBackingStore::upgradeTableIfNeeded 2012-10-30 14:00:32 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rwlbuis rwlbuis mifenton otcheung tonikitoo webkit.review.bot oldest_to_newest 754627 0 rwlbuis 2012-10-30 13:34:23 -0700 This was needed for backwards compatibility, not needed anymore. 754631 1 171514 rwlbuis 2012-10-30 13:41:22 -0700 Created attachment 171514 Patch 754632 2 otcheung 2012-10-30 13:44:17 -0700 lgtm. 754642 3 rwlbuis 2012-10-30 14:00:32 -0700 Committed r132944: <http://trac.webkit.org/changeset/132944> 171514 2012-10-30 13:41:22 -0700 2012-10-30 13:51:47 -0700 Patch bug-100783-20121030163947.patch text/plain 8067 rwlbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyODUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZThiZDkyZDkyMGJkYzNh ODJiNmU1ZTAwODk1NzgzNDNiOTZhYzNmNy4uNzQxOWFmYzlmMTExZjg5MTc4MmVkOTdlZjk4MDM1 YjYwYTBiNWU3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEwLTMwICBSb2Ig QnVpcyAgPHJidWlzQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFJlbW92ZSBDb29r aWVEYXRhYmFzZUJhY2tpbmdTdG9yZTo6dXBncmFkZVRhYmxlSWZOZWVkZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDc4MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBSIDIyMDUxMy4KKworICAgICAg ICBSZW1vdmUgQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmU6OnVwZ3JhZGVUYWJsZUlmTmVlZGVk LCBpdCB3YXMgbmVlZGVkIGZvciBiYWNrd2FyZHMKKyAgICAgICAgY29tcGF0aWJpbGl0eSwgYnV0 IG5vdCBuZWVkZWQgYW55bW9yZS4KKworICAgICAgICAqIHBsYXRmb3JtL2JsYWNrYmVycnkvQ29v a2llRGF0YWJhc2VCYWNraW5nU3RvcmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q29va2llRGF0YWJhc2VCYWNraW5nU3RvcmU6Omludm9rZU9wZW4p OgorICAgICAgICAqIHBsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3Rv cmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUuaDoKKwogMjAxMi0xMC0yOSAgUm9iIEJ1aXMg IDxyYnVpc0ByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBTaW1wbGlmeSBBdXRoZW50 aWNhdGlvbkNoYWxsZW5nZU1hbmFnZXI6Omluc3RhbmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlL0Nvb2tp ZURhdGFiYXNlQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNr YmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3Rv cmUuY3BwCmluZGV4IGUzNDU5NGI2MmNjYmNhYjhlN2VmNGIwZjMxY2Q1OGE2ZDQwNjM5MjYuLmI1 NzE1ODliOGU3ZGYxM2JiODE4MDgzYzdkYzQzMzQyZmI3ZjhlNGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUv Q29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUvQ29va2llRGF0YWJhc2VC YWNraW5nU3RvcmUuY3BwCkBAIC05NCwxMTIgKzk0LDYgQEAgdm9pZCBDb29raWVEYXRhYmFzZUJh Y2tpbmdTdG9yZTo6b25UaHJlYWRGaW5pc2hlZCgpCiAgICAgTWVzc2FnZUNsaWVudDo6b25UaHJl YWRGaW5pc2hlZCgpOwogfQogCi12b2lkIENvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlOjp1cGdy YWRlVGFibGVJZk5lZWRlZChjb25zdCBTdHJpbmcmIGRhdGFiYXNlRmllbGRzLCBjb25zdCBTdHJp bmcmIHByaW1hcnlLZXlGaWVsZHMpCi17Ci0gICAgQVNTRVJUKGlzQ3VycmVudFRocmVhZCgpKTsK LQotICAgIGJvb2wgY3JlYXRpb25UaW1lRXhpc3RzID0gZmFsc2U7Ci0gICAgYm9vbCBwcm90b2Nv bEV4aXN0cyA9IGZhbHNlOwotCi0gICAgaWYgKCFtX2RiLnRhYmxlRXhpc3RzKG1fdGFibGVOYW1l KSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgLy8gQ2hlY2sgaWYgdGhlIGV4aXN0aW5nIHRhYmxl IGhhcyB0aGUgcmVxdWlyZWQgZGF0YWJhc2UgZmllbGRzCi0gICAgewotICAgICAgICBTdHJpbmcg cXVlcnkgPSAiUFJBR01BIHRhYmxlX2luZm8oIiArIG1fdGFibGVOYW1lICsgIik7IjsKLQotICAg ICAgICBTUUxpdGVTdGF0ZW1lbnQgc3RhdGVtZW50KG1fZGIsIHF1ZXJ5KTsKLSAgICAgICAgaWYg KHN0YXRlbWVudC5wcmVwYXJlKCkpIHsKLSAgICAgICAgICAgIExPR19FUlJPUigiQ2Fubm90IHBy ZXBhcmUgc3RhdGVtZW50IHRvIHF1ZXJ5IGNvb2tpZSB0YWJsZSBpbmZvLiBzcWw6JXMiLCBxdWVy eS51dGY4KCkuZGF0YSgpKTsKLSAgICAgICAgICAgIExPR19FUlJPUigiU1FMaXRlIEVycm9yIE1l c3NhZ2U6ICVzIiwgbV9kYi5sYXN0RXJyb3JNc2coKSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgIH0KLQotICAgICAgICB3aGlsZSAoc3RhdGVtZW50LnN0ZXAoKSA9PSBTUUxSZXN1bHRS b3cpIHsKLSAgICAgICAgICAgIERFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBjcmVhdGlvblRp bWUsIChBU0NJSUxpdGVyYWwoImNyZWF0aW9uVGltZSIpKSk7Ci0gICAgICAgICAgICBERUZJTkVf U1RBVElDX0xPQ0FMKFN0cmluZywgcHJvdG9jb2wsIChBU0NJSUxpdGVyYWwoInByb3RvY29sIikp KTsKLSAgICAgICAgICAgIFN0cmluZyBuYW1lID0gc3RhdGVtZW50LmdldENvbHVtblRleHQoMSk7 Ci0gICAgICAgICAgICBpZiAobmFtZSA9PSBjcmVhdGlvblRpbWUpCi0gICAgICAgICAgICAgICAg Y3JlYXRpb25UaW1lRXhpc3RzID0gdHJ1ZTsKLSAgICAgICAgICAgIGlmIChuYW1lID09IHByb3Rv Y29sKQotICAgICAgICAgICAgICAgIHByb3RvY29sRXhpc3RzID0gdHJ1ZTsKLSAgICAgICAgICAg IGlmIChjcmVhdGlvblRpbWVFeGlzdHMgJiYgcHJvdG9jb2xFeGlzdHMpCi0gICAgICAgICAgICAg ICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIExPRyhOZXR3b3JrLCAiTmVlZCB0byB1cGRh dGUgY29va2llIHRhYmxlIHNjaGVtYS4iKTsKLSAgICB9Ci0KLSAgICAvLyBEcm9wIGFuZCByZWNy ZWF0ZSB0aGUgY29va2llIHRhYmxlIHRvIHVwZGF0ZSB0byB0aGUgbGF0ZXN0IGRhdGFiYXNlIGZp ZWxkcy4KLSAgICAvLyBXZSBkbyBub3QgdXNlIGFsdGVyIHRhYmxlIC0gYWRkIGNvbHVtbiBiZWNh dXNlIHRoYXQgbWV0aG9kIGNhbm5vdCBhZGQgcHJpbWFyeSBrZXlzLgotICAgIFZlY3RvcjxTdHJp bmc+IGNvbW1hbmRzOwotCi0gICAgLy8gQmFja3VwIGV4aXN0aW5nIHRhYmxlCi0gICAgU3RyaW5n IHJlbmFtZVF1ZXJ5ID0gIkFMVEVSIFRBQkxFICIgKyBtX3RhYmxlTmFtZSArICIgUkVOQU1FIFRP IEJhY2t1cF8iICsgbV90YWJsZU5hbWUgKyAiOyI7Ci0gICAgY29tbWFuZHMuYXBwZW5kKHJlbmFt ZVF1ZXJ5KTsKLQotICAgIC8vIFJlY3JlYXRlIHRoZSBjb29raWUgdGFibGUgdXNpbmcgdGhlIG5l dyBkYXRhYmFzZSBhbmQgcHJpbWFyeSBrZXkgZmllbGRzCi0gICAgU3RyaW5nQnVpbGRlciBjcmVh dGVUYWJsZVF1ZXJ5OwotICAgIGNyZWF0ZVRhYmxlUXVlcnkuYXBwZW5kKCJDUkVBVEUgVEFCTEUg Iik7Ci0gICAgY3JlYXRlVGFibGVRdWVyeS5hcHBlbmQobV90YWJsZU5hbWUpOwotICAgIGNyZWF0 ZVRhYmxlUXVlcnkuYXBwZW5kKCIgKCIgKyBkYXRhYmFzZUZpZWxkcyArICIsICIgKyBwcmltYXJ5 S2V5RmllbGRzICsgIik7Iik7Ci0gICAgY29tbWFuZHMuYXBwZW5kKGNyZWF0ZVRhYmxlUXVlcnku dG9TdHJpbmcoKSk7Ci0KLSAgICAvLyBDb3B5IHRoZSBvbGQgZGF0YSBpbnRvIHRoZSBuZXcgdGFi bGUuIElmIGEgY29sdW1uIGRvZXMgbm90IGV4aXN0cywKLSAgICAvLyB3ZSBoYXZlIHRvIHB1dCBh ICcnIGluIHRoZSBzZWxlY3Qgc3RhdGVtZW50IHRvIG1ha2UgdGhlIG51bWJlciBvZiBjb2x1bW5z Ci0gICAgLy8gZXF1YWwgaW4gdGhlIGluc2VydCBzdGF0ZW1lbnQuCi0gICAgU3RyaW5nQnVpbGRl ciBtaWdyYXRpb25RdWVyeTsKLSAgICBtaWdyYXRpb25RdWVyeS5hcHBlbmQoIklOU0VSVCBPUiBS RVBMQUNFIElOVE8gIik7Ci0gICAgbWlncmF0aW9uUXVlcnkuYXBwZW5kKG1fdGFibGVOYW1lKTsK LSAgICBtaWdyYXRpb25RdWVyeS5hcHBlbmQoIiBTRUxFQ1QgKiIpOwotICAgIGlmICghY3JlYXRp b25UaW1lRXhpc3RzKQotICAgICAgICBtaWdyYXRpb25RdWVyeS5hcHBlbmQoIiwnJyIpOwotICAg IGlmICghcHJvdG9jb2xFeGlzdHMpCi0gICAgICAgIG1pZ3JhdGlvblF1ZXJ5LmFwcGVuZCgiLCcn Iik7Ci0gICAgbWlncmF0aW9uUXVlcnkuYXBwZW5kKCIgRlJPTSBCYWNrdXBfIiArIG1fdGFibGVO YW1lKTsKLSAgICBjb21tYW5kcy5hcHBlbmQobWlncmF0aW9uUXVlcnkudG9TdHJpbmcoKSk7Ci0K LSAgICAvLyBUaGUgbmV3IGNvbHVtbnMgd2lsbCBiZSBibGFuaywgc2V0IHRoZSBuZXcgdmFsdWVz LgotICAgIGlmICghY3JlYXRpb25UaW1lRXhpc3RzKSB7Ci0gICAgICAgIFN0cmluZyBzZXRDcmVh dGlvblRpbWVRdWVyeSA9ICJVUERBVEUgIiArIG1fdGFibGVOYW1lICsgIiBTRVQgY3JlYXRpb25U aW1lID0gbGFzdEFjY2Vzc2VkOyI7Ci0gICAgICAgIGNvbW1hbmRzLmFwcGVuZChzZXRDcmVhdGlv blRpbWVRdWVyeSk7Ci0gICAgfQotCi0gICAgaWYgKCFwcm90b2NvbEV4aXN0cykgewotICAgICAg ICBTdHJpbmcgc2V0UHJvdG9jb2xRdWVyeSA9ICJVUERBVEUgIiArIG1fdGFibGVOYW1lICsgIiBT RVQgcHJvdG9jb2wgPSAnaHR0cCcgV0hFUkUgaXNTZWN1cmUgPSAnMCc7IjsKLSAgICAgICAgU3Ry aW5nIHNldFByb3RvY29sUXVlcnkyID0gIlVQREFURSAiICsgbV90YWJsZU5hbWUgKyAiIFNFVCBw cm90b2NvbCA9ICdodHRwcycgV0hFUkUgaXNTZWN1cmUgPSAnMSc7IjsKLSAgICAgICAgY29tbWFu ZHMuYXBwZW5kKHNldFByb3RvY29sUXVlcnkpOwotICAgICAgICBjb21tYW5kcy5hcHBlbmQoc2V0 UHJvdG9jb2xRdWVyeTIpOwotICAgIH0KLQotICAgIC8vIERyb3AgdGhlIGJhY2t1cCB0YWJsZQot ICAgIFN0cmluZyBkcm9wQmFja3VwUXVlcnkgPSAiRFJPUCBUQUJMRSBJRiBFWElTVFMgQmFja3Vw XyIgKyBtX3RhYmxlTmFtZSArICI7IjsKLSAgICBjb21tYW5kcy5hcHBlbmQoZHJvcEJhY2t1cFF1 ZXJ5KTsKLQotICAgIFNRTGl0ZVRyYW5zYWN0aW9uIHRyYW5zYWN0aW9uKG1fZGIsIGZhbHNlKTsK LSAgICB0cmFuc2FjdGlvbi5iZWdpbigpOwotICAgIHNpemVfdCBjb21tYW5kU2l6ZSA9IGNvbW1h bmRzLnNpemUoKTsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNvbW1hbmRTaXplOyArK2kp IHsKLSAgICAgICAgaWYgKCFtX2RiLmV4ZWN1dGVDb21tYW5kKGNvbW1hbmRzW2ldKSkgewotICAg ICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gYWx0ZXIgY29va2llIHRhYmxlIHdoZW4gZXhl Y3V0aW5nIHNxbDolcyIsIGNvbW1hbmRzW2ldLnV0ZjgoKS5kYXRhKCkpOwotICAgICAgICAgICAg TE9HX0VSUk9SKCJTUUxpdGUgRXJyb3IgTWVzc2FnZTogJXMiLCBtX2RiLmxhc3RFcnJvck1zZygp KTsKLSAgICAgICAgICAgIHRyYW5zYWN0aW9uLnJvbGxiYWNrKCk7Ci0KLSAgICAgICAgICAgIC8v IFdlIHNob3VsZCBuZXZlciBnZXQgaGVyZSwgYnV0IGlmIHdlIGRvLCByZW5hbWUgdGhlIGN1cnJl bnQgY29va2llIHRhYmxlIGZvciBmdXR1cmUgcmVzdG9yYXRpb24uIFRoaXMgaGFzIHRoZSBzaWRl IGVmZmVjdCBvZgotICAgICAgICAgICAgLy8gY2xlYXJpbmcgdGhlIGN1cnJlbnQgY29va2llIHRh YmxlLCBidXQgdGhhdCdzIGJldHRlciB0aGFuIGNvbnRpbnVhbGx5IGhpdHRpbmcgdGhpcyBjYXNl IGFuZCBoZW5jZSBuZXZlciBiZWluZyBhYmxlIHRvIHVzZSB0aGUKLSAgICAgICAgICAgIC8vIGNv b2tpZSB0YWJsZS4KLSAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICAg ICAgU3RyaW5nIHJlbmFtZVF1ZXJ5ID0gIkFMVEVSIFRBQkxFICIgKyBtX3RhYmxlTmFtZSArICIg UkVOQU1FIFRPIEJhY2t1cDJfIiArIG1fdGFibGVOYW1lICsgIjsiOwotICAgICAgICAgICAgaWYg KCFtX2RiLmV4ZWN1dGVDb21tYW5kKHJlbmFtZVF1ZXJ5KSkgewotICAgICAgICAgICAgICAgIExP R19FUlJPUigiRmFpbGVkIHRvIGJhY2t1cCBleGlzdGluZyBjb29raWUgdGFibGUuIik7Ci0gICAg ICAgICAgICAgICAgTE9HX0VSUk9SKCJTUUxpdGUgRXJyb3IgTWVzc2FnZTogJXMiLCBtX2RiLmxh c3RFcnJvck1zZygpKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybjsKLSAgICAg ICAgfQotICAgIH0KLSAgICB0cmFuc2FjdGlvbi5jb21taXQoKTsKLSAgICBMT0coTmV0d29yaywg IlN1Y2Nlc3NmdWxseSB1cGRhdGVkIGNvb2tpZSB0YWJsZSBzY2hlbWEuIik7Ci19Ci0KIHZvaWQg Q29va2llRGF0YWJhc2VCYWNraW5nU3RvcmU6Om9wZW4oY29uc3QgU3RyaW5nJiBjb29raWVKYXIp CiB7CiAgICAgZGlzcGF0Y2hNZXNzYWdlKGNyZWF0ZU1ldGhvZENhbGxNZXNzYWdlKCZDb29raWVE YXRhYmFzZUJhY2tpbmdTdG9yZTo6aW52b2tlT3BlbiwgdGhpcywgY29va2llSmFyKSk7CkBAIC0y MjIsMTAgKzExNiw3IEBAIHZvaWQgQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmU6Omludm9rZU9w ZW4oY29uc3QgU3RyaW5nJiBjb29raWVKYXIpCiAKICAgICBjb25zdCBTdHJpbmcgcHJpbWFyeUtl eUZpZWxkcygiUFJJTUFSWSBLRVkgKHByb3RvY29sLCBob3N0LCBwYXRoLCBuYW1lKSIpOwogICAg IGNvbnN0IFN0cmluZyBkYXRhYmFzZUZpZWxkcygibmFtZSBURVhULCB2YWx1ZSBURVhULCBob3N0 IFRFWFQsIHBhdGggVEVYVCwgZXhwaXJ5IERPVUJMRSwgbGFzdEFjY2Vzc2VkIERPVUJMRSwgaXNT ZWN1cmUgSU5URUdFUiwgaXNIdHRwT25seSBJTlRFR0VSLCBjcmVhdGlvblRpbWUgRE9VQkxFLCBw cm90b2NvbCBURVhUIik7Ci0gICAgLy8gVXBkYXRlIHRhYmxlIHRvIGFkZCB0aGUgbmV3IGNvbHVt biBjcmVhdGlvblRpbWUgYW5kIHByb3RvY29sIGZvciBiYWNrd2FyZHMgY29tcGF0YWJpbGl0eS4K LSAgICB1cGdyYWRlVGFibGVJZk5lZWRlZChkYXRhYmFzZUZpZWxkcywgcHJpbWFyeUtleUZpZWxk cyk7CiAKLSAgICAvLyBDcmVhdGUgdGFibGUgaWYgbm90IGV4c2lzdCBpbiBjYXNlIHRoYXQgdGhl IHVwZ3JhZGVUYWJsZUlmTmVlZGVkKCkgZmFpbGVkIGFjY2lkZW50YWxseS4KICAgICBTdHJpbmdC dWlsZGVyIGNyZWF0ZVRhYmxlUXVlcnk7CiAgICAgY3JlYXRlVGFibGVRdWVyeS5hcHBlbmQoIkNS RUFURSBUQUJMRSBJRiBOT1QgRVhJU1RTICIpOwogICAgIGNyZWF0ZVRhYmxlUXVlcnkuYXBwZW5k KG1fdGFibGVOYW1lKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNr YmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3Rv cmUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VC YWNraW5nU3RvcmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUuaAppbmRleCA4YmY3NDEwYWM5 YTczOWY1ZjZhZGZlOTQ4MTkwZTRjZmQxZDA5NjJlLi41MzllMjlkYTlmYmNiYzhiNDcxMGJiNmFk MWQzZjdhMmU3NzM4NjY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFj a2JlcnJ5L0Nvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlL0Nvb2tpZURhdGFiYXNlQmFja2luZ1N0 b3JlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVEYXRh YmFzZUJhY2tpbmdTdG9yZS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS5oCkBAIC04Myw3ICs4 Myw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBhZGRUb0NoYW5nZVF1ZXVlKGNvbnN0IFBhcnNlZENv b2tpZSogY2hhbmdlZENvb2tpZSwgVXBkYXRlUGFyYW1ldGVyIGFjdGlvblBhcmFtKTsKICAgICB2 b2lkIHNlbmRDaGFuZ2VzVG9EYXRhYmFzZShpbnQgaW50ZXJ2YWwpOwogICAgIHZvaWQgc2VuZENo YW5nZXNUb0RhdGFiYXNlVGltZXJGaXJlZCgpOwotICAgIHZvaWQgdXBncmFkZVRhYmxlSWZOZWVk ZWQoY29uc3QgU3RyaW5nJiBkYXRhYmFzZVNjaGVtYSwgY29uc3QgU3RyaW5nJiBwcmltYXJ5a2V5 RmllbGRzKTsKIAogICAgIHZvaWQgaW52b2tlT3Blbihjb25zdCBTdHJpbmcmIGNvb2tpZUphcik7 CiAgICAgdm9pZCBpbnZva2VSZW1vdmVBbGwoKTsK