62809 2011-06-16 13:10:14 -0700 [Qt] [WK2] Support undo/redo in MiniBrowser 2011-06-17 08:34:30 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All Linux RESOLVED FIXED P2 Normal --- 1 cshu cshu webkit.review.bot oldest_to_newest 422152 0 cshu 2011-06-16 13:10:14 -0700 Add UI support of undo/redo in MiniBrowser and WebKit2. 422155 1 97482 cshu 2011-06-16 13:18:16 -0700 Created attachment 97482 fix patch 422177 2 97482 yael 2011-06-16 13:40:32 -0700 Comment on attachment 97482 fix patch View in context: https://bugs.webkit.org/attachment.cgi?id=97482&action=review > Source/WebKit2/UIProcess/API/qt/qwkpage.cpp:875 > +QUndoStack* QWKPage::undoStack() const Who is using this new API? 422180 3 cshu 2011-06-16 13:42:18 -0700 (In reply to comment #2) > (From update of attachment 97482 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=97482&action=review > > Source/WebKit2/UIProcess/API/qt/qwkpage.cpp:875 > > +QUndoStack* QWKPage::undoStack() const > Who is using this new API? Just in my patch. But it's true that we can remove it and use d->undoStack. 422531 4 97482 kling 2011-06-17 03:26:17 -0700 Comment on attachment 97482 fix patch View in context: https://bugs.webkit.org/attachment.cgi?id=97482&action=review > Source/WebKit2/UIProcess/API/qt/qwkpage.h:131 > + bool isModified() const; > +#ifndef QT_NO_UNDOSTACK > + QUndoStack* undoStack() const; > +#endif undoStack() should be replaced by d->undoStack inside QWKPage. Why do we need isModified() and the 'modified' property? > Tools/MiniBrowser/qt/BrowserWindow.cpp:89 > + undo->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Z)); Use the QKeySequence constructor that takes a StandardKey (QKeySequence::Undo in this case.) > Tools/MiniBrowser/qt/BrowserWindow.cpp:92 > + redo->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Z)); Ditto (QKeySequence::Redo.) 422592 5 cshu 2011-06-17 06:49:19 -0700 > > Source/WebKit2/UIProcess/API/qt/qwkpage.h:131 > > + bool isModified() const; > > +#ifndef QT_NO_UNDOSTACK > > + QUndoStack* undoStack() const; > > +#endif > > undoStack() should be replaced by d->undoStack inside QWKPage. > Why do we need isModified() and the 'modified' property? Right. We don't seem to need isModified(). It was in WebKit1, though. 422593 6 97592 cshu 2011-06-17 06:49:48 -0700 Created attachment 97592 fix patch 2 422620 7 97592 kling 2011-06-17 07:53:06 -0700 Comment on attachment 97592 fix patch 2 LGTM! 422641 8 97592 webkit.review.bot 2011-06-17 08:34:25 -0700 Comment on attachment 97592 fix patch 2 Clearing flags on attachment: 97592 Committed r89139: <http://trac.webkit.org/changeset/89139> 422642 9 webkit.review.bot 2011-06-17 08:34:30 -0700 All reviewed patches have been landed. Closing bug. 97482 2011-06-16 13:18:16 -0700 2011-06-17 06:49:48 -0700 fix patch 62809_1.patch text/plain 4432 cshu SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5MDYwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDYtMTYgIENoYW5nIFNo dSAgPGNzaHVAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbUXRdIFtXSzJdIFN1cHBvcnQgdW5kby9yZWRvIGluIE1pbmlCcm93c2Vy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjgwOQor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcDoKKyAgICAgICAgKFFXS1Bh Z2U6OmFjdGlvbik6CisgICAgICAgIChRV0tQYWdlOjppc01vZGlmaWVkKToKKyAgICAgICAgKFFX S1BhZ2U6OnVuZG9TdGFjayk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmg6 CisKIDIwMTEtMDYtMTYgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwCShyZXZpc2lvbiA4OTA1OCkKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgy OCw2ICs4MjgsMTggQEAgUUFjdGlvbiogUVdLUGFnZTo6YWN0aW9uKFdlYkFjdGlvbiBhY3Rpbwog ICAgIGNhc2UgU2VsZWN0QWxsOgogICAgICAgICB0ZXh0ID0gY29udGV4dE1lbnVJdGVtVGFnU2Vs ZWN0QWxsKCk7CiAgICAgICAgIGJyZWFrOworI2lmbmRlZiBRVF9OT19VTkRPU1RBQ0sKKyAgICBj YXNlIFVuZG86IHsKKyAgICAgICAgUUFjdGlvbiogdW5kb0FjdGlvbiA9IHVuZG9TdGFjaygpLT5j cmVhdGVVbmRvQWN0aW9uKGQtPnEpOworICAgICAgICBkLT5hY3Rpb25zW2FjdGlvbl0gPSB1bmRv QWN0aW9uOworICAgICAgICByZXR1cm4gdW5kb0FjdGlvbjsKKyAgICB9CisgICAgY2FzZSBSZWRv OiB7CisgICAgICAgIFFBY3Rpb24qIHJlZG9BY3Rpb24gPSB1bmRvU3RhY2soKS0+Y3JlYXRlUmVk b0FjdGlvbihkLT5xKTsKKyAgICAgICAgZC0+YWN0aW9uc1thY3Rpb25dID0gcmVkb0FjdGlvbjsK KyAgICAgICAgcmV0dXJuIHJlZG9BY3Rpb247CisgICAgfQorI2VuZGlmCiAgICAgZGVmYXVsdDoK ICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgIGJyZWFrOwpAQCAtODUwLDYgKzg2MiwyMiBAQCBR QWN0aW9uKiBRV0tQYWdlOjphY3Rpb24oV2ViQWN0aW9uIGFjdGlvCiB9CiAjZW5kaWYgLy8gUVRf Tk9fQUNUSU9OCiAKK2Jvb2wgUVdLUGFnZTo6aXNNb2RpZmllZCgpIGNvbnN0Cit7CisjaWZkZWYg UVRfTk9fVU5ET1NUQUNLCisgICAgcmV0dXJuIGZhbHNlOworI2Vsc2UKKyAgICByZXR1cm4gZC0+ dW5kb1N0YWNrLT5jYW5VbmRvKCk7CisjZW5kaWYKK30KKworI2lmbmRlZiBRVF9OT19VTkRPU1RB Q0sKK1FVbmRvU3RhY2sqIFFXS1BhZ2U6OnVuZG9TdGFjaygpIGNvbnN0Cit7CisgICAgcmV0dXJu IGQtPnVuZG9TdGFjay5nZXQoKTsKK30KKyNlbmRpZgorCiB2b2lkIFFXS1BhZ2U6OmZpbmRab29t YWJsZUFyZWFGb3JQb2ludChjb25zdCBRUG9pbnQmIHBvaW50KQogewogICAgIGQtPnBhZ2UtPmZp bmRab29tYWJsZUFyZWFGb3JQb2ludChwb2ludCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3F3a3BhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3F3a3BhZ2UuaAkocmV2aXNpb24gODkwNTgpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMTQsNiArMTQs NyBAQAogCiBjbGFzcyBRQ3Vyc29yOwogY2xhc3MgUUdyYXBoaWNzSXRlbTsKK2NsYXNzIFFVbmRv U3RhY2s7CiBjbGFzcyBRV0tDb250ZXh0OwogY2xhc3MgUVdLR3JhcGhpY3NXaWRnZXQ7CiBjbGFz cyBRV0tQcmVmZXJlbmNlczsKQEAgLTIzLDYgKzI0LDcgQEAgY2xhc3MgUVdLSGlzdG9yeTsKIAog Y2xhc3MgUVdFQktJVF9FWFBPUlQgUVdLUGFnZSA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBRX09C SkVDVAorICAgIFFfUFJPUEVSVFkoYm9vbCBtb2RpZmllZCBSRUFEIGlzTW9kaWZpZWQpCiAgICAg UV9QUk9QRVJUWShRU3RyaW5nIHRpdGxlIFJFQUQgdGl0bGUpCiAgICAgUV9QUk9QRVJUWShRVXJs IHVybCBSRUFEIHVybCBXUklURSBzZXRVcmwpCiAKQEAgLTQ1LDYgKzQ3LDkgQEAgcHVibGljOgog ICAgICAgICBQYXN0ZSwKICAgICAgICAgU2VsZWN0QWxsLAogCisgICAgICAgIFVuZG8sCisgICAg ICAgIFJlZG8sCisKICAgICAgICAgV2ViQWN0aW9uQ291bnQKICAgICB9OwogCkBAIC0xMjAsNiAr MTI1LDExIEBAIHB1YmxpYzoKIAogICAgIGJvb2wgaXNDb25uZWN0ZWRUb0VuZ2luZSgpIGNvbnN0 OwogCisgICAgYm9vbCBpc01vZGlmaWVkKCkgY29uc3Q7CisjaWZuZGVmIFFUX05PX1VORE9TVEFD SworICAgIFFVbmRvU3RhY2sqIHVuZG9TdGFjaygpIGNvbnN0OworI2VuZGlmCisKIHB1YmxpYzoK ICAgICBRX1NJR05BTCB2b2lkIHN0YXR1c0Jhck1lc3NhZ2UoY29uc3QgUVN0cmluZyYpOwogICAg IFFfU0lHTkFMIHZvaWQgdG9vbFRpcENoYW5nZWQoY29uc3QgUVN0cmluZyYpOwpJbmRleDogVG9v bHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gODkw NjApCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAor MjAxMS0wNi0xNiAgQ2hhbmcgU2h1ICA8Y3NodUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gW1dLMl0gU3VwcG9ydCB1bmRv L3JlZG8gaW4gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTYyODA5CisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2lu ZG93LmNwcDoKKyAgICAgICAgKEJyb3dzZXJXaW5kb3c6OkJyb3dzZXJXaW5kb3cpOgorCiAyMDEx LTA2LTE2ICBEbWl0cnkgTG9tb3YgIDxkc2xvbW92QGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBUb29scy9NaW5pQnJvd3Nlci9xdC9Ccm93c2Vy V2luZG93LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2lu ZG93LmNwcAkocmV2aXNpb24gODkwNTgpCisrKyBUb29scy9NaW5pQnJvd3Nlci9xdC9Ccm93c2Vy V2luZG93LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODQsNiArODQsMTUgQEAgQnJvd3NlcldpbmRv dzo6QnJvd3NlcldpbmRvdyhRV0tDb250ZXh0KgogICAgIGZpbGVNZW51LT5hZGRTZXBhcmF0b3Io KTsKICAgICBmaWxlTWVudS0+YWRkQWN0aW9uKCJRdWl0IiwgdGhpcywgU0xPVChjbG9zZSgpKSk7 CiAKKyAgICBRTWVudSogZWRpdE1lbnUgPSBtZW51QmFyKCktPmFkZE1lbnUoIiZFZGl0Iik7Cisg ICAgUUFjdGlvbiogdW5kbyA9IHBhZ2UoKS0+YWN0aW9uKFFXS1BhZ2U6OlVuZG8pOworICAgIHVu ZG8tPnNldFNob3J0Y3V0KFFLZXlTZXF1ZW5jZShRdDo6Q1RSTCB8IFF0OjpLZXlfWikpOworICAg IGVkaXRNZW51LT5hZGRBY3Rpb24odW5kbyk7CisgICAgUUFjdGlvbiogcmVkbyA9IHBhZ2UoKS0+ YWN0aW9uKFFXS1BhZ2U6OlJlZG8pOworICAgIHJlZG8tPnNldFNob3J0Y3V0KFFLZXlTZXF1ZW5j ZShRdDo6Q1RSTCB8IFF0OjpTSElGVCB8IFF0OjpLZXlfWikpOworICAgIGVkaXRNZW51LT5hZGRB Y3Rpb24ocmVkbyk7CisgICAgZWRpdE1lbnUtPmFkZFNlcGFyYXRvcigpOworCiAgICAgUU1lbnUq IHZpZXdNZW51ID0gbWVudUJhcigpLT5hZGRNZW51KCImVmlldyIpOwogICAgIHZpZXdNZW51LT5h ZGRBY3Rpb24ocGFnZSgpLT5hY3Rpb24oUVdLUGFnZTo6U3RvcCkpOwogICAgIHZpZXdNZW51LT5h ZGRBY3Rpb24ocGFnZSgpLT5hY3Rpb24oUVdLUGFnZTo6UmVsb2FkKSk7Cg== 97592 2011-06-17 06:49:48 -0700 2011-06-17 08:34:25 -0700 fix patch 2 62809_2.patch text/plain 3269 cshu SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5MTM1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDYtMTcgIENoYW5nIFNo dSAgPGNzaHVAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbUXRdIFtXSzJdIFN1cHBvcnQgdW5kby9yZWRvIGluIE1pbmlCcm93c2Vy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjgwOQor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcDoKKyAgICAgICAgKFFXS1Bh Z2U6OmFjdGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmg6CisKIDIw MTEtMDYtMTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQuIEZpeCBXZWJLaXQyIEdUSyBidWlsZCBhZnRlciByODkwNjAuCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAJKHJldmlz aW9uIDg5MDU4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtODI4LDYgKzgyOCwxOCBAQCBRQWN0aW9uKiBRV0tQYWdlOjph Y3Rpb24oV2ViQWN0aW9uIGFjdGlvCiAgICAgY2FzZSBTZWxlY3RBbGw6CiAgICAgICAgIHRleHQg PSBjb250ZXh0TWVudUl0ZW1UYWdTZWxlY3RBbGwoKTsKICAgICAgICAgYnJlYWs7CisjaWZuZGVm IFFUX05PX1VORE9TVEFDSworICAgIGNhc2UgVW5kbzogeworICAgICAgICBRQWN0aW9uKiB1bmRv QWN0aW9uID0gZC0+dW5kb1N0YWNrLT5jcmVhdGVVbmRvQWN0aW9uKGQtPnEpOworICAgICAgICBk LT5hY3Rpb25zW2FjdGlvbl0gPSB1bmRvQWN0aW9uOworICAgICAgICByZXR1cm4gdW5kb0FjdGlv bjsKKyAgICB9CisgICAgY2FzZSBSZWRvOiB7CisgICAgICAgIFFBY3Rpb24qIHJlZG9BY3Rpb24g PSBkLT51bmRvU3RhY2stPmNyZWF0ZVJlZG9BY3Rpb24oZC0+cSk7CisgICAgICAgIGQtPmFjdGlv bnNbYWN0aW9uXSA9IHJlZG9BY3Rpb247CisgICAgICAgIHJldHVybiByZWRvQWN0aW9uOworICAg IH0KKyNlbmRpZgogICAgIGRlZmF1bHQ6CiAgICAgICAgIHJldHVybiAwOwogICAgICAgICBicmVh azsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5oCShyZXZp c2lvbiA4OTA1OCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5o CSh3b3JraW5nIGNvcHkpCkBAIC00NSw2ICs0NSw5IEBAIHB1YmxpYzoKICAgICAgICAgUGFzdGUs CiAgICAgICAgIFNlbGVjdEFsbCwKIAorICAgICAgICBVbmRvLAorICAgICAgICBSZWRvLAorCiAg ICAgICAgIFdlYkFjdGlvbkNvdW50CiAgICAgfTsKIApJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gODkxMzUpCisrKyBUb29scy9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0wNi0xNyAgQ2hh bmcgU2h1ICA8Y3NodUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtRdF0gW1dLMl0gU3VwcG9ydCB1bmRvL3JlZG8gaW4gTWluaUJy b3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYy ODA5CisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmNwcDoKKyAgICAg ICAgKEJyb3dzZXJXaW5kb3c6OkJyb3dzZXJXaW5kb3cpOgorCiAyMDExLTA2LTE3ICBKb29uZSBI dXIgIDxqb29uZS5odXJAY29sbGFib3JhLmNvLnVrPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1h cnRpbiBSb2JpbnNvbi4KSW5kZXg6IFRvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuY3Bw CShyZXZpc2lvbiA4OTA1OCkKKysrIFRvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NCw2ICs4NCwxNSBAQCBCcm93c2VyV2luZG93OjpCcm93 c2VyV2luZG93KFFXS0NvbnRleHQqCiAgICAgZmlsZU1lbnUtPmFkZFNlcGFyYXRvcigpOwogICAg IGZpbGVNZW51LT5hZGRBY3Rpb24oIlF1aXQiLCB0aGlzLCBTTE9UKGNsb3NlKCkpKTsKIAorICAg IFFNZW51KiBlZGl0TWVudSA9IG1lbnVCYXIoKS0+YWRkTWVudSgiJkVkaXQiKTsKKyAgICBRQWN0 aW9uKiB1bmRvID0gcGFnZSgpLT5hY3Rpb24oUVdLUGFnZTo6VW5kbyk7CisgICAgdW5kby0+c2V0 U2hvcnRjdXQoUUtleVNlcXVlbmNlKFFLZXlTZXF1ZW5jZTo6VW5kbykpOworICAgIGVkaXRNZW51 LT5hZGRBY3Rpb24odW5kbyk7CisgICAgUUFjdGlvbiogcmVkbyA9IHBhZ2UoKS0+YWN0aW9uKFFX S1BhZ2U6OlJlZG8pOworICAgIHJlZG8tPnNldFNob3J0Y3V0KFFLZXlTZXF1ZW5jZShRS2V5U2Vx dWVuY2U6OlJlZG8pKTsKKyAgICBlZGl0TWVudS0+YWRkQWN0aW9uKHJlZG8pOworICAgIGVkaXRN ZW51LT5hZGRTZXBhcmF0b3IoKTsKKwogICAgIFFNZW51KiB2aWV3TWVudSA9IG1lbnVCYXIoKS0+ YWRkTWVudSgiJlZpZXciKTsKICAgICB2aWV3TWVudS0+YWRkQWN0aW9uKHBhZ2UoKS0+YWN0aW9u KFFXS1BhZ2U6OlN0b3ApKTsKICAgICB2aWV3TWVudS0+YWRkQWN0aW9uKHBhZ2UoKS0+YWN0aW9u KFFXS1BhZ2U6OlJlbG9hZCkpOwo=