36124 2010-03-15 10:05:01 -0700 [Qt] Multiselect Popup - SelectElement refactoring. 2010-03-19 11:10:51 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 luiz webkit-unassigned commit-queue eric koivisto nokiabugz tonikitoo oldest_to_newest 199706 0 luiz 2010-03-15 10:05:01 -0700 As it is today it is not possible to the menulists popups to tell SelectElement that more then one option is selected. If you select one the other ones selected state will turn off. For <select multiple> I needed to extend the API used by menulist popups. This is the first step. 199709 1 50717 luiz 2010-03-15 10:17:50 -0700 Created attachment 50717 patch 199716 2 50718 luiz 2010-03-15 10:42:17 -0700 Created attachment 50718 patch 2 199719 3 50718 koivisto 2010-03-15 10:50:31 -0700 Comment on attachment 50718 patch 2 r=me 199809 4 50718 commit-queue 2010-03-15 13:39:10 -0700 Comment on attachment 50718 patch 2 Rejecting patch 50718 from commit-queue. Failed to run "['/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', '--reviewer', 'Antti Koivisto', '--force']" exit_code: 1 Last 500 characters of output: + WebCore/dom/SelectElement.cpp | 93 +++++++++++++++++++++------------------- WebCore/dom/SelectElement.h | 3 + 3 files changed, 72 insertions(+), 44 deletions(-) ------------------------------------------------------------------- patching file WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebCore/dom/SelectElement.cpp patching file WebCore/dom/SelectElement.h Hunk #1 FAILED at 97. 1 out of 1 hunk FAILED -- saving rejects to file WebCore/dom/SelectElement.h.rej Full output: http://webkit-commit-queue.appspot.com/results/885008 199947 5 eric 2010-03-15 18:57:53 -0700 We will need an updated patch to land this via the commit queue. 200246 6 tonikitoo 2010-03-16 09:21:01 -0700 *** Bug 34842 has been marked as a duplicate of this bug. *** 200291 7 50808 luiz 2010-03-16 10:50:42 -0700 Created attachment 50808 (committed in r56116) patch 3 Adjusting previous patch. 200719 8 luiz 2010-03-17 06:11:17 -0700 (In reply to comment #5) > We will need an updated patch to land this via the commit queue. Why is it taking so long for the bots to check this patch and for landing? 200847 9 50808 tonikitoo 2010-03-17 10:25:51 -0700 Comment on attachment 50808 (committed in r56116) patch 3 since the CQ is stuck, I committed it manually on behalf of Luiz. Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/dom/SelectElement.cpp M WebCore/dom/SelectElement.h Committed r56116 201938 10 eric 2010-03-19 11:10:51 -0700 The commit-queue gets stuck when people break the build. You can see the status of the queue here: http://webkit-commit-queue.appspot.com/ 50717 2010-03-15 10:17:50 -0700 2010-03-15 10:42:17 -0700 patch 0001-Qt-Multiselect-Popup-SelectElement-refactoring.patch text/plain 9298 luiz RnJvbSAyOTQ0M2FhYjVkNmQ4NWQ2MTRlN2Q2ZjBkZmRjZDk5MmVmMTllOGQ4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IE1vbiwgMTUgTWFyIDIwMTAgMTQ6MTY6MTQgLTAzMDAKU3ViamVjdDogW1BB VENIXSBbUXRdIE11bHRpc2VsZWN0IFBvcHVwIC0gU2VsZWN0RWxlbWVudCByZWZhY3RvcmluZy4K IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjEyNAoKUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCgpBcyBpdCBpcyB0b2RheSBpdCBpcyBub3QgcG9zc2libGUgdG8g dGhlIG1lbnVsaXN0cyBwb3B1cHMgdG8gdGVsbCBTZWxlY3RFbGVtZW50CnRoYXQgbW9yZSB0aGVu IG9uZSBvcHRpb24gaXMgc2VsZWN0ZWQuIElmIHlvdSBzZWxlY3Qgb25lIHRoZSBvdGhlciBvbmVz CnNlbGVjdGVkIHN0YXRlIHdpbGwgdHVybiBvZmYuCgpGb3IgPHNlbGVjdCBtdWx0aXBsZT4gSSBu ZWVkZWQgdG8gZXh0ZW5kIHRoZSBBUEkgdXNlZCBieSBtZW51bGlzdCBwb3B1cHMuIFRoaXMKaXMg dGhlIGZpcnN0IHN0ZXAuIEp1c3QgcmVmYWN0b3JpbmcgU2VsZWN0RWxlbWVudCB3aXRob3V0IGFu eSBiZWhhdmlvciBjaGFuZ2UuClNlcGFyYXRpbmcgY29kZSB0aGF0IHdpbGwgYmUgcmV1c2VkIGlu IGZ1dHVyZSBwYXRjaGVzLgoKKiBkb20vU2VsZWN0RWxlbWVudC5jcHA6CihXZWJDb3JlOjpTZWxl Y3RFbGVtZW50OjpsaXN0Ym94Q2xpY2tIYW5kbGVyKToKKFdlYkNvcmU6OlNlbGVjdEVsZW1lbnQ6 Omxpc3RCb3hEZWZhdWx0RXZlbnRIYW5kbGVyKToKKiBkb20vU2VsZWN0RWxlbWVudC5oOgotLS0K IFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgIHwgICAyMCArKysrKysrKysKIFdlYkNvcmUv ZG9tL1NlbGVjdEVsZW1lbnQuY3BwIHwgICA5MyArKysrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0tLS0tCiBXZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50LmggICB8ICAgIDMgKwogMyBm aWxlcyBjaGFuZ2VkLCA3MiBpbnNlcnRpb25zKCspLCA0NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGY5MDA1OTIu LjY2YzBjM2UgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDMtMTUgIEx1aXogQWdvc3RpbmkgIDxsdWl6 LmFnb3N0aW5pQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW1F0XSBNdWx0aXNlbGVjdCBQb3B1cCAtIFNlbGVjdEVsZW1lbnQg cmVmYWN0b3JpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zNjEyNAorCisgICAgICAgIEFzIGl0IGlzIHRvZGF5IGl0IGlzIG5vdCBwb3NzaWJsZSB0 byB0aGUgbWVudWxpc3RzIHBvcHVwcyB0byB0ZWxsIFNlbGVjdEVsZW1lbnQKKyAgICAgICAgdGhh dCBtb3JlIHRoZW4gb25lIG9wdGlvbiBpcyBzZWxlY3RlZC4gSWYgeW91IHNlbGVjdCBvbmUgdGhl IG90aGVyIG9uZXMKKyAgICAgICAgc2VsZWN0ZWQgc3RhdGUgd2lsbCB0dXJuIG9mZi4KKworICAg ICAgICBGb3IgPHNlbGVjdCBtdWx0aXBsZT4gSSBuZWVkZWQgdG8gZXh0ZW5kIHRoZSBBUEkgdXNl ZCBieSBtZW51bGlzdCBwb3B1cHMuIFRoaXMKKyAgICAgICAgaXMgdGhlIGZpcnN0IHN0ZXAuIEp1 c3QgcmVmYWN0b3JpbmcgU2VsZWN0RWxlbWVudCB3aXRob3V0IGFueSBiZWhhdmlvciBjaGFuZ2Uu CisgICAgICAgIFNlcGFyYXRpbmcgY29kZSB0aGF0IHdpbGwgYmUgcmV1c2VkIGluIGZ1dHVyZSBw YXRjaGVzLgorCisgICAgICAgICogZG9tL1NlbGVjdEVsZW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U2VsZWN0RWxlbWVudDo6bGlzdGJveENsaWNrSGFuZGxlcik6CisgICAgICAgIChXZWJD b3JlOjpTZWxlY3RFbGVtZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcik6CisgICAgICAg ICogZG9tL1NlbGVjdEVsZW1lbnQuaDoKKwogMjAxMC0wMy0xNCAgTHVpeiBBZ29zdGluaSAgPGx1 aXouYWdvc3RpbmlAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQuY3BwIGIvV2Vi Q29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAKaW5kZXggOGI4YThlZi4uMTU4MWViNyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAKKysrIGIvV2ViQ29yZS9kb20vU2Vs ZWN0RWxlbWVudC5jcHAKQEAgLTEsNCArMSw1IEBACiAvKgorICogQ29weXJpZ2h0IChDKSAyMDEw IE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKS4KICAqIENvcHly aWdodCAoQykgMjAwOSBUb3JjaCBNb2JpbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAoaHR0 cDovL3d3dy50b3JjaG1vYmlsZS5jb20vKQogICoKICAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNv ZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKQEAgLTY1OSw2ICs2NjAsNTIg QEAgdm9pZCBTZWxlY3RFbGVtZW50OjptZW51TGlzdERlZmF1bHRFdmVudEhhbmRsZXIoU2VsZWN0 RWxlbWVudERhdGEmIGRhdGEsIEVsZW1lbnQKICAgICB9CiB9CiAKK3ZvaWQgU2VsZWN0RWxlbWVu dDo6bGlzdGJveENsaWNrSGFuZGxlcihTZWxlY3RFbGVtZW50RGF0YSYgZGF0YSwgRWxlbWVudCog ZWxlbWVudCwgaW50IGxpc3RJbmRleCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBib29sIG11bHRpLCBib29sIHNoaWZ0KQoreworICAgIGlmIChsaXN0SW5kZXggPj0g MCkgeworICAgICAgICAvLyBTYXZlIHRoZSBzZWxlY3Rpb24gc28gaXQgY2FuIGJlIGNvbXBhcmVk IHRvIHRoZSBuZXcgc2VsZWN0aW9uIHdoZW4gZGlzcGF0Y2hpbmcgY2hhbmdlIGV2ZW50cyBkdXJp bmcgbW91c2V1cCwgb3IgYWZ0ZXIgYXV0b3Njcm9sbCBmaW5pc2hlcy4KKyAgICAgICAgc2F2ZUxh c3RTZWxlY3Rpb24oZGF0YSwgZWxlbWVudCk7CisKKyAgICAgICAgZGF0YS5zZXRBY3RpdmVTZWxl Y3Rpb25TdGF0ZSh0cnVlKTsKKworICAgICAgICBib29sIHNoaWZ0U2VsZWN0ID0gZGF0YS5tdWx0 aXBsZSgpICYmIHNoaWZ0OworICAgICAgICBib29sIG11bHRpU2VsZWN0ID0gZGF0YS5tdWx0aXBs ZSgpICYmIG11bHRpICYmICFzaGlmdDsKKworICAgICAgICBFbGVtZW50KiBjbGlja2VkRWxlbWVu dCA9IGRhdGEubGlzdEl0ZW1zKGVsZW1lbnQpW2xpc3RJbmRleF07CisgICAgICAgIE9wdGlvbkVs ZW1lbnQqIG9wdGlvbiA9IHRvT3B0aW9uRWxlbWVudChjbGlja2VkRWxlbWVudCk7CisgICAgICAg IGlmIChvcHRpb24pIHsKKyAgICAgICAgICAgIC8vIEtlZXAgdHJhY2sgb2Ygd2hldGhlciBhbiBh Y3RpdmUgc2VsZWN0aW9uIChsaWtlIGR1cmluZyBkcmFnIHNlbGVjdGlvbiksIHNob3VsZCBzZWxl Y3Qgb3IgZGVzZWxlY3QKKyAgICAgICAgICAgIGlmIChvcHRpb24tPnNlbGVjdGVkKCkgJiYgbXVs dGkpCisgICAgICAgICAgICAgICAgZGF0YS5zZXRBY3RpdmVTZWxlY3Rpb25TdGF0ZShmYWxzZSk7 CisKKyAgICAgICAgICAgIGlmICghZGF0YS5hY3RpdmVTZWxlY3Rpb25TdGF0ZSgpKQorICAgICAg ICAgICAgICAgIG9wdGlvbi0+c2V0U2VsZWN0ZWRTdGF0ZShmYWxzZSk7CisgICAgICAgIH0KKwor ICAgICAgICAvLyBJZiB3ZSdyZSBub3QgaW4gYW55IHNwZWNpYWwgbXVsdGlwbGUgc2VsZWN0aW9u IG1vZGUsIHRoZW4gZGVzZWxlY3QgYWxsIG90aGVyIGl0ZW1zLCBleGNsdWRpbmcgdGhlIGNsaWNr ZWQgb3B0aW9uLgorICAgICAgICAvLyBJZiBubyBvcHRpb24gd2FzIGNsaWNrZWQsIHRoZW4gdGhp cyB3aWxsIGRlc2VsZWN0IGFsbCBpdGVtcyBpbiB0aGUgbGlzdC4KKyAgICAgICAgaWYgKCFzaGlm dFNlbGVjdCAmJiAhbXVsdGlTZWxlY3QpCisgICAgICAgICAgICBkZXNlbGVjdEl0ZW1zKGRhdGEs IGVsZW1lbnQsIGNsaWNrZWRFbGVtZW50KTsKKworICAgICAgICAvLyBJZiB0aGUgYW5jaG9yIGhh c24ndCBiZWVuIHNldCwgYW5kIHdlJ3JlIGRvaW5nIGEgc2luZ2xlIHNlbGVjdGlvbiBvciBhIHNo aWZ0IHNlbGVjdGlvbiwgdGhlbiBpbml0aWFsaXplIHRoZSBhbmNob3IgdG8gdGhlIGZpcnN0IHNl bGVjdGVkIGluZGV4LgorICAgICAgICBpZiAoZGF0YS5hY3RpdmVTZWxlY3Rpb25BbmNob3JJbmRl eCgpIDwgMCAmJiAhbXVsdGlTZWxlY3QpCisgICAgICAgICAgICBzZXRBY3RpdmVTZWxlY3Rpb25B bmNob3JJbmRleChkYXRhLCBlbGVtZW50LCBzZWxlY3RlZEluZGV4KGRhdGEsIGVsZW1lbnQpKTsK KworICAgICAgICAvLyBTZXQgdGhlIHNlbGVjdGlvbiBzdGF0ZSBvZiB0aGUgY2xpY2tlZCBvcHRp b24KKyAgICAgICAgaWYgKG9wdGlvbiAmJiAhY2xpY2tlZEVsZW1lbnQtPmRpc2FibGVkKCkpCisg ICAgICAgICAgICBvcHRpb24tPnNldFNlbGVjdGVkU3RhdGUodHJ1ZSk7CisKKyAgICAgICAgLy8g SWYgdGhlcmUgd2FzIG5vIHNlbGVjdGVkSW5kZXgoKSBmb3IgdGhlIHByZXZpb3VzIGluaXRpYWxp emF0aW9uLCBvcgorICAgICAgICAvLyBJZiB3ZSdyZSBkb2luZyBhIHNpbmdsZSBzZWxlY3Rpb24s IG9yIGEgbXVsdGlwbGUgc2VsZWN0aW9uICh1c2luZyBjbWQgb3IgY3RybCksIHRoZW4gaW5pdGlh bGl6ZSB0aGUgYW5jaG9yIGluZGV4IHRvIHRoZSBsaXN0SW5kZXggdGhhdCBqdXN0IGdvdCBjbGlj a2VkLgorICAgICAgICBpZiAobGlzdEluZGV4ID49IDAgJiYgKGRhdGEuYWN0aXZlU2VsZWN0aW9u QW5jaG9ySW5kZXgoKSA8IDAgfHwgIXNoaWZ0U2VsZWN0KSkKKyAgICAgICAgICAgIHNldEFjdGl2 ZVNlbGVjdGlvbkFuY2hvckluZGV4KGRhdGEsIGVsZW1lbnQsIGxpc3RJbmRleCk7CisKKyAgICAg ICAgc2V0QWN0aXZlU2VsZWN0aW9uRW5kSW5kZXgoZGF0YSwgbGlzdEluZGV4KTsKKyAgICAgICAg dXBkYXRlTGlzdEJveFNlbGVjdGlvbihkYXRhLCBlbGVtZW50LCAhbXVsdGlTZWxlY3QpOworICAg IH0KK30KKwogdm9pZCBTZWxlY3RFbGVtZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcihT ZWxlY3RFbGVtZW50RGF0YSYgZGF0YSwgRWxlbWVudCogZWxlbWVudCwgRXZlbnQqIGV2ZW50LCBI VE1MRm9ybUVsZW1lbnQqIGh0bWxGb3JtKQogewogICAgIGNvbnN0IFZlY3RvcjxFbGVtZW50Kj4m IGxpc3RJdGVtcyA9IGRhdGEubGlzdEl0ZW1zKGVsZW1lbnQpOwpAQCAtNjcxLDUzICs3MTgsMTEg QEAgdm9pZCBTZWxlY3RFbGVtZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcihTZWxlY3RF bGVtZW50RGF0YSYgZGF0YSwgRWxlbWVudCoKICAgICAgICAgSW50UG9pbnQgbG9jYWxPZmZzZXQg PSByb3VuZGVkSW50UG9pbnQoZWxlbWVudC0+cmVuZGVyZXIoKS0+YWJzb2x1dGVUb0xvY2FsKG1v dXNlRXZlbnQtPmFic29sdXRlTG9jYXRpb24oKSwgZmFsc2UsIHRydWUpKTsKICAgICAgICAgaW50 IGxpc3RJbmRleCA9IHRvUmVuZGVyTGlzdEJveChlbGVtZW50LT5yZW5kZXJlcigpKS0+bGlzdElu ZGV4QXRPZmZzZXQobG9jYWxPZmZzZXQueCgpLCBsb2NhbE9mZnNldC55KCkpOwogICAgICAgICBp ZiAobGlzdEluZGV4ID49IDApIHsKLSAgICAgICAgICAgIC8vIFNhdmUgdGhlIHNlbGVjdGlvbiBz byBpdCBjYW4gYmUgY29tcGFyZWQgdG8gdGhlIG5ldyBzZWxlY3Rpb24gd2hlbiBkaXNwYXRjaGlu ZyBjaGFuZ2UgZXZlbnRzIGR1cmluZyBtb3VzZXVwLCBvciBhZnRlciBhdXRvc2Nyb2xsIGZpbmlz aGVzLgotICAgICAgICAgICAgc2F2ZUxhc3RTZWxlY3Rpb24oZGF0YSwgZWxlbWVudCk7Ci0KLSAg ICAgICAgICAgIGRhdGEuc2V0QWN0aXZlU2VsZWN0aW9uU3RhdGUodHJ1ZSk7Ci0gICAgICAgICAg ICAKLSAgICAgICAgICAgIGJvb2wgbXVsdGlTZWxlY3RLZXlQcmVzc2VkID0gZmFsc2U7CiAjaWYg UExBVEZPUk0oTUFDKSB8fCAoUExBVEZPUk0oQ0hST01JVU0pICYmIE9TKERBUldJTikpCi0gICAg ICAgICAgICBtdWx0aVNlbGVjdEtleVByZXNzZWQgPSBtb3VzZUV2ZW50LT5tZXRhS2V5KCk7Cisg ICAgICAgICAgICBsaXN0Ym94Q2xpY2tIYW5kbGVyKGRhdGEsIGVsZW1lbnQsIGxpc3RJbmRleCwg bW91c2VFdmVudC0+bWV0YUtleSgpLCBtb3VzZUV2ZW50LT5zaGlmdEtleSgpKTsKICNlbHNlCi0g ICAgICAgICAgICBtdWx0aVNlbGVjdEtleVByZXNzZWQgPSBtb3VzZUV2ZW50LT5jdHJsS2V5KCk7 CisgICAgICAgICAgICBsaXN0Ym94Q2xpY2tIYW5kbGVyKGRhdGEsIGVsZW1lbnQsIGxpc3RJbmRl eCwgbW91c2VFdmVudC0+Y3RybEtleSgpLCBtb3VzZUV2ZW50LT5zaGlmdEtleSgpKTsKICNlbmRp ZgotCi0gICAgICAgICAgICBib29sIHNoaWZ0U2VsZWN0ID0gZGF0YS5tdWx0aXBsZSgpICYmIG1v dXNlRXZlbnQtPnNoaWZ0S2V5KCk7Ci0gICAgICAgICAgICBib29sIG11bHRpU2VsZWN0ID0gZGF0 YS5tdWx0aXBsZSgpICYmIG11bHRpU2VsZWN0S2V5UHJlc3NlZCAmJiAhbW91c2VFdmVudC0+c2hp ZnRLZXkoKTsKLQotICAgICAgICAgICAgRWxlbWVudCogY2xpY2tlZEVsZW1lbnQgPSBsaXN0SXRl bXNbbGlzdEluZGV4XTsgICAgICAgICAgICAKLSAgICAgICAgICAgIE9wdGlvbkVsZW1lbnQqIG9w dGlvbiA9IHRvT3B0aW9uRWxlbWVudChjbGlja2VkRWxlbWVudCk7Ci0gICAgICAgICAgICBpZiAo b3B0aW9uKSB7Ci0gICAgICAgICAgICAgICAgLy8gS2VlcCB0cmFjayBvZiB3aGV0aGVyIGFuIGFj dGl2ZSBzZWxlY3Rpb24gKGxpa2UgZHVyaW5nIGRyYWcgc2VsZWN0aW9uKSwgc2hvdWxkIHNlbGVj dCBvciBkZXNlbGVjdAotICAgICAgICAgICAgICAgIGlmIChvcHRpb24tPnNlbGVjdGVkKCkgJiYg bXVsdGlTZWxlY3RLZXlQcmVzc2VkKQotICAgICAgICAgICAgICAgICAgICBkYXRhLnNldEFjdGl2 ZVNlbGVjdGlvblN0YXRlKGZhbHNlKTsKLQotICAgICAgICAgICAgICAgIGlmICghZGF0YS5hY3Rp dmVTZWxlY3Rpb25TdGF0ZSgpKQotICAgICAgICAgICAgICAgICAgICBvcHRpb24tPnNldFNlbGVj dGVkU3RhdGUoZmFsc2UpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgCi0gICAgICAgICAg ICAvLyBJZiB3ZSdyZSBub3QgaW4gYW55IHNwZWNpYWwgbXVsdGlwbGUgc2VsZWN0aW9uIG1vZGUs IHRoZW4gZGVzZWxlY3QgYWxsIG90aGVyIGl0ZW1zLCBleGNsdWRpbmcgdGhlIGNsaWNrZWQgb3B0 aW9uLgotICAgICAgICAgICAgLy8gSWYgbm8gb3B0aW9uIHdhcyBjbGlja2VkLCB0aGVuIHRoaXMg d2lsbCBkZXNlbGVjdCBhbGwgaXRlbXMgaW4gdGhlIGxpc3QuCi0gICAgICAgICAgICBpZiAoIXNo aWZ0U2VsZWN0ICYmICFtdWx0aVNlbGVjdCkKLSAgICAgICAgICAgICAgICBkZXNlbGVjdEl0ZW1z KGRhdGEsIGVsZW1lbnQsIGNsaWNrZWRFbGVtZW50KTsKLQotICAgICAgICAgICAgLy8gSWYgdGhl IGFuY2hvciBoYXNuJ3QgYmVlbiBzZXQsIGFuZCB3ZSdyZSBkb2luZyBhIHNpbmdsZSBzZWxlY3Rp b24gb3IgYSBzaGlmdCBzZWxlY3Rpb24sIHRoZW4gaW5pdGlhbGl6ZSB0aGUgYW5jaG9yIHRvIHRo ZSBmaXJzdCBzZWxlY3RlZCBpbmRleC4KLSAgICAgICAgICAgIGlmIChkYXRhLmFjdGl2ZVNlbGVj dGlvbkFuY2hvckluZGV4KCkgPCAwICYmICFtdWx0aVNlbGVjdCkKLSAgICAgICAgICAgICAgICBz ZXRBY3RpdmVTZWxlY3Rpb25BbmNob3JJbmRleChkYXRhLCBlbGVtZW50LCBzZWxlY3RlZEluZGV4 KGRhdGEsIGVsZW1lbnQpKTsKLQotICAgICAgICAgICAgLy8gU2V0IHRoZSBzZWxlY3Rpb24gc3Rh dGUgb2YgdGhlIGNsaWNrZWQgb3B0aW9uCi0gICAgICAgICAgICBpZiAob3B0aW9uICYmICFjbGlj a2VkRWxlbWVudC0+ZGlzYWJsZWQoKSkKLSAgICAgICAgICAgICAgICBvcHRpb24tPnNldFNlbGVj dGVkU3RhdGUodHJ1ZSk7Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIC8vIElmIHRoZXJlIHdh cyBubyBzZWxlY3RlZEluZGV4KCkgZm9yIHRoZSBwcmV2aW91cyBpbml0aWFsaXphdGlvbiwgb3IK LSAgICAgICAgICAgIC8vIElmIHdlJ3JlIGRvaW5nIGEgc2luZ2xlIHNlbGVjdGlvbiwgb3IgYSBt dWx0aXBsZSBzZWxlY3Rpb24gKHVzaW5nIGNtZCBvciBjdHJsKSwgdGhlbiBpbml0aWFsaXplIHRo ZSBhbmNob3IgaW5kZXggdG8gdGhlIGxpc3RJbmRleCB0aGF0IGp1c3QgZ290IGNsaWNrZWQuCi0g ICAgICAgICAgICBpZiAobGlzdEluZGV4ID49IDAgJiYgKGRhdGEuYWN0aXZlU2VsZWN0aW9uQW5j aG9ySW5kZXgoKSA8IDAgfHwgIXNoaWZ0U2VsZWN0KSkKLSAgICAgICAgICAgICAgICBzZXRBY3Rp dmVTZWxlY3Rpb25BbmNob3JJbmRleChkYXRhLCBlbGVtZW50LCBsaXN0SW5kZXgpOwotICAgICAg ICAgICAgCi0gICAgICAgICAgICBzZXRBY3RpdmVTZWxlY3Rpb25FbmRJbmRleChkYXRhLCBsaXN0 SW5kZXgpOwotICAgICAgICAgICAgdXBkYXRlTGlzdEJveFNlbGVjdGlvbihkYXRhLCBlbGVtZW50 LCAhbXVsdGlTZWxlY3QpOwotCiAgICAgICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gZWxlbWVu dC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKSkKICAgICAgICAgICAgICAgICBmcmFtZS0+ZXZlbnRIYW5k bGVyKCktPnNldE1vdXNlRG93bk1heVN0YXJ0QXV0b3Njcm9sbCgpOwogCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50LmggYi9XZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50LmgK aW5kZXggMGQ5ZGFmZS4uZGMwOGQxNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vU2VsZWN0RWxl bWVudC5oCisrKyBiL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQuaApAQCAtOTcsNiArOTcsOSBA QCBwcm90ZWN0ZWQ6CiAgICAgc3RhdGljIHZvaWQgYWNjZXNzS2V5U2V0U2VsZWN0ZWRJbmRleChT ZWxlY3RFbGVtZW50RGF0YSYsIEVsZW1lbnQqLCBpbnQgaW5kZXgpOwogICAgIHN0YXRpYyB1bnNp Z25lZCBvcHRpb25Db3VudChjb25zdCBTZWxlY3RFbGVtZW50RGF0YSYsIGNvbnN0IEVsZW1lbnQq KTsKIAorICAgIHN0YXRpYyB2b2lkIGxpc3Rib3hDbGlja0hhbmRsZXIoU2VsZWN0RWxlbWVudERh dGEmIGRhdGEsIEVsZW1lbnQqIGVsZW1lbnQsIGludCBsaXN0SW5kZXgsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBib29sIG11bHRpLCBib29sIHNoaWZ0KTsKKwogIAogcHJp dmF0ZToKICAgICBzdGF0aWMgdm9pZCBtZW51TGlzdERlZmF1bHRFdmVudEhhbmRsZXIoU2VsZWN0 RWxlbWVudERhdGEmLCBFbGVtZW50KiwgRXZlbnQqLCBIVE1MRm9ybUVsZW1lbnQqKTsKLS0gCjEu Ni4zLjMKCg== 50718 2010-03-15 10:42:17 -0700 2010-03-16 10:50:42 -0700 patch 2 0001-Qt-Multiselect-Popup-SelectElement-refactoring.patch text/plain 8935 luiz RnJvbSA0YzhiZTI2ODkxYThhOTgzNDJlYjkyNmExMTdkZWQ4YzY3ZmMwOGNhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IE1vbiwgMTUgTWFyIDIwMTAgMTQ6NDA6MTggLTAzMDAKU3ViamVjdDogW1BB VENIXSBbUXRdIE11bHRpc2VsZWN0IFBvcHVwIC0gU2VsZWN0RWxlbWVudCByZWZhY3RvcmluZy4K IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjEyNAoKUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCgpBcyBpdCBpcyB0b2RheSBpdCBpcyBub3QgcG9zc2libGUgdG8g dGhlIG1lbnVsaXN0cyBwb3B1cHMgdG8gdGVsbCBTZWxlY3RFbGVtZW50CnRoYXQgbW9yZSB0aGVu IG9uZSBvcHRpb24gaXMgc2VsZWN0ZWQuIElmIHlvdSBzZWxlY3Qgb25lIHRoZSBvdGhlciBvbmVz CnNlbGVjdGVkIHN0YXRlIHdpbGwgdHVybiBvZmYuCgpGb3IgPHNlbGVjdCBtdWx0aXBsZT4gSSBu ZWVkZWQgdG8gZXh0ZW5kIHRoZSBBUEkgdXNlZCBieSBtZW51bGlzdCBwb3B1cHMuIFRoaXMKaXMg dGhlIGZpcnN0IHN0ZXAuIEp1c3QgcmVmYWN0b3JpbmcgU2VsZWN0RWxlbWVudCB3aXRob3V0IGFu eSBiZWhhdmlvciBjaGFuZ2UuClNlcGFyYXRpbmcgY29kZSB0aGF0IHdpbGwgYmUgcmV1c2VkIGlu IGZ1dHVyZSBwYXRjaGVzLgoKKiBkb20vU2VsZWN0RWxlbWVudC5jcHA6CihXZWJDb3JlOjpTZWxl Y3RFbGVtZW50OjpsaXN0Ym94Q2xpY2tIYW5kbGVyKToKKFdlYkNvcmU6OlNlbGVjdEVsZW1lbnQ6 Omxpc3RCb3hEZWZhdWx0RXZlbnRIYW5kbGVyKToKKiBkb20vU2VsZWN0RWxlbWVudC5oOgotLS0K IFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgIHwgICAyMCArKysrKysrKysKIFdlYkNvcmUv ZG9tL1NlbGVjdEVsZW1lbnQuY3BwIHwgICA5MyArKysrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0tLS0tCiBXZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50LmggICB8ICAgIDMgKwogMyBm aWxlcyBjaGFuZ2VkLCA3MiBpbnNlcnRpb25zKCspLCA0NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGY5MDA1OTIu LjY2YzBjM2UgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDMtMTUgIEx1aXogQWdvc3RpbmkgIDxsdWl6 LmFnb3N0aW5pQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW1F0XSBNdWx0aXNlbGVjdCBQb3B1cCAtIFNlbGVjdEVsZW1lbnQg cmVmYWN0b3JpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zNjEyNAorCisgICAgICAgIEFzIGl0IGlzIHRvZGF5IGl0IGlzIG5vdCBwb3NzaWJsZSB0 byB0aGUgbWVudWxpc3RzIHBvcHVwcyB0byB0ZWxsIFNlbGVjdEVsZW1lbnQKKyAgICAgICAgdGhh dCBtb3JlIHRoZW4gb25lIG9wdGlvbiBpcyBzZWxlY3RlZC4gSWYgeW91IHNlbGVjdCBvbmUgdGhl IG90aGVyIG9uZXMKKyAgICAgICAgc2VsZWN0ZWQgc3RhdGUgd2lsbCB0dXJuIG9mZi4KKworICAg ICAgICBGb3IgPHNlbGVjdCBtdWx0aXBsZT4gSSBuZWVkZWQgdG8gZXh0ZW5kIHRoZSBBUEkgdXNl ZCBieSBtZW51bGlzdCBwb3B1cHMuIFRoaXMKKyAgICAgICAgaXMgdGhlIGZpcnN0IHN0ZXAuIEp1 c3QgcmVmYWN0b3JpbmcgU2VsZWN0RWxlbWVudCB3aXRob3V0IGFueSBiZWhhdmlvciBjaGFuZ2Uu CisgICAgICAgIFNlcGFyYXRpbmcgY29kZSB0aGF0IHdpbGwgYmUgcmV1c2VkIGluIGZ1dHVyZSBw YXRjaGVzLgorCisgICAgICAgICogZG9tL1NlbGVjdEVsZW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U2VsZWN0RWxlbWVudDo6bGlzdGJveENsaWNrSGFuZGxlcik6CisgICAgICAgIChXZWJD b3JlOjpTZWxlY3RFbGVtZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcik6CisgICAgICAg ICogZG9tL1NlbGVjdEVsZW1lbnQuaDoKKwogMjAxMC0wMy0xNCAgTHVpeiBBZ29zdGluaSAgPGx1 aXouYWdvc3RpbmlAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQuY3BwIGIvV2Vi Q29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAKaW5kZXggOGI4YThlZi4uNGZlNjc2NSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAKKysrIGIvV2ViQ29yZS9kb20vU2Vs ZWN0RWxlbWVudC5jcHAKQEAgLTY1OSw2ICs2NTksNTMgQEAgdm9pZCBTZWxlY3RFbGVtZW50Ojpt ZW51TGlzdERlZmF1bHRFdmVudEhhbmRsZXIoU2VsZWN0RWxlbWVudERhdGEmIGRhdGEsIEVsZW1l bnQKICAgICB9CiB9CiAKK3ZvaWQgU2VsZWN0RWxlbWVudDo6dXBkYXRlU2VsZWN0ZWRTdGF0ZShT ZWxlY3RFbGVtZW50RGF0YSYgZGF0YSwgRWxlbWVudCogZWxlbWVudCwgaW50IGxpc3RJbmRleCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIG11bHRpLCBib29s IHNoaWZ0KQoreworICAgIGlmIChsaXN0SW5kZXggPCAwKQorICAgICAgICByZXR1cm47CisKKyAg ICAvLyBTYXZlIHRoZSBzZWxlY3Rpb24gc28gaXQgY2FuIGJlIGNvbXBhcmVkIHRvIHRoZSBuZXcg c2VsZWN0aW9uIHdoZW4gZGlzcGF0Y2hpbmcgY2hhbmdlIGV2ZW50cyBkdXJpbmcgbW91c2V1cCwg b3IgYWZ0ZXIgYXV0b3Njcm9sbCBmaW5pc2hlcy4KKyAgICBzYXZlTGFzdFNlbGVjdGlvbihkYXRh LCBlbGVtZW50KTsKKworICAgIGRhdGEuc2V0QWN0aXZlU2VsZWN0aW9uU3RhdGUodHJ1ZSk7CisK KyAgICBib29sIHNoaWZ0U2VsZWN0ID0gZGF0YS5tdWx0aXBsZSgpICYmIHNoaWZ0OworICAgIGJv b2wgbXVsdGlTZWxlY3QgPSBkYXRhLm11bHRpcGxlKCkgJiYgbXVsdGkgJiYgIXNoaWZ0OworCisg ICAgRWxlbWVudCogY2xpY2tlZEVsZW1lbnQgPSBkYXRhLmxpc3RJdGVtcyhlbGVtZW50KVtsaXN0 SW5kZXhdOworICAgIE9wdGlvbkVsZW1lbnQqIG9wdGlvbiA9IHRvT3B0aW9uRWxlbWVudChjbGlj a2VkRWxlbWVudCk7CisgICAgaWYgKG9wdGlvbikgeworICAgICAgICAvLyBLZWVwIHRyYWNrIG9m IHdoZXRoZXIgYW4gYWN0aXZlIHNlbGVjdGlvbiAobGlrZSBkdXJpbmcgZHJhZyBzZWxlY3Rpb24p LCBzaG91bGQgc2VsZWN0IG9yIGRlc2VsZWN0CisgICAgICAgIGlmIChvcHRpb24tPnNlbGVjdGVk KCkgJiYgbXVsdGkpCisgICAgICAgICAgICBkYXRhLnNldEFjdGl2ZVNlbGVjdGlvblN0YXRlKGZh bHNlKTsKKworICAgICAgICBpZiAoIWRhdGEuYWN0aXZlU2VsZWN0aW9uU3RhdGUoKSkKKyAgICAg ICAgICAgIG9wdGlvbi0+c2V0U2VsZWN0ZWRTdGF0ZShmYWxzZSk7CisgICAgfQorCisgICAgLy8g SWYgd2UncmUgbm90IGluIGFueSBzcGVjaWFsIG11bHRpcGxlIHNlbGVjdGlvbiBtb2RlLCB0aGVu IGRlc2VsZWN0IGFsbCBvdGhlciBpdGVtcywgZXhjbHVkaW5nIHRoZSBjbGlja2VkIG9wdGlvbi4K KyAgICAvLyBJZiBubyBvcHRpb24gd2FzIGNsaWNrZWQsIHRoZW4gdGhpcyB3aWxsIGRlc2VsZWN0 IGFsbCBpdGVtcyBpbiB0aGUgbGlzdC4KKyAgICBpZiAoIXNoaWZ0U2VsZWN0ICYmICFtdWx0aVNl bGVjdCkKKyAgICAgICAgZGVzZWxlY3RJdGVtcyhkYXRhLCBlbGVtZW50LCBjbGlja2VkRWxlbWVu dCk7CisKKyAgICAvLyBJZiB0aGUgYW5jaG9yIGhhc24ndCBiZWVuIHNldCwgYW5kIHdlJ3JlIGRv aW5nIGEgc2luZ2xlIHNlbGVjdGlvbiBvciBhIHNoaWZ0IHNlbGVjdGlvbiwgdGhlbiBpbml0aWFs aXplIHRoZSBhbmNob3IgdG8gdGhlIGZpcnN0IHNlbGVjdGVkIGluZGV4LgorICAgIGlmIChkYXRh LmFjdGl2ZVNlbGVjdGlvbkFuY2hvckluZGV4KCkgPCAwICYmICFtdWx0aVNlbGVjdCkKKyAgICAg ICAgc2V0QWN0aXZlU2VsZWN0aW9uQW5jaG9ySW5kZXgoZGF0YSwgZWxlbWVudCwgc2VsZWN0ZWRJ bmRleChkYXRhLCBlbGVtZW50KSk7CisKKyAgICAvLyBTZXQgdGhlIHNlbGVjdGlvbiBzdGF0ZSBv ZiB0aGUgY2xpY2tlZCBvcHRpb24KKyAgICBpZiAob3B0aW9uICYmICFjbGlja2VkRWxlbWVudC0+ ZGlzYWJsZWQoKSkKKyAgICAgICAgb3B0aW9uLT5zZXRTZWxlY3RlZFN0YXRlKHRydWUpOworCisg ICAgLy8gSWYgdGhlcmUgd2FzIG5vIHNlbGVjdGVkSW5kZXgoKSBmb3IgdGhlIHByZXZpb3VzIGlu aXRpYWxpemF0aW9uLCBvcgorICAgIC8vIElmIHdlJ3JlIGRvaW5nIGEgc2luZ2xlIHNlbGVjdGlv biwgb3IgYSBtdWx0aXBsZSBzZWxlY3Rpb24gKHVzaW5nIGNtZCBvciBjdHJsKSwgdGhlbiBpbml0 aWFsaXplIHRoZSBhbmNob3IgaW5kZXggdG8gdGhlIGxpc3RJbmRleCB0aGF0IGp1c3QgZ290IGNs aWNrZWQuCisgICAgaWYgKGxpc3RJbmRleCA+PSAwICYmIChkYXRhLmFjdGl2ZVNlbGVjdGlvbkFu Y2hvckluZGV4KCkgPCAwIHx8ICFzaGlmdFNlbGVjdCkpCisgICAgICAgIHNldEFjdGl2ZVNlbGVj dGlvbkFuY2hvckluZGV4KGRhdGEsIGVsZW1lbnQsIGxpc3RJbmRleCk7CisKKyAgICBzZXRBY3Rp dmVTZWxlY3Rpb25FbmRJbmRleChkYXRhLCBsaXN0SW5kZXgpOworICAgIHVwZGF0ZUxpc3RCb3hT ZWxlY3Rpb24oZGF0YSwgZWxlbWVudCwgIW11bHRpU2VsZWN0KTsKK30KKwogdm9pZCBTZWxlY3RF bGVtZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcihTZWxlY3RFbGVtZW50RGF0YSYgZGF0 YSwgRWxlbWVudCogZWxlbWVudCwgRXZlbnQqIGV2ZW50LCBIVE1MRm9ybUVsZW1lbnQqIGh0bWxG b3JtKQogewogICAgIGNvbnN0IFZlY3RvcjxFbGVtZW50Kj4mIGxpc3RJdGVtcyA9IGRhdGEubGlz dEl0ZW1zKGVsZW1lbnQpOwpAQCAtNjcxLDUzICs3MTgsMTEgQEAgdm9pZCBTZWxlY3RFbGVtZW50 OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcihTZWxlY3RFbGVtZW50RGF0YSYgZGF0YSwgRWxl bWVudCoKICAgICAgICAgSW50UG9pbnQgbG9jYWxPZmZzZXQgPSByb3VuZGVkSW50UG9pbnQoZWxl bWVudC0+cmVuZGVyZXIoKS0+YWJzb2x1dGVUb0xvY2FsKG1vdXNlRXZlbnQtPmFic29sdXRlTG9j YXRpb24oKSwgZmFsc2UsIHRydWUpKTsKICAgICAgICAgaW50IGxpc3RJbmRleCA9IHRvUmVuZGVy TGlzdEJveChlbGVtZW50LT5yZW5kZXJlcigpKS0+bGlzdEluZGV4QXRPZmZzZXQobG9jYWxPZmZz ZXQueCgpLCBsb2NhbE9mZnNldC55KCkpOwogICAgICAgICBpZiAobGlzdEluZGV4ID49IDApIHsK LSAgICAgICAgICAgIC8vIFNhdmUgdGhlIHNlbGVjdGlvbiBzbyBpdCBjYW4gYmUgY29tcGFyZWQg dG8gdGhlIG5ldyBzZWxlY3Rpb24gd2hlbiBkaXNwYXRjaGluZyBjaGFuZ2UgZXZlbnRzIGR1cmlu ZyBtb3VzZXVwLCBvciBhZnRlciBhdXRvc2Nyb2xsIGZpbmlzaGVzLgotICAgICAgICAgICAgc2F2 ZUxhc3RTZWxlY3Rpb24oZGF0YSwgZWxlbWVudCk7Ci0KLSAgICAgICAgICAgIGRhdGEuc2V0QWN0 aXZlU2VsZWN0aW9uU3RhdGUodHJ1ZSk7Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIGJvb2wg bXVsdGlTZWxlY3RLZXlQcmVzc2VkID0gZmFsc2U7CiAjaWYgUExBVEZPUk0oTUFDKSB8fCAoUExB VEZPUk0oQ0hST01JVU0pICYmIE9TKERBUldJTikpCi0gICAgICAgICAgICBtdWx0aVNlbGVjdEtl eVByZXNzZWQgPSBtb3VzZUV2ZW50LT5tZXRhS2V5KCk7CisgICAgICAgICAgICB1cGRhdGVTZWxl Y3RlZFN0YXRlKGRhdGEsIGVsZW1lbnQsIGxpc3RJbmRleCwgbW91c2VFdmVudC0+bWV0YUtleSgp LCBtb3VzZUV2ZW50LT5zaGlmdEtleSgpKTsKICNlbHNlCi0gICAgICAgICAgICBtdWx0aVNlbGVj dEtleVByZXNzZWQgPSBtb3VzZUV2ZW50LT5jdHJsS2V5KCk7CisgICAgICAgICAgICB1cGRhdGVT ZWxlY3RlZFN0YXRlKGRhdGEsIGVsZW1lbnQsIGxpc3RJbmRleCwgbW91c2VFdmVudC0+Y3RybEtl eSgpLCBtb3VzZUV2ZW50LT5zaGlmdEtleSgpKTsKICNlbmRpZgotCi0gICAgICAgICAgICBib29s IHNoaWZ0U2VsZWN0ID0gZGF0YS5tdWx0aXBsZSgpICYmIG1vdXNlRXZlbnQtPnNoaWZ0S2V5KCk7 Ci0gICAgICAgICAgICBib29sIG11bHRpU2VsZWN0ID0gZGF0YS5tdWx0aXBsZSgpICYmIG11bHRp U2VsZWN0S2V5UHJlc3NlZCAmJiAhbW91c2VFdmVudC0+c2hpZnRLZXkoKTsKLQotICAgICAgICAg ICAgRWxlbWVudCogY2xpY2tlZEVsZW1lbnQgPSBsaXN0SXRlbXNbbGlzdEluZGV4XTsgICAgICAg ICAgICAKLSAgICAgICAgICAgIE9wdGlvbkVsZW1lbnQqIG9wdGlvbiA9IHRvT3B0aW9uRWxlbWVu dChjbGlja2VkRWxlbWVudCk7Ci0gICAgICAgICAgICBpZiAob3B0aW9uKSB7Ci0gICAgICAgICAg ICAgICAgLy8gS2VlcCB0cmFjayBvZiB3aGV0aGVyIGFuIGFjdGl2ZSBzZWxlY3Rpb24gKGxpa2Ug ZHVyaW5nIGRyYWcgc2VsZWN0aW9uKSwgc2hvdWxkIHNlbGVjdCBvciBkZXNlbGVjdAotICAgICAg ICAgICAgICAgIGlmIChvcHRpb24tPnNlbGVjdGVkKCkgJiYgbXVsdGlTZWxlY3RLZXlQcmVzc2Vk KQotICAgICAgICAgICAgICAgICAgICBkYXRhLnNldEFjdGl2ZVNlbGVjdGlvblN0YXRlKGZhbHNl KTsKLQotICAgICAgICAgICAgICAgIGlmICghZGF0YS5hY3RpdmVTZWxlY3Rpb25TdGF0ZSgpKQot ICAgICAgICAgICAgICAgICAgICBvcHRpb24tPnNldFNlbGVjdGVkU3RhdGUoZmFsc2UpOwotICAg ICAgICAgICAgfQotICAgICAgICAgICAgCi0gICAgICAgICAgICAvLyBJZiB3ZSdyZSBub3QgaW4g YW55IHNwZWNpYWwgbXVsdGlwbGUgc2VsZWN0aW9uIG1vZGUsIHRoZW4gZGVzZWxlY3QgYWxsIG90 aGVyIGl0ZW1zLCBleGNsdWRpbmcgdGhlIGNsaWNrZWQgb3B0aW9uLgotICAgICAgICAgICAgLy8g SWYgbm8gb3B0aW9uIHdhcyBjbGlja2VkLCB0aGVuIHRoaXMgd2lsbCBkZXNlbGVjdCBhbGwgaXRl bXMgaW4gdGhlIGxpc3QuCi0gICAgICAgICAgICBpZiAoIXNoaWZ0U2VsZWN0ICYmICFtdWx0aVNl bGVjdCkKLSAgICAgICAgICAgICAgICBkZXNlbGVjdEl0ZW1zKGRhdGEsIGVsZW1lbnQsIGNsaWNr ZWRFbGVtZW50KTsKLQotICAgICAgICAgICAgLy8gSWYgdGhlIGFuY2hvciBoYXNuJ3QgYmVlbiBz ZXQsIGFuZCB3ZSdyZSBkb2luZyBhIHNpbmdsZSBzZWxlY3Rpb24gb3IgYSBzaGlmdCBzZWxlY3Rp b24sIHRoZW4gaW5pdGlhbGl6ZSB0aGUgYW5jaG9yIHRvIHRoZSBmaXJzdCBzZWxlY3RlZCBpbmRl eC4KLSAgICAgICAgICAgIGlmIChkYXRhLmFjdGl2ZVNlbGVjdGlvbkFuY2hvckluZGV4KCkgPCAw ICYmICFtdWx0aVNlbGVjdCkKLSAgICAgICAgICAgICAgICBzZXRBY3RpdmVTZWxlY3Rpb25BbmNo b3JJbmRleChkYXRhLCBlbGVtZW50LCBzZWxlY3RlZEluZGV4KGRhdGEsIGVsZW1lbnQpKTsKLQot ICAgICAgICAgICAgLy8gU2V0IHRoZSBzZWxlY3Rpb24gc3RhdGUgb2YgdGhlIGNsaWNrZWQgb3B0 aW9uCi0gICAgICAgICAgICBpZiAob3B0aW9uICYmICFjbGlja2VkRWxlbWVudC0+ZGlzYWJsZWQo KSkKLSAgICAgICAgICAgICAgICBvcHRpb24tPnNldFNlbGVjdGVkU3RhdGUodHJ1ZSk7Ci0gICAg ICAgICAgICAKLSAgICAgICAgICAgIC8vIElmIHRoZXJlIHdhcyBubyBzZWxlY3RlZEluZGV4KCkg Zm9yIHRoZSBwcmV2aW91cyBpbml0aWFsaXphdGlvbiwgb3IKLSAgICAgICAgICAgIC8vIElmIHdl J3JlIGRvaW5nIGEgc2luZ2xlIHNlbGVjdGlvbiwgb3IgYSBtdWx0aXBsZSBzZWxlY3Rpb24gKHVz aW5nIGNtZCBvciBjdHJsKSwgdGhlbiBpbml0aWFsaXplIHRoZSBhbmNob3IgaW5kZXggdG8gdGhl IGxpc3RJbmRleCB0aGF0IGp1c3QgZ290IGNsaWNrZWQuCi0gICAgICAgICAgICBpZiAobGlzdElu ZGV4ID49IDAgJiYgKGRhdGEuYWN0aXZlU2VsZWN0aW9uQW5jaG9ySW5kZXgoKSA8IDAgfHwgIXNo aWZ0U2VsZWN0KSkKLSAgICAgICAgICAgICAgICBzZXRBY3RpdmVTZWxlY3Rpb25BbmNob3JJbmRl eChkYXRhLCBlbGVtZW50LCBsaXN0SW5kZXgpOwotICAgICAgICAgICAgCi0gICAgICAgICAgICBz ZXRBY3RpdmVTZWxlY3Rpb25FbmRJbmRleChkYXRhLCBsaXN0SW5kZXgpOwotICAgICAgICAgICAg dXBkYXRlTGlzdEJveFNlbGVjdGlvbihkYXRhLCBlbGVtZW50LCAhbXVsdGlTZWxlY3QpOwotCiAg ICAgICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gZWxlbWVudC0+ZG9jdW1lbnQoKS0+ZnJhbWUo KSkKICAgICAgICAgICAgICAgICBmcmFtZS0+ZXZlbnRIYW5kbGVyKCktPnNldE1vdXNlRG93bk1h eVN0YXJ0QXV0b3Njcm9sbCgpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9TZWxlY3RFbGVt ZW50LmggYi9XZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50LmgKaW5kZXggMGQ5ZGFmZS4uMTlkYzdh YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5oCisrKyBiL1dlYkNvcmUv ZG9tL1NlbGVjdEVsZW1lbnQuaApAQCAtOTcsNiArOTcsOSBAQCBwcm90ZWN0ZWQ6CiAgICAgc3Rh dGljIHZvaWQgYWNjZXNzS2V5U2V0U2VsZWN0ZWRJbmRleChTZWxlY3RFbGVtZW50RGF0YSYsIEVs ZW1lbnQqLCBpbnQgaW5kZXgpOwogICAgIHN0YXRpYyB1bnNpZ25lZCBvcHRpb25Db3VudChjb25z dCBTZWxlY3RFbGVtZW50RGF0YSYsIGNvbnN0IEVsZW1lbnQqKTsKIAorICAgIHN0YXRpYyB2b2lk IHVwZGF0ZVNlbGVjdGVkU3RhdGUoU2VsZWN0RWxlbWVudERhdGEmIGRhdGEsIEVsZW1lbnQqIGVs ZW1lbnQsIGludCBsaXN0SW5kZXgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBib29sIG11bHRpLCBib29sIHNoaWZ0KTsKKwogIAogcHJpdmF0ZToKICAgICBzdGF0aWMgdm9p ZCBtZW51TGlzdERlZmF1bHRFdmVudEhhbmRsZXIoU2VsZWN0RWxlbWVudERhdGEmLCBFbGVtZW50 KiwgRXZlbnQqLCBIVE1MRm9ybUVsZW1lbnQqKTsKLS0gCjEuNi4zLjMKCg== 50808 2010-03-16 10:50:42 -0700 2010-03-17 10:25:51 -0700 (committed in r56116) patch 3 0001-Qt-Multiselect-Popup-SelectElement-refactoring.patch text/plain 8959 luiz RnJvbSBlNjRlYWZiZGE1NThiZTJiYjlmMjc4ZGI1OWQ3NWU0N2RkOGJhNWFiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IFR1ZSwgMTYgTWFyIDIwMTAgMTQ6NDY6MzYgLTAzMDAKU3ViamVjdDogW1BB VENIXSBbUXRdIE11bHRpc2VsZWN0IFBvcHVwIC0gU2VsZWN0RWxlbWVudCByZWZhY3RvcmluZy4K IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjEyNAoKUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCgpBcyBpdCBpcyB0b2RheSBpdCBpcyBub3QgcG9zc2libGUgdG8g dGhlIG1lbnVsaXN0cyBwb3B1cHMgdG8gdGVsbCBTZWxlY3RFbGVtZW50CnRoYXQgbW9yZSB0aGVu IG9uZSBvcHRpb24gaXMgc2VsZWN0ZWQuIElmIHlvdSBzZWxlY3Qgb25lIHRoZSBvdGhlciBvbmVz CnNlbGVjdGVkIHN0YXRlIHdpbGwgdHVybiBvZmYuCgpGb3IgPHNlbGVjdCBtdWx0aXBsZT4gSSBu ZWVkZWQgdG8gZXh0ZW5kIHRoZSBBUEkgdXNlZCBieSBtZW51bGlzdCBwb3B1cHMuIFRoaXMKaXMg dGhlIGZpcnN0IHN0ZXAuIEp1c3QgcmVmYWN0b3JpbmcgU2VsZWN0RWxlbWVudCB3aXRob3V0IGFu eSBiZWhhdmlvciBjaGFuZ2UuClNlcGFyYXRpbmcgY29kZSB0aGF0IHdpbGwgYmUgcmV1c2VkIGlu IGZ1dHVyZSBwYXRjaGVzLgoKKiBkb20vU2VsZWN0RWxlbWVudC5jcHA6CihXZWJDb3JlOjpTZWxl Y3RFbGVtZW50Ojp1cGRhdGVTZWxlY3RlZFN0YXRlKToKKFdlYkNvcmU6OlNlbGVjdEVsZW1lbnQ6 Omxpc3RCb3hEZWZhdWx0RXZlbnRIYW5kbGVyKToKKiBkb20vU2VsZWN0RWxlbWVudC5oOgotLS0K IFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgIHwgICAyMCArKysrKysrKysKIFdlYkNvcmUv ZG9tL1NlbGVjdEVsZW1lbnQuY3BwIHwgICA5MiArKysrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0tLS0tCiBXZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50LmggICB8ICAgIDMgKwogMyBm aWxlcyBjaGFuZ2VkLCA3MSBpbnNlcnRpb25zKCspLCA0NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDJhZjMyYzYu LjNiMjhhNmYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDMtMTYgIEx1aXogQWdvc3RpbmkgIDxsdWl6 LmFnb3N0aW5pQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW1F0XSBNdWx0aXNlbGVjdCBQb3B1cCAtIFNlbGVjdEVsZW1lbnQg cmVmYWN0b3JpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zNjEyNAorCisgICAgICAgIEFzIGl0IGlzIHRvZGF5IGl0IGlzIG5vdCBwb3NzaWJsZSB0 byB0aGUgbWVudWxpc3RzIHBvcHVwcyB0byB0ZWxsIFNlbGVjdEVsZW1lbnQKKyAgICAgICAgdGhh dCBtb3JlIHRoZW4gb25lIG9wdGlvbiBpcyBzZWxlY3RlZC4gSWYgeW91IHNlbGVjdCBvbmUgdGhl IG90aGVyIG9uZXMKKyAgICAgICAgc2VsZWN0ZWQgc3RhdGUgd2lsbCB0dXJuIG9mZi4KKworICAg ICAgICBGb3IgPHNlbGVjdCBtdWx0aXBsZT4gSSBuZWVkZWQgdG8gZXh0ZW5kIHRoZSBBUEkgdXNl ZCBieSBtZW51bGlzdCBwb3B1cHMuIFRoaXMKKyAgICAgICAgaXMgdGhlIGZpcnN0IHN0ZXAuIEp1 c3QgcmVmYWN0b3JpbmcgU2VsZWN0RWxlbWVudCB3aXRob3V0IGFueSBiZWhhdmlvciBjaGFuZ2Uu CisgICAgICAgIFNlcGFyYXRpbmcgY29kZSB0aGF0IHdpbGwgYmUgcmV1c2VkIGluIGZ1dHVyZSBw YXRjaGVzLgorCisgICAgICAgICogZG9tL1NlbGVjdEVsZW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U2VsZWN0RWxlbWVudDo6dXBkYXRlU2VsZWN0ZWRTdGF0ZSk6CisgICAgICAgIChXZWJD b3JlOjpTZWxlY3RFbGVtZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcik6CisgICAgICAg ICogZG9tL1NlbGVjdEVsZW1lbnQuaDoKKwogMjAxMC0wMy0xNiAgSmFrdWIgV2llY3pvcmVrICA8 andpZWN6b3Jla0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVs LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAgYi9XZWJDb3JlL2Rv bS9TZWxlY3RFbGVtZW50LmNwcAppbmRleCAwMDk2NjI3Li40YTU0YmZlIDEwMDY0NAotLS0gYS9X ZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50LmNwcAorKysgYi9XZWJDb3JlL2RvbS9TZWxlY3RFbGVt ZW50LmNwcApAQCAtNjQ3LDYgKzY0Nyw1MiBAQCB2b2lkIFNlbGVjdEVsZW1lbnQ6Om1lbnVMaXN0 RGVmYXVsdEV2ZW50SGFuZGxlcihTZWxlY3RFbGVtZW50RGF0YSYgZGF0YSwgRWxlbWVudAogICAg IH0KIH0KIAordm9pZCBTZWxlY3RFbGVtZW50Ojp1cGRhdGVTZWxlY3RlZFN0YXRlKFNlbGVjdEVs ZW1lbnREYXRhJiBkYXRhLCBFbGVtZW50KiBlbGVtZW50LCBpbnQgbGlzdEluZGV4LAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgbXVsdGksIGJvb2wgc2hpZnQp Cit7CisgICAgQVNTRVJUKGxpc3RJbmRleCA+PSAwKTsKKworICAgIC8vIFNhdmUgdGhlIHNlbGVj dGlvbiBzbyBpdCBjYW4gYmUgY29tcGFyZWQgdG8gdGhlIG5ldyBzZWxlY3Rpb24gd2hlbiBkaXNw YXRjaGluZyBjaGFuZ2UgZXZlbnRzIGR1cmluZyBtb3VzZXVwLCBvciBhZnRlciBhdXRvc2Nyb2xs IGZpbmlzaGVzLgorICAgIHNhdmVMYXN0U2VsZWN0aW9uKGRhdGEsIGVsZW1lbnQpOworCisgICAg ZGF0YS5zZXRBY3RpdmVTZWxlY3Rpb25TdGF0ZSh0cnVlKTsKKworICAgIGJvb2wgc2hpZnRTZWxl Y3QgPSBkYXRhLm11bHRpcGxlKCkgJiYgc2hpZnQ7CisgICAgYm9vbCBtdWx0aVNlbGVjdCA9IGRh dGEubXVsdGlwbGUoKSAmJiBtdWx0aSAmJiAhc2hpZnQ7CisKKyAgICBFbGVtZW50KiBjbGlja2Vk RWxlbWVudCA9IGRhdGEubGlzdEl0ZW1zKGVsZW1lbnQpW2xpc3RJbmRleF07CisgICAgT3B0aW9u RWxlbWVudCogb3B0aW9uID0gdG9PcHRpb25FbGVtZW50KGNsaWNrZWRFbGVtZW50KTsKKyAgICBp ZiAob3B0aW9uKSB7CisgICAgICAgIC8vIEtlZXAgdHJhY2sgb2Ygd2hldGhlciBhbiBhY3RpdmUg c2VsZWN0aW9uIChsaWtlIGR1cmluZyBkcmFnIHNlbGVjdGlvbiksIHNob3VsZCBzZWxlY3Qgb3Ig ZGVzZWxlY3QKKyAgICAgICAgaWYgKG9wdGlvbi0+c2VsZWN0ZWQoKSAmJiBtdWx0aSkKKyAgICAg ICAgICAgIGRhdGEuc2V0QWN0aXZlU2VsZWN0aW9uU3RhdGUoZmFsc2UpOworCisgICAgICAgIGlm ICghZGF0YS5hY3RpdmVTZWxlY3Rpb25TdGF0ZSgpKQorICAgICAgICAgICAgb3B0aW9uLT5zZXRT ZWxlY3RlZFN0YXRlKGZhbHNlKTsKKyAgICB9CisKKyAgICAvLyBJZiB3ZSdyZSBub3QgaW4gYW55 IHNwZWNpYWwgbXVsdGlwbGUgc2VsZWN0aW9uIG1vZGUsIHRoZW4gZGVzZWxlY3QgYWxsIG90aGVy IGl0ZW1zLCBleGNsdWRpbmcgdGhlIGNsaWNrZWQgb3B0aW9uLgorICAgIC8vIElmIG5vIG9wdGlv biB3YXMgY2xpY2tlZCwgdGhlbiB0aGlzIHdpbGwgZGVzZWxlY3QgYWxsIGl0ZW1zIGluIHRoZSBs aXN0LgorICAgIGlmICghc2hpZnRTZWxlY3QgJiYgIW11bHRpU2VsZWN0KQorICAgICAgICBkZXNl bGVjdEl0ZW1zKGRhdGEsIGVsZW1lbnQsIGNsaWNrZWRFbGVtZW50KTsKKworICAgIC8vIElmIHRo ZSBhbmNob3IgaGFzbid0IGJlZW4gc2V0LCBhbmQgd2UncmUgZG9pbmcgYSBzaW5nbGUgc2VsZWN0 aW9uIG9yIGEgc2hpZnQgc2VsZWN0aW9uLCB0aGVuIGluaXRpYWxpemUgdGhlIGFuY2hvciB0byB0 aGUgZmlyc3Qgc2VsZWN0ZWQgaW5kZXguCisgICAgaWYgKGRhdGEuYWN0aXZlU2VsZWN0aW9uQW5j aG9ySW5kZXgoKSA8IDAgJiYgIW11bHRpU2VsZWN0KQorICAgICAgICBzZXRBY3RpdmVTZWxlY3Rp b25BbmNob3JJbmRleChkYXRhLCBlbGVtZW50LCBzZWxlY3RlZEluZGV4KGRhdGEsIGVsZW1lbnQp KTsKKworICAgIC8vIFNldCB0aGUgc2VsZWN0aW9uIHN0YXRlIG9mIHRoZSBjbGlja2VkIG9wdGlv bgorICAgIGlmIChvcHRpb24gJiYgIWNsaWNrZWRFbGVtZW50LT5kaXNhYmxlZCgpKQorICAgICAg ICBvcHRpb24tPnNldFNlbGVjdGVkU3RhdGUodHJ1ZSk7CisKKyAgICAvLyBJZiB0aGVyZSB3YXMg bm8gc2VsZWN0ZWRJbmRleCgpIGZvciB0aGUgcHJldmlvdXMgaW5pdGlhbGl6YXRpb24sIG9yCisg ICAgLy8gSWYgd2UncmUgZG9pbmcgYSBzaW5nbGUgc2VsZWN0aW9uLCBvciBhIG11bHRpcGxlIHNl bGVjdGlvbiAodXNpbmcgY21kIG9yIGN0cmwpLCB0aGVuIGluaXRpYWxpemUgdGhlIGFuY2hvciBp bmRleCB0byB0aGUgbGlzdEluZGV4IHRoYXQganVzdCBnb3QgY2xpY2tlZC4KKyAgICBpZiAoZGF0 YS5hY3RpdmVTZWxlY3Rpb25BbmNob3JJbmRleCgpIDwgMCB8fCAhc2hpZnRTZWxlY3QpCisgICAg ICAgIHNldEFjdGl2ZVNlbGVjdGlvbkFuY2hvckluZGV4KGRhdGEsIGVsZW1lbnQsIGxpc3RJbmRl eCk7CisKKyAgICBzZXRBY3RpdmVTZWxlY3Rpb25FbmRJbmRleChkYXRhLCBsaXN0SW5kZXgpOwor ICAgIHVwZGF0ZUxpc3RCb3hTZWxlY3Rpb24oZGF0YSwgZWxlbWVudCwgIW11bHRpU2VsZWN0KTsK K30KKwogdm9pZCBTZWxlY3RFbGVtZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcihTZWxl Y3RFbGVtZW50RGF0YSYgZGF0YSwgRWxlbWVudCogZWxlbWVudCwgRXZlbnQqIGV2ZW50LCBIVE1M Rm9ybUVsZW1lbnQqIGh0bWxGb3JtKQogewogICAgIGNvbnN0IFZlY3RvcjxFbGVtZW50Kj4mIGxp c3RJdGVtcyA9IGRhdGEubGlzdEl0ZW1zKGVsZW1lbnQpOwpAQCAtNjU5LDUzICs3MDUsMTEgQEAg dm9pZCBTZWxlY3RFbGVtZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcihTZWxlY3RFbGVt ZW50RGF0YSYgZGF0YSwgRWxlbWVudCoKICAgICAgICAgSW50UG9pbnQgbG9jYWxPZmZzZXQgPSBy b3VuZGVkSW50UG9pbnQoZWxlbWVudC0+cmVuZGVyZXIoKS0+YWJzb2x1dGVUb0xvY2FsKG1vdXNl RXZlbnQtPmFic29sdXRlTG9jYXRpb24oKSwgZmFsc2UsIHRydWUpKTsKICAgICAgICAgaW50IGxp c3RJbmRleCA9IHRvUmVuZGVyTGlzdEJveChlbGVtZW50LT5yZW5kZXJlcigpKS0+bGlzdEluZGV4 QXRPZmZzZXQobG9jYWxPZmZzZXQueCgpLCBsb2NhbE9mZnNldC55KCkpOwogICAgICAgICBpZiAo bGlzdEluZGV4ID49IDApIHsKLSAgICAgICAgICAgIC8vIFNhdmUgdGhlIHNlbGVjdGlvbiBzbyBp dCBjYW4gYmUgY29tcGFyZWQgdG8gdGhlIG5ldyBzZWxlY3Rpb24gd2hlbiBkaXNwYXRjaGluZyBj aGFuZ2UgZXZlbnRzIGR1cmluZyBtb3VzZXVwLCBvciBhZnRlciBhdXRvc2Nyb2xsIGZpbmlzaGVz LgotICAgICAgICAgICAgc2F2ZUxhc3RTZWxlY3Rpb24oZGF0YSwgZWxlbWVudCk7Ci0KLSAgICAg ICAgICAgIGRhdGEuc2V0QWN0aXZlU2VsZWN0aW9uU3RhdGUodHJ1ZSk7Ci0gICAgICAgICAgICAK LSAgICAgICAgICAgIGJvb2wgbXVsdGlTZWxlY3RLZXlQcmVzc2VkID0gZmFsc2U7CiAjaWYgUExB VEZPUk0oTUFDKSB8fCAoUExBVEZPUk0oQ0hST01JVU0pICYmIE9TKERBUldJTikpCi0gICAgICAg ICAgICBtdWx0aVNlbGVjdEtleVByZXNzZWQgPSBtb3VzZUV2ZW50LT5tZXRhS2V5KCk7CisgICAg ICAgICAgICB1cGRhdGVTZWxlY3RlZFN0YXRlKGRhdGEsIGVsZW1lbnQsIGxpc3RJbmRleCwgbW91 c2VFdmVudC0+bWV0YUtleSgpLCBtb3VzZUV2ZW50LT5zaGlmdEtleSgpKTsKICNlbHNlCi0gICAg ICAgICAgICBtdWx0aVNlbGVjdEtleVByZXNzZWQgPSBtb3VzZUV2ZW50LT5jdHJsS2V5KCk7Cisg ICAgICAgICAgICB1cGRhdGVTZWxlY3RlZFN0YXRlKGRhdGEsIGVsZW1lbnQsIGxpc3RJbmRleCwg bW91c2VFdmVudC0+Y3RybEtleSgpLCBtb3VzZUV2ZW50LT5zaGlmdEtleSgpKTsKICNlbmRpZgot Ci0gICAgICAgICAgICBib29sIHNoaWZ0U2VsZWN0ID0gZGF0YS5tdWx0aXBsZSgpICYmIG1vdXNl RXZlbnQtPnNoaWZ0S2V5KCk7Ci0gICAgICAgICAgICBib29sIG11bHRpU2VsZWN0ID0gZGF0YS5t dWx0aXBsZSgpICYmIG11bHRpU2VsZWN0S2V5UHJlc3NlZCAmJiAhbW91c2VFdmVudC0+c2hpZnRL ZXkoKTsKLQotICAgICAgICAgICAgRWxlbWVudCogY2xpY2tlZEVsZW1lbnQgPSBsaXN0SXRlbXNb bGlzdEluZGV4XTsgICAgICAgICAgICAKLSAgICAgICAgICAgIE9wdGlvbkVsZW1lbnQqIG9wdGlv biA9IHRvT3B0aW9uRWxlbWVudChjbGlja2VkRWxlbWVudCk7Ci0gICAgICAgICAgICBpZiAob3B0 aW9uKSB7Ci0gICAgICAgICAgICAgICAgLy8gS2VlcCB0cmFjayBvZiB3aGV0aGVyIGFuIGFjdGl2 ZSBzZWxlY3Rpb24gKGxpa2UgZHVyaW5nIGRyYWcgc2VsZWN0aW9uKSwgc2hvdWxkIHNlbGVjdCBv ciBkZXNlbGVjdAotICAgICAgICAgICAgICAgIGlmIChvcHRpb24tPnNlbGVjdGVkKCkgJiYgbXVs dGlTZWxlY3RLZXlQcmVzc2VkKQotICAgICAgICAgICAgICAgICAgICBkYXRhLnNldEFjdGl2ZVNl bGVjdGlvblN0YXRlKGZhbHNlKTsKLQotICAgICAgICAgICAgICAgIGlmICghZGF0YS5hY3RpdmVT ZWxlY3Rpb25TdGF0ZSgpKQotICAgICAgICAgICAgICAgICAgICBvcHRpb24tPnNldFNlbGVjdGVk U3RhdGUoZmFsc2UpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgCi0gICAgICAgICAgICAv LyBJZiB3ZSdyZSBub3QgaW4gYW55IHNwZWNpYWwgbXVsdGlwbGUgc2VsZWN0aW9uIG1vZGUsIHRo ZW4gZGVzZWxlY3QgYWxsIG90aGVyIGl0ZW1zLCBleGNsdWRpbmcgdGhlIGNsaWNrZWQgb3B0aW9u LgotICAgICAgICAgICAgLy8gSWYgbm8gb3B0aW9uIHdhcyBjbGlja2VkLCB0aGVuIHRoaXMgd2ls bCBkZXNlbGVjdCBhbGwgaXRlbXMgaW4gdGhlIGxpc3QuCi0gICAgICAgICAgICBpZiAoIXNoaWZ0 U2VsZWN0ICYmICFtdWx0aVNlbGVjdCkKLSAgICAgICAgICAgICAgICBkZXNlbGVjdEl0ZW1zKGRh dGEsIGVsZW1lbnQsIGNsaWNrZWRFbGVtZW50KTsKLQotICAgICAgICAgICAgLy8gSWYgdGhlIGFu Y2hvciBoYXNuJ3QgYmVlbiBzZXQsIGFuZCB3ZSdyZSBkb2luZyBhIHNpbmdsZSBzZWxlY3Rpb24g b3IgYSBzaGlmdCBzZWxlY3Rpb24sIHRoZW4gaW5pdGlhbGl6ZSB0aGUgYW5jaG9yIHRvIHRoZSBm aXJzdCBzZWxlY3RlZCBpbmRleC4KLSAgICAgICAgICAgIGlmIChkYXRhLmFjdGl2ZVNlbGVjdGlv bkFuY2hvckluZGV4KCkgPCAwICYmICFtdWx0aVNlbGVjdCkKLSAgICAgICAgICAgICAgICBzZXRB Y3RpdmVTZWxlY3Rpb25BbmNob3JJbmRleChkYXRhLCBlbGVtZW50LCBzZWxlY3RlZEluZGV4KGRh dGEsIGVsZW1lbnQpKTsKLQotICAgICAgICAgICAgLy8gU2V0IHRoZSBzZWxlY3Rpb24gc3RhdGUg b2YgdGhlIGNsaWNrZWQgb3B0aW9uCi0gICAgICAgICAgICBpZiAob3B0aW9uICYmICFjbGlja2Vk RWxlbWVudC0+ZGlzYWJsZWQoKSkKLSAgICAgICAgICAgICAgICBvcHRpb24tPnNldFNlbGVjdGVk U3RhdGUodHJ1ZSk7Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIC8vIElmIHRoZXJlIHdhcyBu byBzZWxlY3RlZEluZGV4KCkgZm9yIHRoZSBwcmV2aW91cyBpbml0aWFsaXphdGlvbiwgb3IKLSAg ICAgICAgICAgIC8vIElmIHdlJ3JlIGRvaW5nIGEgc2luZ2xlIHNlbGVjdGlvbiwgb3IgYSBtdWx0 aXBsZSBzZWxlY3Rpb24gKHVzaW5nIGNtZCBvciBjdHJsKSwgdGhlbiBpbml0aWFsaXplIHRoZSBh bmNob3IgaW5kZXggdG8gdGhlIGxpc3RJbmRleCB0aGF0IGp1c3QgZ290IGNsaWNrZWQuCi0gICAg ICAgICAgICBpZiAobGlzdEluZGV4ID49IDAgJiYgKGRhdGEuYWN0aXZlU2VsZWN0aW9uQW5jaG9y SW5kZXgoKSA8IDAgfHwgIXNoaWZ0U2VsZWN0KSkKLSAgICAgICAgICAgICAgICBzZXRBY3RpdmVT ZWxlY3Rpb25BbmNob3JJbmRleChkYXRhLCBlbGVtZW50LCBsaXN0SW5kZXgpOwotICAgICAgICAg ICAgCi0gICAgICAgICAgICBzZXRBY3RpdmVTZWxlY3Rpb25FbmRJbmRleChkYXRhLCBsaXN0SW5k ZXgpOwotICAgICAgICAgICAgdXBkYXRlTGlzdEJveFNlbGVjdGlvbihkYXRhLCBlbGVtZW50LCAh bXVsdGlTZWxlY3QpOwotCiAgICAgICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gZWxlbWVudC0+ ZG9jdW1lbnQoKS0+ZnJhbWUoKSkKICAgICAgICAgICAgICAgICBmcmFtZS0+ZXZlbnRIYW5kbGVy KCktPnNldE1vdXNlRG93bk1heVN0YXJ0QXV0b3Njcm9sbCgpOwogCmRpZmYgLS1naXQgYS9XZWJD b3JlL2RvbS9TZWxlY3RFbGVtZW50LmggYi9XZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50LmgKaW5k ZXggNjg5MWMyMi4uOGMxNjBmNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVu dC5oCisrKyBiL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQuaApAQCAtOTUsNiArOTUsOSBAQCBw cm90ZWN0ZWQ6CiAgICAgc3RhdGljIHZvaWQgaW5zZXJ0ZWRJbnRvVHJlZShTZWxlY3RFbGVtZW50 RGF0YSYsIEVsZW1lbnQqKTsKICAgICBzdGF0aWMgdm9pZCBhY2Nlc3NLZXlTZXRTZWxlY3RlZElu ZGV4KFNlbGVjdEVsZW1lbnREYXRhJiwgRWxlbWVudCosIGludCBpbmRleCk7CiAgICAgc3RhdGlj IHVuc2lnbmVkIG9wdGlvbkNvdW50KGNvbnN0IFNlbGVjdEVsZW1lbnREYXRhJiwgY29uc3QgRWxl bWVudCopOworCisgICAgc3RhdGljIHZvaWQgdXBkYXRlU2VsZWN0ZWRTdGF0ZShTZWxlY3RFbGVt ZW50RGF0YSYgZGF0YSwgRWxlbWVudCogZWxlbWVudCwgaW50IGxpc3RJbmRleCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgbXVsdGksIGJvb2wgc2hpZnQpOwogIAog cHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCBtZW51TGlzdERlZmF1bHRFdmVudEhhbmRsZXIoU2Vs ZWN0RWxlbWVudERhdGEmLCBFbGVtZW50KiwgRXZlbnQqLCBIVE1MRm9ybUVsZW1lbnQqKTsKLS0g CjEuNi4zLjMKCg==