201290 2019-08-29 00:03:20 -0700 Web Inspector: Import file pickers sometimes do not import 2019-08-29 23:59:22 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=201289 InRadar P2 Normal --- 1 joepeck joepeck commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer wenson_hsieh oldest_to_newest 1566125 0 joepeck 2019-08-29 00:03:20 -0700 Import file pickers sometimes do not import Steps to Reproduce: 1. Inspect webkit.org 2. Show Timeline tab 3. Click "Import" button 4. Select a previously exported recording => Nothing happens Notes: • FileChooser::invalidate happened because the input element got GC'd => "change" handler never fired Lets keep the <input type="file"> around artificially. 1566126 1 webkit-bug-importer 2019-08-29 00:03:34 -0700 <rdar://problem/54826117> 1566127 2 377549 joepeck 2019-08-29 00:05:25 -0700 Created attachment 377549 [PATCH] Proposed Fix 1566131 3 377549 hi 2019-08-29 00:14:10 -0700 Comment on attachment 377549 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=377549&action=review r=me, nice catch! Really odd that an active input can get GC'd 🤔 > Source/WebInspectorUI/UserInterface/Base/FileUtilities.js:91 > + fileReader.readAsDataURL(saveData.content); Nice! > Source/WebInspectorUI/UserInterface/Base/FileUtilities.js:96 > + if (!FileUtilities.importTextInputElement) { Could we use an "_" prefixed value to make sure callers know it's private? Just like `WI.ImageUtilities._scratchContext2D`. > Source/WebInspectorUI/UserInterface/Base/FileUtilities.js:111 > + if (!FileUtilities.importJSONInputElement) { Do we need a separate <input> for text vs json? Theoretically, only one can be active at a time, so it shouldn't be an issue. > Source/WebInspectorUI/UserInterface/Base/FileUtilities.js:135 > let reader = new FileReader; You could also move this inside the `Promise` as well, as it's not needed anywhere outside. 1566136 4 joepeck 2019-08-29 00:20:49 -0700 > > Source/WebInspectorUI/UserInterface/Base/FileUtilities.js:96 > > + if (!FileUtilities.importTextInputElement) { > > Could we use an "_" prefixed value to make sure callers know it's private? > Just like `WI.ImageUtilities._scratchContext2D`. Sure. > > Source/WebInspectorUI/UserInterface/Base/FileUtilities.js:111 > > + if (!FileUtilities.importJSONInputElement) { > > Do we need a separate <input> for text vs json? Theoretically, only one can > be active at a time, so it shouldn't be an issue. Let's keep it separate. If the other bug gets addressed we can just revert this code! > > > Source/WebInspectorUI/UserInterface/Base/FileUtilities.js:135 > > let reader = new FileReader; > > You could also move this inside the `Promise` as well, as it's not needed > anywhere outside. Might as well! 1566139 5 377554 joepeck 2019-08-29 00:29:50 -0700 Created attachment 377554 [PATCH] For Landing 1566153 6 commit-queue 2019-08-29 01:23:44 -0700 The commit-queue encountered the following flaky tests while processing attachment 377554: svg/custom/tabindex-order.html bug 201294 (authors: krit@webkit.org and rniwa@webkit.org) The commit-queue is continuing to process your patch. 1566155 7 377554 commit-queue 2019-08-29 01:24:24 -0700 Comment on attachment 377554 [PATCH] For Landing Clearing flags on attachment: 377554 Committed r249248: <https://trac.webkit.org/changeset/249248> 377549 2019-08-29 00:05:25 -0700 2019-08-29 00:29:37 -0700 [PATCH] Proposed Fix file-1.patch text/plain 4336 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDhlMGUxYTc5NGJiLi5mMjU4ZmZhMmU0ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDgtMjkgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBJbXBvcnQgZmlsZSBwaWNrZXJzIHNvbWV0aW1lcyBkbyBub3QgaW1wb3J0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDEyOTAKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzU0ODI2MTE3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL0ZpbGVVdGlsaXRpZXMuanM6Cisg ICAgICAgIChXSS5GaWxlVXRpbGl0aWVzLmltcG9ydFRleHQpOgorICAgICAgICAoV0kuRmlsZVV0 aWxpdGllcy5pbXBvcnRKU09OKToKKyAgICAgICAgS2VlcCB0aGUgaW5wdXQgZWxlbWVudCBhbGl2 ZSBzbyBpdCBkb2Vzbid0IGdldCBnYXJiYWdlIGNvbGxlY3RlZCwKKyAgICAgICAgd2hpY2ggbWFr ZXMgdGhlIGZpbGUgY2hvb3NlciBkbyBub3RoaW5nLgorCisgICAgICAgIChXSS5GaWxlVXRpbGl0 aWVzLnNhdmUpOgorICAgICAgICAoV0kuRmlsZVV0aWxpdGllcy5hc3luYy5yZWFkVGV4dCk6Cisg ICAgICAgIFBsYWNlIHJlYWQgb3BlcmF0aW9ucyBhZnRlciBldmVudCBoYW5kbGVycyBhcmUgc2V0 dXAgaW4gY2FzZSB0aGUKKyAgICAgICAgcmVhZCBvcGVyYXRpb25zIGNhbiBoYXBwZW4gc3luY2hy b25vdXNseSBhbmQgZXZlbnRzIG1heSBub3QgZmlyZS4KKwogMjAxOS0wOC0yOCAgSm9zZXBoIFBl Y29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IExv Y2FsIE92ZXJyaWRlcyAtIFByb3ZpZGUgc3Vic3RpdHV0aW9uIGNvbnRlbnQgZm9yIHJlc291cmNl IGxvYWRzIChVUkwgYmFzZWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL0ZpbGVVdGlsaXRpZXMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9CYXNlL0ZpbGVVdGlsaXRpZXMuanMKaW5kZXggZThjY2Y1NDUwM2UuLjdh N2Q5ZjlkMGM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL0ZpbGVVdGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQmFzZS9GaWxlVXRpbGl0aWVzLmpzCkBAIC04MiwzNSArODIsNDMgQEAgV0kuRmls ZVV0aWxpdGllcyA9IGNsYXNzIEZpbGVVdGlsaXRpZXMgewogICAgICAgICB9CiAKICAgICAgICAg bGV0IGZpbGVSZWFkZXIgPSBuZXcgRmlsZVJlYWRlcjsKLSAgICAgICAgZmlsZVJlYWRlci5yZWFk QXNEYXRhVVJMKHNhdmVEYXRhLmNvbnRlbnQpOwogICAgICAgICBmaWxlUmVhZGVyLmFkZEV2ZW50 TGlzdGVuZXIoImxvYWRlbmQiLCAoKSA9PiB7CiAgICAgICAgICAgICBsZXQgZGF0YVVSTENvbXBv bmVudHMgPSBwYXJzZURhdGFVUkwoZmlsZVJlYWRlci5yZXN1bHQpOwogCiAgICAgICAgICAgICBj b25zdCBiYXNlNjRFbmNvZGVkID0gdHJ1ZTsKICAgICAgICAgICAgIEluc3BlY3RvckZyb250ZW5k SG9zdC5zYXZlKHN1Z2dlc3RlZE5hbWUsIGRhdGFVUkxDb21wb25lbnRzLmRhdGEsIGJhc2U2NEVu Y29kZWQsIGZvcmNlU2F2ZUFzIHx8IHNhdmVEYXRhLmZvcmNlU2F2ZUFzKTsKICAgICAgICAgfSk7 CisgICAgICAgIGZpbGVSZWFkZXIucmVhZEFzRGF0YVVSTChzYXZlRGF0YS5jb250ZW50KTsKICAg ICB9CiAKICAgICBzdGF0aWMgaW1wb3J0VGV4dChjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIGxl dCBpbnB1dEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbnB1dCIpOwotICAgICAg ICBpbnB1dEVsZW1lbnQudHlwZSA9ICJmaWxlIjsKLSAgICAgICAgaW5wdXRFbGVtZW50Lm11bHRp cGxlID0gdHJ1ZTsKLSAgICAgICAgaW5wdXRFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNoYW5n ZSIsIChldmVudCkgPT4gewotICAgICAgICAgICAgV0kuRmlsZVV0aWxpdGllcy5yZWFkVGV4dChp bnB1dEVsZW1lbnQuZmlsZXMsIGNhbGxiYWNrKTsKLSAgICAgICAgfSk7Ci0gICAgICAgIGlucHV0 RWxlbWVudC5jbGljaygpOworICAgICAgICBpZiAoIUZpbGVVdGlsaXRpZXMuaW1wb3J0VGV4dElu cHV0RWxlbWVudCkgeworICAgICAgICAgICAgbGV0IGlucHV0RWxlbWVudCA9IEZpbGVVdGlsaXRp ZXMuaW1wb3J0VGV4dElucHV0RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImlucHV0 Iik7CisgICAgICAgICAgICBpbnB1dEVsZW1lbnQudHlwZSA9ICJmaWxlIjsKKyAgICAgICAgICAg IGlucHV0RWxlbWVudC5tdWx0aXBsZSA9IHRydWU7CisgICAgICAgICAgICBpbnB1dEVsZW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigiY2hhbmdlIiwgKGV2ZW50KSA9PiB7CisgICAgICAgICAgICAgICAg V0kuRmlsZVV0aWxpdGllcy5yZWFkVGV4dChpbnB1dEVsZW1lbnQuZmlsZXMsIGNhbGxiYWNrKTsK KyAgICAgICAgICAgIH0pOworICAgICAgICB9CisKKyAgICAgICAgRmlsZVV0aWxpdGllcy5pbXBv cnRUZXh0SW5wdXRFbGVtZW50LnZhbHVlID0gbnVsbDsKKyAgICAgICAgRmlsZVV0aWxpdGllcy5p bXBvcnRUZXh0SW5wdXRFbGVtZW50LmNsaWNrKCk7CiAgICAgfQogCiAgICAgc3RhdGljIGltcG9y dEpTT04oY2FsbGJhY2spCiAgICAgewotICAgICAgICBsZXQgaW5wdXRFbGVtZW50ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiaW5wdXQiKTsKLSAgICAgICAgaW5wdXRFbGVtZW50LnR5cGUgPSAi ZmlsZSI7Ci0gICAgICAgIGlucHV0RWxlbWVudC5tdWx0aXBsZSA9IHRydWU7Ci0gICAgICAgIGlu cHV0RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjaGFuZ2UiLCAoZXZlbnQpID0+IHsKLSAgICAg ICAgICAgIFdJLkZpbGVVdGlsaXRpZXMucmVhZEpTT04oaW5wdXRFbGVtZW50LmZpbGVzLCBjYWxs YmFjayk7Ci0gICAgICAgIH0pOwotICAgICAgICBpbnB1dEVsZW1lbnQuY2xpY2soKTsKKyAgICAg ICAgaWYgKCFGaWxlVXRpbGl0aWVzLmltcG9ydEpTT05JbnB1dEVsZW1lbnQpIHsKKyAgICAgICAg ICAgIGxldCBpbnB1dEVsZW1lbnQgPSBGaWxlVXRpbGl0aWVzLmltcG9ydEpTT05JbnB1dEVsZW1l bnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbnB1dCIpOworICAgICAgICAgICAgaW5wdXRF bGVtZW50LnR5cGUgPSAiZmlsZSI7CisgICAgICAgICAgICBpbnB1dEVsZW1lbnQubXVsdGlwbGUg PSB0cnVlOworICAgICAgICAgICAgaW5wdXRFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNoYW5n ZSIsIChldmVudCkgPT4geworICAgICAgICAgICAgICAgIFdJLkZpbGVVdGlsaXRpZXMucmVhZEpT T04oaW5wdXRFbGVtZW50LmZpbGVzLCBjYWxsYmFjayk7CisgICAgICAgICAgICB9KTsKKyAgICAg ICAgfQorCisgICAgICAgIEZpbGVVdGlsaXRpZXMuaW1wb3J0SlNPTklucHV0RWxlbWVudC52YWx1 ZSA9IG51bGw7CisgICAgICAgIEZpbGVVdGlsaXRpZXMuaW1wb3J0SlNPTklucHV0RWxlbWVudC5j bGljaygpOwogICAgIH0KIAogICAgIHN0YXRpYyBhc3luYyByZWFkVGV4dChmaWxlT3JMaXN0LCBj YWxsYmFjaykKQEAgLTEyNSw3ICsxMzMsNiBAQCBXSS5GaWxlVXRpbGl0aWVzID0gY2xhc3MgRmls ZVV0aWxpdGllcyB7CiAKICAgICAgICAgZm9yIChsZXQgZmlsZSBvZiBmaWxlcykgewogICAgICAg ICAgICAgbGV0IHJlYWRlciA9IG5ldyBGaWxlUmVhZGVyOwotICAgICAgICAgICAgcmVhZGVyLnJl YWRBc1RleHQoZmlsZSk7CiAKICAgICAgICAgICAgIGxldCByZXN1bHQgPSB7CiAgICAgICAgICAg ICAgICAgZmlsZW5hbWU6IGZpbGUubmFtZSwKQEAgLTEzOCw2ICsxNDUsNyBAQCBXSS5GaWxlVXRp bGl0aWVzID0gY2xhc3MgRmlsZVV0aWxpdGllcyB7CiAgICAgICAgICAgICAgICAgICAgICAgICBy ZXNvbHZlKGV2ZW50KTsKICAgICAgICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICAgICAg ICAgIHJlYWRlci5hZGRFdmVudExpc3RlbmVyKCJlcnJvciIsIHJlamVjdCk7CisgICAgICAgICAg ICAgICAgICAgIHJlYWRlci5yZWFkQXNUZXh0KGZpbGUpOwogICAgICAgICAgICAgICAgIH0pOwog ICAgICAgICAgICAgfSBjYXRjaCAoZSkgewogICAgICAgICAgICAgICAgIHJlc3VsdC5lcnJvciA9 IGU7Cg== 377554 2019-08-29 00:29:50 -0700 2019-08-29 01:24:24 -0700 [PATCH] For Landing for-landing-2.patch text/plain 4577 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDk3MDY5ZTA3ZWFhLi43MTJkODJiZGY1YSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDgtMjkgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBJbXBvcnQgZmlsZSBwaWNrZXJzIHNvbWV0aW1lcyBkbyBub3QgaW1wb3J0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDEyOTAKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzU0ODI2MTE3PgorCisgICAgICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNz by4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9GaWxlVXRpbGl0aWVzLmpzOgorICAg ICAgICAoV0kuRmlsZVV0aWxpdGllcy5pbXBvcnRUZXh0KToKKyAgICAgICAgKFdJLkZpbGVVdGls aXRpZXMuaW1wb3J0SlNPTik6CisgICAgICAgIEtlZXAgdGhlIGlucHV0IGVsZW1lbnQgYWxpdmUg c28gaXQgZG9lc24ndCBnZXQgZ2FyYmFnZSBjb2xsZWN0ZWQsCisgICAgICAgIHdoaWNoIG1ha2Vz IHRoZSBmaWxlIGNob29zZXIgZG8gbm90aGluZy4KKworICAgICAgICAoV0kuRmlsZVV0aWxpdGll cy5zYXZlKToKKyAgICAgICAgKFdJLkZpbGVVdGlsaXRpZXMuYXN5bmMucmVhZFRleHQpOgorICAg ICAgICBQbGFjZSByZWFkIG9wZXJhdGlvbnMgYWZ0ZXIgZXZlbnQgaGFuZGxlcnMgYXJlIHNldHVw IGluIGNhc2UgdGhlCisgICAgICAgIHJlYWQgb3BlcmF0aW9ucyBjYW4gaGFwcGVuIHN5bmNocm9u b3VzbHkgYW5kIGV2ZW50cyBtYXkgbm90IGZpcmUuCisKIDIwMTktMDgtMjYgIERldmluIFJvdXNz byAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGRlY3JlYXNl IGhvcml6b250YWwgcGFkZGluZyBvZiBgV0kuU2NvcGVCYXJgIHRvIGhhdmUgbW9yZSByb29tCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0ZpbGVV dGlsaXRpZXMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0Zp bGVVdGlsaXRpZXMuanMKaW5kZXggZThjY2Y1NDUwM2UuLmZmN2Q4ZDA5NmMwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0ZpbGVVdGlsaXRpZXMu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9GaWxlVXRp bGl0aWVzLmpzCkBAIC04MiwzNSArODIsNDMgQEAgV0kuRmlsZVV0aWxpdGllcyA9IGNsYXNzIEZp bGVVdGlsaXRpZXMgewogICAgICAgICB9CiAKICAgICAgICAgbGV0IGZpbGVSZWFkZXIgPSBuZXcg RmlsZVJlYWRlcjsKLSAgICAgICAgZmlsZVJlYWRlci5yZWFkQXNEYXRhVVJMKHNhdmVEYXRhLmNv bnRlbnQpOwogICAgICAgICBmaWxlUmVhZGVyLmFkZEV2ZW50TGlzdGVuZXIoImxvYWRlbmQiLCAo KSA9PiB7CiAgICAgICAgICAgICBsZXQgZGF0YVVSTENvbXBvbmVudHMgPSBwYXJzZURhdGFVUkwo ZmlsZVJlYWRlci5yZXN1bHQpOwogCiAgICAgICAgICAgICBjb25zdCBiYXNlNjRFbmNvZGVkID0g dHJ1ZTsKICAgICAgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5zYXZlKHN1Z2dlc3RlZE5h bWUsIGRhdGFVUkxDb21wb25lbnRzLmRhdGEsIGJhc2U2NEVuY29kZWQsIGZvcmNlU2F2ZUFzIHx8 IHNhdmVEYXRhLmZvcmNlU2F2ZUFzKTsKICAgICAgICAgfSk7CisgICAgICAgIGZpbGVSZWFkZXIu cmVhZEFzRGF0YVVSTChzYXZlRGF0YS5jb250ZW50KTsKICAgICB9CiAKICAgICBzdGF0aWMgaW1w b3J0VGV4dChjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIGxldCBpbnB1dEVsZW1lbnQgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJpbnB1dCIpOwotICAgICAgICBpbnB1dEVsZW1lbnQudHlwZSA9 ICJmaWxlIjsKLSAgICAgICAgaW5wdXRFbGVtZW50Lm11bHRpcGxlID0gdHJ1ZTsKLSAgICAgICAg aW5wdXRFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNoYW5nZSIsIChldmVudCkgPT4gewotICAg ICAgICAgICAgV0kuRmlsZVV0aWxpdGllcy5yZWFkVGV4dChpbnB1dEVsZW1lbnQuZmlsZXMsIGNh bGxiYWNrKTsKLSAgICAgICAgfSk7Ci0gICAgICAgIGlucHV0RWxlbWVudC5jbGljaygpOworICAg ICAgICBpZiAoIUZpbGVVdGlsaXRpZXMuX2ltcG9ydFRleHRJbnB1dEVsZW1lbnQpIHsKKyAgICAg ICAgICAgIGxldCBpbnB1dEVsZW1lbnQgPSBGaWxlVXRpbGl0aWVzLl9pbXBvcnRUZXh0SW5wdXRF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW5wdXQiKTsKKyAgICAgICAgICAgIGlu cHV0RWxlbWVudC50eXBlID0gImZpbGUiOworICAgICAgICAgICAgaW5wdXRFbGVtZW50Lm11bHRp cGxlID0gdHJ1ZTsKKyAgICAgICAgICAgIGlucHV0RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJj aGFuZ2UiLCAoZXZlbnQpID0+IHsKKyAgICAgICAgICAgICAgICBXSS5GaWxlVXRpbGl0aWVzLnJl YWRUZXh0KGlucHV0RWxlbWVudC5maWxlcywgY2FsbGJhY2spOworICAgICAgICAgICAgfSk7Cisg ICAgICAgIH0KKworICAgICAgICBGaWxlVXRpbGl0aWVzLl9pbXBvcnRUZXh0SW5wdXRFbGVtZW50 LnZhbHVlID0gbnVsbDsKKyAgICAgICAgRmlsZVV0aWxpdGllcy5faW1wb3J0VGV4dElucHV0RWxl bWVudC5jbGljaygpOwogICAgIH0KIAogICAgIHN0YXRpYyBpbXBvcnRKU09OKGNhbGxiYWNrKQog ICAgIHsKLSAgICAgICAgbGV0IGlucHV0RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImlucHV0Iik7Ci0gICAgICAgIGlucHV0RWxlbWVudC50eXBlID0gImZpbGUiOwotICAgICAgICBp bnB1dEVsZW1lbnQubXVsdGlwbGUgPSB0cnVlOwotICAgICAgICBpbnB1dEVsZW1lbnQuYWRkRXZl bnRMaXN0ZW5lcigiY2hhbmdlIiwgKGV2ZW50KSA9PiB7Ci0gICAgICAgICAgICBXSS5GaWxlVXRp bGl0aWVzLnJlYWRKU09OKGlucHV0RWxlbWVudC5maWxlcywgY2FsbGJhY2spOwotICAgICAgICB9 KTsKLSAgICAgICAgaW5wdXRFbGVtZW50LmNsaWNrKCk7CisgICAgICAgIGlmICghRmlsZVV0aWxp dGllcy5faW1wb3J0SlNPTklucHV0RWxlbWVudCkgeworICAgICAgICAgICAgbGV0IGlucHV0RWxl bWVudCA9IEZpbGVVdGlsaXRpZXMuX2ltcG9ydEpTT05JbnB1dEVsZW1lbnQgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJpbnB1dCIpOworICAgICAgICAgICAgaW5wdXRFbGVtZW50LnR5cGUgPSAi ZmlsZSI7CisgICAgICAgICAgICBpbnB1dEVsZW1lbnQubXVsdGlwbGUgPSB0cnVlOworICAgICAg ICAgICAgaW5wdXRFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNoYW5nZSIsIChldmVudCkgPT4g eworICAgICAgICAgICAgICAgIFdJLkZpbGVVdGlsaXRpZXMucmVhZEpTT04oaW5wdXRFbGVtZW50 LmZpbGVzLCBjYWxsYmFjayk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQorCisgICAgICAg IEZpbGVVdGlsaXRpZXMuX2ltcG9ydEpTT05JbnB1dEVsZW1lbnQudmFsdWUgPSBudWxsOworICAg ICAgICBGaWxlVXRpbGl0aWVzLl9pbXBvcnRKU09OSW5wdXRFbGVtZW50LmNsaWNrKCk7CiAgICAg fQogCiAgICAgc3RhdGljIGFzeW5jIHJlYWRUZXh0KGZpbGVPckxpc3QsIGNhbGxiYWNrKQpAQCAt MTI0LDIwICsxMzIsMTkgQEAgV0kuRmlsZVV0aWxpdGllcyA9IGNsYXNzIEZpbGVVdGlsaXRpZXMg ewogICAgICAgICAgICAgZmlsZXMgPSBBcnJheS5mcm9tKGZpbGVPckxpc3QpOwogCiAgICAgICAg IGZvciAobGV0IGZpbGUgb2YgZmlsZXMpIHsKLSAgICAgICAgICAgIGxldCByZWFkZXIgPSBuZXcg RmlsZVJlYWRlcjsKLSAgICAgICAgICAgIHJlYWRlci5yZWFkQXNUZXh0KGZpbGUpOwotCiAgICAg ICAgICAgICBsZXQgcmVzdWx0ID0gewogICAgICAgICAgICAgICAgIGZpbGVuYW1lOiBmaWxlLm5h bWUsCiAgICAgICAgICAgICB9OwogCiAgICAgICAgICAgICB0cnkgewogICAgICAgICAgICAgICAg IGF3YWl0IG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+IHsKKyAgICAgICAgICAgICAg ICAgICAgbGV0IHJlYWRlciA9IG5ldyBGaWxlUmVhZGVyOwogICAgICAgICAgICAgICAgICAgICBy ZWFkZXIuYWRkRXZlbnRMaXN0ZW5lcigibG9hZGVuZCIsIChldmVudCkgPT4gewogICAgICAgICAg ICAgICAgICAgICAgICAgcmVzdWx0LnRleHQgPSByZWFkZXIucmVzdWx0OwogICAgICAgICAgICAg ICAgICAgICAgICAgcmVzb2x2ZShldmVudCk7CiAgICAgICAgICAgICAgICAgICAgIH0pOwogICAg ICAgICAgICAgICAgICAgICByZWFkZXIuYWRkRXZlbnRMaXN0ZW5lcigiZXJyb3IiLCByZWplY3Qp OworICAgICAgICAgICAgICAgICAgICByZWFkZXIucmVhZEFzVGV4dChmaWxlKTsKICAgICAgICAg ICAgICAgICB9KTsKICAgICAgICAgICAgIH0gY2F0Y2ggKGUpIHsKICAgICAgICAgICAgICAgICBy ZXN1bHQuZXJyb3IgPSBlOwo=