75226 2011-12-26 04:42:40 -0800 Web Inspector: [Scripts] Implement iterative match highlighting in the "Go to Function" dialog item list 2011-12-26 07:06:59 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 527194 0 apavlov 2011-12-26 04:42:40 -0800 Patch to follow. 527197 1 120550 apavlov 2011-12-26 05:07:48 -0800 Created attachment 120550 Patch 527199 2 120550 pfeldman 2011-12-26 05:18:13 -0800 Comment on attachment 120550 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=120550&action=review > Source/WebCore/inspector/front-end/JavaScriptOutlineDialog.js:455 > + this._regExp = query ? this._dialog._createSearchRegExp(query, true) : null; this._regex > Source/WebCore/inspector/front-end/JavaScriptOutlineDialog.js:475 > + if (this._highlightTimer) So is this this._timer or this._highlightTimer? > Source/WebCore/inspector/front-end/JavaScriptOutlineDialog.js:483 > + const chunkSize = 50; It seems like computing visible range and highlighting it synchronously might require less code. > Source/WebCore/inspector/front-end/JavaScriptOutlineDialog.js:499 > + var text = element._text; Could you use highlightRangesWithStyleClass instead? 527205 3 120553 apavlov 2011-12-26 06:24:17 -0800 Created attachment 120553 [PATCH] Comments addressed 527207 4 120553 pfeldman 2011-12-26 06:35:24 -0800 Comment on attachment 120553 [PATCH] Comments addressed View in context: https://bugs.webkit.org/attachment.cgi?id=120553&action=review > Source/WebCore/inspector/front-end/JavaScriptOutlineDialog.js:232 > + this._startMatchHighlighting(); clearHighlight > Source/WebCore/inspector/front-end/JavaScriptOutlineDialog.js:274 > + _startMatchHighlighting: function(query) inline > Source/WebCore/inspector/front-end/JavaScriptOutlineDialog.js:465 > + start: function(query) highlightViewportItems 527210 5 apavlov 2011-12-26 07:06:59 -0800 Committed: <http://trac.webkit.org/changeset/103684> 120550 2011-12-26 05:07:48 -0800 2011-12-26 06:24:08 -0800 Patch bug-75226-20111226170746.patch text/plain 7450 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTVmY2E3ZTgwMzlmMGE1 Yjk5NGQwZTk2Y2FhMTdmNjk5ZjYzYzFhNy4uOTIwNWU0NTg3YmIwZjMyNzQxMTliNzRhMDY2OWM1 NjQ1OGU4ZjJmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDExLTEyLTI2ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW1NjcmlwdHNdIEltcGxlbWVudCBpdGVyYXRpdmUgbWF0Y2ggaGlnaGxpZ2h0aW5nIGlu IHRoZSAiR28gdG8gRnVuY3Rpb24iIGRpYWxvZyBpdGVtIGxpc3QKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1MjI2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFT Y3JpcHRPdXRsaW5lRGlhbG9nLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRP dXRsaW5lRGlhbG9nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURp YWxvZy5wcm90b3R5cGUuX2ZpbHRlckZ1bmN0aW9ucyk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu SmF2YVNjcmlwdE91dGxpbmVEaWFsb2cucHJvdG90eXBlLl9zdGFydE1hdGNoSGlnaGxpZ2h0aW5n KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5wcm90b3R5 cGUuX2hpZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRPdXRsaW5lRGlhbG9n Lk1hdGNoSGlnaGxpZ2h0ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRPdXRs aW5lRGlhbG9nLk1hdGNoSGlnaGxpZ2h0ZXIucHJvdG90eXBlLnN0YXJ0KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5NYXRjaEhpZ2hsaWdodGVyLnByb3Rv dHlwZS5zdG9wKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURpYWxv Zy5NYXRjaEhpZ2hsaWdodGVyLnByb3RvdHlwZS5nZXQgX3Zpc2libGVFbGVtZW50cyk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cuTWF0Y2hIaWdobGlnaHRl ci5wcm90b3R5cGUuX3J1bkhpZ2hsaWdodCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNj cmlwdE91dGxpbmVEaWFsb2cuTWF0Y2hIaWdobGlnaHRlci5wcm90b3R5cGUuX2hpZ2hsaWdodENo dW5rKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5NYXRj aEhpZ2hsaWdodGVyLnByb3RvdHlwZS5faGlnaGxpZ2h0SXRlbSk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9qYXZhU2NyaXB0T3V0bGluZURpYWxvZy5jc3M6CisgICAgICAgICguanMt b3V0bGluZS1kaWFsb2cgPiAuY29udGFpbmVyID4gZGl2Lml0ZW0gPiBzcGFuLmhpZ2hsaWdodCk6 CisKKzIwMTEtMTItMjYgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4K KwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbXBsZW1lbnQgIkdvIHRvIEZ1bmN0aW9uIiBkaWFs b2cgZm9yIEphdmFTY3JpcHQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTc1MDkyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRPdXRsaW5lRGlhbG9nLmpzCmluZGV4IGNlYWI0MjQ5 YjdkY2M0Y2E0NzUxNWYxOTVmZjRmNGZhOGU2MGMxNTcuLmEyMmI1ZTNmZGJjMGFkYzM4NmE2MmM4 MTFjZWVmMTRlZGFkMjhkNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5qcwpAQCAtOTEsNiAr OTEsOCBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cgPSBmdW5jdGlvbihw YW5lbCwgdmlldykKICAgICB0aGlzLl9wcmV2aW91c0ZvY3VzRWxlbWVudCA9IFdlYkluc3BlY3Rv ci5jdXJyZW50Rm9jdXNFbGVtZW50KCk7CiAgICAgV2ViSW5zcGVjdG9yLnNldEN1cnJlbnRGb2N1 c0VsZW1lbnQodGhpcy5fcHJvbXB0RWxlbWVudCk7CiAgICAgdGhpcy5fcHJvbXB0RWxlbWVudC5z ZWxlY3QoKTsKKworICAgIHRoaXMuX2hpZ2hsaWdodGVyID0gbmV3IFdlYkluc3BlY3Rvci5KYXZh U2NyaXB0T3V0bGluZURpYWxvZy5NYXRjaEhpZ2hsaWdodGVyKHRoaXMpOwogfQogCiAvKioKQEAg LTIyNCw2ICsyMjYsNyBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cucHJv dG90eXBlID0gewogICAgICAgICAgICAgICAgIHZhciBlbGVtZW50ID0gdGhpcy5faXRlbUVsZW1l bnRzW2ldOwogICAgICAgICAgICAgICAgIGVsZW1lbnQuc3R5bGUuZGlzcGxheSA9ICIiOwogICAg ICAgICAgICAgICAgIHRoaXMuX3Zpc2libGVFbGVtZW50cy5wdXNoKGVsZW1lbnQpOworICAgICAg ICAgICAgICAgIHRoaXMuX3N0YXJ0TWF0Y2hIaWdobGlnaHRpbmcoKTsKICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlbGVjdGlvbih0aGlzLl9mdW5jdGlvbkl0ZW1Db250 YWluZXIuZmlyc3RDaGlsZCk7CiAgICAgICAgICAgICByZXR1cm47CkBAIC0yNDQsNiArMjQ3LDcg QEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRPdXRsaW5lRGlhbG9nLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIH0KICAgICAgICAgICAgIHRoaXMuX3Zpc2libGVFbGVtZW50cyA9IG5ld1Zpc2li bGVFbGVtZW50czsKICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlbGVjdGlvbihmaXJzdEVsZW1l bnQpOworICAgICAgICAgICAgdGhpcy5fc3RhcnRNYXRjaEhpZ2hsaWdodGluZyhxdWVyeSk7CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtMjU5LDYgKzI2MywxNSBAQCBXZWJJ bnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cucHJvdG90eXBlID0gewogICAgICAgICB9 CiAgICAgICAgIHRoaXMuX3Zpc2libGVFbGVtZW50cyA9IG5ld1Zpc2libGVFbGVtZW50czsKICAg ICAgICAgdGhpcy5fdXBkYXRlU2VsZWN0aW9uKGZpcnN0RWxlbWVudCk7CisgICAgICAgIHRoaXMu X3N0YXJ0TWF0Y2hIaWdobGlnaHRpbmcocXVlcnkpOworICAgIH0sCisKKyAgICAvKioKKyAgICAg KiBAcGFyYW0ge3N0cmluZz19IHF1ZXJ5CisgICAgICovCisgICAgX3N0YXJ0TWF0Y2hIaWdobGln aHRpbmc6IGZ1bmN0aW9uKHF1ZXJ5KQorICAgIHsKKyAgICAgICAgdGhpcy5faGlnaGxpZ2h0ZXIu c3RhcnQocXVlcnkpOwogICAgIH0sCiAKICAgICBfc2VsZWN0Rmlyc3RJdGVtOiBmdW5jdGlvbigp CkBAIC0yNzgsNiArMjkxLDcgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRPdXRsaW5lRGlhbG9n LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMuX2lzSGlkaW5nKQogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB0aGlzLl9pc0hpZGluZyA9IHRydWU7CisgICAgICAgIHRoaXMuX2hp Z2hsaWdodGVyLnN0b3AoKTsKICAgICAgICAgaWYgKHRoaXMuX2ZpbHRlclRpbWVyKQogICAgICAg ICAgICAgY2xlYXJUaW1lb3V0KHRoaXMuX2ZpbHRlclRpbWVyKTsKICAgICAgICAgdGhpcy5fZWxl bWVudC5wYXJlbnRFbGVtZW50LnJlbW92ZUNoaWxkKHRoaXMuX2VsZW1lbnQpOwpAQCAtNDI2LDMg KzQ0MCw5NSBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cucHJvdG90eXBl ID0gewogICAgICAgICAgICAgdGhpcy5fdmlldy5oaWdobGlnaHRMaW5lKGxpbmVOdW1iZXIpOwog ICAgIH0KIH0KKworLyoqCisqIEBjb25zdHJ1Y3RvcgorKi8KK1dlYkluc3BlY3Rvci5KYXZhU2Ny aXB0T3V0bGluZURpYWxvZy5NYXRjaEhpZ2hsaWdodGVyID0gZnVuY3Rpb24oZGlhbG9nKQorewor ICAgIHRoaXMuX2RpYWxvZyA9IGRpYWxvZzsKK30KKworV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRP dXRsaW5lRGlhbG9nLk1hdGNoSGlnaGxpZ2h0ZXIucHJvdG90eXBlID0geworICAgIHN0YXJ0OiBm dW5jdGlvbihxdWVyeSkKKyAgICB7CisgICAgICAgIHRoaXMuX3JlZ0V4cCA9IHF1ZXJ5ID8gdGhp cy5fZGlhbG9nLl9jcmVhdGVTZWFyY2hSZWdFeHAocXVlcnksIHRydWUpIDogbnVsbDsKKyAgICAg ICAgdGhpcy5fY3VycmVudFZpc2libGVSb3cgPSAwOworICAgICAgICB0aGlzLl9ydW5IaWdobGln aHQoKTsKKyAgICB9LAorCisgICAgc3RvcDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYg KHRoaXMuX3RpbWVyKSB7CisgICAgICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5fdGltZXIpOwor ICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3RpbWVyOworICAgICAgICB9CisgICAgfSwKKworICAg IGdldCBfdmlzaWJsZUVsZW1lbnRzKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9kaWFs b2cuX3Zpc2libGVFbGVtZW50czsKKyAgICB9LAorCisgICAgX3J1bkhpZ2hsaWdodDogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2hpZ2hsaWdodFRpbWVyKQorICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX2hpZ2hsaWdodENodW5rKCk7CisgICAgfSwKKwor ICAgIF9oaWdobGlnaHRDaHVuazogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgY29uc3QgY2h1 bmtTaXplID0gNTA7CisgICAgICAgIHZhciB2aXNpYmxlRWxlbWVudHMgPSB0aGlzLl92aXNpYmxl RWxlbWVudHM7CisgICAgICAgIGlmICh0aGlzLl9jdXJyZW50VmlzaWJsZVJvdyA+PSB2aXNpYmxl RWxlbWVudHMubGVuZ3RoKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHZhciBsYXN0 ID0gTWF0aC5taW4odmlzaWJsZUVsZW1lbnRzLmxlbmd0aCwgdGhpcy5fY3VycmVudFZpc2libGVS b3cgKyBjaHVua1NpemUpOworICAgICAgICBmb3IgKHZhciBpID0gdGhpcy5fY3VycmVudFZpc2li bGVSb3c7IGkgPCBsYXN0OyArK2kpCisgICAgICAgICAgICB0aGlzLl9oaWdobGlnaHRJdGVtKHZp c2libGVFbGVtZW50c1tpXSk7CisKKyAgICAgICAgdGhpcy5fY3VycmVudFZpc2libGVSb3cgPSBs YXN0OworICAgICAgICBpZiAobGFzdCA8IHZpc2libGVFbGVtZW50cy5sZW5ndGgpCisgICAgICAg ICAgICB0aGlzLl90aW1lciA9IHNldFRpbWVvdXQodGhpcy5faGlnaGxpZ2h0Q2h1bmsuYmluZCh0 aGlzKSwgNTAwKTsKKyAgICB9LAorCisgICAgX2hpZ2hsaWdodEl0ZW06IGZ1bmN0aW9uKGVsZW1l bnQpCisgICAgeworICAgICAgICB2YXIgdGV4dCA9IGVsZW1lbnQuX3RleHQ7CisgICAgICAgIGlm ICghdGhpcy5fcmVnRXhwKSB7CisgICAgICAgICAgICBpZiAoZWxlbWVudC5faGFzSGlnaGxpZ2h0 KSB7CisgICAgICAgICAgICAgICAgZWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICAg ICAgICAgIGVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUodGV4dCAr IGVsZW1lbnQuX2FyZ3VtZW50cykpOworICAgICAgICAgICAgICAgIGRlbGV0ZSBlbGVtZW50Ll9o YXNIaWdobGlnaHQ7CisgICAgICAgICAgICB9CisgICAgICAgICAgICByZXR1cm47CisgICAgICAg IH0KKworICAgICAgICBlbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CisKKyAgICAgICAgdmFyIG1h dGNoOworICAgICAgICB2YXIgcmVzdWx0OworICAgICAgICB2YXIgcG9zaXRpb24gPSAwOworICAg ICAgICB2YXIgZnJhZ21lbnQgPSBkb2N1bWVudC5jcmVhdGVEb2N1bWVudEZyYWdtZW50KCk7CisK KyAgICAgICAgd2hpbGUgKChyZXN1bHQgPSB0aGlzLl9yZWdFeHAuZXhlYyh0ZXh0KSkgIT09IG51 bGwpIHsKKyAgICAgICAgICAgIHZhciBtYXRjaFN0YXJ0ID0gcmVzdWx0LmluZGV4OworICAgICAg ICAgICAgaWYgKHBvc2l0aW9uICE9PSBtYXRjaFN0YXJ0KQorICAgICAgICAgICAgICAgIGZyYWdt ZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKHRleHQuc3Vic3RyaW5nKHBv c2l0aW9uLCBtYXRjaFN0YXJ0KSkpOworICAgICAgICAgICAgcG9zaXRpb24gPSB0aGlzLl9yZWdF eHAubGFzdEluZGV4OworICAgICAgICAgICAgdmFyIGhpZ2hsaWdodEVsZW1lbnQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgICAgICBoaWdobGlnaHRFbGVtZW50LmNs YXNzTmFtZSA9ICJoaWdobGlnaHQiOworICAgICAgICAgICAgaGlnaGxpZ2h0RWxlbWVudC50ZXh0 Q29udGVudCA9IHRleHQuc3Vic3RyaW5nKG1hdGNoU3RhcnQsIHBvc2l0aW9uKTsKKyAgICAgICAg ICAgIGZyYWdtZW50LmFwcGVuZENoaWxkKGhpZ2hsaWdodEVsZW1lbnQpOworICAgICAgICB9CisK KyAgICAgICAgaWYgKHBvc2l0aW9uIDwgdGV4dC5sZW5ndGgpCisgICAgICAgICAgICBmcmFnbWVu dC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSh0ZXh0LnN1YnN0cmluZyhwb3Np dGlvbikpKTsKKyAgICAgICAgZnJhZ21lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4 dE5vZGUoZWxlbWVudC5fYXJndW1lbnRzKSk7CisKKyAgICAgICAgZWxlbWVudC5hcHBlbmRDaGls ZChmcmFnbWVudCk7CisgICAgICAgIGVsZW1lbnQuX2hhc0hpZ2hsaWdodCA9IHRydWU7CisgICAg fQorfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9qYXZh U2NyaXB0T3V0bGluZURpYWxvZy5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2phdmFTY3JpcHRPdXRsaW5lRGlhbG9nLmNzcwppbmRleCAzMTdhYjdiNjM0YWRkYTNmOTUy ZjI3OTY4ZTRhMjg0YjVlMGUyNzRjLi40ODgyZjhhMDA0N2Q0OTViNWEyMjQ1NzEwYTA4YjJjOGU5 MTk2MDQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2ph dmFTY3JpcHRPdXRsaW5lRGlhbG9nLmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2phdmFTY3JpcHRPdXRsaW5lRGlhbG9nLmNzcwpAQCAtNTMsMyArNTMsOCBAQAog LmpzLW91dGxpbmUtZGlhbG9nID4gLmNvbnRhaW5lciA+IGRpdi5pdGVtLnNlbGVjdGVkIHsKICAg ICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjI0LCAyMjQsIDIyNCk7CiB9CisKKy5qcy1vdXRsaW5l LWRpYWxvZyA+IC5jb250YWluZXIgPiBkaXYuaXRlbSA+IHNwYW4uaGlnaGxpZ2h0IHsKKyAgICBj b2xvcjogYmxhY2s7CisgICAgZm9udC13ZWlnaHQ6IGJvbGQ7Cit9Cg== 120553 2011-12-26 06:24:17 -0800 2011-12-26 06:35:24 -0800 [PATCH] Comments addressed bug-75226-20111226182415.patch text/plain 9870 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTVmY2E3ZTgwMzlmMGE1 Yjk5NGQwZTk2Y2FhMTdmNjk5ZjYzYzFhNy4uMzJlZDU1MzgwYmRjMDdhMWYyN2FmMzkxN2QwY2Rm OWRhMmM2ZjIxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDExLTEyLTI2ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW1NjcmlwdHNdIEltcGxlbWVudCBpdGVyYXRpdmUgbWF0Y2ggaGlnaGxpZ2h0aW5nIGlu IHRoZSAiR28gdG8gRnVuY3Rpb24iIGRpYWxvZyBpdGVtIGxpc3QKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1MjI2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFT Y3JpcHRPdXRsaW5lRGlhbG9nLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRP dXRsaW5lRGlhbG9nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURp YWxvZy5wcm90b3R5cGUuX2NyZWF0ZVNlYXJjaFJlZ0V4cCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cucHJvdG90eXBlLl9maWx0ZXJGdW5jdGlvbnMpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRPdXRsaW5lRGlhbG9nLnByb3RvdHlwZS5f c3RhcnRNYXRjaEhpZ2hsaWdodGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlw dE91dGxpbmVEaWFsb2cucHJvdG90eXBlLl9vbktleURvd24ucHJldmlvdXNJdGVtKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5wcm90b3R5cGUuX29uS2V5 RG93bi5uZXh0SXRlbSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVE aWFsb2cucHJvdG90eXBlLl9vbktleURvd24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFT Y3JpcHRPdXRsaW5lRGlhbG9nLnByb3RvdHlwZS5fdXBkYXRlU2VsZWN0aW9uKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5wcm90b3R5cGUuX29uU2Nyb2xs KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5NYXRjaEhp Z2hsaWdodGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURpYWxv Zy5NYXRjaEhpZ2hsaWdodGVyLnByb3RvdHlwZS5zdGFydCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cuTWF0Y2hIaWdobGlnaHRlci5wcm90b3R5cGUuX2hp Z2hsaWdodFZpZXdwb3J0SXRlbXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRP dXRsaW5lRGlhbG9nLk1hdGNoSGlnaGxpZ2h0ZXIucHJvdG90eXBlLl9oaWdobGlnaHRJdGVtKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2phdmFTY3JpcHRPdXRsaW5lRGlhbG9nLmNz czoKKyAgICAgICAgKC5qcy1vdXRsaW5lLWRpYWxvZyA+IC5jb250YWluZXIgPiBkaXYuaXRlbSA+ IHNwYW4uaGlnaGxpZ2h0KToKKworMjAxMS0xMi0yNiAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZs b3ZAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEltcGxlbWVudCAiR28g dG8gRnVuY3Rpb24iIGRpYWxvZyBmb3IgSmF2YVNjcmlwdAogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzUwOTIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cu anMKaW5kZXggY2VhYjQyNDliN2RjYzRjYTQ3NTE1ZjE5NWZmNGY0ZmE4ZTYwYzE1Ny4uNTlkYzlj Mzk0NzAzMzIxMWZkN2E4NTEyNzQ0YWExMjRmODI5ZDkyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRPdXRsaW5lRGlh bG9nLmpzCkBAIC04MSw2ICs4MSw3IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURp YWxvZyA9IGZ1bmN0aW9uKHBhbmVsLCB2aWV3KQogCiAgICAgdGhpcy5fZnVuY3Rpb25JdGVtQ29u dGFpbmVyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgdGhpcy5fZnVuY3Rp b25JdGVtQ29udGFpbmVyLmNsYXNzTmFtZSA9ICJjb250YWluZXIgbW9ub3NwYWNlIjsKKyAgICB0 aGlzLl9mdW5jdGlvbkl0ZW1Db250YWluZXIuYWRkRXZlbnRMaXN0ZW5lcigic2Nyb2xsIiwgdGhp cy5fb25TY3JvbGwuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgdGhpcy5fcGFuZWwgPSBwYW5l bDsKICAgICB0aGlzLl92aWV3ID0gdmlldzsKQEAgLTkxLDYgKzkyLDggQEAgV2ViSW5zcGVjdG9y LkphdmFTY3JpcHRPdXRsaW5lRGlhbG9nID0gZnVuY3Rpb24ocGFuZWwsIHZpZXcpCiAgICAgdGhp cy5fcHJldmlvdXNGb2N1c0VsZW1lbnQgPSBXZWJJbnNwZWN0b3IuY3VycmVudEZvY3VzRWxlbWVu dCgpOwogICAgIFdlYkluc3BlY3Rvci5zZXRDdXJyZW50Rm9jdXNFbGVtZW50KHRoaXMuX3Byb21w dEVsZW1lbnQpOwogICAgIHRoaXMuX3Byb21wdEVsZW1lbnQuc2VsZWN0KCk7CisKKyAgICB0aGlz Ll9oaWdobGlnaHRlciA9IG5ldyBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cu TWF0Y2hIaWdobGlnaHRlcih0aGlzKTsKIH0KIAogLyoqCkBAIC0yMDQsNyArMjA3LDYgQEAgV2Vi SW5zcGVjdG9yLkphdmFTY3JpcHRPdXRsaW5lRGlhbG9nLnByb3RvdHlwZSA9IHsKICAgICB7CiAg ICAgICAgIHZhciB0cmltbWVkUXVlcnkgPSBxdWVyeS50cmltKCk7CiAgICAgICAgIHZhciByZWdF eHBTdHJpbmcgPSB0cmltbWVkUXVlcnkuZXNjYXBlRm9yUmVnRXhwKCkucmVwbGFjZSgvXFxcKi9n LCAiLioiKS5yZXBsYWNlKC8oPyFeKShbQS1aXSkvZywgIlteQS1aXSokMSIpOwotICAgICAgICBj b25zb2xlLmxvZyhyZWdFeHBTdHJpbmcpOwogICAgICAgICB2YXIgaXNTdWZmaXggPSAocXVlcnku Y2hhckF0KHF1ZXJ5Lmxlbmd0aCAtIDEpID09PSAiICIpOwogICAgICAgICBpZiAoaXNTdWZmaXgp CiAgICAgICAgICAgICByZWdFeHBTdHJpbmcgKz0gIiQiOwpAQCAtMjI2LDkgKzIyOCwxMiBAQCBX ZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cucHJvdG90eXBlID0gewogICAgICAg ICAgICAgICAgIHRoaXMuX3Zpc2libGVFbGVtZW50cy5wdXNoKGVsZW1lbnQpOwogICAgICAgICAg ICAgfQogICAgICAgICAgICAgdGhpcy5fdXBkYXRlU2VsZWN0aW9uKHRoaXMuX2Z1bmN0aW9uSXRl bUNvbnRhaW5lci5maXJzdENoaWxkKTsKKyAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9xdWVyeTsK KyAgICAgICAgICAgIHRoaXMuX3N0YXJ0TWF0Y2hIaWdobGlnaHRpbmcoKTsKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQogCisgICAgICAgIHRoaXMuX3F1ZXJ5ID0gcXVlcnk7CiAgICAg ICAgIHZhciByZWdFeHAgPSB0aGlzLl9jcmVhdGVTZWFyY2hSZWdFeHAocXVlcnkpOwogICAgICAg ICB2YXIgZmlyc3RFbGVtZW50OwogICAgICAgICB2YXIgbmV3VmlzaWJsZUVsZW1lbnRzID0gW107 CkBAIC0yNDQsNiArMjQ5LDcgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRPdXRsaW5lRGlhbG9n LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHRoaXMuX3Zpc2libGVF bGVtZW50cyA9IG5ld1Zpc2libGVFbGVtZW50czsKICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNl bGVjdGlvbihmaXJzdEVsZW1lbnQpOworICAgICAgICAgICAgdGhpcy5fc3RhcnRNYXRjaEhpZ2hs aWdodGluZyhxdWVyeSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtMjU5 LDYgKzI2NSwxNSBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cucHJvdG90 eXBlID0gewogICAgICAgICB9CiAgICAgICAgIHRoaXMuX3Zpc2libGVFbGVtZW50cyA9IG5ld1Zp c2libGVFbGVtZW50czsKICAgICAgICAgdGhpcy5fdXBkYXRlU2VsZWN0aW9uKGZpcnN0RWxlbWVu dCk7CisgICAgICAgIHRoaXMuX3N0YXJ0TWF0Y2hIaWdobGlnaHRpbmcocXVlcnkpOworICAgIH0s CisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmluZz19IHF1ZXJ5CisgICAgICovCisgICAg X3N0YXJ0TWF0Y2hIaWdobGlnaHRpbmc6IGZ1bmN0aW9uKHF1ZXJ5KQorICAgIHsKKyAgICAgICAg dGhpcy5faGlnaGxpZ2h0ZXIuc3RhcnQocXVlcnkpOwogICAgIH0sCiAKICAgICBfc2VsZWN0Rmly c3RJdGVtOiBmdW5jdGlvbigpCkBAIC0zMDIsMTYgKzMxNywxOCBAQCBXZWJJbnNwZWN0b3IuSmF2 YVNjcmlwdE91dGxpbmVEaWFsb2cucHJvdG90eXBlID0gewogICAgICAgICB7CiAgICAgICAgICAg ICB2YXIgc2Nyb2xsSXRlbXNMZWZ0ID0gaXNQYWdlU2Nyb2xsICYmIHRoaXMuX3Jvd3NQZXJWaWV3 cG9ydCA/IHRoaXMuX3Jvd3NQZXJWaWV3cG9ydCA6IDE7CiAgICAgICAgICAgICB2YXIgY2FuZGlk YXRlID0gaXRlbUVsZW1lbnQ7CisgICAgICAgICAgICB2YXIgbGFzdFZpc2libGVDYW5kaWRhdGUg PSBjYW5kaWRhdGU7CiAgICAgICAgICAgICBkbyB7CiAgICAgICAgICAgICAgICAgY2FuZGlkYXRl ID0gY2FuZGlkYXRlLnByZXZpb3VzU2libGluZzsKICAgICAgICAgICAgICAgICBpZiAoIWNhbmRp ZGF0ZSkgewogICAgICAgICAgICAgICAgICAgICBpZiAoaXNQYWdlU2Nyb2xsKQotICAgICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2Z1bmN0aW9uSXRlbUNvbnRhaW5lci5maXJzdENo aWxkOworICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGxhc3RWaXNpYmxlQ2FuZGlkYXRl OwogICAgICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgICAgICBjYW5k aWRhdGUgPSB0aGlzLl9mdW5jdGlvbkl0ZW1Db250YWluZXIubGFzdENoaWxkOwogICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgICAgICBpZiAoY2FuZGlkYXRlLnN0eWxlLmRpc3BsYXkgPT09 ICJub25lIikKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAg bGFzdFZpc2libGVDYW5kaWRhdGUgPSBjYW5kaWRhdGU7CiAgICAgICAgICAgICAgICAgLS1zY3Jv bGxJdGVtc0xlZnQ7CiAgICAgICAgICAgICB9IHdoaWxlIChzY3JvbGxJdGVtc0xlZnQgJiYgY2Fu ZGlkYXRlICE9PSB0aGlzLl9zZWxlY3RlZEVsZW1lbnQpOwogCkBAIC0zMjIsMTYgKzMzOSwxOCBA QCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cucHJvdG90eXBlID0gewogICAg ICAgICB7CiAgICAgICAgICAgICB2YXIgc2Nyb2xsSXRlbXNMZWZ0ID0gaXNQYWdlU2Nyb2xsICYm IHRoaXMuX3Jvd3NQZXJWaWV3cG9ydCA/IHRoaXMuX3Jvd3NQZXJWaWV3cG9ydCA6IDE7CiAgICAg ICAgICAgICB2YXIgY2FuZGlkYXRlID0gaXRlbUVsZW1lbnQ7CisgICAgICAgICAgICB2YXIgbGFz dFZpc2libGVDYW5kaWRhdGUgPSBjYW5kaWRhdGU7CiAgICAgICAgICAgICBkbyB7CiAgICAgICAg ICAgICAgICAgY2FuZGlkYXRlID0gY2FuZGlkYXRlLm5leHRTaWJsaW5nOwogICAgICAgICAgICAg ICAgIGlmICghY2FuZGlkYXRlKSB7CiAgICAgICAgICAgICAgICAgICAgIGlmIChpc1BhZ2VTY3Jv bGwpCi0gICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5fZnVuY3Rpb25JdGVtQ29u dGFpbmVyLmxhc3RDaGlsZDsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBsYXN0Vmlz aWJsZUNhbmRpZGF0ZTsKICAgICAgICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAg ICAgICAgICAgY2FuZGlkYXRlID0gdGhpcy5fZnVuY3Rpb25JdGVtQ29udGFpbmVyLmZpcnN0Q2hp bGQ7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIGlmIChjYW5kaWRhdGUuc3R5 bGUuZGlzcGxheSA9PT0gIm5vbmUiKQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAg ICAgICAgICAgICAgICBsYXN0VmlzaWJsZUNhbmRpZGF0ZSA9IGNhbmRpZGF0ZTsKICAgICAgICAg ICAgICAgICAtLXNjcm9sbEl0ZW1zTGVmdDsKICAgICAgICAgICAgIH0gd2hpbGUgKHNjcm9sbEl0 ZW1zTGVmdCAmJiBjYW5kaWRhdGUgIT09IHRoaXMuX3NlbGVjdGVkRWxlbWVudCk7CiAKQEAgLTM5 Niw4ICs0MTUsMTAgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRPdXRsaW5lRGlhbG9nLnByb3Rv dHlwZSA9IHsKICAgICAgICAgaWYgKG5ld1NlbGVjdGVkRWxlbWVudCkgewogICAgICAgICAgICAg bmV3U2VsZWN0ZWRFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInNlbGVjdGVkIik7CiAgICAgICAgICAg ICBuZXdTZWxlY3RlZEVsZW1lbnQuc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZChmYWxzZSk7Ci0gICAg ICAgICAgICBpZiAoIXRoaXMuX3Jvd3NQZXJWaWV3cG9ydCkKLSAgICAgICAgICAgICAgICB0aGlz Ll9yb3dzUGVyVmlld3BvcnQgPSBNYXRoLmZsb29yKHRoaXMuX2Z1bmN0aW9uSXRlbUNvbnRhaW5l ci5vZmZzZXRIZWlnaHQgLyBuZXdTZWxlY3RlZEVsZW1lbnQub2Zmc2V0SGVpZ2h0KTsKKyAgICAg ICAgICAgIGlmICghdGhpcy5faXRlbUhlaWdodCkgeworICAgICAgICAgICAgICAgIHRoaXMuX2l0 ZW1IZWlnaHQgPSBuZXdTZWxlY3RlZEVsZW1lbnQub2Zmc2V0SGVpZ2h0OworICAgICAgICAgICAg ICAgIHRoaXMuX3Jvd3NQZXJWaWV3cG9ydCA9IE1hdGguZmxvb3IodGhpcy5fZnVuY3Rpb25JdGVt Q29udGFpbmVyLm9mZnNldEhlaWdodCAvIHRoaXMuX2l0ZW1IZWlnaHQpOworICAgICAgICAgICAg fQogICAgICAgICB9CiAgICAgfSwKIApAQCAtNDE5LDYgKzQ0MCwxMSBAQCBXZWJJbnNwZWN0b3Iu SmF2YVNjcmlwdE91dGxpbmVEaWFsb2cucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl91cGRh dGVTZWxlY3Rpb24oaXRlbUVsZW1lbnQpOwogICAgIH0sCiAKKyAgICBfb25TY3JvbGw6IGZ1bmN0 aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3N0YXJ0TWF0Y2hIaWdobGlnaHRpbmcodGhpcy5f cXVlcnkpOworICAgIH0sCisKICAgICBfaGlnaGxpZ2h0RnVuY3Rpb25MaW5lOiBmdW5jdGlvbigp CiAgICAgewogICAgICAgICB2YXIgbGluZU51bWJlciA9IHRoaXMuX3NlbGVjdGVkRWxlbWVudC5f bGluZTsKQEAgLTQyNiwzICs0NTIsNTkgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRPdXRsaW5l RGlhbG9nLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX3ZpZXcuaGlnaGxpZ2h0TGlu ZShsaW5lTnVtYmVyKTsKICAgICB9CiB9CisKKy8qKgorKiBAY29uc3RydWN0b3IKKyovCitXZWJJ bnNwZWN0b3IuSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cuTWF0Y2hIaWdobGlnaHRlciA9IGZ1bmN0 aW9uKGRpYWxvZykKK3sKKyAgICB0aGlzLl9kaWFsb2cgPSBkaWFsb2c7Cit9CisKK1dlYkluc3Bl Y3Rvci5KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5NYXRjaEhpZ2hsaWdodGVyLnByb3RvdHlwZSA9 IHsKKyAgICBzdGFydDogZnVuY3Rpb24ocXVlcnkpCisgICAgeworICAgICAgICB0aGlzLl9yZWdl eCA9IHF1ZXJ5ID8gdGhpcy5fZGlhbG9nLl9jcmVhdGVTZWFyY2hSZWdFeHAocXVlcnksIHRydWUp IDogbnVsbDsKKyAgICAgICAgdGhpcy5faGlnaGxpZ2h0Vmlld3BvcnRJdGVtcygpOworICAgIH0s CisKKyAgICBfaGlnaGxpZ2h0Vmlld3BvcnRJdGVtczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgdmFyIHZpc2libGVFbGVtZW50cyA9IHRoaXMuX2RpYWxvZy5fdmlzaWJsZUVsZW1lbnRzOwor ICAgICAgICB2YXIgc3RhcnRJbmRleCA9IE1hdGguZmxvb3IodGhpcy5fZGlhbG9nLl9mdW5jdGlv bkl0ZW1Db250YWluZXIuc2Nyb2xsVG9wIC8gdGhpcy5fZGlhbG9nLl9pdGVtSGVpZ2h0KTsKKyAg ICAgICAgdmFyIGVuZEluZGV4ID0gTWF0aC5taW4odmlzaWJsZUVsZW1lbnRzLmxlbmd0aCwgc3Rh cnRJbmRleCArIHRoaXMuX2RpYWxvZy5fcm93c1BlclZpZXdwb3J0ICsgMSk7CisgICAgICAgIHZh ciBzdGFydCA9IG5ldyBEYXRlKCkuZ2V0VGltZSgpOworICAgICAgICBmb3IgKHZhciBpID0gc3Rh cnRJbmRleDsgaSA8IGVuZEluZGV4OyArK2kpCisgICAgICAgICAgICB0aGlzLl9oaWdobGlnaHRJ dGVtKHZpc2libGVFbGVtZW50c1tpXSk7CisgICAgfSwKKworICAgIF9oaWdobGlnaHRJdGVtOiBm dW5jdGlvbihlbGVtZW50KQorICAgIHsKKyAgICAgICAgdmFyIHRleHQgPSBlbGVtZW50Ll90ZXh0 OworICAgICAgICBpZiAoIXRoaXMuX3JlZ2V4KSB7CisgICAgICAgICAgICBpZiAoZWxlbWVudC5f ZG9tQ2hhbmdlcykgeworICAgICAgICAgICAgICAgIHJldmVydERvbUNoYW5nZXMoZWxlbWVudC5f ZG9tQ2hhbmdlcyk7CisgICAgICAgICAgICAgICAgZGVsZXRlIGVsZW1lbnQuX2RvbUNoYW5nZXM7 CisgICAgICAgICAgICB9CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAg ICBpZiAoZWxlbWVudC5fZG9tQ2hhbmdlcykgeworICAgICAgICAgICAgcmV2ZXJ0RG9tQ2hhbmdl cyhlbGVtZW50Ll9kb21DaGFuZ2VzKTsKKyAgICAgICAgICAgIGRlbGV0ZSBlbGVtZW50Ll9kb21D aGFuZ2VzOworICAgICAgICB9CisKKyAgICAgICAgdmFyIHJhbmdlcyA9IFtdOworCisgICAgICAg IHZhciBtYXRjaDsKKyAgICAgICAgd2hpbGUgKChtYXRjaCA9IHRoaXMuX3JlZ2V4LmV4ZWModGV4 dCkpICE9PSBudWxsKSB7CisgICAgICAgICAgICByYW5nZXMucHVzaCh7IG9mZnNldDogbWF0Y2gu aW5kZXgsIGxlbmd0aDogdGhpcy5fcmVnZXgubGFzdEluZGV4IC0gbWF0Y2guaW5kZXggfSk7Cisg ICAgICAgIH0KKworICAgICAgICB2YXIgY2hhbmdlcyA9IFtdOworICAgICAgICBoaWdobGlnaHRS YW5nZXNXaXRoU3R5bGVDbGFzcyhlbGVtZW50LCByYW5nZXMsICJoaWdobGlnaHQiLCBjaGFuZ2Vz KTsKKworICAgICAgICBpZiAoY2hhbmdlcy5sZW5ndGgpCisgICAgICAgICAgICBlbGVtZW50Ll9k b21DaGFuZ2VzID0gY2hhbmdlczsKKyAgICB9Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2phdmFTY3JpcHRPdXRsaW5lRGlhbG9nLmNzcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvamF2YVNjcmlwdE91dGxpbmVEaWFsb2cuY3Nz CmluZGV4IDMxN2FiN2I2MzRhZGRhM2Y5NTJmMjc5NjhlNGEyODRiNWUwZTI3NGMuLjQ4ODJmOGEw MDQ3ZDQ5NWI1YTIyNDU3MTBhMDhiMmM4ZTkxOTYwNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvamF2YVNjcmlwdE91dGxpbmVEaWFsb2cuY3NzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvamF2YVNjcmlwdE91dGxpbmVEaWFs b2cuY3NzCkBAIC01MywzICs1Myw4IEBACiAuanMtb3V0bGluZS1kaWFsb2cgPiAuY29udGFpbmVy ID4gZGl2Lml0ZW0uc2VsZWN0ZWQgewogICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyMjQsIDIy NCwgMjI0KTsKIH0KKworLmpzLW91dGxpbmUtZGlhbG9nID4gLmNvbnRhaW5lciA+IGRpdi5pdGVt ID4gc3Bhbi5oaWdobGlnaHQgeworICAgIGNvbG9yOiBibGFjazsKKyAgICBmb250LXdlaWdodDog Ym9sZDsKK30K