153425 2016-01-25 09:17:44 -0800 Modern IDB: Implement getIndexRecord in the SQLite backing store 2016-01-25 10:20:35 -0800 1 1 1 Unclassified WebKit WebCore Misc. Safari 9 Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 153021 1 beidson beidson achristensen alecflett commit-queue jsbell oldest_to_newest 1158344 0 beidson 2016-01-25 09:17:44 -0800 Modern IDB: Implement getIndexRecord in the SQLite backing store 1158347 1 269754 beidson 2016-01-25 09:19:40 -0800 Created attachment 269754 Patch v1 1158354 2 269754 darin 2016-01-25 09:29:29 -0800 Comment on attachment 269754 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=269754&action=review > Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:1150 > + getResult = { SharedBuffer::create(cursor->currentValueBuffer().data(), cursor->currentValueBuffer().size()) }; Is there a way to do this without copying? SharedBuffer knows how to adopt a Vector<char> but not a Vector<uint8_t>. Might be a topic worth returning to. 1158363 3 beidson 2016-01-25 09:57:47 -0800 (In reply to comment #2) > Comment on attachment 269754 [details] > Patch v1 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=269754&action=review > > > Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:1150 > > + getResult = { SharedBuffer::create(cursor->currentValueBuffer().data(), cursor->currentValueBuffer().size()) }; > > Is there a way to do this without copying? SharedBuffer knows how to adopt a > Vector<char> but not a Vector<uint8_t>. Might be a topic worth returning to. Definitely plan on returning to this. Right now I'm trying to shovel over the WebKit2 SQLite backend with minimal changes, but I definitely plan to give it a once over afterwards. Thanks! 1158367 4 269754 commit-queue 2016-01-25 10:20:32 -0800 Comment on attachment 269754 Patch v1 Clearing flags on attachment: 269754 Committed r195541: <http://trac.webkit.org/changeset/195541> 1158368 5 commit-queue 2016-01-25 10:20:35 -0800 All reviewed patches have been landed. Closing bug. 269754 2016-01-25 09:19:40 -0800 2016-01-25 10:20:32 -0800 Patch v1 patch text/plain 8595 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhYWYyNWJjLi4yNmI4MjZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTYtMDEt MjUgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1vZGVybiBJ REI6IEltcGxlbWVudCBnZXRJbmRleFJlY29yZCBpbiB0aGUgU1FMaXRlIGJhY2tpbmcgc3RvcmUu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTM0MjUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRm b3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAxNi0wMS0yNSAgWW91ZW5uIEZhYmxl dCAgPHlvdWVubi5mYWJsZXRAY3JmLmNhbm9uLmZyPgogCiAgICAgICAgIFtGZXRjaCBBUEldIElt cGxlbWVudCBGZXRjaCBBUEkgSGVhZGVycwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdr MS9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDQyMWM3Y2EuLjQ2ZGMzNDUgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTI1Miw2ICsyNTIsMTAg QEAgY3J5cHRvL3N1YnRsZS9yc2EtaW5kZXhlZGRiLW5vbi1leHBvcnRhYmxlLmh0bWwgWyBGYWls dXJlIF0KIGZhc3QvaGlzdG9yeS9wYWdlLWNhY2hlLWluZGV4ZWQtb3BlbmVkLWRiLmh0bWwgWyBG YWlsdXJlIF0KIGltcG9ydGVkL3czYy9pbmRleGVkZGIvY2xvc2UtaW4tdXBncmFkZW5lZWRlZC5o dG1sIFsgRmFpbHVyZSBdCiBpbXBvcnRlZC93M2MvaW5kZXhlZGRiL2N1cnNvci1vdmVybG9hZHMu aHRtIFsgRmFpbHVyZSBdCitpbXBvcnRlZC93M2MvaW5kZXhlZGRiL2lkYmN1cnNvci1hZHZhbmNl LWNvbnRpbnVlLWFzeW5jLmh0bSBbIEZhaWx1cmUgXQoraW1wb3J0ZWQvdzNjL2luZGV4ZWRkYi9p ZGJjdXJzb3ItYWR2YW5jZS1pbnZhbGlkLmh0bSBbIEZhaWx1cmUgXQoraW1wb3J0ZWQvdzNjL2lu ZGV4ZWRkYi9pZGJjdXJzb3ItYWR2YW5jZS5odG0gWyBGYWlsdXJlIF0KK2ltcG9ydGVkL3czYy9p bmRleGVkZGIvaWRiY3Vyc29yLWNvbnRpbnVlLmh0bSBbIEZhaWx1cmUgXQogaW1wb3J0ZWQvdzNj L2luZGV4ZWRkYi9pZGJjdXJzb3ItZGlyZWN0aW9uLWluZGV4LWtleXJhbmdlLmh0bSBbIEZhaWx1 cmUgXQogaW1wb3J0ZWQvdzNjL2luZGV4ZWRkYi9pZGJjdXJzb3ItZGlyZWN0aW9uLWluZGV4Lmh0 bSBbIEZhaWx1cmUgXQogaW1wb3J0ZWQvdzNjL2luZGV4ZWRkYi9pZGJjdXJzb3ItZGlyZWN0aW9u LW9iamVjdHN0b3JlLWtleXJhbmdlLmh0bSBbIEZhaWx1cmUgXQpAQCAtMjYwLDYgKzI2NCw3IEBA IGltcG9ydGVkL3czYy9pbmRleGVkZGIvaWRiY3Vyc29yLWRpcmVjdGlvbi5odG0gWyBGYWlsdXJl IF0KIGltcG9ydGVkL3czYy9pbmRleGVkZGIvaWRiY3Vyc29yLWtleS5odG0gWyBGYWlsdXJlIF0K IGltcG9ydGVkL3czYy9pbmRleGVkZGIvaWRiY3Vyc29yLXByaW1hcnlrZXkuaHRtIFsgRmFpbHVy ZSBdCiBpbXBvcnRlZC93M2MvaW5kZXhlZGRiL2lkYmN1cnNvci1yZXVzZWQuaHRtIFsgRmFpbHVy ZSBdCitpbXBvcnRlZC93M2MvaW5kZXhlZGRiL2lkYmN1cnNvci1zb3VyY2UuaHRtIFsgRmFpbHVy ZSBdCiBpbXBvcnRlZC93M2MvaW5kZXhlZGRiL2lkYmN1cnNvcl9hZHZhbmNlX2luZGV4Lmh0bSBb IEZhaWx1cmUgXQogaW1wb3J0ZWQvdzNjL2luZGV4ZWRkYi9pZGJjdXJzb3JfYWR2YW5jZV9pbmRl eDIuaHRtIFsgRmFpbHVyZSBdCiBpbXBvcnRlZC93M2MvaW5kZXhlZGRiL2lkYmN1cnNvcl9hZHZh bmNlX2luZGV4My5odG0gWyBGYWlsdXJlIF0KQEAgLTM0Nyw2ICszNTIsNyBAQCBpbXBvcnRlZC93 M2MvaW5kZXhlZGRiL2lkYmZhY3Rvcnlfb3BlbjQuaHRtIFsgRmFpbHVyZSBdCiBpbXBvcnRlZC93 M2MvaW5kZXhlZGRiL2lkYmZhY3Rvcnlfb3BlbjUuaHRtIFsgRmFpbHVyZSBdCiBpbXBvcnRlZC93 M2MvaW5kZXhlZGRiL2lkYmZhY3Rvcnlfb3BlbjYuaHRtIFsgRmFpbHVyZSBdCiBpbXBvcnRlZC93 M2MvaW5kZXhlZGRiL2lkYmZhY3Rvcnlfb3BlbjcuaHRtIFsgRmFpbHVyZSBdCitpbXBvcnRlZC93 M2MvaW5kZXhlZGRiL2lkYmluZGV4LW11bHRpZW50cnktYmlnLmh0bSBbIEZhaWx1cmUgXQogaW1w b3J0ZWQvdzNjL2luZGV4ZWRkYi9pZGJpbmRleC1tdWx0aWVudHJ5Lmh0bSBbIEZhaWx1cmUgXQog aW1wb3J0ZWQvdzNjL2luZGV4ZWRkYi9pZGJpbmRleF9jb3VudC5odG0gWyBGYWlsdXJlIF0KIGlt cG9ydGVkL3czYy9pbmRleGVkZGIvaWRiaW5kZXhfY291bnQyLmh0bSBbIEZhaWx1cmUgXQpAQCAt NDI2LDYgKzQzMiw3IEBAIGltcG9ydGVkL3czYy9pbmRleGVkZGIvaW5kZXhfc29ydF9vcmRlci5o dG0gWyBGYWlsdXJlIF0KIGltcG9ydGVkL3czYy9pbmRleGVkZGIva2V5Z2VuZXJhdG9yLWNvbnN0 cmFpbnRlcnJvci5odG0gWyBGYWlsdXJlIF0KIGltcG9ydGVkL3czYy9pbmRleGVkZGIva2V5Z2Vu ZXJhdG9yLW92ZXJmbG93Lmh0bSBbIEZhaWx1cmUgXQogaW1wb3J0ZWQvdzNjL2luZGV4ZWRkYi9r ZXlnZW5lcmF0b3IuaHRtIFsgRmFpbHVyZSBdCitpbXBvcnRlZC93M2MvaW5kZXhlZGRiL2tleXBh dGguaHRtIFsgRmFpbHVyZSBdCiBpbXBvcnRlZC93M2MvaW5kZXhlZGRiL2tleXBhdGhfbWF4c2l6 ZS5odG0gWyBGYWlsdXJlIF0KIGltcG9ydGVkL3czYy9pbmRleGVkZGIvbGlzdF9vcmRlcmluZy5o dG0gWyBGYWlsdXJlIF0KIGltcG9ydGVkL3czYy9pbmRleGVkZGIvb2JqZWN0c3RvcmVfa2V5b3Jk ZXIuaHRtIFsgRmFpbHVyZSBdCkBAIC00MzksNiArNDQ2LDcgQEAgaW1wb3J0ZWQvdzNjL2luZGV4 ZWRkYi90cmFuc2FjdGlvbl9idWJibGUtYW5kLWNhcHR1cmUuaHRtIFsgRmFpbHVyZSBdCiBpbXBv cnRlZC93M2MvaW5kZXhlZGRiL3ZhbHVlLmh0bSBbIEZhaWx1cmUgXQogaW1wb3J0ZWQvdzNjL2lu ZGV4ZWRkYi92YWx1ZV9yZWN1cnNpdmUuaHRtIFsgRmFpbHVyZSBdCiBpbXBvcnRlZC93M2MvaW5k ZXhlZGRiL3dyaXRlci1zdGFydmF0aW9uLmh0bSBbIEZhaWx1cmUgXQorc3RvcmFnZS9pbmRleGVk ZGIvY2xvc2VkLWN1cnNvci5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9jdXJz b3ItYWRkZWQtYnVnLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL2N1cnNvci1h ZHZhbmNlLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL2N1cnNvci1iYXNpY3Mu aHRtbCBbIEZhaWx1cmUgXQpAQCAtNTM0LDM5ICs1NDIsMjQgQEAgc3RvcmFnZS9pbmRleGVkZGIv b3BlbmN1cnNvci1rZXkuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvb3B0aW9u YWwtYXJndW1lbnRzLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL3ByZWZldGNo LWJ1Z2ZpeC0xMDgwNzEuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvcmVhZG9u bHkuaHRtbCBbIEZhaWx1cmUgXQotc3RvcmFnZS9pbmRleGVkZGIvdHJhbnNhY3Rpb24tYWN0aXZl LWZsYWcuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvdHJhbnNhY3Rpb24tcm9s bGJhY2suaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvdmFsdWUtdW5kZWZpbmVk Lmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL3ZhbHVlcy1vZGQtdHlwZXMuaHRt bCBbIEZhaWx1cmUgXQogCiAjIFNRTGl0ZSBiYWNrZW5kIHRlc3RzIHRoYXQgdGltZW91dAogY3J5 cHRvL3N1YnRsZS9yc2EtaW5kZXhlZGRiLmh0bWwgWyBTa2lwIF0KLWltcG9ydGVkL3czYy9pbmRl eGVkZGIvaWRiY3Vyc29yLWFkdmFuY2UtY29udGludWUtYXN5bmMuaHRtIFsgU2tpcCBdCi1pbXBv cnRlZC93M2MvaW5kZXhlZGRiL2lkYmN1cnNvci1hZHZhbmNlLWludmFsaWQuaHRtIFsgU2tpcCBd Ci1pbXBvcnRlZC93M2MvaW5kZXhlZGRiL2lkYmN1cnNvci1hZHZhbmNlLmh0bSBbIFNraXAgXQot aW1wb3J0ZWQvdzNjL2luZGV4ZWRkYi9pZGJjdXJzb3ItY29udGludWUuaHRtIFsgU2tpcCBdCi1p bXBvcnRlZC93M2MvaW5kZXhlZGRiL2lkYmN1cnNvci1zb3VyY2UuaHRtIFsgU2tpcCBdCiBpbXBv cnRlZC93M2MvaW5kZXhlZGRiL2lkYmZhY3Rvcnlfb3BlbjEyLmh0bSBbIFNraXAgXQotaW1wb3J0 ZWQvdzNjL2luZGV4ZWRkYi9pZGJpbmRleC1tdWx0aWVudHJ5LWJpZy5odG0gWyBTa2lwIF0KIGlt cG9ydGVkL3czYy9pbmRleGVkZGIvaWRib2JqZWN0c3RvcmVfb3BlbkN1cnNvcl9pbnZhbGlkLmh0 bSBbIFNraXAgXQotaW1wb3J0ZWQvdzNjL2luZGV4ZWRkYi9rZXlwYXRoLmh0bSBbIFNraXAgXQot c3RvcmFnZS9pbmRleGVkZGIvY2xvc2VkLWN1cnNvci5odG1sIFsgU2tpcCBdCiBzdG9yYWdlL2lu ZGV4ZWRkYi9jdXJzb3ItY2FzdC5odG1sIFsgU2tpcCBdCi1zdG9yYWdlL2luZGV4ZWRkYi9kZWxl dGVkYXRhYmFzZS10cmFuc2FjdGlvbi5odG1sIFsgU2tpcCBdCi1zdG9yYWdlL2luZGV4ZWRkYi9t b2Rlcm4vYmxvY2tlZC1vcGVuLWRiLXJlcXVlc3RzLmh0bWwgWyBTa2lwIF0KIHN0b3JhZ2UvaW5k ZXhlZGRiL21vZGVybi90cmFuc2FjdGlvbi1zY2hlZHVsZXItMS5odG1sIFsgU2tpcCBdCiBzdG9y YWdlL2luZGV4ZWRkYi9tb2Rlcm4vdHJhbnNhY3Rpb24tc2NoZWR1bGVyLTIuaHRtbCBbIFNraXAg XQotc3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL3RyYW5zYWN0aW9uLXNjaGVkdWxlci00Lmh0bWwg WyBTa2lwIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi90cmFuc2FjdGlvbi1zY2hlZHVsZXIt NS5odG1sIFsgU2tpcCBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vdHJhbnNhY3Rpb24tc2No ZWR1bGVyLTYuaHRtbCBbIFNraXAgXQotc3RvcmFnZS9pbmRleGVkZGIvbm9ibG9icy5odG1sIFsg U2tpcCBdCiBzdG9yYWdlL2luZGV4ZWRkYi9wZW5kaW5nLWFjdGl2aXR5Lmh0bWwgWyBTa2lwIF0K IHN0b3JhZ2UvaW5kZXhlZGRiL3ByZWZldGNoLWludmFsaWRhdGlvbi5odG1sIFsgU2tpcCBdCiBz dG9yYWdlL2luZGV4ZWRkYi9wcmVmZXRjaC1yYWNlLmh0bWwgWyBTa2lwIF0KLXN0b3JhZ2UvaW5k ZXhlZGRiL3ByaW1hcnkta2V5LXVuaXF1ZS10by1vYmplY3RzdG9yZS5odG1sIFsgU2tpcCBdCiBz dG9yYWdlL2luZGV4ZWRkYi9yZXF1ZXN0LXJlc3VsdC1jYWNoZS5odG1sIFsgU2tpcCBdCiBzdG9y YWdlL2luZGV4ZWRkYi90cmFuc2FjdGlvbi1jb29yZGluYXRpb24td2l0aGluLWRhdGFiYXNlLmh0 bWwgWyBTa2lwIF0KLXN0b3JhZ2UvaW5kZXhlZGRiL3RyYW5zYWN0aW9uLW9yZGVyaW5nLmh0bWwg WyBTa2lwIF0KIAogIyBTUUxpdGUgYmFja2VuZCB0ZXN0cyB0aGF0IGNyYXNoIG9yIEFTU0VSVAog c3RvcmFnZS9pbmRleGVkZGIvZGF0YWJhc2Utb2RkLW5hbWVzLmh0bWwgWyBTa2lwIF0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCBjMzJhOTBkLi40ZWNlMjMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIw MTYtMDEtMjUgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1v ZGVybiBJREI6IEltcGxlbWVudCBnZXRJbmRleFJlY29yZCBpbiB0aGUgU1FMaXRlIGJhY2tpbmcg c3RvcmUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NTM0MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO byBuZXcgdGVzdHMgKFNvbWUgZmFpbHVyZXMgbm93IHBhc3MsIG90aGVyIGZhaWx1cmVzIHByb2dy ZXNzZWQgY2xvc2VyIHRvIHBhc3NpbmcpLgorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIv c2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJT ZXJ2ZXI6OlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6Z2V0SW5kZXhSZWNvcmQpOgorCiAyMDE2LTAx LTI1ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBV bnJldmlld2VkLCByb2xsaW5nIG91dCByMTk1NTMzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0 b3JlLmNwcAppbmRleCAxODVjNzMwLi41OWFiZGY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2lu Z1N0b3JlLmNwcApAQCAtMTEyNiw5ICsxMTI2LDMyIEBAIElEQkVycm9yIFNRTGl0ZUlEQkJhY2tp bmdTdG9yZTo6Z2V0UmVjb3JkKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rp CiAgICAgcmV0dXJuIHsgfTsKIH0KIAotSURCRXJyb3IgU1FMaXRlSURCQmFja2luZ1N0b3JlOjpn ZXRJbmRleFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImLCB1aW50NjRfdCwgdWlu dDY0X3QsIEluZGV4ZWREQjo6SW5kZXhSZWNvcmRUeXBlLCBjb25zdCBJREJLZXlSYW5nZURhdGEm LCBJREJHZXRSZXN1bHQmKQorSURCRXJyb3IgU1FMaXRlSURCQmFja2luZ1N0b3JlOjpnZXRJbmRl eFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmll ciwgdWludDY0X3Qgb2JqZWN0U3RvcmVJRCwgdWludDY0X3QgaW5kZXhJRCwgSW5kZXhlZERCOjpJ bmRleFJlY29yZFR5cGUgdHlwZSwgY29uc3QgSURCS2V5UmFuZ2VEYXRhJiByYW5nZSwgSURCR2V0 UmVzdWx0JiBnZXRSZXN1bHQpCiB7Ci0gICAgcmV0dXJuIHsgSURCRGF0YWJhc2VFeGNlcHRpb246 OlVua25vd25FcnJvciwgQVNDSUlMaXRlcmFsKCJOb3QgaW1wbGVtZW50ZWQiKSB9OworICAgIExP RyhJbmRleGVkREIsICJTUUxpdGVJREJCYWNraW5nU3RvcmU6OmdldEluZGV4UmVjb3JkIik7Cisg ICAgQVNTRVJUKG1fc3FsaXRlREIpOworICAgIEFTU0VSVChtX3NxbGl0ZURCLT5pc09wZW4oKSk7 CisKKyAgICBhdXRvKiB0cmFuc2FjdGlvbiA9IG1fdHJhbnNhY3Rpb25zLmdldCh0cmFuc2FjdGlv bklkZW50aWZpZXIpOworICAgIGlmICghdHJhbnNhY3Rpb24gfHwgIXRyYW5zYWN0aW9uLT5pblBy b2dyZXNzKCkpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJBdHRlbXB0IHRvIGdldCBhbiBpbmRleCBy ZWNvcmQgZnJvbSBkYXRhYmFzZSB3aXRob3V0IGFuIGluLXByb2dyZXNzIHRyYW5zYWN0aW9uIik7 CisgICAgICAgIHJldHVybiB7IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpVbmtub3duRXJyb3IsIEFT Q0lJTGl0ZXJhbCgiQXR0ZW1wdCB0byBnZXQgYW4gaW5kZXggcmVjb3JkIGZyb20gZGF0YWJhc2Ug d2l0aG91dCBhbiBpbi1wcm9ncmVzcyB0cmFuc2FjdGlvbiIpIH07CisgICAgfQorCisgICAgYXV0 byBjdXJzb3IgPSB0cmFuc2FjdGlvbi0+bWF5YmVPcGVuQmFja2luZ1N0b3JlQ3Vyc29yKG9iamVj dFN0b3JlSUQsIGluZGV4SUQsIHJhbmdlKTsKKyAgICBpZiAoIWN1cnNvcikgeworICAgICAgICBM T0dfRVJST1IoIkNhbm5vdCBvcGVuIGN1cnNvciB0byBwZXJmb3JtIGluZGV4IGdldCBpbiBkYXRh YmFzZSIpOworICAgICAgICByZXR1cm4geyBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6VW5rbm93bkVy cm9yLCBBU0NJSUxpdGVyYWwoIkNhbm5vdCBvcGVuIGN1cnNvciB0byBwZXJmb3JtIGluZGV4IGdl dCBpbiBkYXRhYmFzZSIpIH07CisgICAgfQorCisgICAgaWYgKHR5cGUgPT0gSW5kZXhlZERCOjpJ bmRleFJlY29yZFR5cGU6OktleSkKKyAgICAgICAgZ2V0UmVzdWx0ID0geyBjdXJzb3ItPmN1cnJl bnRQcmltYXJ5S2V5KCkgfTsKKyAgICBlbHNlIHsKKyAgICAgICAgZ2V0UmVzdWx0ID0geyBTaGFy ZWRCdWZmZXI6OmNyZWF0ZShjdXJzb3ItPmN1cnJlbnRWYWx1ZUJ1ZmZlcigpLmRhdGEoKSwgY3Vy c29yLT5jdXJyZW50VmFsdWVCdWZmZXIoKS5zaXplKCkpIH07CisgICAgICAgIGdldFJlc3VsdC5z ZXRLZXlEYXRhKGN1cnNvci0+Y3VycmVudFByaW1hcnlLZXkoKSk7CisgICAgfQorCisgICAgcmV0 dXJuIHsgfTsKIH0KIAogSURCRXJyb3IgU1FMaXRlSURCQmFja2luZ1N0b3JlOjpnZXRDb3VudChj b25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgdWludDY0 X3Qgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCB1aW50NjRfdCBpbmRleElkZW50aWZpZXIsIGNvbnN0 IElEQktleVJhbmdlRGF0YSYgcmFuZ2UsIHVpbnQ2NF90JiBvdXRDb3VudCkK