34269 2010-01-28 08:50:33 -0800 Web Inspector: Use platform-specific fonts for SourceFrame contents 2010-01-29 06:11:12 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov bweinstein joepeck keishi pfeldman pmuellr rik timothy oldest_to_newest 185511 0 apavlov 2010-01-28 08:50:33 -0800 SourceFrame contents should use the same platform-specific fonts as those defined in https://bugs.webkit.org/show_bug.cgi?id=34040 185824 1 47706 apavlov 2010-01-29 05:22:11 -0800 Created attachment 47706 [PATCH] Proposed solution 185826 2 47706 pfeldman 2010-01-29 05:28:23 -0800 Comment on attachment 47706 [PATCH] Proposed solution > this._textModel = textModel; > this._textModel.changeListener = this._textChanged.bind(this); > + if (!WebInspector.TextEditor.PlatformFonts) { > + WebInspector.TextEditor.PlatformFonts = {}; > + WebInspector.TextEditor.PlatformFonts[WebInspector.OS.Windows] = {size: 12, face: "Lucida Console"}; > + WebInspector.TextEditor.PlatformFonts[WebInspector.OS.WindowsVistaOrLater] = {size: 12, face: "Courier"}; > + WebInspector.TextEditor.PlatformFonts[WebInspector.OS.MacSnowLeopard] = {size: 11, face: "Menlo"}; > + WebInspector.TextEditor.PlatformFonts[WebInspector.OS.MacLeopard] = {size: 10, face: "Monaco"}; > + WebInspector.TextEditor.PlatformFonts[WebInspector.OS.MacTiger] = {size: 10, face: "Monaco"}; > + } > + should this be defined in init font? > + this._isMac = platform === WebInspector.OS.MacTiger || platform === WebInspector.OS.MacLeopard || platform === WebInspector.OS.MacSnowLeopard; > indexOf("mac") === 0? > + const fontMetrics = WebInspector.TextEditor.PlatformFonts[platform] || {size: 10, face: "monospace"}; fontInfo? 185838 3 47708 apavlov 2010-01-29 05:56:44 -0800 Created attachment 47708 [PATCH] Comments addressed 185844 4 pfeldman 2010-01-29 06:11:12 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/TextEditor.js M WebCore/inspector/front-end/inspector.js Committed r54059 47706 2010-01-29 05:22:11 -0800 2010-01-29 05:56:44 -0800 [PATCH] Proposed solution sourceview.patch text/plain 4643 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Yzg5MDlkNy4uNGZhMDZiZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wMS0yOSAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFNvdXJjZSB2aWV3IGRpc3BsYXlzIHRleHQgdXNpbmcgd3Jv bmcgZm9udHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTM0MjY5CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3IuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvcik6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGV4dEVkaXRvci5wcm90b3R5cGUuX2luaXRGb250KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5qczoKKwogMjAxMC0wMS0yOSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxk bWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIu CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dEVkaXRvci5qcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9yLmpzCmluZGV4IGFlZjVkOWEu LjlmZjlkZGEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRp dG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9yLmpzCkBA IC0zMiw2ICszMiwxNSBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvciA9IGZ1bmN0aW9uKHRleHRN b2RlbCwgcGxhdGZvcm0pCiB7CiAgICAgdGhpcy5fdGV4dE1vZGVsID0gdGV4dE1vZGVsOwogICAg IHRoaXMuX3RleHRNb2RlbC5jaGFuZ2VMaXN0ZW5lciA9IHRoaXMuX3RleHRDaGFuZ2VkLmJpbmQo dGhpcyk7CisgICAgaWYgKCFXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5QbGF0Zm9ybUZvbnRzKSB7 CisgICAgICAgIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yLlBsYXRmb3JtRm9udHMgPSB7fTsKKyAg ICAgICAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IuUGxhdGZvcm1Gb250c1tXZWJJbnNwZWN0b3Iu T1MuV2luZG93c10gPSB7c2l6ZTogMTIsIGZhY2U6ICJMdWNpZGEgQ29uc29sZSJ9OworICAgICAg ICBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5QbGF0Zm9ybUZvbnRzW1dlYkluc3BlY3Rvci5PUy5X aW5kb3dzVmlzdGFPckxhdGVyXSA9IHtzaXplOiAxMiwgZmFjZTogIkNvdXJpZXIifTsKKyAgICAg ICAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IuUGxhdGZvcm1Gb250c1tXZWJJbnNwZWN0b3IuT1Mu TWFjU25vd0xlb3BhcmRdID0ge3NpemU6IDExLCBmYWNlOiAiTWVubG8ifTsKKyAgICAgICAgV2Vi SW5zcGVjdG9yLlRleHRFZGl0b3IuUGxhdGZvcm1Gb250c1tXZWJJbnNwZWN0b3IuT1MuTWFjTGVv cGFyZF0gPSB7c2l6ZTogMTAsIGZhY2U6ICJNb25hY28ifTsKKyAgICAgICAgV2ViSW5zcGVjdG9y LlRleHRFZGl0b3IuUGxhdGZvcm1Gb250c1tXZWJJbnNwZWN0b3IuT1MuTWFjVGlnZXJdID0ge3Np emU6IDEwLCBmYWNlOiAiTW9uYWNvIn07CisgICAgfQorCiAgICAgdGhpcy5faGlnaGxpZ2h0ZXIg PSBuZXcgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JIaWdobGlnaHRlcih0aGlzLl90ZXh0TW9kZWws IHRoaXMuX2hpZ2hsaWdodENoYW5nZWQuYmluZCh0aGlzKSk7CiAKICAgICB0aGlzLmVsZW1lbnQg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKQEAgLTc4LDEwICs4Nyw3IEBAIFdlYklu c3BlY3Rvci5UZXh0RWRpdG9yID0gZnVuY3Rpb24odGV4dE1vZGVsLCBwbGF0Zm9ybSkKICAgICB0 aGlzLl9jdHggPSB0aGlzLl9jYW52YXMuZ2V0Q29udGV4dCgiMmQiKTsKICAgICB0aGlzLl9zZWxl Y3Rpb24gPSBuZXcgV2ViSW5zcGVjdG9yLlRleHRTZWxlY3Rpb25Nb2RlbCh0aGlzLl9zZWxlY3Rp b25DaGFuZ2VkLmJpbmQodGhpcykpOwogCi0gICAgdGhpcy5faXNNYWNUaWdlciA9IHBsYXRmb3Jt ID09PSAibWFjLXRpZ2VyIjsKLSAgICB0aGlzLl9pc01hY0xlb3BhcmQgPSBwbGF0Zm9ybSA9PT0g Im1hYy1sZW9wYXJkIjsKLSAgICB0aGlzLl9pc01hYyA9IHRoaXMuX2lzTWFjVGlnZXIgfHwgdGhp cy5faXNNYWNMZW9wYXJkOwotICAgIHRoaXMuX2lzV2luID0gcGxhdGZvcm0gPT09ICJ3aW5kb3dz IjsKKyAgICB0aGlzLl9pc01hYyA9IHBsYXRmb3JtID09PSBXZWJJbnNwZWN0b3IuT1MuTWFjVGln ZXIgfHwgcGxhdGZvcm0gPT09IFdlYkluc3BlY3Rvci5PUy5NYWNMZW9wYXJkIHx8IHBsYXRmb3Jt ID09PSBXZWJJbnNwZWN0b3IuT1MuTWFjU25vd0xlb3BhcmQ7CiAKICAgICB0aGlzLl9pbml0Rm9u dCgpOwogCkBAIC05NDgsMjAgKzk1NCwxOCBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3VwZGF0ZUN1cnNvcih0aGlzLl9zZWxlY3Rpb24uZW5k TGluZSwgdGhpcy5fc2VsZWN0aW9uLmVuZENvbHVtbik7CiAgICAgfSwKIAotICAgIF9pbml0Rm9u dDogZnVuY3Rpb24oc2Fuc1NlcmlmLCBmb250U2l6ZSkKKyAgICBfaW5pdEZvbnQ6IGZ1bmN0aW9u KHNhbnNTZXJpZikKICAgICB7CiAgICAgICAgIGlmIChzYW5zU2VyaWYpIHsKICAgICAgICAgICAg IHRoaXMuX2lzTW9ub3NwYWNlID0gZmFsc2U7Ci0gICAgICAgICAgICB0aGlzLl9mb250U2l6ZSA9 IGZvbnRTaXplIHx8IDExOworICAgICAgICAgICAgdGhpcy5fZm9udFNpemUgPSAxMTsKICAgICAg ICAgICAgIHRoaXMuX2ZvbnQgPSB0aGlzLl9mb250U2l6ZSArICJweCBzYW5zLXNlcmlmIjsKICAg ICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHRoaXMuX2lzTW9ub3NwYWNlID0gdHJ1ZTsKLSAg ICAgICAgICAgIHRoaXMuX2ZvbnRTaXplID0gZm9udFNpemUgfHwgMTA7Ci0gICAgICAgICAgICB0 aGlzLl9mb250ID0gdGhpcy5fZm9udFNpemUgKyAicHggbW9ub3NwYWNlIjsKLSAgICAgICAgICAg IGlmICh0aGlzLl9pc01hYykKLSAgICAgICAgICAgICAgICB0aGlzLl9mb250ID0gdGhpcy5fZm9u dFNpemUgKyAicHggTW9uYWNvIjsKLSAgICAgICAgICAgIGVsc2UgaWYgKHRoaXMuX2lzV2luKQot ICAgICAgICAgICAgICAgIHRoaXMuX2ZvbnQgPSAodGhpcy5fZm9udFNpemUgKyAxKSArICJweCBD b3VyaWVyIE5ldyI7CisgICAgICAgICAgICBjb25zdCBwbGF0Zm9ybSA9IFdlYkluc3BlY3Rvci5w bGF0Zm9ybTsKKyAgICAgICAgICAgIGNvbnN0IGZvbnRNZXRyaWNzID0gV2ViSW5zcGVjdG9yLlRl eHRFZGl0b3IuUGxhdGZvcm1Gb250c1twbGF0Zm9ybV0gfHwge3NpemU6IDEwLCBmYWNlOiAibW9u b3NwYWNlIn07CisgICAgICAgICAgICB0aGlzLl9mb250U2l6ZSA9IGZvbnRNZXRyaWNzLnNpemU7 CisgICAgICAgICAgICB0aGlzLl9mb250ID0gdGhpcy5fZm9udFNpemUgKyAicHggIiArIGZvbnRN ZXRyaWNzLmZhY2U7CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5fY3R4LmZvbnQgPSB0aGlzLl9m b250OwogICAgICAgICB0aGlzLl9kaWdpdFdpZHRoID0gdGhpcy5fY3R4Lm1lYXN1cmVUZXh0KCIw Iikud2lkdGg7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVj dG9yLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCBj YTc2M2RjLi5jODUzMmQ4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anMKQEAgLTU1LDEzICs1NSw2IEBAIHZhciBXZWJJbnNwZWN0b3IgPSB7CiAgICAgY29va2llRG9t YWluczoge30sCiAgICAgbWlzc2luZ0xvY2FsaXplZFN0cmluZ3M6IHt9LAogICAgIHBlbmRpbmdE aXNwYXRjaGVzOiAwLAotICAgIE9TOiB7Ci0gICAgICAgIFdpbmRvd3M6ICJ3aW5kb3dzIiwKLSAg ICAgICAgV2luZG93c1Zpc3RhT3JMYXRlcjogIndpbmRvd3MtdmlzdGEtb3ItbGF0ZXIiLAotICAg ICAgICBNYWNUaWdlcjogIm1hYy10aWdlciIsCi0gICAgICAgIE1hY0xlb3BhcmQ6ICJtYWMtbGVv cGFyZCIsCi0gICAgICAgIE1hY1Nub3dMZW9wYXJkOiAibWFjLXNub3dsZW9wYXJkIgotICAgIH0s CiAKICAgICAvLyBSZWdFeHAgZ3JvdXBzOgogICAgIC8vIDEgLSBzY2hlbWUKQEAgLTQyMiw2ICs0 MTUsMTQgQEAgdmFyIFdlYkluc3BlY3RvciA9IHsKICAgICB9CiB9CiAKK1dlYkluc3BlY3Rvci5P UyA9IHsKKyAgICBXaW5kb3dzOiAid2luZG93cyIsCisgICAgV2luZG93c1Zpc3RhT3JMYXRlcjog IndpbmRvd3MtdmlzdGEtb3ItbGF0ZXIiLAorICAgIE1hY1RpZ2VyOiAibWFjLXRpZ2VyIiwKKyAg ICBNYWNMZW9wYXJkOiAibWFjLWxlb3BhcmQiLAorICAgIE1hY1Nub3dMZW9wYXJkOiAibWFjLXNu b3dsZW9wYXJkIgorfQorCiBXZWJJbnNwZWN0b3IubG9hZGVkID0gZnVuY3Rpb24oKQogewogICAg IEluc3BlY3RvckJhY2tlbmQuc2V0SW5qZWN0ZWRTY3JpcHRTb3VyY2UoIigiICsgaW5qZWN0ZWRT Y3JpcHRDb25zdHJ1Y3RvciArICIpOyIpOwo= 47708 2010-01-29 05:56:44 -0800 2010-01-29 06:05:17 -0800 [PATCH] Comments addressed sourceview.patch text/plain 4247 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Yzg5MDlkNy4uMThhZWEwOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wMS0yOSAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNvdXJjZSB2aWV3IGRpc3BsYXlz IHRleHQgdXNpbmcgd3JvbmcgZm9udHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM0MjY5CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Rl eHRFZGl0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvcik6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUuX2luaXRGb250KToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKwogMjAxMC0wMS0yOSAgUGF2ZWwg RmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBU aW1vdGh5IEhhdGNoZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv VGV4dEVkaXRvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9yLmpz CmluZGV4IGFlZjVkOWEuLjU1NTQzNjUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9UZXh0RWRpdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9U ZXh0RWRpdG9yLmpzCkBAIC03OCwxMCArNzgsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvciA9 IGZ1bmN0aW9uKHRleHRNb2RlbCwgcGxhdGZvcm0pCiAgICAgdGhpcy5fY3R4ID0gdGhpcy5fY2Fu dmFzLmdldENvbnRleHQoIjJkIik7CiAgICAgdGhpcy5fc2VsZWN0aW9uID0gbmV3IFdlYkluc3Bl Y3Rvci5UZXh0U2VsZWN0aW9uTW9kZWwodGhpcy5fc2VsZWN0aW9uQ2hhbmdlZC5iaW5kKHRoaXMp KTsKIAotICAgIHRoaXMuX2lzTWFjVGlnZXIgPSBwbGF0Zm9ybSA9PT0gIm1hYy10aWdlciI7Ci0g ICAgdGhpcy5faXNNYWNMZW9wYXJkID0gcGxhdGZvcm0gPT09ICJtYWMtbGVvcGFyZCI7Ci0gICAg dGhpcy5faXNNYWMgPSB0aGlzLl9pc01hY1RpZ2VyIHx8IHRoaXMuX2lzTWFjTGVvcGFyZDsKLSAg ICB0aGlzLl9pc1dpbiA9IHBsYXRmb3JtID09PSAid2luZG93cyI7CisgICAgdGhpcy5faXNNYWMg PSBwbGF0Zm9ybSAmJiAocGxhdGZvcm0uaW5kZXhPZigibWFjIikgPT09IDApOwogCiAgICAgdGhp cy5faW5pdEZvbnQoKTsKIApAQCAtOTQ4LDIwICs5NDUsMjcgQEAgV2ViSW5zcGVjdG9yLlRleHRF ZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl91cGRhdGVDdXJzb3IodGhpcy5fc2Vs ZWN0aW9uLmVuZExpbmUsIHRoaXMuX3NlbGVjdGlvbi5lbmRDb2x1bW4pOwogICAgIH0sCiAKLSAg ICBfaW5pdEZvbnQ6IGZ1bmN0aW9uKHNhbnNTZXJpZiwgZm9udFNpemUpCisgICAgX2luaXRGb250 OiBmdW5jdGlvbihzYW5zU2VyaWYpCiAgICAgeworICAgICAgICBpZiAoIVdlYkluc3BlY3Rvci5U ZXh0RWRpdG9yLlBsYXRmb3JtRm9udHMpIHsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5UZXh0 RWRpdG9yLlBsYXRmb3JtRm9udHMgPSB7fTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5UZXh0 RWRpdG9yLlBsYXRmb3JtRm9udHNbV2ViSW5zcGVjdG9yLk9TLldpbmRvd3NdID0ge3NpemU6IDEy LCBmYWNlOiAiTHVjaWRhIENvbnNvbGUifTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5UZXh0 RWRpdG9yLlBsYXRmb3JtRm9udHNbV2ViSW5zcGVjdG9yLk9TLldpbmRvd3NWaXN0YU9yTGF0ZXJd ID0ge3NpemU6IDEyLCBmYWNlOiAiQ291cmllciJ9OworICAgICAgICAgICAgV2ViSW5zcGVjdG9y LlRleHRFZGl0b3IuUGxhdGZvcm1Gb250c1tXZWJJbnNwZWN0b3IuT1MuTWFjU25vd0xlb3BhcmRd ID0ge3NpemU6IDExLCBmYWNlOiAiTWVubG8ifTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5U ZXh0RWRpdG9yLlBsYXRmb3JtRm9udHNbV2ViSW5zcGVjdG9yLk9TLk1hY0xlb3BhcmRdID0ge3Np emU6IDEwLCBmYWNlOiAiTW9uYWNvIn07CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuVGV4dEVk aXRvci5QbGF0Zm9ybUZvbnRzW1dlYkluc3BlY3Rvci5PUy5NYWNUaWdlcl0gPSB7c2l6ZTogMTAs IGZhY2U6ICJNb25hY28ifTsKKyAgICAgICAgfQorCiAgICAgICAgIGlmIChzYW5zU2VyaWYpIHsK ICAgICAgICAgICAgIHRoaXMuX2lzTW9ub3NwYWNlID0gZmFsc2U7Ci0gICAgICAgICAgICB0aGlz Ll9mb250U2l6ZSA9IGZvbnRTaXplIHx8IDExOworICAgICAgICAgICAgdGhpcy5fZm9udFNpemUg PSAxMTsKICAgICAgICAgICAgIHRoaXMuX2ZvbnQgPSB0aGlzLl9mb250U2l6ZSArICJweCBzYW5z LXNlcmlmIjsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHRoaXMuX2lzTW9ub3NwYWNl ID0gdHJ1ZTsKLSAgICAgICAgICAgIHRoaXMuX2ZvbnRTaXplID0gZm9udFNpemUgfHwgMTA7Ci0g ICAgICAgICAgICB0aGlzLl9mb250ID0gdGhpcy5fZm9udFNpemUgKyAicHggbW9ub3NwYWNlIjsK LSAgICAgICAgICAgIGlmICh0aGlzLl9pc01hYykKLSAgICAgICAgICAgICAgICB0aGlzLl9mb250 ID0gdGhpcy5fZm9udFNpemUgKyAicHggTW9uYWNvIjsKLSAgICAgICAgICAgIGVsc2UgaWYgKHRo aXMuX2lzV2luKQotICAgICAgICAgICAgICAgIHRoaXMuX2ZvbnQgPSAodGhpcy5fZm9udFNpemUg KyAxKSArICJweCBDb3VyaWVyIE5ldyI7CisgICAgICAgICAgICBjb25zdCBwbGF0Zm9ybSA9IFdl Ykluc3BlY3Rvci5wbGF0Zm9ybTsKKyAgICAgICAgICAgIGNvbnN0IGZvbnRJbmZvID0gV2ViSW5z cGVjdG9yLlRleHRFZGl0b3IuUGxhdGZvcm1Gb250c1twbGF0Zm9ybV0gfHwge3NpemU6IDEwLCBm YWNlOiAibW9ub3NwYWNlIn07CisgICAgICAgICAgICB0aGlzLl9mb250U2l6ZSA9IGZvbnRJbmZv LnNpemU7CisgICAgICAgICAgICB0aGlzLl9mb250ID0gdGhpcy5fZm9udFNpemUgKyAicHggIiAr IGZvbnRJbmZvLmZhY2U7CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5fY3R4LmZvbnQgPSB0aGlz Ll9mb250OwogICAgICAgICB0aGlzLl9kaWdpdFdpZHRoID0gdGhpcy5fY3R4Lm1lYXN1cmVUZXh0 KCIwIikud2lkdGg7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5z cGVjdG9yLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRl eCBjYTc2M2RjLi5jODUzMmQ4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuanMKQEAgLTU1LDEzICs1NSw2IEBAIHZhciBXZWJJbnNwZWN0b3IgPSB7CiAgICAgY29va2ll RG9tYWluczoge30sCiAgICAgbWlzc2luZ0xvY2FsaXplZFN0cmluZ3M6IHt9LAogICAgIHBlbmRp bmdEaXNwYXRjaGVzOiAwLAotICAgIE9TOiB7Ci0gICAgICAgIFdpbmRvd3M6ICJ3aW5kb3dzIiwK LSAgICAgICAgV2luZG93c1Zpc3RhT3JMYXRlcjogIndpbmRvd3MtdmlzdGEtb3ItbGF0ZXIiLAot ICAgICAgICBNYWNUaWdlcjogIm1hYy10aWdlciIsCi0gICAgICAgIE1hY0xlb3BhcmQ6ICJtYWMt bGVvcGFyZCIsCi0gICAgICAgIE1hY1Nub3dMZW9wYXJkOiAibWFjLXNub3dsZW9wYXJkIgotICAg IH0sCiAKICAgICAvLyBSZWdFeHAgZ3JvdXBzOgogICAgIC8vIDEgLSBzY2hlbWUKQEAgLTQyMiw2 ICs0MTUsMTQgQEAgdmFyIFdlYkluc3BlY3RvciA9IHsKICAgICB9CiB9CiAKK1dlYkluc3BlY3Rv ci5PUyA9IHsKKyAgICBXaW5kb3dzOiAid2luZG93cyIsCisgICAgV2luZG93c1Zpc3RhT3JMYXRl cjogIndpbmRvd3MtdmlzdGEtb3ItbGF0ZXIiLAorICAgIE1hY1RpZ2VyOiAibWFjLXRpZ2VyIiwK KyAgICBNYWNMZW9wYXJkOiAibWFjLWxlb3BhcmQiLAorICAgIE1hY1Nub3dMZW9wYXJkOiAibWFj LXNub3dsZW9wYXJkIgorfQorCiBXZWJJbnNwZWN0b3IubG9hZGVkID0gZnVuY3Rpb24oKQogewog ICAgIEluc3BlY3RvckJhY2tlbmQuc2V0SW5qZWN0ZWRTY3JpcHRTb3VyY2UoIigiICsgaW5qZWN0 ZWRTY3JpcHRDb25zdHJ1Y3RvciArICIpOyIpOwo=