79691 2012-02-27 12:02:17 -0800 Web Inspector: [InspectorIndexedDB] Show meaningful description for object store items values. 2012-03-02 02:00:19 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 75386 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 565872 0 vsevik 2012-02-27 12:02:17 -0800 Show meaningful description for object store items values. 565876 1 129081 vsevik 2012-02-27 12:03:41 -0800 Created attachment 129081 Patch 566809 2 129081 pfeldman 2012-02-28 09:51:28 -0800 Comment on attachment 129081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129081&action=review > Source/WebCore/inspector/front-end/IndexedDBViews.js:349 > + span.appendChild(document.createTextNode("\"" + value.description + "\"")); Appending blob will kill the renderer. > Source/WebCore/inspector/front-end/IndexedDBViews.js:352 > + default: What about the number, null, undefined? 568829 3 129733 vsevik 2012-03-01 12:41:53 -0800 Created attachment 129733 Patch 569441 4 vsevik 2012-03-02 02:00:19 -0800 Committed r109536: <http://trac.webkit.org/changeset/109536> 129081 2012-02-27 12:03:41 -0800 2012-03-01 12:41:46 -0800 Patch bug-79691-20120228000339.patch text/plain 5018 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MDA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzllZWRkZmQ2OGFmZDc5 YmQxM2Y4ZTVmZTVjODMzOThkOTYzZTk4ZS4uZGZkNWU5MzI2OWZiYTdjMGYxZWE1YWVlY2NlYWM0 MWIwMjY0ZmZmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDEyLTAyLTI3ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtJbnNwZWN0b3JJbmRleGVkREJdIFNob3cgbWVhbmluZ2Z1bCBkZXNjcmlwdGlvbiBmb3Ig b2JqZWN0IHN0b3JlIGl0ZW1zIHZhbHVlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTc5NjkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0luZGV4ZWREQlZpZXdzLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLklEQkRhdGFHcmlkTm9kZS5wcm90b3R5cGUuY3JlYXRl Q2VsbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSURCRGF0YUdyaWROb2RlLnByb3RvdHlwZS5f Zm9ybWF0VmFsdWUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVy dGllc1NlY3Rpb24uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydHlUcmVl RWxlbWVudC5wcm90b3R5cGUub25wb3B1bGF0ZS5jYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuT2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUub25wb3B1bGF0ZSk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbmRleGVkREJWaWV3cy5jc3M6CisgICAgICAg ICguaW5kZXhlZC1kYi1kYXRhLXZpZXcgLmRhdGEtZ3JpZCAuZGF0YS1jb250YWluZXIgdGQudmFs dWUtY29sdW1uKToKKyAgICAgICAgKC5pbmRleGVkLWRiLWRhdGEtdmlldyAuZGF0YS1ncmlkIC5k YXRhLWNvbnRhaW5lciB0ZC52YWx1ZS1jb2x1bW4gZGl2LnByaW1pdGl2ZS12YWx1ZSk6CisKKzIw MTItMDItMjcgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKICAgICAg ICAgV2ViIEluc3BlY3RvcjogU2NyaXB0cyBuYXZpZ2F0b3Igb3ZlcmxheSBzaG91bGQgbm90IGNv bnN1bWUgbW91c2UgYWN0aW9ucy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc5Njc0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvSW5kZXhlZERCVmlld3MuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0luZGV4ZWREQlZpZXdzLmpzCmluZGV4IGExNGI3OTFiOWUxYzNjZDU4N2IwYWI1 OTc2NGRkYzU2NTIyNDU5ZWIuLjFhZTE5YTU3ZDQ5ZGJjNjYyYzljZDAwMWYwMzFiMDdhNmQ3ZTdm NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5kZXhl ZERCVmlld3MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmRl eGVkREJWaWV3cy5qcwpAQCAtMzIxLDE0ICszMjEsMzkgQEAgV2ViSW5zcGVjdG9yLklEQkRhdGFH cmlkTm9kZS5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgY3JlYXRlQ2VsbDogZnVuY3Rpb24o Y29sdW1uSWRlbnRpZmllcikKICAgICB7CisgICAgICAgIHZhciBjZWxsID0gV2ViSW5zcGVjdG9y LkRhdGFHcmlkTm9kZS5wcm90b3R5cGUuY3JlYXRlQ2VsbC5jYWxsKHRoaXMsIGNvbHVtbklkZW50 aWZpZXIpOwogICAgICAgICBpZiAoY29sdW1uSWRlbnRpZmllciAhPT0gInZhbHVlIikKLSAgICAg ICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlLnByb3RvdHlwZS5jcmVhdGVD ZWxsLmNhbGwodGhpcywgY29sdW1uSWRlbnRpZmllcik7CisgICAgICAgICAgICByZXR1cm4gY2Vs bDsKICAgICAgICAgCi0gICAgICAgIHZhciBzZWN0aW9uID0gbmV3IFdlYkluc3BlY3Rvci5PYmpl Y3RQcm9wZXJ0aWVzU2VjdGlvbih0aGlzLmRhdGFbInZhbHVlIl0sIHRoaXMuX3ZhbHVlVGl0bGUp Ci0gICAgICAgIHNlY3Rpb24uZWRpdGFibGUgPSBmYWxzZTsKLSAgICAgICAgc2VjdGlvbi5za2lw UHJvdG8gPSB0cnVlOwotICAgICAgICByZXR1cm4gc2VjdGlvbi5lbGVtZW50OwotICAgIH0KKyAg ICAgICAgY2VsbC5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICB2YXIgdmFsdWUgPSB0aGlzLmRh dGFbInZhbHVlIl07CisgICAgICAgIHRoaXMuX2Zvcm1hdFZhbHVlKGNlbGwsIHZhbHVlKTsKKyAg ICAgICAgcmV0dXJuIGNlbGw7CisgICAgfSwKKworICAgIF9mb3JtYXRWYWx1ZTogZnVuY3Rpb24o Y2VsbCwgdmFsdWUpCisgICAgeworICAgICAgICB2YXIgdHlwZSA9IHZhbHVlLnN1YnR5cGUgfHwg dmFsdWUudHlwZTsKKyAgICAgICAgCisgICAgICAgIHN3aXRjaCAodHlwZSkgeworICAgICAgICBj YXNlICJvYmplY3QiOgorICAgICAgICBjYXNlICJhcnJheSI6CisgICAgICAgICAgICB2YXIgc2Vj dGlvbiA9IG5ldyBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24odmFsdWUsIHZh bHVlLmRlc2NyaXB0aW9uKQorICAgICAgICAgICAgc2VjdGlvbi5lZGl0YWJsZSA9IGZhbHNlOwor ICAgICAgICAgICAgc2VjdGlvbi5za2lwUHJvdG8gPSB0cnVlOworICAgICAgICAgICAgY2VsbC5h cHBlbmRDaGlsZChzZWN0aW9uLmVsZW1lbnQpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAg IGNhc2UgInN0cmluZyI6CisgICAgICAgICAgICB2YXIgY29udGVudHMgPSBjZWxsLmNyZWF0ZUNo aWxkKCJkaXYiLCAicHJpbWl0aXZlLXZhbHVlIik7CisgICAgICAgICAgICB2YXIgc3BhbiA9IGNv bnRlbnRzLmNyZWF0ZUNoaWxkKCJzcGFuIiwgImNvbnNvbGUtZm9ybWF0dGVkLXN0cmluZyBzb3Vy Y2UtY29kZSIpOworICAgICAgICAgICAgc3Bhbi5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVU ZXh0Tm9kZSgiXCIiICsgdmFsdWUuZGVzY3JpcHRpb24gKyAiXCIiKSk7CisgICAgICAgICAgICBj ZWxsLmFwcGVuZENoaWxkKGNvbnRlbnRzKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBk ZWZhdWx0OgorICAgICAgICAgICAgdmFyIGNvbnRlbnRzID0gY2VsbC5jcmVhdGVDaGlsZCgiZGl2 IiwgInByaW1pdGl2ZS12YWx1ZSIpOworICAgICAgICAgICAgY29udGVudHMuYXBwZW5kQ2hpbGQo ZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUodmFsdWUuZGVzY3JpcHRpb24pKTsKKyAgICAgICAgfQor ICAgIH0sCiB9OwogCiBXZWJJbnNwZWN0b3IuSURCRGF0YUdyaWROb2RlLnByb3RvdHlwZS5fX3By b3RvX18gPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlLnByb3RvdHlwZTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rp b24uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRp ZXNTZWN0aW9uLmpzCmluZGV4IDIwYWNmOTEzMzQ5YmE0MDQ5MzdkZjhkYjQwYTU3NzY0OTcwODY5 NTkuLjkzNTkxMDUzOTZlZjY2OWMxYTI0ODQ4NmQ2ZGJhNGI3N2I2YzE1YTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rp b24uanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9w ZXJ0aWVzU2VjdGlvbi5qcwpAQCAtMTc4LDYgKzE3OCw4IEBAIFdlYkluc3BlY3Rvci5PYmplY3RQ cm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKIAogICAgICAgICAgICAgcHJvcGVydGll cy5zb3J0KFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5Db21wYXJlUHJvcGVy dGllcyk7CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHByb3BlcnRpZXMubGVuZ3Ro OyArK2kpIHsKKyAgICAgICAgICAgICAgICBpZiAodGhpcy50cmVlT3V0bGluZS5zZWN0aW9uLnNr aXBQcm90byAmJiBwcm9wZXJ0aWVzW2ldLm5hbWUgPT09ICJfX3Byb3RvX18iKQorICAgICAgICAg ICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgICAgICB0aGlzLmFwcGVuZENoaWxkKG5l dyB0aGlzLnRyZWVPdXRsaW5lLnNlY3Rpb24udHJlZUVsZW1lbnRDb25zdHJ1Y3Rvcihwcm9wZXJ0 aWVzW2ldKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luZGV4ZWREQlZpZXdzLmNzcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5kZXhlZERCVmlld3MuY3NzCmluZGV4IGI1ODE3 ZDE0ZTdmMDNiMDU5OTVlMDRhYzE3ZjQ4OGE3ZjcyZTNiY2EuLjcxNjhiN2FkMDBmZWNjODFhYzQy Zjg2N2Q2OGFiMWM3NGI5ZjRmOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5kZXhlZERCVmlld3MuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvaW5kZXhlZERCVmlld3MuY3NzCkBAIC05OSwzICs5OSwxMyBAQAogLmlu ZGV4ZWQtZGItZGF0YS12aWV3IC5kYXRhLWdyaWQgLmRhdGEtY29udGFpbmVyIHRyOm50aC1sYXN0 LWNoaWxkKDEpIHRkIHsKICAgICBib3JkZXI6IDA7CiB9CisKKy5pbmRleGVkLWRiLWRhdGEtdmll dyAuZGF0YS1ncmlkIC5kYXRhLWNvbnRhaW5lciB0ZC52YWx1ZS1jb2x1bW4geworICAgIHBhZGRp bmc6IDA7Cit9CisKKy5pbmRleGVkLWRiLWRhdGEtdmlldyAuZGF0YS1ncmlkIC5kYXRhLWNvbnRh aW5lciB0ZC52YWx1ZS1jb2x1bW4gZGl2LnByaW1pdGl2ZS12YWx1ZSB7CisgICAgcGFkZGluZy1s ZWZ0OiA1cHg7CisgICAgbGluZS1oZWlnaHQ6IDE4cHg7CisgICAgbWFyZ2luLXRvcDogMXB4Owor fQo= 129733 2012-03-01 12:41:53 -0800 2012-03-02 01:49:45 -0800 Patch bug-79691-20120302004151.patch text/plain 8385 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MzQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDU3NzBlZGZmYWMxNDMz ZGRiNWVlNzdjYzFlMzI0OGEzMGM2MTBjNi4uZmFmNjJjZTczNjFjNTViOTlhNzNhNzcyYjI0YjI4 NjVhMTZjZTJkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAzLTAxICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtJbnNwZWN0b3JJbmRleGVkREJdIFNob3cgbWVhbmluZ2Z1bCBkZXNjcmlwdGlvbiBmb3Ig b2JqZWN0IHN0b3JlIGl0ZW1zIHZhbHVlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTc5NjkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0luZGV4ZWREQk1vZGVsLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkluZGV4ZWREQk1vZGVsLmlkYktleUZyb21LZXkpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSW5kZXhlZERCVmlld3MuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuSURCRGF0YVZpZXcucHJvdG90eXBlLl91cGRhdGVEYXRhLmNhbGxiYWNr KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5JREJEYXRhVmlldy5wcm90b3R5cGUuX3VwZGF0ZURh dGEpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLklEQkRhdGFHcmlkTm9kZS5wcm90b3R5cGUuY3Jl YXRlQ2VsbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSURCRGF0YUdyaWROb2RlLnByb3RvdHlw ZS5fZm9ybWF0VmFsdWUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJv cGVydGllc1NlY3Rpb24uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydHlU cmVlRWxlbWVudC5wcm90b3R5cGUub25wb3B1bGF0ZS5jYWxsYmFjayk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuT2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUub25wb3B1bGF0ZSk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZW1vdGVPYmplY3QuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTG9jYWxKU09OT2JqZWN0LnByb3RvdHlwZS5nZXQgc3VidHlwZSk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbmRleGVkREJWaWV3cy5jc3M6CisgICAgICAg ICguaW5kZXhlZC1kYi1kYXRhLXZpZXcgLmRhdGEtZ3JpZCAuZGF0YS1jb250YWluZXIgdGQpOgor ICAgICAgICAoLmluZGV4ZWQtZGItZGF0YS12aWV3IC5kYXRhLWdyaWQgLmRhdGEtY29udGFpbmVy IHRkLnByaW1hcnlLZXktY29sdW1uKToKKyAgICAgICAgKC5pbmRleGVkLWRiLWRhdGEtdmlldyAu ZGF0YS1ncmlkIC5kYXRhLWNvbnRhaW5lciB0ZC5wcmltYXJ5S2V5LWNvbHVtbiBkaXYucHJpbWl0 aXZlLXZhbHVlKToKKyAgICAgICAgKC5pbmRleGVkLWRiLWRhdGEtdmlldyAuZGF0YS1ncmlkIC5k YXRhLWNvbnRhaW5lciB0ZCAuc2VjdGlvbiAuaGVhZGVyIC50aXRsZSk6CisKIDIwMTItMDMtMDEg IFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGhpZGUgY29sb3IgcGlja2VyIG9uIEVzYyBhbmQgRW50ZXIuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luZGV4ZWREQk1vZGVsLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmRleGVkREJNb2RlbC5qcwppbmRleCBh NzNmYzdlZDMyMTI0YmNkNDVlMjI0MThmZGU1YWY5YWU3NjY5OWZmLi4yZjA3NWM1NjlmZDc3MDQ1 YjBjOTYzNjlmYmZlNWI1YmJhNWJlYjNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0luZGV4ZWREQk1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvSW5kZXhlZERCTW9kZWwuanMKQEAgLTczLDcgKzczLDcgQEAgV2Vi SW5zcGVjdG9yLkluZGV4ZWREQk1vZGVsLmlkYktleUZyb21LZXkgPSBmdW5jdGlvbihrZXkpCiAg ICAgICAgIGJyZWFrOwogICAgIGNhc2UgV2ViSW5zcGVjdG9yLkluZGV4ZWREQk1vZGVsLktleVR5 cGVzLkFycmF5VHlwZToKICAgICAgICAgaWRiS2V5ID0gW107Ci0gICAgICAgIGZvciAodmFyIGkg PSAwOyBpIDwga2V5Lmxlbmd0aDsgKytpKQorICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGtl eS5hcnJheS5sZW5ndGg7ICsraSkKICAgICAgICAgICAgIGlkYktleS5wdXNoKFdlYkluc3BlY3Rv ci5JbmRleGVkREJNb2RlbC5pZGJLZXlGcm9tS2V5KGtleS5hcnJheVtpXSkpOwogICAgICAgICBi cmVhazsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0luZGV4ZWREQlZpZXdzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9JbmRleGVkREJWaWV3cy5qcwppbmRleCBiYTE1NDZkNjI2MTc4NmZiY2JmM2Y2NmIyZDI1YzY3 NmQyN2VhZTlmLi44MGRjZGIxODRjMWM2YzliM2E4YjI3MTVjZTc0MzgyNWNhMzljMDUwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luZGV4ZWREQlZpZXdz LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5kZXhlZERCVmll d3MuanMKQEAgLTI4MCw4ICsyODAsOCBAQCBXZWJJbnNwZWN0b3IuSURCRGF0YVZpZXcucHJvdG90 eXBlID0gewogICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBlbnRyaWVzLmxlbmd0aDsg KytpKSB7CiAgICAgICAgICAgICAgICAgdmFyIGRhdGEgPSB7fTsKICAgICAgICAgICAgICAgICBk YXRhWyJudW1iZXIiXSA9IGkgKyBza2lwQ291bnQ7Ci0gICAgICAgICAgICAgICAgZGF0YVsia2V5 Il0gPSB0aGlzLl9zdHJpbmdpZnlLZXkoZW50cmllc1tpXS5rZXkpOwotICAgICAgICAgICAgICAg IGRhdGFbInByaW1hcnlLZXkiXSA9IHRoaXMuX3N0cmluZ2lmeUtleShlbnRyaWVzW2ldLnByaW1h cnlLZXkpOworICAgICAgICAgICAgICAgIGRhdGFbImtleSJdID0gZW50cmllc1tpXS5rZXk7Cisg ICAgICAgICAgICAgICAgZGF0YVsicHJpbWFyeUtleSJdID0gZW50cmllc1tpXS5wcmltYXJ5S2V5 OwogICAgICAgICAgICAgICAgIGRhdGFbInZhbHVlIl0gPSBlbnRyaWVzW2ldLnZhbHVlOwogCiAg ICAgICAgICAgICAgICAgdmFyIHByaW1hcnlLZXkgPSBKU09OLnN0cmluZ2lmeSh0aGlzLl9pc0lu ZGV4ID8gZW50cmllc1tpXS5wcmltYXJ5S2V5IDogZW50cmllc1tpXS5rZXkpOwpAQCAtMzM0LDEz ICszMzQsNDYgQEAgV2ViSW5zcGVjdG9yLklEQkRhdGFHcmlkTm9kZS5wcm90b3R5cGUgPSB7CiAg ICAgICovCiAgICAgY3JlYXRlQ2VsbDogZnVuY3Rpb24oY29sdW1uSWRlbnRpZmllcikKICAgICB7 Ci0gICAgICAgIGlmIChjb2x1bW5JZGVudGlmaWVyICE9PSAidmFsdWUiKQotICAgICAgICAgICAg cmV0dXJuIFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUucHJvdG90eXBlLmNyZWF0ZUNlbGwuY2Fs bCh0aGlzLCBjb2x1bW5JZGVudGlmaWVyKTsKKyAgICAgICAgdmFyIGNlbGwgPSBXZWJJbnNwZWN0 b3IuRGF0YUdyaWROb2RlLnByb3RvdHlwZS5jcmVhdGVDZWxsLmNhbGwodGhpcywgY29sdW1uSWRl bnRpZmllcik7CisgICAgICAgIHZhciB2YWx1ZSA9IHRoaXMuZGF0YVtjb2x1bW5JZGVudGlmaWVy XTsKKyAgICAgICAgCisgICAgICAgIHN3aXRjaCAoY29sdW1uSWRlbnRpZmllcikgeworICAgICAg ICBjYXNlICJ2YWx1ZSI6CisgICAgICAgICAgICBjZWxsLnJlbW92ZUNoaWxkcmVuKCk7CisgICAg ICAgICAgICB0aGlzLl9mb3JtYXRWYWx1ZShjZWxsLCB2YWx1ZSk7CisgICAgICAgICAgICBicmVh azsKKyAgICAgICAgY2FzZSAia2V5IjoKKyAgICAgICAgY2FzZSAicHJpbWFyeUtleSI6CisgICAg ICAgICAgICBjZWxsLnJlbW92ZUNoaWxkcmVuKCk7CisgICAgICAgICAgICB0aGlzLl9mb3JtYXRW YWx1ZShjZWxsLCBuZXcgV2ViSW5zcGVjdG9yLkxvY2FsSlNPTk9iamVjdCh2YWx1ZSkpOworICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgIH0KKworICAgICAgICBy ZXR1cm4gY2VsbDsKKyAgICB9LAogCi0gICAgICAgIHZhciBzZWN0aW9uID0gbmV3IFdlYkluc3Bl Y3Rvci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbih0aGlzLmRhdGFbInZhbHVlIl0sIHRoaXMuX3Zh bHVlVGl0bGUpCi0gICAgICAgIHNlY3Rpb24uZWRpdGFibGUgPSBmYWxzZTsKLSAgICAgICAgc2Vj dGlvbi5za2lwUHJvdG8gPSB0cnVlOwotICAgICAgICByZXR1cm4gc2VjdGlvbi5lbGVtZW50Owor ICAgIF9mb3JtYXRWYWx1ZTogZnVuY3Rpb24oY2VsbCwgdmFsdWUpCisgICAgeworICAgICAgICB2 YXIgdHlwZSA9IHZhbHVlLnN1YnR5cGUgfHwgdmFsdWUudHlwZTsKKyAgICAgICAgdmFyIGNvbnRl bnRzID0gY2VsbC5jcmVhdGVDaGlsZCgiZGl2IiwgInNvdXJjZS1jb2RlIGNvbnNvbGUtZm9ybWF0 dGVkLSIgKyB0eXBlKTsKKworICAgICAgICBzd2l0Y2ggKHR5cGUpIHsKKyAgICAgICAgY2FzZSAi b2JqZWN0IjoKKyAgICAgICAgY2FzZSAiYXJyYXkiOgorICAgICAgICAgICAgdmFyIHNlY3Rpb24g PSBuZXcgV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnRpZXNTZWN0aW9uKHZhbHVlLCB2YWx1ZS5k ZXNjcmlwdGlvbikKKyAgICAgICAgICAgIHNlY3Rpb24uZWRpdGFibGUgPSBmYWxzZTsKKyAgICAg ICAgICAgIHNlY3Rpb24uc2tpcFByb3RvID0gdHJ1ZTsKKyAgICAgICAgICAgIGNvbnRlbnRzLmFw cGVuZENoaWxkKHNlY3Rpb24uZWxlbWVudCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAg Y2FzZSAic3RyaW5nIjoKKyAgICAgICAgICAgIGNvbnRlbnRzLmFkZFN0eWxlQ2xhc3MoInByaW1p dGl2ZS12YWx1ZSIpOworICAgICAgICAgICAgY29udGVudHMuYXBwZW5kQ2hpbGQoZG9jdW1lbnQu Y3JlYXRlVGV4dE5vZGUoIlwiIiArIHZhbHVlLmRlc2NyaXB0aW9uICsgIlwiIikpOworICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBjb250ZW50cy5hZGRT dHlsZUNsYXNzKCJwcmltaXRpdmUtdmFsdWUiKTsKKyAgICAgICAgICAgIGNvbnRlbnRzLmFwcGVu ZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKHZhbHVlLmRlc2NyaXB0aW9uKSk7CisgICAg ICAgIH0KICAgICB9CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qcwppbmRleCAyMGFjZjkx MzM0OWJhNDA0OTM3ZGY4ZGI0MGE1Nzc2NDk3MDg2OTU5Li45MzU5MTA1Mzk2ZWY2NjljMWEyNDg0 ODZkNmRiYTRiNzdiNmMxNWE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMKQEAgLTE3OCw2 ICsxNzgsOCBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5 cGUgPSB7CiAKICAgICAgICAgICAgIHByb3BlcnRpZXMuc29ydChXZWJJbnNwZWN0b3IuT2JqZWN0 UHJvcGVydGllc1NlY3Rpb24uQ29tcGFyZVByb3BlcnRpZXMpOwogICAgICAgICAgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCBwcm9wZXJ0aWVzLmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICAgICAg aWYgKHRoaXMudHJlZU91dGxpbmUuc2VjdGlvbi5za2lwUHJvdG8gJiYgcHJvcGVydGllc1tpXS5u YW1lID09PSAiX19wcm90b19fIikKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAg ICAgICAgICAgICAgdGhpcy5hcHBlbmRDaGlsZChuZXcgdGhpcy50cmVlT3V0bGluZS5zZWN0aW9u LnRyZWVFbGVtZW50Q29uc3RydWN0b3IocHJvcGVydGllc1tpXSkpOwogICAgICAgICAgICAgfQog ICAgICAgICB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9SZW1vdGVPYmplY3QuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl bW90ZU9iamVjdC5qcwppbmRleCA1NTE5MWRkNDRjYzQxNzE3NzhhN2NiOGJmYTE4YjdiODRlYThh NzVkLi5hNjAyOGYyYWJlYTg2N2VjZWU5N2FhZjY2MWNhNWMyNzc0MTE5ZTNjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1JlbW90ZU9iamVjdC5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1JlbW90ZU9iamVjdC5qcwpAQCAt MzY0LDYgKzM2NCw5IEBAIFdlYkluc3BlY3Rvci5Mb2NhbEpTT05PYmplY3QucHJvdG90eXBlID0g ewogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB0aGlzLl9jYWNoZWREZXNjcmlw dGlvbiA9IHRoaXMuX2NvbmNhdGVuYXRlKCJbIiwgIl0iLCBmb3JtYXRBcnJheUl0ZW0pOwogICAg ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSAiZGF0ZSI6CisgICAgICAgICAg ICAgICAgdGhpcy5fY2FjaGVkRGVzY3JpcHRpb24gPSAiIiArIHRoaXMuX3ZhbHVlOworICAgICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSAibnVsbCI6CiAgICAgICAgICAgICAg ICAgdGhpcy5fY2FjaGVkRGVzY3JpcHRpb24gPSAibnVsbCI7CiAgICAgICAgICAgICAgICAgYnJl YWs7CkBAIC00MjQsNiArNDI3LDkgQEAgV2ViSW5zcGVjdG9yLkxvY2FsSlNPTk9iamVjdC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLl92YWx1ZSBpbnN0YW5jZW9mIEFycmF5KQogICAg ICAgICAgICAgcmV0dXJuICJhcnJheSI7CiAKKyAgICAgICAgaWYgKHRoaXMuX3ZhbHVlIGluc3Rh bmNlb2YgRGF0ZSkKKyAgICAgICAgICAgIHJldHVybiAiZGF0ZSI7CisKICAgICAgICAgcmV0dXJu IHVuZGVmaW5lZDsKICAgICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL2luZGV4ZWREQlZpZXdzLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5kZXhlZERCVmlld3MuY3NzCmluZGV4IGI1ODE3ZDE0ZTdmMDNiMDU5OTVl MDRhYzE3ZjQ4OGE3ZjcyZTNiY2EuLjJkYzAzOGQzZWQ3NDZjNzdiNGM5OGEyNjBhYjgxZjY0MzI0 OWQzYzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5k ZXhlZERCVmlld3MuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv aW5kZXhlZERCVmlld3MuY3NzCkBAIC05OSwzICs5OSwyNiBAQAogLmluZGV4ZWQtZGItZGF0YS12 aWV3IC5kYXRhLWdyaWQgLmRhdGEtY29udGFpbmVyIHRyOm50aC1sYXN0LWNoaWxkKDEpIHRkIHsK ICAgICBib3JkZXI6IDA7CiB9CisKKy5pbmRleGVkLWRiLWRhdGEtdmlldyAuZGF0YS1ncmlkIC5k YXRhLWNvbnRhaW5lciB0ZCB7CisgICAgaGVpZ2h0OiAxOHB4OworfQorCisuaW5kZXhlZC1kYi1k YXRhLXZpZXcgLmRhdGEtZ3JpZCAuZGF0YS1jb250YWluZXIgdGQudmFsdWUtY29sdW1uLAorLmlu ZGV4ZWQtZGItZGF0YS12aWV3IC5kYXRhLWdyaWQgLmRhdGEtY29udGFpbmVyIHRkLmtleS1jb2x1 bW4sCisuaW5kZXhlZC1kYi1kYXRhLXZpZXcgLmRhdGEtZ3JpZCAuZGF0YS1jb250YWluZXIgdGQu cHJpbWFyeUtleS1jb2x1bW4geworICAgIHBhZGRpbmc6IDA7Cit9CisKKy5pbmRleGVkLWRiLWRh dGEtdmlldyAuZGF0YS1ncmlkIC5kYXRhLWNvbnRhaW5lciB0ZC52YWx1ZS1jb2x1bW4gZGl2LnBy aW1pdGl2ZS12YWx1ZSwKKy5pbmRleGVkLWRiLWRhdGEtdmlldyAuZGF0YS1ncmlkIC5kYXRhLWNv bnRhaW5lciB0ZC5rZXktY29sdW1uIGRpdi5wcmltaXRpdmUtdmFsdWUsCisuaW5kZXhlZC1kYi1k YXRhLXZpZXcgLmRhdGEtZ3JpZCAuZGF0YS1jb250YWluZXIgdGQucHJpbWFyeUtleS1jb2x1bW4g ZGl2LnByaW1pdGl2ZS12YWx1ZSB7CisgICAgcGFkZGluZy1sZWZ0OiA1cHg7CisgICAgbWFyZ2lu LXRvcDogMXB4OworfQorCisuaW5kZXhlZC1kYi1kYXRhLXZpZXcgLmRhdGEtZ3JpZCAuZGF0YS1j b250YWluZXIgdGQgLnNlY3Rpb24gLmhlYWRlciAudGl0bGUgeworICAgIHdoaXRlLXNwYWNlOiBu b3dyYXA7CisgICAgdGV4dC1vdmVyZmxvdzogZWxsaXBzaXM7CisgICAgb3ZlcmZsb3c6IGhpZGRl bjsKK30K