18548 2008-04-17 11:07:34 -0700 Web Inspector freezes if a search fires with a small number of letters 2008-08-07 20:56:44 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 rik webkit-unassigned aroben bjorn mitz timothy oldest_to_newest 77950 0 rik 2008-04-17 11:07:34 -0700 If you type less than 3 letters, the search is performed and is really slow on a normal document. The search should wait for more letters or be activated by hitting the Enter button. 81067 1 rik 2008-05-20 16:51:59 -0700 Steps to reproduce 1. Go to http://digg.com 2. Open the inspector 3. Type "a" in the search field The inspector is now freezing while performing the search. 4. In the search results, select "<head>" The inspector is also freezing. I think the first freeze is normal (lots of things to retrieve) but the user should opt-in for this search. However, the freeze when selecting a node is not normal. 81557 2 21355 rik 2008-05-26 17:42:30 -0700 Created attachment 21355 Proposed patch This should solve the first problem (freeze on search). I'm not sure this patch follows code conventions. 81560 3 21356 rik 2008-05-26 18:02:10 -0700 Created attachment 21356 Proposed patch e becomes event and no braces for single lines if statements. Thanks pewtermoose. 81563 4 mitz 2008-05-26 20:08:17 -0700 I think that in the long-term, it would be best to perform long searches without locking up the UI. 81630 5 21356 aroben 2008-05-27 12:02:49 -0700 Comment on attachment 21356 Proposed patch I don't think it's a good idea to have searching sometimes happen automatically and sometimes happen only when pressing Enter. 81641 6 rik 2008-05-27 12:51:28 -0700 In the ideal situation, the search will be performed without locking the UI. In this case, this patch is unnecessary. However, the actual behaviour is not providing enough feedback. The options are providing search only when pressing Enter (for a consistent behaviour) or the behaviour in the patch (easier to search for long strings without pressing Enter). For the second option, a feedback a la Spotlight could help informing the user about what's happening. 81743 7 timothy 2008-05-28 09:18:21 -0700 I think we should change it to search only when pressing Enter. That should give a better experience while allowing all lengths of text. This would only require removing incremental="incremental" and using the "search" event. 81793 8 dev+webkit 2008-05-28 15:02:42 -0700 (In reply to comment #7) > I think we should change it to search only when pressing Enter. That should > give a better experience while allowing all lengths of text. > > This would only require removing incremental="incremental" and using the > "search" event. > Or perhaps only start the search after typing has paused for a certain amount of time? 81802 9 rik 2008-05-28 15:34:05 -0700 We should not forget about step 4. I see 3s for addRange() and focus() in "set currentFocusElement" There's 802 calls to WebInspector.ResourcesPanel.refreshResource done in 1s. 85010 10 bjorn 2008-07-02 13:38:23 -0700 This bug is a deal breaker for me. Hope it gets quashed. Good luck! 87624 11 21356 eric 2008-08-01 15:01:10 -0700 Comment on attachment 21356 Proposed patch Assigning to Tim to review. Adam also knows this code well. 87630 12 21356 timothy 2008-08-01 15:12:58 -0700 Comment on attachment 21356 Proposed patch + var forceSearch = event.keyCode == 13; You should use event.keyIdentifier === "Enter" here. + if (!forceSearch && this.lastQuery && this.lastQuery == query) You should use === here. Otherwise I will r+ it. 87903 13 22664 rik 2008-08-05 16:17:50 -0700 Created attachment 22664 Patch with comments addressed 88083 14 timothy 2008-08-07 20:56:44 -0700 Landed in r35632. 21355 2008-05-26 17:42:30 -0700 2008-05-26 18:02:10 -0700 Proposed patch awesome-patch.txt text/plain 3224 rik SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNDE0MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDgtMDUtMjYgIEFudGhvbnkgUmljYXVkICA8cmlrMjRkQGdtYWls LmNvbT4KKworICAgICAgICBUaGUgc2VhcmNoIGlzIG9ubHkgcGVyZm9ybWVkIGlmIHRoZSBmaWVs ZCBjb250YWlucyBtb3JlIHRoYW4gMworICAgICAgICBsZXR0ZXJzIG9yIGlmIEVudGVyIGlzIHBy ZXNzZWQuCisgICAgICAgIAorICAgICAgICBTZWFyY2ggaXMgbm93IHBlcmZvcm1lZCB0aHJvdWdo IGEga2V5dXAgZXZlbnQuCisKKyAgICAgICAgQWRkZWQgYSBXZWJJbnNwZWN0b3IubGFzdFF1ZXJ5 IHRvIHJlbWVtYmVyIHRoZSBsYXN0IHF1ZXJ5IGFuZCBub3QKKyAgICAgICAgcGVyZm9ybSBpdCBh Z2FpbiAoZWcuIHRoZSB1c2VyIGhpdHMgYSBtb2RpZmllciBrZXkpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODU0OAorICAgICAgICAKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0FSTklORzogTk8gVEVT VCBDQVNFUyBBRERFRCBPUiBDSEFOR0VECisKKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9pbnNw ZWN0b3IuaHRtbDogUmVtb3ZlZCB0aGUgb25zZWFyY2ggYW5kIGluY3JlbWVudGFsCisgICAgICAg IGF0dHJpYnV0ZXMKKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanM6CisKIDIw MDgtMDUtMjYgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBTYW0uCkluZGV4OiBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rv ci5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmh0 bWwJKHJldmlzaW9uIDM0MTQyKQorKysgV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3Iu aHRtbAkod29ya2luZyBjb3B5KQpAQCAtNzMsNyArNzMsNyBAQCBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YgVEhFIFBPCiA8Ym9keSBjbGFzcz0iZGV0YWNoZWQiPgogICAgIDxkaXYg aWQ9InRvb2xiYXIiPgogICAgICAgICA8ZGl2IGNsYXNzPSJ0b29sYmFyLWl0ZW0gZmxleGFibGUt c3BhY2UiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJ0b29sYmFyLWl0ZW0iPjxpbnB1dCBp ZD0ic2VhcmNoIiB0eXBlPSJzZWFyY2giIHJlc3VsdHM9IjIwIiBpbmNyZW1lbnRhbD0iaW5jcmVt ZW50YWwiIG9uc2VhcmNoPSJXZWJJbnNwZWN0b3IucGVyZm9ybVNlYXJjaCh0aGlzLnZhbHVlKSI+ PGRpdiBpZD0ic2VhcmNoLXRvb2xiYXItbGFiZWwiIGNsYXNzPSJ0b29sYmFyLWxhYmVsIj48L2Rp dj48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0idG9vbGJhci1pdGVtIj48aW5wdXQgaWQ9InNl YXJjaCIgdHlwZT0ic2VhcmNoIiByZXN1bHRzPSIyMCI+PGRpdiBpZD0ic2VhcmNoLXRvb2xiYXIt bGFiZWwiIGNsYXNzPSJ0b29sYmFyLWxhYmVsIj48L2Rpdj48L2Rpdj4KICAgICA8L2Rpdj4KICAg ICA8ZGl2IGlkPSJtYWluIj4KICAgICAgICAgPGRpdiBpZD0ic2VhcmNoUmVzdWx0cyIgY2xhc3M9 ImZvY3VzYWJsZSBoaWRkZW4iPjwvZGl2PgpJbmRleDogV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9p bnNwZWN0b3IuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0 b3IuanMJKHJldmlzaW9uIDM0MTQyKQorKysgV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0 b3IuanMJKHdvcmtpbmcgY29weSkKQEAgLTM0Niw2ICszNDYsOCBAQCBXZWJJbnNwZWN0b3IubG9h ZGVkID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX3VwZGF0ZUVycm9yQW5kV2FybmluZ0NvdW50cygp OwogCiAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNlYXJjaC10b29sYmFyLWxhYmVsIiku dGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNlYXJjaCIpOworICAgIHZhciBz ZWFyY2hGaWVsZCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzZWFyY2giKTsKKyAgICBzZWFy Y2hGaWVsZC5hZGRFdmVudExpc3RlbmVyKCJrZXl1cCIsIHRoaXMucGVyZm9ybVNlYXJjaC5iaW5k KHRoaXMpLCBmYWxzZSk7CiAKICAgICBpZiAocGxhdGZvcm0gPT09ICJtYWMtbGVvcGFyZCIpCiAg ICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0b29sYmFyIikuYWRkRXZlbnRMaXN0ZW5l cigibW91c2Vkb3duIiwgdGhpcy50b29sYmFyRHJhZ1N0YXJ0LCB0cnVlKTsKQEAgLTkxMSwxMyAr OTEzLDI1IEBAIFdlYkluc3BlY3Rvci5hZGRNYWluRXZlbnRMaXN0ZW5lcnMgPSBmdW4KICAgICBk b2MuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLmRvY3VtZW50Q2xpY2suYmluZCh0aGlz KSwgdHJ1ZSk7CiB9CiAKLVdlYkluc3BlY3Rvci5wZXJmb3JtU2VhcmNoID0gZnVuY3Rpb24ocXVl cnkpCitXZWJJbnNwZWN0b3IucGVyZm9ybVNlYXJjaCA9IGZ1bmN0aW9uKGUpCiB7CisgICAgdmFy IHF1ZXJ5ID0gZS50YXJnZXQudmFsdWU7CisgICAgCiAgICAgaWYgKCFxdWVyeSB8fCAhcXVlcnku bGVuZ3RoKSB7CiAgICAgICAgIHRoaXMuc2hvd2luZ1NlYXJjaFJlc3VsdHMgPSBmYWxzZTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIHZhciBmb3JjZVNlYXJjaCA9IGUua2V5Q29kZSA9 PSAxMzsKKyAgICBpZighZm9yY2VTZWFyY2ggJiYgcXVlcnkubGVuZ3RoIDwgMykgeworICAgICAg ICByZXR1cm47CisgICAgfQorCisgICAgaWYgKCFmb3JjZVNlYXJjaCAmJiB0aGlzLmxhc3RRdWVy eSAmJiB0aGlzLmxhc3RRdWVyeSA9PSBxdWVyeSkgeworICAgICAgICByZXR1cm47CisgICAgfQor ICAgIHRoaXMubGFzdFF1ZXJ5ID0gcXVlcnk7CisgICAgCiAgICAgdmFyIHJlc3VsdHNDb250YWlu ZXIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2VhcmNoUmVzdWx0cyIpOwogICAgIHJlc3Vs dHNDb250YWluZXIucmVtb3ZlQ2hpbGRyZW4oKTsKIAo= 21356 2008-05-26 18:02:10 -0700 2008-08-05 16:17:50 -0700 Proposed patch awesome-patch.txt text/plain 3218 rik SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNDE0MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDgtMDUtMjYgIEFudGhvbnkgUmljYXVkICA8cmlrMjRkQGdtYWls LmNvbT4KKworICAgICAgICBUaGUgc2VhcmNoIGlzIG9ubHkgcGVyZm9ybWVkIGlmIHRoZSBmaWVs ZCBjb250YWlucyBtb3JlIHRoYW4gMworICAgICAgICBsZXR0ZXJzIG9yIGlmIEVudGVyIGlzIHBy ZXNzZWQuCisgICAgICAgIAorICAgICAgICBTZWFyY2ggaXMgbm93IHBlcmZvcm1lZCB0aHJvdWdo IGEga2V5dXAgZXZlbnQuCisKKyAgICAgICAgQWRkZWQgYSBXZWJJbnNwZWN0b3IubGFzdFF1ZXJ5 IHRvIHJlbWVtYmVyIHRoZSBsYXN0IHF1ZXJ5IGFuZCBub3QKKyAgICAgICAgcGVyZm9ybSBpdCBh Z2FpbiAoZWcuIHRoZSB1c2VyIGhpdHMgYSBtb2RpZmllciBrZXkpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODU0OAorICAgICAgICAKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0FSTklORzogTk8gVEVT VCBDQVNFUyBBRERFRCBPUiBDSEFOR0VECisKKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9pbnNw ZWN0b3IuaHRtbDogUmVtb3ZlZCB0aGUgb25zZWFyY2ggYW5kIGluY3JlbWVudGFsCisgICAgICAg IGF0dHJpYnV0ZXMKKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanM6CisKIDIw MDgtMDUtMjYgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBTYW0uCkluZGV4OiBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rv ci5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmh0 bWwJKHJldmlzaW9uIDM0MTQyKQorKysgV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3Iu aHRtbAkod29ya2luZyBjb3B5KQpAQCAtNzMsNyArNzMsNyBAQCBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YgVEhFIFBPCiA8Ym9keSBjbGFzcz0iZGV0YWNoZWQiPgogICAgIDxkaXYg aWQ9InRvb2xiYXIiPgogICAgICAgICA8ZGl2IGNsYXNzPSJ0b29sYmFyLWl0ZW0gZmxleGFibGUt c3BhY2UiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJ0b29sYmFyLWl0ZW0iPjxpbnB1dCBp ZD0ic2VhcmNoIiB0eXBlPSJzZWFyY2giIHJlc3VsdHM9IjIwIiBpbmNyZW1lbnRhbD0iaW5jcmVt ZW50YWwiIG9uc2VhcmNoPSJXZWJJbnNwZWN0b3IucGVyZm9ybVNlYXJjaCh0aGlzLnZhbHVlKSI+ PGRpdiBpZD0ic2VhcmNoLXRvb2xiYXItbGFiZWwiIGNsYXNzPSJ0b29sYmFyLWxhYmVsIj48L2Rp dj48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0idG9vbGJhci1pdGVtIj48aW5wdXQgaWQ9InNl YXJjaCIgdHlwZT0ic2VhcmNoIiByZXN1bHRzPSIyMCI+PGRpdiBpZD0ic2VhcmNoLXRvb2xiYXIt bGFiZWwiIGNsYXNzPSJ0b29sYmFyLWxhYmVsIj48L2Rpdj48L2Rpdj4KICAgICA8L2Rpdj4KICAg ICA8ZGl2IGlkPSJtYWluIj4KICAgICAgICAgPGRpdiBpZD0ic2VhcmNoUmVzdWx0cyIgY2xhc3M9 ImZvY3VzYWJsZSBoaWRkZW4iPjwvZGl2PgpJbmRleDogV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9p bnNwZWN0b3IuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0 b3IuanMJKHJldmlzaW9uIDM0MTQyKQorKysgV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0 b3IuanMJKHdvcmtpbmcgY29weSkKQEAgLTM0Niw2ICszNDYsOCBAQCBXZWJJbnNwZWN0b3IubG9h ZGVkID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX3VwZGF0ZUVycm9yQW5kV2FybmluZ0NvdW50cygp OwogCiAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNlYXJjaC10b29sYmFyLWxhYmVsIiku dGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNlYXJjaCIpOworICAgIHZhciBz ZWFyY2hGaWVsZCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzZWFyY2giKTsKKyAgICBzZWFy Y2hGaWVsZC5hZGRFdmVudExpc3RlbmVyKCJrZXl1cCIsIHRoaXMucGVyZm9ybVNlYXJjaC5iaW5k KHRoaXMpLCBmYWxzZSk7CiAKICAgICBpZiAocGxhdGZvcm0gPT09ICJtYWMtbGVvcGFyZCIpCiAg ICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0b29sYmFyIikuYWRkRXZlbnRMaXN0ZW5l cigibW91c2Vkb3duIiwgdGhpcy50b29sYmFyRHJhZ1N0YXJ0LCB0cnVlKTsKQEAgLTkxMSwxMyAr OTEzLDIzIEBAIFdlYkluc3BlY3Rvci5hZGRNYWluRXZlbnRMaXN0ZW5lcnMgPSBmdW4KICAgICBk b2MuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLmRvY3VtZW50Q2xpY2suYmluZCh0aGlz KSwgdHJ1ZSk7CiB9CiAKLVdlYkluc3BlY3Rvci5wZXJmb3JtU2VhcmNoID0gZnVuY3Rpb24ocXVl cnkpCitXZWJJbnNwZWN0b3IucGVyZm9ybVNlYXJjaCA9IGZ1bmN0aW9uKGV2ZW50KQogeworICAg IHZhciBxdWVyeSA9IGV2ZW50LnRhcmdldC52YWx1ZTsKKyAgICAKICAgICBpZiAoIXF1ZXJ5IHx8 ICFxdWVyeS5sZW5ndGgpIHsKICAgICAgICAgdGhpcy5zaG93aW5nU2VhcmNoUmVzdWx0cyA9IGZh bHNlOwogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgdmFyIGZvcmNlU2VhcmNoID0gZXZl bnQua2V5Q29kZSA9PSAxMzsKKyAgICBpZighZm9yY2VTZWFyY2ggJiYgcXVlcnkubGVuZ3RoIDwg MykKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKCFmb3JjZVNlYXJjaCAmJiB0aGlzLmxhc3RR dWVyeSAmJiB0aGlzLmxhc3RRdWVyeSA9PSBxdWVyeSkKKyAgICAgICAgcmV0dXJuOworICAgIHRo aXMubGFzdFF1ZXJ5ID0gcXVlcnk7CisgICAgCiAgICAgdmFyIHJlc3VsdHNDb250YWluZXIgPSBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2VhcmNoUmVzdWx0cyIpOwogICAgIHJlc3VsdHNDb250 YWluZXIucmVtb3ZlQ2hpbGRyZW4oKTsKIAo= 22664 2008-08-05 16:17:50 -0700 2008-08-05 16:37:03 -0700 Patch with comments addressed plop.patch text/plain 3184 rik SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNTU4MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDgtMDgtMDUgIEFudGhvbnkgUmljYXVkICA8cmlrMjRkQGdtYWls LmNvbT4KKworICAgICAgICBUaGUgc2VhcmNoIGlzIG9ubHkgcGVyZm9ybWVkIGlmIHRoZSBmaWVs ZCBjb250YWlucyBtb3JlIHRoYW4gMworICAgICAgICBsZXR0ZXJzIG9yIGlmIEVudGVyIGlzIHBy ZXNzZWQuCisgICAgICAgIAorICAgICAgICBTZWFyY2ggaXMgbm93IHBlcmZvcm1lZCB0aHJvdWdo IGEga2V5dXAgZXZlbnQuCisKKyAgICAgICAgQWRkZWQgYSBXZWJJbnNwZWN0b3IubGFzdFF1ZXJ5 IHRvIHJlbWVtYmVyIHRoZSBsYXN0IHF1ZXJ5IGFuZCBub3QKKyAgICAgICAgcGVyZm9ybSBpdCBh Z2FpbiAoZWcuIHRoZSB1c2VyIGhpdHMgYSBtb2RpZmllciBrZXkpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODU0OAorICAgICAgICAKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWdlL2luc3BlY3Rv ci9pbnNwZWN0b3IuaHRtbDogUmVtb3ZlZCB0aGUgb25zZWFyY2ggYW5kIGluY3JlbWVudGFsCisg ICAgICAgIGF0dHJpYnV0ZXMKKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanM6 CisKIDIwMDgtMDgtMDUgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAg IFBhcnNlIENTUyBBbmltYXRpb25zLCBpbmNsdWRpbmcgdGhlIG5ldwpJbmRleDogV2ViQ29yZS9w YWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2Uv aW5zcGVjdG9yL2luc3BlY3Rvci5odG1sCShyZXZpc2lvbiAzNTU3OSkKKysrIFdlYkNvcmUvcGFn ZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTczLDcgKzczLDcg QEAgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQTwogPGJvZHkgY2xhc3M9 ImRldGFjaGVkIj4KICAgICA8ZGl2IGlkPSJ0b29sYmFyIj4KICAgICAgICAgPGRpdiBjbGFzcz0i dG9vbGJhci1pdGVtIGZsZXhhYmxlLXNwYWNlIj48L2Rpdj4KLSAgICAgICAgPGRpdiBjbGFzcz0i dG9vbGJhci1pdGVtIj48aW5wdXQgaWQ9InNlYXJjaCIgdHlwZT0ic2VhcmNoIiByZXN1bHRzPSIy MCIgaW5jcmVtZW50YWw9ImluY3JlbWVudGFsIiBvbnNlYXJjaD0iV2ViSW5zcGVjdG9yLnBlcmZv cm1TZWFyY2godGhpcy52YWx1ZSkiPjxkaXYgaWQ9InNlYXJjaC10b29sYmFyLWxhYmVsIiBjbGFz cz0idG9vbGJhci1sYWJlbCI+PC9kaXY+PC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9InRvb2xi YXItaXRlbSI+PGlucHV0IGlkPSJzZWFyY2giIHR5cGU9InNlYXJjaCIgcmVzdWx0cz0iMjAiPjxk aXYgaWQ9InNlYXJjaC10b29sYmFyLWxhYmVsIiBjbGFzcz0idG9vbGJhci1sYWJlbCI+PC9kaXY+ PC9kaXY+CiAgICAgPC9kaXY+CiAgICAgPGRpdiBpZD0ibWFpbiI+CiAgICAgICAgIDxkaXYgaWQ9 InNlYXJjaFJlc3VsdHMiIHRhYmluZGV4PSIwIj48L2Rpdj4KSW5kZXg6IFdlYkNvcmUvcGFnZS9p bnNwZWN0b3IvaW5zcGVjdG9yLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9pbnNwZWN0 b3IvaW5zcGVjdG9yLmpzCShyZXZpc2lvbiAzNTU3OSkKKysrIFdlYkNvcmUvcGFnZS9pbnNwZWN0 b3IvaW5zcGVjdG9yLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0zNDAsNiArMzQwLDggQEAgV2ViSW5z cGVjdG9yLmxvYWRlZCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLl91cGRhdGVFcnJvckFuZFdhcm5p bmdDb3VudHMoKTsKIAogICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzZWFyY2gtdG9vbGJh ci1sYWJlbCIpLnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZWFyY2giKTsK KyAgICB2YXIgc2VhcmNoRmllbGQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2VhcmNoIik7 CisgICAgc2VhcmNoRmllbGQuYWRkRXZlbnRMaXN0ZW5lcigia2V5dXAiLCB0aGlzLnBlcmZvcm1T ZWFyY2guYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgaWYgKHBsYXRmb3JtID09PSAibWFjLWxl b3BhcmQiKQogICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidG9vbGJhciIpLmFkZEV2 ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMudG9vbGJhckRyYWdTdGFydCwgdHJ1ZSk7CkBA IC05MjYsMTMgKzkyOCwyMyBAQCBXZWJJbnNwZWN0b3IuYWRkTWFpbkV2ZW50TGlzdGVuZXJzID0g ZnVuCiAgICAgZG9jLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5kb2N1bWVudENsaWNr LmJpbmQodGhpcyksIHRydWUpOwogfQogCi1XZWJJbnNwZWN0b3IucGVyZm9ybVNlYXJjaCA9IGZ1 bmN0aW9uKHF1ZXJ5KQorV2ViSW5zcGVjdG9yLnBlcmZvcm1TZWFyY2ggPSBmdW5jdGlvbihldmVu dCkKIHsKKyAgICB2YXIgcXVlcnkgPSBldmVudC50YXJnZXQudmFsdWU7CisgICAgCiAgICAgaWYg KCFxdWVyeSB8fCAhcXVlcnkubGVuZ3RoKSB7CiAgICAgICAgIHRoaXMuc2hvd2luZ1NlYXJjaFJl c3VsdHMgPSBmYWxzZTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIHZhciBmb3JjZVNl YXJjaCA9IGV2ZW50LmtleUlkZW50aWZpZXIgPT09ICJFbnRlciI7CisgICAgaWYoIWZvcmNlU2Vh cmNoICYmIHF1ZXJ5Lmxlbmd0aCA8IDMpCisgICAgICAgIHJldHVybjsKKworICAgIGlmICghZm9y Y2VTZWFyY2ggJiYgdGhpcy5sYXN0UXVlcnkgJiYgdGhpcy5sYXN0UXVlcnkgPT09IHF1ZXJ5KQor ICAgICAgICByZXR1cm47CisgICAgdGhpcy5sYXN0UXVlcnkgPSBxdWVyeTsKKyAgICAKICAgICB2 YXIgcmVzdWx0c0NvbnRhaW5lciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzZWFyY2hSZXN1 bHRzIik7CiAgICAgcmVzdWx0c0NvbnRhaW5lci5yZW1vdmVDaGlsZHJlbigpOwogCg==