17633 2008-03-01 20:32:56 -0800 SVG: modifying x & y attribute of text element from JS fails 2008-03-30 10:18:35 -0700 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andrejohn.mas webkit-unassigned oldest_to_newest 72470 0 andrejohn.mas 2008-03-01 20:32:56 -0800 Tested with nightly of 2008-03-01 If you try modifying the x and y attributes of a text element they are ignored, from Javascript, when they should be taken into account. In other words if I change x from 200 to 300, then the object remains at 200. I have compared this behaviour with Opera 9.5 and Firefox where the object moves. This behaviour should be corrected in Webkit. 72471 1 19478 andrejohn.mas 2008-03-01 20:35:03 -0800 Created attachment 19478 Test case illustrating the issue I have attached a test case which illustrates the issue. Here you see that both rectangles are moved to the new location (correct behaviour), but not the text element (incorrect behaviour). 72472 2 19479 andrejohn.mas 2008-03-01 20:36:41 -0800 Created attachment 19479 Updated test-case, removing unnecessary alerts 74529 3 good4me 2008-03-20 10:57:15 -0700 Possibly related to Bug 15799 ? 74535 4 andrejohn.mas 2008-03-20 11:25:39 -0700 Just an extra note: doing the same manipulation of other elements such as 'rectangle' works. 75816 5 20211 rwlbuis 2008-03-30 03:38:42 -0700 Created attachment 20211 First attempt This should fix the bug. It does not cover setting for example rotate on text though. Also I intend this so far only for <text>, not <tspan>. I think we should make seperate bugs for them and ofcourse also testcase(s) for those bugs. Cheers, Rob. 75817 6 20211 oliver 2008-03-30 04:26:56 -0700 Comment on attachment 20211 First attempt Looks good. I'd like the testcase to be pure text output though -- dumpAsText() is your friend :D 75830 7 rwlbuis 2008-03-30 10:17:18 -0700 Hi Oliver, (In reply to comment #6) > (From update of attachment 20211 [edit]) > Looks good. I'd like the testcase to be pure text output though -- > dumpAsText() is your friend :D I didnt see a way to make it work that way. The test relies on the end position of the text. Eric didnt see an (easy) way either. Anyway, let me know if you feel I missed an opportunity to use dumpAsText here, then I will replace the testcase. Cheers, Rob. 75831 8 rwlbuis 2008-03-30 10:18:35 -0700 Fixed by #31441. 19478 2008-03-01 20:35:03 -0800 2008-03-01 20:36:41 -0800 Test case illustrating the issue bug-testcase.svg image/svg+xml 2165 andrejohn.mas PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJ QyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9T VkcvMS4xL0RURC9zdmcxMS5kdGQiPgo8c3ZnIHdpZHRoPSIxMDAlIgogICAgIGhlaWdodD0iMTAw JSIgCiAgICAgdmVyc2lvbj0iMS4xIgogICAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw L3N2ZyIKICAgICB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIKICAg ICBvbmxvYWQ9InN0YXJ0dXAoZXZ0KSIgPgoKCjxnIGlkPSJib3hHIj4KICAgPHJlY3QgaWQ9ImJv eCIgeD0iMjAiIHk9IjIwIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCIgZmlsbD0id2hpdGUiIHN0 cm9rZT0iYmx1ZSIgb25jbGljaz0iamF2YXNjcmlwdDpib3hDbGlja2VkKCkiLz4KICAgPHJlY3Qg eD0iMzAiIHk9IjMwIiB3aWR0aD0iMzAiIGhlaWdodD0iMzAiIHN0cm9rZT0icmVkIiBvbmNsaWNr PSJqYXZhc2NyaXB0OmJveENsaWNrZWQoKSIgLz4KICAgPHRleHQgeD0iNDAiIHk9IjQwIiBmaWxs PSJibGFjayIgb25jbGljaz0iYm94Q2xpY2tlZCgpIj5IZWxsbzwvdGV4dD4KPC9nPgoKCiAgIDxz Y3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij48IVtDREFUQVsKICAgCiAgIHZhciBzdmdEb2N1 bWVudDsKICAgCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI7CiAgIAogICBm dW5jdGlvbiBzdGFydHVwKGV2dCkgewogICAgICBPPWV2dC50YXJnZXQ7CiAgICAgIHN2Z0RvY3Vt ZW50PU8ub3duZXJEb2N1bWVudDsgICAgICAKICAgfQogICAKICAgZnVuY3Rpb24gYm94Q2xpY2tl ZCAoKSB7CiAgICAgYWxlcnQoImJveCBjbGlja2VkICIpOwogICAgIAogICAgIG1vdmVDYXJkICgg NDAwLCA0MDApOwogIAogICB9CiAgIAogICBmdW5jdGlvbiBtb3ZlQ2FyZCAoIHgsIHkgKSB7Cgog ICAgICBjYXJkID0gc3ZnRG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImJveCIpOwogICAgIAogICAg ICBjYXJkRyA9IHN2Z0RvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJib3hHIik7CiAgICAgCgogICAg ICBpZiAoIGNhcmRHICkgewogICAgICAgICBvbGRYID0gcGFyc2VJbnQoY2FyZC5nZXRBdHRyaWJ1 dGUoIngiKSk7CiAgICAgICAgIG9sZFkgPSBwYXJzZUludChjYXJkLmdldEF0dHJpYnV0ZSgieSIp KTsKCiAgICAgICAgIHhEaWZmID0geC1vbGRYOwogICAgICAgICB5RGlmZiA9IHktb2xkWTsgICAg ICAgIAogICAgICAgIAogICAgICAgCiAgICAgICAgIGlmICggY2FyZEcuaGFzQ2hpbGROb2Rlcygp ICkgewogICAgICAgICAgICBjaGlsZHJlbiA9IGNhcmRHLmNoaWxkTm9kZXM7CiAgICAgICAgICAg ICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgZm9yICggaT0wOyBp PCBjaGlsZHJlbi5sZW5ndGg7IGkrKyApIHsKICAgICAgICAgICAgICAgY2hpbGQgPSBjaGlsZHJl bltpXTsgICAgICAgICAgIAogICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgaWYgKCBjaGls ZC5ub2RlTmFtZSA9PSAiI3RleHQiICkgewogICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgICAKICAgICAgICAgIC8vIGFsZXJ0KCJib3ggeHh4 ICIgKyBjaGlsZCk7CiAgICAgICAgICAgICAgIHh4ID0gcGFyc2VJbnQoY2hpbGQuZ2V0QXR0cmli dXRlKCJ4IikpOwogICAgICAgICAgICAgICB5eSA9IHBhcnNlSW50KGNoaWxkLmdldEF0dHJpYnV0 ZSgieSIpKTsKICAgICAgICAgICAgLy9hbGVydCgiYm94IHl5eSAiKTsKICAgICAgICAgICAgICAg Ly9uZXdYID0gMCt4eCt4RGlmZjsKICAgICAgICAgICAgICAgLy9hbGVydCgieDoiK3grIixvbGRY OiIrb2xkWCsiLHhEaWZmOiIreERpZmYrIix4eDoiK3h4KyIsbmV3OiIrbmV3WCk7CiAgICAgICAg ICAgICAgIGFsZXJ0KCJYOiIrY2hpbGQubm9kZU5hbWUpOwogICAgICAKICAgICAgICAgICAgICAg Y2hpbGQuc2V0QXR0cmlidXRlKCd4JywgeHgreERpZmYpOwogICAgICAgICAgICAgICBjaGlsZC5z ZXRBdHRyaWJ1dGUoJ3knLCB5eSt5RGlmZik7ICAgICAgICAgCiAgICAgICAgICAgIH0KICAgICAg ICAgfQogICAgICB9ICAgCiAgIH0KICAgCiAgIAogICAKICAgXV0+PC9zY3JpcHQ+Cgo8L3N2Zz4= 19479 2008-03-01 20:36:41 -0800 2008-03-01 20:36:41 -0800 Updated test-case, removing unnecessary alerts bug-testcase.svg image/svg+xml 1918 andrejohn.mas PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJ QyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9T VkcvMS4xL0RURC9zdmcxMS5kdGQiPgo8c3ZnIHdpZHRoPSIxMDAlIgogICAgIGhlaWdodD0iMTAw JSIgCiAgICAgdmVyc2lvbj0iMS4xIgogICAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw L3N2ZyIKICAgICB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIKICAg ICBvbmxvYWQ9InN0YXJ0dXAoZXZ0KSIgPgoKCjxnIGlkPSJib3hHIj4KICAgPHJlY3QgaWQ9ImJv eCIgeD0iMjAiIHk9IjIwIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCIgZmlsbD0id2hpdGUiIHN0 cm9rZT0iYmx1ZSIgb25jbGljaz0iamF2YXNjcmlwdDpib3hDbGlja2VkKCkiLz4KICAgPHJlY3Qg eD0iMzAiIHk9IjMwIiB3aWR0aD0iMzAiIGhlaWdodD0iMzAiIHN0cm9rZT0icmVkIiBvbmNsaWNr PSJqYXZhc2NyaXB0OmJveENsaWNrZWQoKSIgLz4KICAgPHRleHQgeD0iNDAiIHk9IjQwIiBmaWxs PSJibGFjayIgb25jbGljaz0iYm94Q2xpY2tlZCgpIj5IZWxsbzwvdGV4dD4KPC9nPgoKCiAgIDxz Y3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij48IVtDREFUQVsKICAgCiAgIHZhciBzdmdEb2N1 bWVudDsKICAgCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI7CiAgIAogICBm dW5jdGlvbiBzdGFydHVwKGV2dCkgewogICAgICBPPWV2dC50YXJnZXQ7CiAgICAgIHN2Z0RvY3Vt ZW50PU8ub3duZXJEb2N1bWVudDsgICAgICAKICAgfQogICAKICAgZnVuY3Rpb24gYm94Q2xpY2tl ZCAoKSB7CiAgICAgYWxlcnQoImJveCBjbGlja2VkICIpOwogICAgIAogICAgIG1vdmVDYXJkICgg NDAwLCA0MDApOwogIAogICB9CiAgIAogICBmdW5jdGlvbiBtb3ZlQ2FyZCAoIHgsIHkgKSB7Cgog ICAgICBjYXJkID0gc3ZnRG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImJveCIpOwogICAgIAogICAg ICBjYXJkRyA9IHN2Z0RvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJib3hHIik7CiAgICAgCgogICAg ICBpZiAoIGNhcmRHICkgewogICAgICAgICBvbGRYID0gcGFyc2VJbnQoY2FyZC5nZXRBdHRyaWJ1 dGUoIngiKSk7CiAgICAgICAgIG9sZFkgPSBwYXJzZUludChjYXJkLmdldEF0dHJpYnV0ZSgieSIp KTsKCiAgICAgICAgIHhEaWZmID0geC1vbGRYOwogICAgICAgICB5RGlmZiA9IHktb2xkWTsgICAg ICAgIAogICAgICAgCiAgICAgICAgIGlmICggY2FyZEcuaGFzQ2hpbGROb2RlcygpICkgewogICAg ICAgICAgICBjaGlsZHJlbiA9IGNhcmRHLmNoaWxkTm9kZXM7CiAgICAgICAgICAgICAgICAgIAog ICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgZm9yICggaT0wOyBpPCBjaGlsZHJl bi5sZW5ndGg7IGkrKyApIHsKICAgICAgICAgICAgICAgY2hpbGQgPSBjaGlsZHJlbltpXTsgICAg ICAgICAgIAogICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgaWYgKCBjaGlsZC5ub2RlTmFt ZSA9PSAiI3RleHQiICkgewogICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAKIAogICAgICAgICAgICAgICB4eCA9IHBhcnNlSW50KGNoaWxk LmdldEF0dHJpYnV0ZSgieCIpKTsKICAgICAgICAgICAgICAgeXkgPSBwYXJzZUludChjaGlsZC5n ZXRBdHRyaWJ1dGUoInkiKSk7CiAgIAogICAgICAgICAgICAgICBjaGlsZC5zZXRBdHRyaWJ1dGUo J3gnLCB4eCt4RGlmZik7CiAgICAgICAgICAgICAgIGNoaWxkLnNldEF0dHJpYnV0ZSgneScsIHl5 K3lEaWZmKTsgICAgICAgICAKICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgIH0gICAKICAg fQogICAKICAgCiAgIAogICBdXT48L3NjcmlwdD4KCjwvc3ZnPg== 20211 2008-03-30 03:38:42 -0700 2008-03-30 04:26:56 -0700 First attempt 17633.diff text/plain 9103 rwlbuis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMTQzOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDgtMDMtMzAgIFJvYiBCdWlzICA8YnVpc0BrZGUub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHA6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjMzCisgICAgICAgIFNWRzogbW9kaWZ5aW5n IHggJiB5IGF0dHJpYnV0ZSBvZiB0ZXh0IGVsZW1lbnQgZnJvbSBKUyBmYWlscworCisgICAgICAg IE1ha2UgU1ZHIHRleHQgcmVsYXlvdXQgd2hlbiB4LCB5IGF0dHJpYnV0ZSBpcyBjaGFuZ2VkIGZy b20ganMuCisKKyAgICAgICAgKiBzdmcvU1ZHVGV4dENvbnRlbnRFbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNWR1RleHRDb250ZW50RWxlbWVudDo6aXNLbm93bkF0dHJpYnV0ZSk6Cisg ICAgICAgICogc3ZnL1NWR1RleHRDb250ZW50RWxlbWVudC5oOgorICAgICAgICAqIHN2Zy9TVkdU ZXh0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdUZXh0RWxlbWVudDo6c3ZnQXR0 cmlidXRlQ2hhbmdlZCk6CisgICAgICAgICogc3ZnL1NWR1RleHRFbGVtZW50Lmg6CisgICAgICAg ICogc3ZnL1NWR1RleHRQb3NpdGlvbmluZ0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U1ZHVGV4dFBvc2l0aW9uaW5nRWxlbWVudDo6aXNLbm93bkF0dHJpYnV0ZSk6CisgICAgICAgICog c3ZnL1NWR1RleHRQb3NpdGlvbmluZ0VsZW1lbnQuaDoKKwogMjAwOC0wMy0yOCAgTWFjaWVqIFN0 YWNob3dpYWsgIDxtanNAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlci4K SW5kZXg6IFdlYkNvcmUvc3ZnL1NWR1RleHRDb250ZW50RWxlbWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9zdmcvU1ZHVGV4dENvbnRlbnRFbGVtZW50LmNwcAkocmV2aXNpb24gMzE0Mzkp CisrKyBXZWJDb3JlL3N2Zy9TVkdUZXh0Q29udGVudEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xLDYgKzEsNiBAQAogLyoKICAgICBDb3B5cmlnaHQgKEMpIDIwMDQsIDIwMDUsIDIwMDcs IDIwMDggTmlrb2xhcyBaaW1tZXJtYW5uIDx6aW1tZXJtYW5uQGtkZS5vcmc+Ci0gICAgICAgICAg ICAgICAgICAyMDA0LCAyMDA1LCAyMDA2LCAyMDA3IFJvYiBCdWlzIDxidWlzQGtkZS5vcmc+Cisg ICAgICAgICAgICAgICAgICAyMDA0LCAyMDA1LCAyMDA2LCAyMDA3LCAyMDA4IFJvYiBCdWlzIDxi dWlzQGtkZS5vcmc+CiAKICAgICBUaGlzIGZpbGUgaXMgcGFydCBvZiB0aGUgS0RFIHByb2plY3QK IApAQCAtNTA5LDYgKzUwOSwxNiBAQCB2b2lkIFNWR1RleHRDb250ZW50RWxlbWVudDo6cGFyc2VN YXBwZWRBCiAgICAgfQogfQogCitib29sIFNWR1RleHRDb250ZW50RWxlbWVudDo6aXNLbm93bkF0 dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBhdHRyTmFtZSkKK3sKKyAgICByZXR1cm4gKGF0 dHJOYW1lLm1hdGNoZXMoU1ZHTmFtZXM6Omxlbmd0aEFkanVzdEF0dHIpIHx8CisgICAgICAgICAg ICBhdHRyTmFtZS5tYXRjaGVzKFNWR05hbWVzOjp0ZXh0TGVuZ3RoQXR0cikgfHwKKyAgICAgICAg ICAgIFNWR1Rlc3RzOjppc0tub3duQXR0cmlidXRlKGF0dHJOYW1lKSB8fAorICAgICAgICAgICAg U1ZHTGFuZ1NwYWNlOjppc0tub3duQXR0cmlidXRlKGF0dHJOYW1lKSB8fAorICAgICAgICAgICAg U1ZHRXh0ZXJuYWxSZXNvdXJjZXNSZXF1aXJlZDo6aXNLbm93bkF0dHJpYnV0ZShhdHRyTmFtZSkg fHwKKyAgICAgICAgICAgIFNWR1N0eWxlZEVsZW1lbnQ6OmlzS25vd25BdHRyaWJ1dGUoYXR0ck5h bWUpKTsKK30KKwogfQogCiAjZW5kaWYgLy8gRU5BQkxFKFNWRykKSW5kZXg6IFdlYkNvcmUvc3Zn L1NWR1RleHRDb250ZW50RWxlbWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3ZnL1NWR1Rl eHRDb250ZW50RWxlbWVudC5oCShyZXZpc2lvbiAzMTQzOSkKKysrIFdlYkNvcmUvc3ZnL1NWR1Rl eHRDb250ZW50RWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsNiBAQAogLyoKICAg ICBDb3B5cmlnaHQgKEMpIDIwMDQsIDIwMDUsIDIwMDggTmlrb2xhcyBaaW1tZXJtYW5uIDx6aW1t ZXJtYW5uQGtkZS5vcmc+Ci0gICAgICAgICAgICAgICAgICAyMDA0LCAyMDA1LCAyMDA2IFJvYiBC dWlzIDxidWlzQGtkZS5vcmc+CisgICAgICAgICAgICAgICAgICAyMDA0LCAyMDA1LCAyMDA2LCAy MDA4IFJvYiBCdWlzIDxidWlzQGtkZS5vcmc+CiAKICAgICBUaGlzIGZpbGUgaXMgcGFydCBvZiB0 aGUgS0RFIHByb2plY3QKIApAQCAtNjEsNiArNjEsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK ICAgICAgICAgdmlydHVhbCB2b2lkIHBhcnNlTWFwcGVkQXR0cmlidXRlKE1hcHBlZEF0dHJpYnV0 ZSopOwogCisgICAgICAgIGJvb2wgaXNLbm93bkF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1l Jik7CisKICAgICBwcml2YXRlOgogICAgICAgICBBTklNQVRFRF9QUk9QRVJUWV9GT1JXQVJEX0RF Q0xBUkFUSU9OUyhTVkdFeHRlcm5hbFJlc291cmNlc1JlcXVpcmVkLCBib29sLCBFeHRlcm5hbFJl c291cmNlc1JlcXVpcmVkLCBleHRlcm5hbFJlc291cmNlc1JlcXVpcmVkKQogCkluZGV4OiBXZWJD b3JlL3N2Zy9TVkdUZXh0RWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdmcvU1ZH VGV4dEVsZW1lbnQuY3BwCShyZXZpc2lvbiAzMTQzOSkKKysrIFdlYkNvcmUvc3ZnL1NWR1RleHRF bGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw2ICsxLDYgQEAKIC8qCiAgICAgQ29weXJp Z2h0IChDKSAyMDA0LCAyMDA1LCAyMDA3LCAyMDA4IE5pa29sYXMgWmltbWVybWFubiA8emltbWVy bWFubkBrZGUub3JnPgotICAgICAgICAgICAgICAgICAgMjAwNCwgMjAwNSwgMjAwNiBSb2IgQnVp cyA8YnVpc0BrZGUub3JnPgorICAgICAgICAgICAgICAgICAgMjAwNCwgMjAwNSwgMjAwNiwgMjAw OCBSb2IgQnVpcyA8YnVpc0BrZGUub3JnPgogCiAgICAgVGhpcyBmaWxlIGlzIHBhcnQgb2YgdGhl IEtERSBwcm9qZWN0CiAKQEAgLTExMyw2ICsxMTMsMTcgQEAgYm9vbCBTVkdUZXh0RWxlbWVudDo6 Y2hpbGRTaG91bGRDcmVhdGVSZQogICAgIHJldHVybiBmYWxzZTsKIH0KIAordm9pZCBTVkdUZXh0 RWxlbWVudDo6c3ZnQXR0cmlidXRlQ2hhbmdlZChjb25zdCBRdWFsaWZpZWROYW1lJiBhdHRyTmFt ZSkKK3sKKyAgICBTVkdUZXh0UG9zaXRpb25pbmdFbGVtZW50OjpzdmdBdHRyaWJ1dGVDaGFuZ2Vk KGF0dHJOYW1lKTsKKworICAgIGlmICghcmVuZGVyZXIoKSkKKyAgICAgICAgcmV0dXJuOworCisg ICAgaWYgKFNWR1RleHRQb3NpdGlvbmluZ0VsZW1lbnQ6OmlzS25vd25BdHRyaWJ1dGUoYXR0ck5h bWUpKQorICAgICAgICByZW5kZXJlcigpLT5zZXROZWVkc0xheW91dCh0cnVlKTsKK30KKwogfQog CiAjZW5kaWYgLy8gRU5BQkxFKFNWRykKSW5kZXg6IFdlYkNvcmUvc3ZnL1NWR1RleHRFbGVtZW50 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdmcvU1ZHVGV4dEVsZW1lbnQuaAkocmV2aXNpb24g MzE0MzkpCisrKyBXZWJDb3JlL3N2Zy9TVkdUZXh0RWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBA IC0xLDYgKzEsNiBAQAogLyoKICAgICBDb3B5cmlnaHQgKEMpIDIwMDQsIDIwMDUsIDIwMDggTmlr b2xhcyBaaW1tZXJtYW5uIDx6aW1tZXJtYW5uQGtkZS5vcmc+Ci0gICAgICAgICAgICAgICAgICAy MDA0LCAyMDA1LCAyMDA2IFJvYiBCdWlzIDxidWlzQGtkZS5vcmc+CisgICAgICAgICAgICAgICAg ICAyMDA0LCAyMDA1LCAyMDA2LCAyMDA4IFJvYiBCdWlzIDxidWlzQGtkZS5vcmc+CiAKICAgICBU aGlzIGZpbGUgaXMgcGFydCBvZiB0aGUgS0RFIHByb2plY3QKIApAQCAtNDgsNiArNDgsOCBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgUmVuZGVyT2JqZWN0KiBjcmVhdGVS ZW5kZXJlcihSZW5kZXJBcmVuYSosIFJlbmRlclN0eWxlKik7CiAgICAgICAgIHZpcnR1YWwgYm9v bCBjaGlsZFNob3VsZENyZWF0ZVJlbmRlcmVyKE5vZGUqKSBjb25zdDsKICAgICAgICAgICAgICAg ICAKKyAgICAgICAgdmlydHVhbCB2b2lkIHN2Z0F0dHJpYnV0ZUNoYW5nZWQoY29uc3QgUXVhbGlm aWVkTmFtZSYpOworCiAgICAgcHJvdGVjdGVkOgogICAgICAgICB2aXJ0dWFsIGNvbnN0IFNWR0Vs ZW1lbnQqIGNvbnRleHRFbGVtZW50KCkgY29uc3QgeyByZXR1cm4gdGhpczsgfQogCkluZGV4OiBX ZWJDb3JlL3N2Zy9TVkdUZXh0UG9zaXRpb25pbmdFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3N2Zy9TVkdUZXh0UG9zaXRpb25pbmdFbGVtZW50LmNwcAkocmV2aXNpb24gMzE0Mzkp CisrKyBXZWJDb3JlL3N2Zy9TVkdUZXh0UG9zaXRpb25pbmdFbGVtZW50LmNwcAkod29ya2luZyBj b3B5KQpAQCAtMSw2ICsxLDYgQEAKIC8qCiAgICAgQ29weXJpZ2h0IChDKSAyMDA0LCAyMDA1LCAy MDA4IE5pa29sYXMgWmltbWVybWFubiA8emltbWVybWFubkBrZGUub3JnPgotICAgICAgICAgICAg ICAgICAgMjAwNCwgMjAwNSwgMjAwNiwgMjAwNyBSb2IgQnVpcyA8YnVpc0BrZGUub3JnPgorICAg ICAgICAgICAgICAgICAgMjAwNCwgMjAwNSwgMjAwNiwgMjAwNywgMjAwOCBSb2IgQnVpcyA8YnVp c0BrZGUub3JnPgogCiAgICAgVGhpcyBmaWxlIGlzIHBhcnQgb2YgdGhlIEtERSBwcm9qZWN0CiAK QEAgLTY3LDYgKzY3LDE2IEBAIHZvaWQgU1ZHVGV4dFBvc2l0aW9uaW5nRWxlbWVudDo6cGFyc2VN YXAKICAgICAgICAgU1ZHVGV4dENvbnRlbnRFbGVtZW50OjpwYXJzZU1hcHBlZEF0dHJpYnV0ZShh dHRyKTsKIH0KIAorYm9vbCBTVkdUZXh0UG9zaXRpb25pbmdFbGVtZW50Ojppc0tub3duQXR0cmli dXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIGF0dHJOYW1lKQoreworICAgIHJldHVybiAoYXR0ck5h bWUubWF0Y2hlcyhTVkdOYW1lczo6eEF0dHIpIHx8CisgICAgICAgICAgICBhdHRyTmFtZS5tYXRj aGVzKFNWR05hbWVzOjp5QXR0cikgfHwKKyAgICAgICAgICAgIGF0dHJOYW1lLm1hdGNoZXMoU1ZH TmFtZXM6OmR4QXR0cikgfHwKKyAgICAgICAgICAgIGF0dHJOYW1lLm1hdGNoZXMoU1ZHTmFtZXM6 OmR5QXR0cikgfHwKKyAgICAgICAgICAgIGF0dHJOYW1lLm1hdGNoZXMoU1ZHTmFtZXM6OnJvdGF0 ZUF0dHIpIHx8CisgICAgICAgICAgICBTVkdUZXh0Q29udGVudEVsZW1lbnQ6OmlzS25vd25BdHRy aWJ1dGUoYXR0ck5hbWUpKTsKK30KKwogfQogCiAjZW5kaWYgLy8gRU5BQkxFKFNWRykKSW5kZXg6 IFdlYkNvcmUvc3ZnL1NWR1RleHRQb3NpdGlvbmluZ0VsZW1lbnQuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3N2Zy9TVkdUZXh0UG9zaXRpb25pbmdFbGVtZW50LmgJKHJldmlzaW9uIDMxNDM5KQor KysgV2ViQ29yZS9zdmcvU1ZHVGV4dFBvc2l0aW9uaW5nRWxlbWVudC5oCSh3b3JraW5nIGNvcHkp CkBAIC0xLDYgKzEsNiBAQAogLyoKICAgICBDb3B5cmlnaHQgKEMpIDIwMDQsIDIwMDUsIDIwMDgg Tmlrb2xhcyBaaW1tZXJtYW5uIDx6aW1tZXJtYW5uQGtkZS5vcmc+Ci0gICAgICAgICAgICAgICAg ICAyMDA0LCAyMDA1LCAyMDA2IFJvYiBCdWlzIDxidWlzQGtkZS5vcmc+CisgICAgICAgICAgICAg ICAgICAyMDA0LCAyMDA1LCAyMDA2LCAyMDA4IFJvYiBCdWlzIDxidWlzQGtkZS5vcmc+CiAKICAg ICBUaGlzIGZpbGUgaXMgcGFydCBvZiB0aGUgS0RFIHByb2plY3QKIApAQCAtMzgsNiArMzgsOCBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgdmlydHVhbCB2b2lkIHBhcnNlTWFwcGVk QXR0cmlidXRlKE1hcHBlZEF0dHJpYnV0ZSopOwogCisgICAgICAgIGJvb2wgaXNLbm93bkF0dHJp YnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJik7CisKICAgICBwcml2YXRlOgogICAgICAgICBBTklN QVRFRF9QUk9QRVJUWV9ERUNMQVJBVElPTlMoU1ZHVGV4dFBvc2l0aW9uaW5nRWxlbWVudCwgU1ZH TGVuZ3RoTGlzdCosIFJlZlB0cjxTVkdMZW5ndGhMaXN0PiwgWCwgeCkKICAgICAgICAgQU5JTUFU RURfUFJPUEVSVFlfREVDTEFSQVRJT05TKFNWR1RleHRQb3NpdGlvbmluZ0VsZW1lbnQsIFNWR0xl bmd0aExpc3QqLCBSZWZQdHI8U1ZHTGVuZ3RoTGlzdD4sIFksIHkpCkluZGV4OiBMYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lv biAzMTQzOSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDA4LTAzLTMwICBSb2IgQnVpcyAgPGJ1aXNAa2RlLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0Y2FzZSBmb3I6Cisg ICAgICAgIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjMzCisgICAg ICAgIFNWRzogbW9kaWZ5aW5nIHggJiB5IGF0dHJpYnV0ZSBvZiB0ZXh0IGVsZW1lbnQgZnJvbSBK UyBmYWlscworCisgICAgICAgICogc3ZnL2N1c3RvbS90ZXh0LXh5LXVwZGF0ZXMtZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBzdmcvY3VzdG9tL3RleHQteHktdXBkYXRlcy5zdmc6IEFk ZGVkLgorCiAyMDA4LTAzLTI5ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQnJhZHkgRWlkc29uLgpJbmRleDogTGF5b3V0VGVzdHMvc3ZnL2N1c3Rv bS90ZXh0LXh5LXVwZGF0ZXMtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L3N2Zy9jdXN0b20vdGV4dC14eS11cGRhdGVzLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysr IExheW91dFRlc3RzL3N2Zy9jdXN0b20vdGV4dC14eS11cGRhdGVzLWV4cGVjdGVkLnR4dAkocmV2 aXNpb24gMCkKQEAgLTAsMCArMSwxMCBAQAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisg IFJlbmRlclZpZXcgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCitsYXllciBhdCAoMCwwKSBzaXplIDgw MHg2MDAKKyAgUmVuZGVyU1ZHUm9vdCB7c3ZnfSBhdCAoLTEwLC0yNCkgc2l6ZSAxNTN4MTI4Cisg ICAgUmVuZGVyU1ZHVGV4dCB7dGV4dH0gYXQgKDEwMCwxMDApIHNpemUgNDN4MTggY29udGFpbnMg MSBjaHVuayhzKQorICAgICAgUmVuZGVyU1ZHSW5saW5lVGV4dCB7I3RleHR9IGF0ICgwLC0xNCkg c2l6ZSA0M3gxOAorICAgICAgICBjaHVuayAxIHRleHQgcnVuIDEgYXQgKDEwMC4wMCwxMDAuMDAp IHN0YXJ0T2Zmc2V0IDAgZW5kT2Zmc2V0IDYgd2lkdGggNDMuMDA6ICJQYXNzZWQiCisgICAgUmVu ZGVyU1ZHVGV4dCB7dGV4dH0gYXQgKC0xMCwtMTApIHNpemUgMzl4MTkgY29udGFpbnMgMSBjaHVu ayhzKQorICAgICAgUmVuZGVyU1ZHSW5saW5lVGV4dCB7I3RleHR9IGF0ICgwLC0xNCkgc2l6ZSAz OXgxOQorICAgICAgICBjaHVuayAxIHRleHQgcnVuIDEgYXQgKC0xMC4wMCwtMTAuMDApIHN0YXJ0 T2Zmc2V0IDAgZW5kT2Zmc2V0IDYgd2lkdGggMzkuMDA6ICJGYWlsZWQiCkluZGV4OiBMYXlvdXRU ZXN0cy9zdmcvY3VzdG9tL3RleHQteHktdXBkYXRlcy5zdmcKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvc3ZnL2N1c3RvbS90ZXh0LXh5LXVwZGF0ZXMuc3ZnCShyZXZpc2lvbiAwKQorKysgTGF5 b3V0VGVzdHMvc3ZnL2N1c3RvbS90ZXh0LXh5LXVwZGF0ZXMuc3ZnCShyZXZpc2lvbiAwKQpAQCAt MCwwICsxLDE5IEBACis8P3htbCB2ZXJzaW9uPSIxLjAiIHN0YW5kYWxvbmU9Im5vIj8+Cis8IURP Q1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMSBCYXNpYy8vRU4iICJodHRwOi8v d3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS1iYXNpYy5kdGQiPgorPHN2ZyB2 ZXJzaW9uPSIxLjEiIGJhc2VQcm9maWxlPSJiYXNpYyIgaWQ9InN2Zy1yb290IiB3aWR0aD0iMTAw JSIgaGVpZ2h0PSIxMDAlIiAKKyAgICAgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5 OTkveGxpbmsiCisgICAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgb25sb2Fk PSJteXRlc3QoKSI+CisgICAgPHNjcmlwdD4KKyAgICAgCWZ1bmN0aW9uIG15dGVzdCgpIHsKKyAg ICAgICAgICAgIHZhciBteVRleHQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicGFzc2VkIik7 CisgICAgICAgICAgICBteVRleHQuc2V0QXR0cmlidXRlKCJ4IiwgIjEwMCIpOworICAgICAgICAg ICAgbXlUZXh0LnNldEF0dHJpYnV0ZSgieSIsICIxMDAiKTsKKyAgICAgICAgICAgIG15VGV4dCA9 IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJmYWlsZWQiKTsKKyAgICAgICAgICAgIG15VGV4dC5z ZXRBdHRyaWJ1dGUoIngiLCAiLTEwIik7CisgICAgICAgICAgICBteVRleHQuc2V0QXR0cmlidXRl KCJ5IiwgIi0xMCIpOworICAgICAJfQorICAgIDwvc2NyaXB0PgorICAgIDx0ZXh0IHg9Ii0xMCIg eT0iLTEwIiBpZD0icGFzc2VkIj5QYXNzZWQ8L3RleHQ+CisgICAgPHRleHQgeD0iMTAwIiB5PSIx MDAiIGlkPSJmYWlsZWQiPkZhaWxlZDwvdGV4dD4KKzwvc3ZnPgorCg==