92237 2012-07-25 03:56:12 -0700 [BlackBerry] Pass all file chooser settings to clients 2012-07-31 19:39:53 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 robin.webkit webkit-unassigned charles.wei mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 677879 0 robin.webkit 2012-07-25 03:56:12 -0700 Pass all file chooser settings to clients. 677895 1 robin.webkit 2012-07-25 04:11:32 -0700 cc 677900 2 154322 robin.webkit 2012-07-25 04:14:30 -0700 Created attachment 154322 patch 678519 3 154322 rwlbuis 2012-07-25 15:13:50 -0700 Comment on attachment 154322 patch View in context: https://bugs.webkit.org/attachment.cgi?id=154322&action=review > Source/WebKit/blackberry/Api/WebPageClient.h:171 > + virtual bool chooseFilenames(bool allowMultiple, const SharedArray<WebString>& acceptTypes, unsigned numOfAcceptTypes, const SharedArray<WebString>& selectedFiles, unsigned numOfselectedFiles, const WebString& capture, SharedArray<WebString>& chosenFiles, unsigned& numOfChosenFiles) = 0; Is it really needed to provide numOfAcceptTypes and numOfselectedFiles? Can't they be deduced from the SharedArrays? 678780 4 robin.webkit 2012-07-25 19:27:43 -0700 (In reply to comment #3) > (From update of attachment 154322 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=154322&action=review > > > Source/WebKit/blackberry/Api/WebPageClient.h:171 > > + virtual bool chooseFilenames(bool allowMultiple, const SharedArray<WebString>& acceptTypes, unsigned numOfAcceptTypes, const SharedArray<WebString>& selectedFiles, unsigned numOfselectedFiles, const WebString& capture, SharedArray<WebString>& chosenFiles, unsigned& numOfChosenFiles) = 0; > > Is it really needed to provide numOfAcceptTypes and numOfselectedFiles? Can't they be deduced from the SharedArrays? I admit this method have too many parameters :( SharedArray is a very simple template class in the platform. The array size cannot be deduced from SharedArray, since it does not store any information about the size of array. I will look into if SharedArray can be extend so that we can get array size from it. 682837 5 155467 robin.webkit 2012-07-31 01:59:41 -0700 Created attachment 155467 updated patch 682909 6 155467 rwlbuis 2012-07-31 04:20:12 -0700 Comment on attachment 155467 updated patch LGTM. 683774 7 155467 webkit.review.bot 2012-07-31 19:39:49 -0700 Comment on attachment 155467 updated patch Clearing flags on attachment: 155467 Committed r124285: <http://trac.webkit.org/changeset/124285> 683775 8 webkit.review.bot 2012-07-31 19:39:53 -0700 All reviewed patches have been landed. Closing bug. 154322 2012-07-25 04:14:30 -0700 2012-07-31 01:59:32 -0700 patch bug-92237-20120725191414.patch text/plain 4907 robin.webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA4ZjI5ZDc1MTZkNjkyZjI3MjllYzQ1MDhlOTE4OGE0YTFjOGYyMmRkLi4yNjZiYmU1YWQ4 NTQ4NTdiY2NiMzQ5NGEzZGJmZDc4M2UyYjEwM2ViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wNy0yNSAgUm9iaW4gQ2FvICA8cm9iaW4uY2Fv QHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAgICBbQmxhY2tCZXJyeV0gUGFzcyBhbGwgZmls ZSBjaG9vc2VyIHNldHRpbmdzIHRvIGNsaWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTkyMjM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRXhwb3NlIGFsbCBmaWxlIGNob29zZXIgc2V0dGluZ3MgdG8g Y2xpZW50cy4KKworICAgICAgICAqIEFwaS9XZWJQYWdlQ2xpZW50Lmg6CisgICAgICAgICogV2Vi Q29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDaHJvbWVDbGllbnRCbGFja0JlcnJ5OjpydW5PcGVuUGFuZWwpOgorCiAyMDEyLTA3LTI0ICBS b2IgQnVpcyAgPHJidWlzQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIERvIG5vdCBj YWxsIHNldHRpbmdzIHNldHRlcnMgdHdpY2Ugb24gcGFnZSBjb25zdHJ1Y3Rpb24KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ2xpZW50LmgKaW5kZXggZTkzMWQ2MDUwYjFl NTlkZTQ2MzEzNzExYzBjODExYTAzN2RmNTc4OS4uYmMyMWQ5YWUwMjVlYjRkN2MzZmMzMDQwMjM1 N2M0Njc3YTM1YzdmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJQYWdlQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdl Q2xpZW50LmgKQEAgLTE2OCw3ICsxNjgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIG9w ZW5EYXRlVGltZVBvcHVwKGludCB0eXBlLCBjb25zdCBXZWJTdHJpbmcmIHZhbHVlLCBjb25zdCBX ZWJTdHJpbmcmIG1pbiwgY29uc3QgV2ViU3RyaW5nJiBtYXgsIGRvdWJsZSBzdGVwKSA9IDA7CiAg ICAgdmlydHVhbCB2b2lkIG9wZW5Db2xvclBvcHVwKGNvbnN0IFdlYlN0cmluZyYgdmFsdWUpID0g MDsKIAotICAgIHZpcnR1YWwgYm9vbCBjaG9vc2VGaWxlbmFtZXMoYm9vbCBhbGxvd011bHRpcGxl LCBjb25zdCBXZWJTdHJpbmcmIGFjY2VwdFR5cGVzLCBjb25zdCBTaGFyZWRBcnJheTxXZWJTdHJp bmc+JiBpbml0aWFsRmlsZXMsIHVuc2lnbmVkIGluaXRpYWxGaWxlU2l6ZSwgU2hhcmVkQXJyYXk8 V2ViU3RyaW5nPiYgY2hvc2VuRmlsZXMsIHVuc2lnbmVkJiBjaG9zZW5GaWxlU2l6ZSkgPSAwOwor ICAgIHZpcnR1YWwgYm9vbCBjaG9vc2VGaWxlbmFtZXMoYm9vbCBhbGxvd011bHRpcGxlLCBjb25z dCBTaGFyZWRBcnJheTxXZWJTdHJpbmc+JiBhY2NlcHRUeXBlcywgdW5zaWduZWQgbnVtT2ZBY2Nl cHRUeXBlcywgY29uc3QgU2hhcmVkQXJyYXk8V2ViU3RyaW5nPiYgc2VsZWN0ZWRGaWxlcywgdW5z aWduZWQgbnVtT2ZzZWxlY3RlZEZpbGVzLCBjb25zdCBXZWJTdHJpbmcmIGNhcHR1cmUsIFNoYXJl ZEFycmF5PFdlYlN0cmluZz4mIGNob3NlbkZpbGVzLCB1bnNpZ25lZCYgbnVtT2ZDaG9zZW5GaWxl cykgPSAwOwogCiAgICAgdmlydHVhbCB2b2lkIGxvYWRQbHVnaW5Gb3JNaW1ldHlwZShpbnQsIGlu dCB3aWR0aCwgaW50IGhlaWdodCwgY29uc3QgU2hhcmVkQXJyYXk8V2ViU3RyaW5nPiYgcGFyYW1O YW1lcywgY29uc3QgU2hhcmVkQXJyYXk8V2ViU3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGludCBzaXpl LCBjb25zdCBjaGFyKiB1cmwpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgbm90aWZ5UGx1Z2luUmVj dENoYW5nZWQoaW50LCBQbGF0Zm9ybTo6SW50UmVjdCByZWN0Q2hhbmdlZCkgPSAwOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVu dEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0 L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwCmluZGV4IGU5NzQxYTI1YmE5MzljOWEwMWVjYjJj OWVmYzkzMWQyNGUwZTI5YjcuLjc2ZjllNzI3ZWY1ZjA3OTVjZDZiZWQ0NDMyYmE0NmY4ZmRlMjRh YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9D aHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv V2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHAKQEAgLTUwNiwyNyArNTA2 LDM4IEBAIHZvaWQgQ2hyb21lQ2xpZW50QmxhY2tCZXJyeTo6ZXhjZWVkZWREYXRhYmFzZVF1b3Rh KEZyYW1lKiBmcmFtZSwgY29uc3QgU3RyaW5nJiBuCiAKIHZvaWQgQ2hyb21lQ2xpZW50QmxhY2tC ZXJyeTo6cnVuT3BlblBhbmVsKEZyYW1lKiwgUGFzc1JlZlB0cjxGaWxlQ2hvb3Nlcj4gY2hvb3Nl cikKIHsKLSAgICBTaGFyZWRBcnJheTxXZWJTdHJpbmc+IGluaXRpYWxGaWxlczsKLSAgICB1bnNp Z25lZCBpbnQgaW5pdGlhbEZpbGVTaXplID0gY2hvb3Nlci0+c2V0dGluZ3MoKS5zZWxlY3RlZEZp bGVzLnNpemUoKTsKLSAgICBpZiAoaW5pdGlhbEZpbGVTaXplID4gMCkKLSAgICAgICAgaW5pdGlh bEZpbGVzLnJlc2V0KG5ldyBXZWJTdHJpbmdbaW5pdGlhbEZpbGVTaXplXSk7Ci0gICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IGluaXRpYWxGaWxlU2l6ZTsgKytpKQotICAgICAgICBpbml0aWFs RmlsZXNbaV0gPSBjaG9vc2VyLT5zZXR0aW5ncygpLnNlbGVjdGVkRmlsZXNbaV07CisgICAgU2hh cmVkQXJyYXk8V2ViU3RyaW5nPiBzZWxlY3RlZEZpbGVzOworICAgIHVuc2lnbmVkIG51bU9mU2Vs ZWN0ZWRGaWxlcyA9IGNob29zZXItPnNldHRpbmdzKCkuc2VsZWN0ZWRGaWxlcy5zaXplKCk7Cisg ICAgaWYgKG51bU9mU2VsZWN0ZWRGaWxlcyA+IDApCisgICAgICAgIHNlbGVjdGVkRmlsZXMucmVz ZXQobmV3IFdlYlN0cmluZ1tudW1PZlNlbGVjdGVkRmlsZXNdKTsKKyAgICBmb3IgKHVuc2lnbmVk IGkgPSAwOyBpIDwgbnVtT2ZTZWxlY3RlZEZpbGVzOyArK2kpCisgICAgICAgIHNlbGVjdGVkRmls ZXNbaV0gPSBjaG9vc2VyLT5zZXR0aW5ncygpLnNlbGVjdGVkRmlsZXNbaV07CisKKyAgICBTaGFy ZWRBcnJheTxXZWJTdHJpbmc+IGFjY2VwdE1JTUVUeXBlczsKKyAgICB1bnNpZ25lZCBudW1PZkFj Y2VwdE1JTUVUeXBlcyA9IGNob29zZXItPnNldHRpbmdzKCkuYWNjZXB0TUlNRVR5cGVzLnNpemUo KTsKKyAgICBpZiAobnVtT2ZBY2NlcHRNSU1FVHlwZXMgPiAwKQorICAgICAgICBhY2NlcHRNSU1F VHlwZXMucmVzZXQobmV3IFdlYlN0cmluZ1tudW1PZkFjY2VwdE1JTUVUeXBlc10pOworICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgPCBudW1PZkFjY2VwdE1JTUVUeXBlczsgKytpKQorICAgICAg ICBhY2NlcHRNSU1FVHlwZXNbaV0gPSBjaG9vc2VyLT5zZXR0aW5ncygpLmFjY2VwdE1JTUVUeXBl c1tpXTsKKworICAgIFdlYlN0cmluZyBjYXB0dXJlOworI2lmIEVOQUJMRShNRURJQV9DQVBUVVJF KQorICAgIGNhcHR1cmUgPSBjaG9vc2VyLT5zZXR0aW5ncygpLmNhcHR1cmU7CisjZW5kaWYKIAog ICAgIFNoYXJlZEFycmF5PFdlYlN0cmluZz4gY2hvc2VuRmlsZXM7Ci0gICAgdW5zaWduZWQgaW50 IGNob3NlbkZpbGVTaXplOworICAgIHVuc2lnbmVkIG51bU9mQ2hvc2VuRmlsZXM7CiAKICAgICB7 CiAgICAgICAgIFBhZ2VHcm91cExvYWREZWZlcnJlciBkZWZlcnJlcihtX3dlYlBhZ2VQcml2YXRl LT5tX3BhZ2UsIHRydWUpOwogICAgICAgICBUaW1lckJhc2U6OmZpcmVUaW1lcnNJbk5lc3RlZEV2 ZW50TG9vcCgpOwogCi0gICAgICAgIC8vIEZJWE1FOiBVc2UgY2hvb3Nlci0+c2V0dGluZ3MoKS5h Y2NlcHRNSU1FVHlwZXMgaW5zdGVhZCBvZiBXZWJTdHJpbmcoKSBmb3IgdGhlIHNlY29uZCBwYXJh bWV0ZXIuCi0gICAgICAgIGlmICghbV93ZWJQYWdlUHJpdmF0ZS0+bV9jbGllbnQtPmNob29zZUZp bGVuYW1lcyhjaG9vc2VyLT5zZXR0aW5ncygpLmFsbG93c011bHRpcGxlRmlsZXMsIFdlYlN0cmlu ZygpLCBpbml0aWFsRmlsZXMsIGluaXRpYWxGaWxlU2l6ZSwgY2hvc2VuRmlsZXMsIGNob3NlbkZp bGVTaXplKSkKKyAgICAgICAgaWYgKCFtX3dlYlBhZ2VQcml2YXRlLT5tX2NsaWVudC0+Y2hvb3Nl RmlsZW5hbWVzKGNob29zZXItPnNldHRpbmdzKCkuYWxsb3dzTXVsdGlwbGVGaWxlcywgYWNjZXB0 TUlNRVR5cGVzLCBudW1PZkFjY2VwdE1JTUVUeXBlcywgc2VsZWN0ZWRGaWxlcywgbnVtT2ZTZWxl Y3RlZEZpbGVzLCBjYXB0dXJlLCBjaG9zZW5GaWxlcywgbnVtT2ZDaG9zZW5GaWxlcykpCiAgICAg ICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgVmVjdG9yPFN0cmluZz4gZmlsZXMoY2hvc2Vu RmlsZVNpemUpOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBjaG9zZW5GaWxlU2l6ZTsg KytpKQorICAgIFZlY3RvcjxTdHJpbmc+IGZpbGVzKG51bU9mQ2hvc2VuRmlsZXMpOworICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgPCBudW1PZkNob3NlbkZpbGVzOyArK2kpCiAgICAgICAgIGZp bGVzW2ldID0gY2hvc2VuRmlsZXNbaV07CiAgICAgY2hvb3Nlci0+Y2hvb3NlRmlsZXMoZmlsZXMp OwogfQo= 155467 2012-07-31 01:59:41 -0700 2012-07-31 19:39:49 -0700 updated patch bug-92237-20120731165923.patch text/plain 3704 robin.webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBlMWU2OGE3ZjcxODk3NmZmMzk4ZTI5OWEyMDlhYjI2YzBiZDE2ZTM2Li5lNzRhYjhlNzM1 ODE1OTM3NWY5NGZlODdlMWYzZmI2NTc4OWNmYTUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wNy0zMSAgUm9iaW4gQ2FvICA8cm9iaW4uY2Fv QHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAgICBbQmxhY2tCZXJyeV0gUGFzcyBhbGwgZmls ZSBjaG9vc2VyIHNldHRpbmdzIHRvIGNsaWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTkyMjM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRXhwb3NlIGFsbCBmaWxlIGNob29zZXIgc2V0dGluZ3MgdG8g Y2xpZW50cy4KKworICAgICAgICAqIEFwaS9XZWJQYWdlQ2xpZW50Lmg6CisgICAgICAgICogV2Vi Q29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDaHJvbWVDbGllbnRCbGFja0JlcnJ5OjpydW5PcGVuUGFuZWwpOgorCiAyMDEyLTA3LTMwICBZ b3NoaWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Zvcm1zXSBH ZXQgcmlkIG9mIEVsZW1lbnQ6OmlzUmVhZE9ubHlGb3JtQ29udHJvbCBvdGhlciB0aGFuIENTUyBy ZWxhdGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VD bGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oCmlu ZGV4IGFjYzE2OGU0OTZiOTY5ZTYxZTJiMWU0YTI5N2VjZjJiMzRlZmE3N2IuLjE1NDBiYWMwMzQx ZDZkNzUwMWFjM2ExMDY2NjgxYjc3ZGI1Zjk3ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oCkBAIC0xNjcsNyArMTY3LDcgQEAgcHVibGljOgogICAg IHZpcnR1YWwgdm9pZCBvcGVuRGF0ZVRpbWVQb3B1cChpbnQgdHlwZSwgY29uc3QgV2ViU3RyaW5n JiB2YWx1ZSwgY29uc3QgV2ViU3RyaW5nJiBtaW4sIGNvbnN0IFdlYlN0cmluZyYgbWF4LCBkb3Vi bGUgc3RlcCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBvcGVuQ29sb3JQb3B1cChjb25zdCBXZWJT dHJpbmcmIHZhbHVlKSA9IDA7CiAKLSAgICB2aXJ0dWFsIGJvb2wgY2hvb3NlRmlsZW5hbWVzKGJv b2wgYWxsb3dNdWx0aXBsZSwgY29uc3QgV2ViU3RyaW5nJiBhY2NlcHRUeXBlcywgY29uc3QgU2hh cmVkQXJyYXk8V2ViU3RyaW5nPiYgaW5pdGlhbEZpbGVzLCBTaGFyZWRBcnJheTxXZWJTdHJpbmc+ JiBjaG9zZW5GaWxlcykgPSAwOworICAgIHZpcnR1YWwgYm9vbCBjaG9vc2VGaWxlbmFtZXMoYm9v bCBhbGxvd011bHRpcGxlLCBjb25zdCBTaGFyZWRBcnJheTxXZWJTdHJpbmc+JiBhY2NlcHRUeXBl cywgY29uc3QgU2hhcmVkQXJyYXk8V2ViU3RyaW5nPiYgaW5pdGlhbEZpbGVzLCBjb25zdCBXZWJT dHJpbmcmIGNhcHR1cmUsIFNoYXJlZEFycmF5PFdlYlN0cmluZz4mIGNob3NlbkZpbGVzKSA9IDA7 CiAKICAgICB2aXJ0dWFsIHZvaWQgbG9hZFBsdWdpbkZvck1pbWV0eXBlKGludCwgaW50IHdpZHRo LCBpbnQgaGVpZ2h0LCBjb25zdCBTaGFyZWRBcnJheTxXZWJTdHJpbmc+JiBwYXJhbU5hbWVzLCBj b25zdCBTaGFyZWRBcnJheTxXZWJTdHJpbmc+JiBwYXJhbVZhbHVlcywgY29uc3QgY2hhciogdXJs KSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIG5vdGlmeVBsdWdpblJlY3RDaGFuZ2VkKGludCwgUGxh dGZvcm06OkludFJlY3QgcmVjdENoYW5nZWQpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcCBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFj a0JlcnJ5LmNwcAppbmRleCBjYzNmOTVlMGE4Y2Y0MTA1NWRjYzk1Y2ZmNDU3MzUwMmY4ODczODE0 Li5iMGRhZTYwOTc3ZjQzOTdjYWY1Zjg1YTIxY2UwNTFhYjJhYzgwYTI0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tC ZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0No cm9tZUNsaWVudEJsYWNrQmVycnkuY3BwCkBAIC01MTMsMTQgKzUxMywyNSBAQCB2b2lkIENocm9t ZUNsaWVudEJsYWNrQmVycnk6OnJ1bk9wZW5QYW5lbChGcmFtZSosIFBhc3NSZWZQdHI8RmlsZUNo b29zZXI+IGNob29zZQogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBudW1iZXJPZkluaXRp YWxGaWxlczsgKytpKQogICAgICAgICBpbml0aWFsRmlsZXNbaV0gPSBjaG9vc2VyLT5zZXR0aW5n cygpLnNlbGVjdGVkRmlsZXNbaV07CiAKKyAgICBTaGFyZWRBcnJheTxXZWJTdHJpbmc+IGFjY2Vw dE1JTUVUeXBlczsKKyAgICB1bnNpZ25lZCBudW1iZXJPZlR5cGVzID0gY2hvb3Nlci0+c2V0dGlu Z3MoKS5hY2NlcHRNSU1FVHlwZXMuc2l6ZSgpOworICAgIGlmIChudW1iZXJPZlR5cGVzID4gMCkK KyAgICAgICAgYWNjZXB0TUlNRVR5cGVzLnJlc2V0KG5ldyBXZWJTdHJpbmdbbnVtYmVyT2ZUeXBl c10sIG51bWJlck9mVHlwZXMpOworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBudW1iZXJP ZlR5cGVzOyArK2kpCisgICAgICAgIGFjY2VwdE1JTUVUeXBlc1tpXSA9IGNob29zZXItPnNldHRp bmdzKCkuYWNjZXB0TUlNRVR5cGVzW2ldOworCisgICAgV2ViU3RyaW5nIGNhcHR1cmU7CisjaWYg RU5BQkxFKE1FRElBX0NBUFRVUkUpCisgICAgY2FwdHVyZSA9IGNob29zZXItPnNldHRpbmdzKCku Y2FwdHVyZTsKKyNlbmRpZgorCiAgICAgU2hhcmVkQXJyYXk8V2ViU3RyaW5nPiBjaG9zZW5GaWxl czsKIAogICAgIHsKICAgICAgICAgUGFnZUdyb3VwTG9hZERlZmVycmVyIGRlZmVycmVyKG1fd2Vi UGFnZVByaXZhdGUtPm1fcGFnZSwgdHJ1ZSk7CiAgICAgICAgIFRpbWVyQmFzZTo6ZmlyZVRpbWVy c0luTmVzdGVkRXZlbnRMb29wKCk7CiAKLSAgICAgICAgLy8gRklYTUU6IFVzZSBjaG9vc2VyLT5z ZXR0aW5ncygpLmFjY2VwdE1JTUVUeXBlcyBpbnN0ZWFkIG9mIFdlYlN0cmluZygpIGZvciB0aGUg c2Vjb25kIHBhcmFtZXRlci4KLSAgICAgICAgaWYgKCFtX3dlYlBhZ2VQcml2YXRlLT5tX2NsaWVu dC0+Y2hvb3NlRmlsZW5hbWVzKGNob29zZXItPnNldHRpbmdzKCkuYWxsb3dzTXVsdGlwbGVGaWxl cywgV2ViU3RyaW5nKCksIGluaXRpYWxGaWxlcywgY2hvc2VuRmlsZXMpKQorICAgICAgICBpZiAo IW1fd2ViUGFnZVByaXZhdGUtPm1fY2xpZW50LT5jaG9vc2VGaWxlbmFtZXMoY2hvb3Nlci0+c2V0 dGluZ3MoKS5hbGxvd3NNdWx0aXBsZUZpbGVzLCBhY2NlcHRNSU1FVHlwZXMsIGluaXRpYWxGaWxl cywgY2FwdHVyZSwgY2hvc2VuRmlsZXMpKQogICAgICAgICAgICAgcmV0dXJuOwogICAgIH0KIAo=