89628 2012-06-20 18:44:55 -0700 Make FormControlState capable to store multiple values 2012-06-24 20:20:35 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 23346 89623 89847 1 tkent tkent ddkilzer jberlin kinuko marja morrita webkit.review.bot oldest_to_newest 654123 0 tkent 2012-06-20 18:44:55 -0700 FileInputType::saveFormControlState: // FIXME: FormControlState should be capable to have multiple strings and we // should stop the following ugly string concatenation. StringBuilder result; unsigned numFiles = m_fileList->length(); for (unsigned i = 0; i < numFiles; ++i) { result.append(m_fileList->item(i)->path()); result.append('\1'); result.append(m_fileList->item(i)->name()); result.append('\0'); } We resolve this FIXME in this bug. 654190 1 148719 tkent 2012-06-20 20:19:03 -0700 Created attachment 148719 Patch 655240 2 148719 webkit.review.bot 2012-06-21 22:36:44 -0700 Comment on attachment 148719 Patch Clearing flags on attachment: 148719 Committed r121004: <http://trac.webkit.org/changeset/121004> 655241 3 webkit.review.bot 2012-06-21 22:36:49 -0700 All reviewed patches have been landed. Closing bug. 655523 4 jberlin 2012-06-22 09:49:32 -0700 (In reply to comment #2) > (From update of attachment 148719 [details]) > Clearing flags on attachment: 148719 > > Committed r121004: <http://trac.webkit.org/changeset/121004> This broke the i386 build: Source/WebCore/html/FormController.cpp:62:36: error: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'size_t' (aka 'unsigned long') [-Werror,-Wshorten-64-to-32] state.m_values.reserveCapacity(valueSize); ~~~~~ ^~~~~~~~~ 655524 5 ddkilzer 2012-06-22 09:50:33 -0700 (In reply to comment #2) > (From update of attachment 148719 [details]) > Clearing flags on attachment: 148719 > > Committed r121004: <http://trac.webkit.org/changeset/121004> This caused a build failure on 32-bit architectures. Follow-up build fix in r121032. <http://trac.webkit.org/changeset/121032> 656286 6 tkent 2012-06-24 17:30:01 -0700 (In reply to comment #5) > > Committed r121004: <http://trac.webkit.org/changeset/121004> > > This caused a build failure on 32-bit architectures. Follow-up build fix in r121032. > > <http://trac.webkit.org/changeset/121032> Thank you for the fix! We should have a 32 bit EWS. 148719 2012-06-20 20:19:03 -0700 2012-06-21 22:36:44 -0700 Patch bug-89628-20120621121902.patch text/plain 13982 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwODk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2ZlOWVhYTQ5NTFjYzgx NmI5ZTI2Yjk5ZWIxMDliZWM2ZjA1MDRhNi4uY2Y5NjU2N2NkNThmZjM1NDU4ZjNmZWZkMTU2Mzgy OTJkNWFiZjMyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1IEBACisyMDEyLTA2LTIwICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBNYWtlIEZvcm1Db250cm9s U3RhdGUgY2FwYWJsZSB0byBzdG9yZSBtdWx0aXBsZSB2YWx1ZXMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5NjI4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBGb3JtQ29udHJvbFN0YXRlIGNhcGFi bGUgdG8gc3RvcmUgbXVsdGlwbGUgdmFsdWVzIGluIG9yZGVyIHRvCisgICAgICAgIGNsZWFuIEZp bGVJbnB1dFR5cGUuY3BwIHVwIGFuZCBwcmVwYXJlIHRvIGZpeCBCdWcgODk2MjMuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLiBUaGlzIGRvZXNuJ3QgY2hhbmdlIHdlYi1leHBvc2VkIGJlaGF2aW9y LCBhbmQKKyAgICAgICAgZmFzdC9mb3Jtcy9maWxlL3JlY292ZXItZmlsZS1pbnB1dC1pbi11bnBv c3RlZC1mb3JtLmh0bWwgY292ZXJzCisgICAgICAgIG1ham9yIHBhcnQgb2YgdGhpcyBjaGFuZ2Uu CisKKyAgICAgICAgKiBodG1sL0Zvcm1Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZvcm1Db250cm9sU3RhdGU6OnNlcmlhbGl6ZVRvKTogU3VwcG9ydCBmb3IgdHdvIG9yIG1vcmUg dmFsdWVzLgorICAgICAgICAoV2ViQ29yZTo6Rm9ybUNvbnRyb2xTdGF0ZTo6ZGVzZXJpYWxpemUp OiBkaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OmZvcm1TdGF0ZVNpZ25hdHVyZSk6CisgICAgICAg IEJ1bXAgdXAgdGhlIHZlcnNpb24gYmVjYXVzZSB0aGUgc3RhdGUgZm9ybWF0IGZvciA8aW5wdXQg dHlwZT1maWxlPiBpcyBjaGFuZ2VkLgorICAgICAgICAqIGh0bWwvRm9ybUNvbnRyb2xsZXIuaDoK KyAgICAgICAgIC0gU3RyaW5nIG1fdmFsdWUgLT4gVmVjdG9yPFN0cmluZz4gbV92YWx1ZXMKKyAg ICAgICAgIC0gQWRkIHNvbWUgZnVuY3Rpb25zLgorICAgICAgICAgLSBSZW1vdmUgaGFzVmFsdWUo KSBhbmQgdmFsdWUoKS4KKyAgICAgICAgKFdlYkNvcmU6OkZvcm1Db250cm9sU3RhdGU6OkZvcm1D b250cm9sU3RhdGUpOiBtX3ZhbHVlIC0+IG1fdmFsdWVzLgorICAgICAgICAoV2ViQ29yZTo6Rm9y bUNvbnRyb2xTdGF0ZTo6dmFsdWVTaXplKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpGb3Jt Q29udHJvbFN0YXRlOjpvcGVyYXRvcltdKTogQWRkZWQuCisgICAgICAgIChGb3JtQ29udHJvbFN0 YXRlKTogQWRkIGFwcGVuZCgpIGRlY2xhcmF0aW9uLCBldGMuCisgICAgICAgIChXZWJDb3JlOjpG b3JtQ29udHJvbFN0YXRlOjpvcGVyYXRvcj0pOiBtX3ZhbHVlIC0+IG1fdmFsdWVzCisgICAgICAg IChXZWJDb3JlOjpGb3JtQ29udHJvbFN0YXRlOjphcHBlbmQpOiBBZGRlZC4KKworICAgICAgICAq IGh0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVudFdpdGhTdGF0ZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpIVE1MRm9ybUNvbnRyb2xFbGVtZW50V2l0aFN0YXRlOjpmaW5pc2hQYXJzaW5nQ2hpbGRy ZW4pOgorICAgICAgICBVc2UgdmFsdWVTaXplKCkgaW5zdGVhZCBvZiBoYXNWYWx1ZSgpLgorICAg ICAgICAqIGh0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVudFdpdGhTdGF0ZS5oOgorICAgICAgICAo SFRNTEZvcm1Db250cm9sRWxlbWVudFdpdGhTdGF0ZSk6IFVwZGF0ZSB0aGUgY29tbWVudC4KKwor ICAgICAgICAqIGh0bWwvRmlsZUlucHV0VHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGaWxl SW5wdXRUeXBlOjpzYXZlRm9ybUNvbnRyb2xTdGF0ZSk6CisgICAgICAgIFVzZSBtdWx0aXBsZSB2 YWx1ZSBjYXBhYmlsaXR5IG9mIEZvcm1Db250cm9sU3RhdGUKKyAgICAgICAgKFdlYkNvcmU6OkZp bGVJbnB1dFR5cGU6OnJlc3RvcmVGb3JtQ29udHJvbFN0YXRlKTogZGl0dG8uCisKKyAgICAgICAg KiBodG1sL0Jhc2VDaGVja2FibGVJbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QmFz ZUNoZWNrYWJsZUlucHV0VHlwZTo6cmVzdG9yZUZvcm1Db250cm9sU3RhdGUpOiBVc2UgWzBdIGlu c3RlYWQgb2YgdmFsdWUoKS4KKyAgICAgICAgKiBodG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkhUTUxTZWxlY3RFbGVtZW50OjpyZXN0b3JlRm9ybUNvbnRyb2xT dGF0ZSk6IGRpdHRvLgorICAgICAgICAqIGh0bWwvSFRNTFRleHRBcmVhRWxlbWVudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MVGV4dEFyZWFFbGVtZW50OjpyZXN0b3JlRm9ybUNvbnRyb2xT dGF0ZSk6IGRpdHRvLgorICAgICAgICAqIGh0bWwvSGlkZGVuSW5wdXRUeXBlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkhpZGRlbklucHV0VHlwZTo6cmVzdG9yZUZvcm1Db250cm9sU3RhdGUpOiBk aXR0by4KKyAgICAgICAgKiBodG1sL0lucHV0VHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ bnB1dFR5cGU6OnJlc3RvcmVGb3JtQ29udHJvbFN0YXRlKTogZGl0dG8uCisKIDIwMTItMDYtMjAg IEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtTaGFkb3ddW0Vk aXRpbmddIERlbGV0aW5nIGNoYXJhY3RlciBpbiBkaXN0cmlidXRlZCBlbGVtZW50IGNhdXNlZCBh IGNyYXNoLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9CYXNlQ2hlY2thYmxlSW5w dXRUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvQmFzZUNoZWNrYWJsZUlucHV0VHlwZS5j cHAKaW5kZXggMTkwMGFkMjk2ZjliMjRhYzI2M2MwMTMzMTNlMWVkMzFiZDMxZDZmZS4uMjgxMjE3 M2I3NzYyODM2NDY3NDRlNWEwMjM3NGJjMmRmZWQzMzNkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9CYXNlQ2hlY2thYmxlSW5wdXRUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0Jhc2VDaGVja2FibGVJbnB1dFR5cGUuY3BwCkBAIC01MCw3ICs1MCw3IEBAIEZvcm1D b250cm9sU3RhdGUgQmFzZUNoZWNrYWJsZUlucHV0VHlwZTo6c2F2ZUZvcm1Db250cm9sU3RhdGUo KSBjb25zdAogCiB2b2lkIEJhc2VDaGVja2FibGVJbnB1dFR5cGU6OnJlc3RvcmVGb3JtQ29udHJv bFN0YXRlKGNvbnN0IEZvcm1Db250cm9sU3RhdGUmIHN0YXRlKQogewotICAgIGVsZW1lbnQoKS0+ c2V0Q2hlY2tlZChzdGF0ZS52YWx1ZSgpID09ICJvbiIpOworICAgIGVsZW1lbnQoKS0+c2V0Q2hl Y2tlZChzdGF0ZVswXSA9PSAib24iKTsKIH0KIAogYm9vbCBCYXNlQ2hlY2thYmxlSW5wdXRUeXBl OjphcHBlbmRGb3JtRGF0YShGb3JtRGF0YUxpc3QmIGVuY29kaW5nLCBib29sKSBjb25zdApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9GaWxlSW5wdXRUeXBlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvRmlsZUlucHV0VHlwZS5jcHAKaW5kZXggZjE2NDUxMWQ4YTNhZjUwNzFhZTBi MjkzMjAxMGMyM2RhMTc5NGNjMy4uZjM5NzMzZDE1ZjFiMGE3MzQ5MmEwOGU2MmM0YTRhODU1NmQ4 ZWU0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9GaWxlSW5wdXRUeXBlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0ZpbGVJbnB1dFR5cGUuY3BwCkBAIC0xMDUsMzEgKzEw NSwyNSBAQCBGb3JtQ29udHJvbFN0YXRlIEZpbGVJbnB1dFR5cGU6OnNhdmVGb3JtQ29udHJvbFN0 YXRlKCkgY29uc3QKIHsKICAgICBpZiAobV9maWxlTGlzdC0+aXNFbXB0eSgpKQogICAgICAgICBy ZXR1cm4gRm9ybUNvbnRyb2xTdGF0ZSgpOwotICAgIC8vIEZJWE1FOiBGb3JtQ29udHJvbFN0YXRl IHNob3VsZCBiZSBjYXBhYmxlIHRvIGhhdmUgbXVsdGlwbGUgc3RyaW5ncyBhbmQgd2UKLSAgICAv LyBzaG91bGQgc3RvcCB0aGUgZm9sbG93aW5nIHVnbHkgc3RyaW5nIGNvbmNhdGVuYXRpb24uCi0g ICAgU3RyaW5nQnVpbGRlciByZXN1bHQ7CisgICAgRm9ybUNvbnRyb2xTdGF0ZSBzdGF0ZTsKICAg ICB1bnNpZ25lZCBudW1GaWxlcyA9IG1fZmlsZUxpc3QtPmxlbmd0aCgpOwogICAgIGZvciAodW5z aWduZWQgaSA9IDA7IGkgPCBudW1GaWxlczsgKytpKSB7Ci0gICAgICAgIHJlc3VsdC5hcHBlbmQo bV9maWxlTGlzdC0+aXRlbShpKS0+cGF0aCgpKTsKLSAgICAgICAgcmVzdWx0LmFwcGVuZCgnXDEn KTsKLSAgICAgICAgcmVzdWx0LmFwcGVuZChtX2ZpbGVMaXN0LT5pdGVtKGkpLT5uYW1lKCkpOwot ICAgICAgICByZXN1bHQuYXBwZW5kKCdcMCcpOworICAgICAgICBzdGF0ZS5hcHBlbmQobV9maWxl TGlzdC0+aXRlbShpKS0+cGF0aCgpKTsKKyAgICAgICAgc3RhdGUuYXBwZW5kKG1fZmlsZUxpc3Qt Pml0ZW0oaSktPm5hbWUoKSk7CiAgICAgfQotICAgIHJldHVybiBGb3JtQ29udHJvbFN0YXRlKHJl c3VsdC50b1N0cmluZygpKTsKKyAgICByZXR1cm4gc3RhdGU7CiB9CiAKIHZvaWQgRmlsZUlucHV0 VHlwZTo6cmVzdG9yZUZvcm1Db250cm9sU3RhdGUoY29uc3QgRm9ybUNvbnRyb2xTdGF0ZSYgc3Rh dGUpCiB7CisgICAgaWYgKHN0YXRlLnZhbHVlU2l6ZSgpICUgMikKKyAgICAgICAgcmV0dXJuOwog ICAgIFZlY3RvcjxGaWxlQ2hvb3NlckZpbGVJbmZvPiBmaWxlczsKLSAgICBWZWN0b3I8U3RyaW5n PiBwYXRoczsKLSAgICBzdGF0ZS52YWx1ZSgpLnNwbGl0KCdcMCcsIHBhdGhzKTsKLSAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpIDwgcGF0aHMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgVmVjdG9y PFN0cmluZz4gcGF0aEFuZE5hbWU7Ci0gICAgICAgIHBhdGhzW2ldLnNwbGl0KCdcMScsIHBhdGhB bmROYW1lKTsKLSAgICAgICAgaWYgKHBhdGhBbmROYW1lLnNpemUoKSA+IDEpCi0gICAgICAgICAg ICBmaWxlcy5hcHBlbmQoRmlsZUNob29zZXJGaWxlSW5mbyhwYXRoQW5kTmFtZVswXSwgcGF0aEFu ZE5hbWVbMV0pKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHN0YXRlLnZhbHVlU2l6ZSgp OyBpICs9IDIpIHsKKyAgICAgICAgaWYgKCFzdGF0ZVtpICsgMV0uaXNFbXB0eSgpKQorICAgICAg ICAgICAgZmlsZXMuYXBwZW5kKEZpbGVDaG9vc2VyRmlsZUluZm8oc3RhdGVbaV0sIHN0YXRlW2kg KyAxXSkpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBmaWxlcy5hcHBlbmQoRmlsZUNob29z ZXJGaWxlSW5mbyhwYXRoc1tpXSkpOworICAgICAgICAgICAgZmlsZXMuYXBwZW5kKEZpbGVDaG9v c2VyRmlsZUluZm8oc3RhdGVbaV0pKTsKICAgICB9CiAgICAgZmlsZXNDaG9zZW4oZmlsZXMpOwog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9Gb3JtQ29udHJvbGxlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0Zvcm1Db250cm9sbGVyLmNwcAppbmRleCA0NmM5M2IzOGFmYzEx OTFkMWU1NjMzYjAxODJiZTM2MWQ1NjY2MGI1Li43NDgzMGIzYWRmZjJhZDM3ZDE2OGZmNTMwOTU2 MTA3OGYwNGRjZmY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0Zvcm1Db250cm9s bGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0Zvcm1Db250cm9sbGVyLmNwcApAQCAt MzIsMjAgKzMyLDIxIEBAIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAvLyBTZXJpbGl6ZWQg Zm9ybSBvZiBGb3JtQ29udHJvbFN0YXRlOgogLy8gICgnLCcgbWVhbnMgc3RyaW5ncyBhcm91bmQg aXQgYXJlIHNlcGFyYXRlZCBpbiBzdGF0ZVZlY3Rvci4pCiAvLwotLy8gU2VyaWFsaXplZENvbnRy b2xTdGF0ZSA6Oj0gU2tpcFN0YXRlIHwgU2luZ2xlVmFsdWVTdGF0ZQorLy8gU2VyaWFsaXplZENv bnRyb2xTdGF0ZSA6Oj0gU2tpcFN0YXRlIHwgUmVzdG9yZVN0YXRlCiAvLyBTa2lwU3RhdGUgOjo9 ICcwJwotLy8gU2luZ2xlVmFsdWVTdGF0ZSA6Oj0gJzEnLCBDb250cm9sVmFsdWUKKy8vIFJlc3Rv cmVTdGF0ZSA6Oj0gVW5zaWduZWROdW1iZXIsIENvbnRyb2xWYWx1ZSsKKy8vIFVuc2lnbmVkTnVt YmVyIDo6PSBbMC05XSsKIC8vIENvbnRyb2xWYWx1ZSA6Oj0gYXJiaXRyYXJ5IHN0cmluZworLy8K Ky8vIFJlc3RvcmVTdGF0ZSBoYXMgYSBzZXF1ZW5jZSBvZiBDb250cm9sVmFsdWVzLiBUaGUgbGVu Z3RoIG9mIHRoZQorLy8gc2VxdWVuY2UgaXMgcmVwcmVzZW50ZWQgYnkgVW5zaWduZWROdW1iZXIu CiAKIHZvaWQgRm9ybUNvbnRyb2xTdGF0ZTo6c2VyaWFsaXplVG8oVmVjdG9yPFN0cmluZz4mIHN0 YXRlVmVjdG9yKSBjb25zdAogewogICAgIEFTU0VSVCghaXNGYWlsdXJlKCkpOwotICAgIGlmICgh aGFzVmFsdWUoKSkKLSAgICAgICAgc3RhdGVWZWN0b3IuYXBwZW5kKCIwIik7Ci0gICAgZWxzZSB7 Ci0gICAgICAgIHN0YXRlVmVjdG9yLmFwcGVuZCgiMSIpOwotICAgICAgICBzdGF0ZVZlY3Rvci5h cHBlbmQobV92YWx1ZSk7Ci0gICAgfQorICAgIHN0YXRlVmVjdG9yLmFwcGVuZChTdHJpbmc6Om51 bWJlcihtX3ZhbHVlcy5zaXplKCkpKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fdmFs dWVzLnNpemUoKTsgKytpKQorICAgICAgICBzdGF0ZVZlY3Rvci5hcHBlbmQobV92YWx1ZXNbaV0u aXNOdWxsKCkgPyBlbXB0eVN0cmluZygpIDogbV92YWx1ZXNbaV0pOwogfQogCiBGb3JtQ29udHJv bFN0YXRlIEZvcm1Db250cm9sU3RhdGU6OmRlc2VyaWFsaXplKGNvbnN0IFZlY3RvcjxTdHJpbmc+ JiBzdGF0ZVZlY3Rvciwgc2l6ZV90JiBpbmRleCkKQEAgLTU1LDkgKzU2LDEzIEBAIEZvcm1Db250 cm9sU3RhdGUgRm9ybUNvbnRyb2xTdGF0ZTo6ZGVzZXJpYWxpemUoY29uc3QgVmVjdG9yPFN0cmlu Zz4mIHN0YXRlVmVjdG9yCiAgICAgdWludDY0X3QgdmFsdWVTaXplID0gc3RhdGVWZWN0b3JbaW5k ZXgrK10udG9VSW50NjQoKTsKICAgICBpZiAoIXZhbHVlU2l6ZSkKICAgICAgICAgcmV0dXJuIEZv cm1Db250cm9sU3RhdGUoKTsKLSAgICBpZiAodmFsdWVTaXplICE9IDEgfHwgaW5kZXggKyAxID4g c3RhdGVWZWN0b3Iuc2l6ZSgpKQorICAgIGlmIChpbmRleCArIHZhbHVlU2l6ZSA+IHN0YXRlVmVj dG9yLnNpemUoKSkKICAgICAgICAgcmV0dXJuIEZvcm1Db250cm9sU3RhdGUoVHlwZUZhaWx1cmUp OwotICAgIHJldHVybiBGb3JtQ29udHJvbFN0YXRlKHN0YXRlVmVjdG9yW2luZGV4KytdKTsKKyAg ICBGb3JtQ29udHJvbFN0YXRlIHN0YXRlOworICAgIHN0YXRlLm1fdmFsdWVzLnJlc2VydmVDYXBh Y2l0eSh2YWx1ZVNpemUpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgdmFsdWVTaXplOyAr K2kpCisgICAgICAgIHN0YXRlLmFwcGVuZChzdGF0ZVZlY3RvcltpbmRleCsrXSk7CisgICAgcmV0 dXJuIHN0YXRlOwogfQogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkBAIC03Niw3ICs4MSw3IEBA IHN0YXRpYyBTdHJpbmcgZm9ybVN0YXRlU2lnbmF0dXJlKCkKICAgICAvLyBJbiB0aGUgbGVnYWN5 IHZlcnNpb24gb2Ygc2VyaWFsaXplZCBzdGF0ZSwgdGhlIGZpcnN0IGl0ZW0gd2FzIGEgbmFtZQog ICAgIC8vIGF0dHJpYnV0ZSB2YWx1ZSBvZiBhIGZvcm0gY29udHJvbC4gVGhlIGZvbGxvd2luZyBz dHJpbmcgbGl0ZXJhbCBzaG91bGQKICAgICAvLyBjb250YWluIHNvbWUgY2hhcmFjdGVycyB3aGlj aCBhcmUgcmFyZWx5IHVzZWQgZm9yIG5hbWUgYXR0cmlidXRlIHZhbHVlcy4KLSAgICBERUZJTkVf U1RBVElDX0xPQ0FMKFN0cmluZywgc2lnbmF0dXJlLCAoIlxuXHI/JSBXZWJLaXQgc2VyaWFsaXpl ZCBmb3JtIHN0YXRlIHZlcnNpb24gMSBcblxyPSYiKSk7CisgICAgREVGSU5FX1NUQVRJQ19MT0NB TChTdHJpbmcsIHNpZ25hdHVyZSwgKCJcblxyPyUgV2ViS2l0IHNlcmlhbGl6ZWQgZm9ybSBzdGF0 ZSB2ZXJzaW9uIDIgXG5ccj0mIikpOwogICAgIHJldHVybiBzaWduYXR1cmU7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvRm9ybUNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvRm9ybUNvbnRyb2xsZXIuaAppbmRleCA2NWYzMTE3MjJlNzkzZDljYmRjYWIzNmNj ZjI5MGViZGIxNTNlNjFlLi5mYTU0NjNiOGFlMzc2NzQ2MDEzYWZiZmM4OTVkYWZkNzA2ZDJmZTlh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0Zvcm1Db250cm9sbGVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9Gb3JtQ29udHJvbGxlci5oCkBAIC03NywxNCArNzcsMTUgQEAg c3RydWN0IEZvcm1FbGVtZW50S2V5SGFzaFRyYWl0cyA6IFdURjo6R2VuZXJpY0hhc2hUcmFpdHM8 Rm9ybUVsZW1lbnRLZXk+IHsKIGNsYXNzIEZvcm1Db250cm9sU3RhdGUgewogcHVibGljOgogICAg IEZvcm1Db250cm9sU3RhdGUoKSA6IG1fdHlwZShUeXBlU2tpcCkgeyB9Ci0gICAgZXhwbGljaXQg Rm9ybUNvbnRyb2xTdGF0ZShjb25zdCBTdHJpbmcmIHZhbHVlKSA6IG1fdHlwZShUeXBlUmVzdG9y ZSksIG1fdmFsdWUodmFsdWUpIHsgfQorICAgIGV4cGxpY2l0IEZvcm1Db250cm9sU3RhdGUoY29u c3QgU3RyaW5nJiB2YWx1ZSkgOiBtX3R5cGUoVHlwZVJlc3RvcmUpIHsgbV92YWx1ZXMuYXBwZW5k KHZhbHVlKTsgfQogICAgIHN0YXRpYyBGb3JtQ29udHJvbFN0YXRlIGRlc2VyaWFsaXplKGNvbnN0 IFZlY3RvcjxTdHJpbmc+JiBzdGF0ZVZlY3Rvciwgc2l6ZV90JiBpbmRleCk7Ci0gICAgRm9ybUNv bnRyb2xTdGF0ZShjb25zdCBGb3JtQ29udHJvbFN0YXRlJiBhbm90aGVyKSA6IG1fdHlwZShhbm90 aGVyLm1fdHlwZSksIG1fdmFsdWUoYW5vdGhlci5tX3ZhbHVlKSB7IH0KKyAgICBGb3JtQ29udHJv bFN0YXRlKGNvbnN0IEZvcm1Db250cm9sU3RhdGUmIGFub3RoZXIpIDogbV90eXBlKGFub3RoZXIu bV90eXBlKSwgbV92YWx1ZXMoYW5vdGhlci5tX3ZhbHVlcykgeyB9CiAgICAgRm9ybUNvbnRyb2xT dGF0ZSYgb3BlcmF0b3I9KGNvbnN0IEZvcm1Db250cm9sU3RhdGUmKTsKIAogICAgIGJvb2wgaXNG YWlsdXJlKCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IFR5cGVGYWlsdXJlOyB9Ci0gICAgYm9v bCBoYXNWYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBUeXBlUmVzdG9yZTsgfQotICAg IFN0cmluZyB2YWx1ZSgpIGNvbnN0IHsgcmV0dXJuIG1fdmFsdWU7IH0KKyAgICBzaXplX3QgdmFs dWVTaXplKCkgY29uc3QgeyByZXR1cm4gbV92YWx1ZXMuc2l6ZSgpOyB9CisgICAgY29uc3QgU3Ry aW5nJiBvcGVyYXRvcltdKHNpemVfdCBpKSBjb25zdCB7IHJldHVybiBtX3ZhbHVlc1tpXTsgfQor ICAgIHZvaWQgYXBwZW5kKGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgc2VyaWFsaXplVG8oVmVj dG9yPFN0cmluZz4mIHN0YXRlVmVjdG9yKSBjb25zdDsKIAogcHJpdmF0ZToKQEAgLTkyLDE2ICs5 MywyMiBAQCBwcml2YXRlOgogICAgIGV4cGxpY2l0IEZvcm1Db250cm9sU3RhdGUoVHlwZSB0eXBl KSA6IG1fdHlwZSh0eXBlKSB7IH0KIAogICAgIFR5cGUgbV90eXBlOwotICAgIFN0cmluZyBtX3Zh bHVlOworICAgIFZlY3RvcjxTdHJpbmc+IG1fdmFsdWVzOwogfTsKIAogaW5saW5lIEZvcm1Db250 cm9sU3RhdGUmIEZvcm1Db250cm9sU3RhdGU6Om9wZXJhdG9yPShjb25zdCBGb3JtQ29udHJvbFN0 YXRlJiBhbm90aGVyKQogewogICAgIG1fdHlwZSA9IGFub3RoZXIubV90eXBlOwotICAgIG1fdmFs dWUgPSBhbm90aGVyLm1fdmFsdWU7CisgICAgbV92YWx1ZXMgPSBhbm90aGVyLm1fdmFsdWVzOwog ICAgIHJldHVybiAqdGhpczsKIH0KIAoraW5saW5lIHZvaWQgRm9ybUNvbnRyb2xTdGF0ZTo6YXBw ZW5kKGNvbnN0IFN0cmluZyYgdmFsdWUpCit7CisgICAgbV90eXBlID0gVHlwZVJlc3RvcmU7Cisg ICAgbV92YWx1ZXMuYXBwZW5kKHZhbHVlKTsKK30KKwogY2xhc3MgRm9ybUNvbnRyb2xsZXIgewog cHVibGljOgogICAgIHN0YXRpYyBQYXNzT3duUHRyPEZvcm1Db250cm9sbGVyPiBjcmVhdGUoKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50V2l0 aFN0YXRlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVudFdp dGhTdGF0ZS5jcHAKaW5kZXggNDE1MjIyNGVlOTYwMzYyYmMzNjBjMDdhNjAwODMxMTlhYzk0NmE2 YS4uYTg4NGVlMWJkYzlhNzY4MTg2YTQ0YmQxMWFhNDZiMWNjNTk1M2M1OSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50V2l0aFN0YXRlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnRXaXRoU3RhdGUu Y3BwCkBAIC04MCw3ICs4MCw3IEBAIHZvaWQgSFRNTEZvcm1Db250cm9sRWxlbWVudFdpdGhTdGF0 ZTo6ZmluaXNoUGFyc2luZ0NoaWxkcmVuKCkKICAgICBEb2N1bWVudCogZG9jID0gZG9jdW1lbnQo KTsKICAgICBpZiAoZG9jLT5mb3JtQ29udHJvbGxlcigpLT5oYXNTdGF0ZUZvck5ld0Zvcm1FbGVt ZW50cygpKSB7CiAgICAgICAgIEZvcm1Db250cm9sU3RhdGUgc3RhdGUgPSBkb2MtPmZvcm1Db250 cm9sbGVyKCktPnRha2VTdGF0ZUZvckZvcm1FbGVtZW50KG5hbWUoKS5pbXBsKCksIHR5cGUoKS5p bXBsKCkpOwotICAgICAgICBpZiAoc3RhdGUuaGFzVmFsdWUoKSkKKyAgICAgICAgaWYgKHN0YXRl LnZhbHVlU2l6ZSgpID4gMCkKICAgICAgICAgICAgIHJlc3RvcmVGb3JtQ29udHJvbFN0YXRlKHN0 YXRlKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3Jt Q29udHJvbEVsZW1lbnRXaXRoU3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1D b250cm9sRWxlbWVudFdpdGhTdGF0ZS5oCmluZGV4IDBhZjk4ZjhkODU3ZjhiZDA0NjRkZDY3NzVk YjExMTY0MmJhMTE2NDQuLmYxNGQ4NTZhOGI3M2M3ZTVhYzAyYWM4Mjk4MGRhOTkyZTVkZTkxOWIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVudFdp dGhTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVu dFdpdGhTdGF0ZS5oCkBAIC0zOCw3ICszOCw3IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgc2hvdWxk U2F2ZUFuZFJlc3RvcmVGb3JtQ29udHJvbFN0YXRlKCkgY29uc3Q7CiAgICAgdmlydHVhbCBGb3Jt Q29udHJvbFN0YXRlIHNhdmVGb3JtQ29udHJvbFN0YXRlKCkgY29uc3Q7Ci0gICAgLy8gVGhlIHNw ZWNpZmllZCBGb3JtQ29udHJvbFN0YXRlIG11c3QgaGF2ZSBvbmUgc3RyaW5nIHZhbHVlLgorICAg IC8vIFRoZSBzcGVjaWZpZWQgRm9ybUNvbnRyb2xTdGF0ZSBtdXN0IGhhdmUgYXQgbGVhc3Qgb25l IHN0cmluZyB2YWx1ZS4KICAgICB2aXJ0dWFsIHZvaWQgcmVzdG9yZUZvcm1Db250cm9sU3RhdGUo Y29uc3QgRm9ybUNvbnRyb2xTdGF0ZSYpIHsgfQogCiBwcm90ZWN0ZWQ6CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTFNlbGVjdEVsZW1lbnQuY3BwCmluZGV4IGE1ZDhhZDJiYzVkY2FmNDA2MzBlYjM5 NzUzNmFmZjYyZTUwM2FkNDAuLjExMTExZDNhMTk5YjUyYzRjMGQxMDFhOWI1NWMxYjJlZGUzMDQ3 NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNlbGVjdEVsZW1lbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNlbGVjdEVsZW1lbnQuY3BwCkBAIC05MzYs NyArOTM2LDcgQEAgdm9pZCBIVE1MU2VsZWN0RWxlbWVudDo6cmVzdG9yZUZvcm1Db250cm9sU3Rh dGUoY29uc3QgRm9ybUNvbnRyb2xTdGF0ZSYgc3RhdGUpCiAgICAgY29uc3QgVmVjdG9yPEhUTUxF bGVtZW50Kj4mIGl0ZW1zID0gbGlzdEl0ZW1zKCk7CiAgICAgc2l6ZV90IGxlbmd0aCA9IGl0ZW1z LnNpemUoKTsKIAotICAgIFN0cmluZyBtYXNrID0gc3RhdGUudmFsdWUoKTsKKyAgICBTdHJpbmcg bWFzayA9IHN0YXRlWzBdOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kp IHsKICAgICAgICAgSFRNTEVsZW1lbnQqIGVsZW1lbnQgPSBpdGVtc1tpXTsKICAgICAgICAgaWYg KGVsZW1lbnQtPmhhc1RhZ05hbWUob3B0aW9uVGFnKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTFRleHRBcmVhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxUZXh0QXJlYUVsZW1lbnQuY3BwCmluZGV4IGJmNTEyNWY4YmY0ZDk3OGRmM2M1MWRjZmRmMzFk NzQyMTU3YmNiMmQuLjlmMjMwMTMwM2JhZDg3MmM1MjM3YzUzODIwNWQ0Y2M3MjE5YTI5NDAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRBcmVhRWxlbWVudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEFyZWFFbGVtZW50LmNwcApAQCAtMTA5LDcg KzEwOSw3IEBAIEZvcm1Db250cm9sU3RhdGUgSFRNTFRleHRBcmVhRWxlbWVudDo6c2F2ZUZvcm1D b250cm9sU3RhdGUoKSBjb25zdAogCiB2b2lkIEhUTUxUZXh0QXJlYUVsZW1lbnQ6OnJlc3RvcmVG b3JtQ29udHJvbFN0YXRlKGNvbnN0IEZvcm1Db250cm9sU3RhdGUmIHN0YXRlKQogewotICAgIHNl dFZhbHVlKHN0YXRlLnZhbHVlKCkpOworICAgIHNldFZhbHVlKHN0YXRlWzBdKTsKIH0KIAogdm9p ZCBIVE1MVGV4dEFyZWFFbGVtZW50OjpjaGlsZHJlbkNoYW5nZWQoYm9vbCBjaGFuZ2VkQnlQYXJz ZXIsIE5vZGUqIGJlZm9yZUNoYW5nZSwgTm9kZSogYWZ0ZXJDaGFuZ2UsIGludCBjaGlsZENvdW50 RGVsdGEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hpZGRlbklucHV0VHlwZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hpZGRlbklucHV0VHlwZS5jcHAKaW5kZXggOTZkNGNl MDAxYjdmMTA2N2U3MDQ3OGY4NzE4YjUzM2Y4ODJhOWE3Zi4uMDQ5NjM3YzBlZmZiNDIxYzQxM2Q2 NWQzNDk4MmQ3MDU5NDQ1ZGM5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IaWRk ZW5JbnB1dFR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSGlkZGVuSW5wdXRUeXBl LmNwcApAQCAtNjAsNyArNjAsNyBAQCBGb3JtQ29udHJvbFN0YXRlIEhpZGRlbklucHV0VHlwZTo6 c2F2ZUZvcm1Db250cm9sU3RhdGUoKSBjb25zdAogCiB2b2lkIEhpZGRlbklucHV0VHlwZTo6cmVz dG9yZUZvcm1Db250cm9sU3RhdGUoY29uc3QgRm9ybUNvbnRyb2xTdGF0ZSYgc3RhdGUpCiB7Ci0g ICAgZWxlbWVudCgpLT5zZXRBdHRyaWJ1dGUodmFsdWVBdHRyLCBzdGF0ZS52YWx1ZSgpKTsKKyAg ICBlbGVtZW50KCktPnNldEF0dHJpYnV0ZSh2YWx1ZUF0dHIsIHN0YXRlWzBdKTsKIH0KIAogYm9v bCBIaWRkZW5JbnB1dFR5cGU6OnN1cHBvcnRzVmFsaWRhdGlvbigpIGNvbnN0CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0lucHV0VHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0lucHV0VHlwZS5jcHAKaW5kZXggNTE0MTE5ZmVhNGM0MTdhYmFjYWM5YjcxNDA4ZTQxNWEwZjdl MWRhNi4uYTY2OTZkMmY1M2QwMDA3Yzc2ZGYxYjZiOWY0YjlkZmNhNWViOTNmYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSW5wdXRUeXBlLmNwcApAQCAtMTc5LDcgKzE3OSw3IEBAIEZvcm1Db250cm9sU3RhdGUg SW5wdXRUeXBlOjpzYXZlRm9ybUNvbnRyb2xTdGF0ZSgpIGNvbnN0CiAKIHZvaWQgSW5wdXRUeXBl OjpyZXN0b3JlRm9ybUNvbnRyb2xTdGF0ZShjb25zdCBGb3JtQ29udHJvbFN0YXRlJiBzdGF0ZSkK IHsKLSAgICBlbGVtZW50KCktPnNldFZhbHVlKHN0YXRlLnZhbHVlKCkpOworICAgIGVsZW1lbnQo KS0+c2V0VmFsdWUoc3RhdGVbMF0pOwogfQogCiBib29sIElucHV0VHlwZTo6aXNGb3JtRGF0YUFw cGVuZGFibGUoKSBjb25zdAo=