76931 2012-01-24 12:36:32 -0800 RenderSVGShape::strokeContains will fail for some strokes 2012-02-07 04:19:45 -0800 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 71820 77964 1 schenney schenney krit rwlbuis schenney webkit.review.bot zimmermann oldest_to_newest 541564 0 schenney 2012-01-24 12:36:32 -0800 The method RenderSVGShape::strokeContains has a special case for zero-length-subpaths, and this only handles square end caps. It will give incorrect results for round endcaps on zero-length subpaths. 541667 1 krit 2012-01-24 14:03:51 -0800 Adding Rob who initially worked on zero-length-subpaths and line styles. 550266 2 125705 schenney 2012-02-06 14:05:26 -0800 Created attachment 125705 Patch A simple fix for this issue and test cases. 550375 3 125705 darin 2012-02-06 15:56:06 -0800 Comment on attachment 125705 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125705&action=review > LayoutTests/svg/hittest/zero-length-butt-cap-path-expected.txt:1 > +PASSED; PASSED; PASSED; PASSED; PASSED; PASSED; PASSED; PASSED; Test output is a little cryptic. Tests that make it clear in the output what they are testing are even better. > LayoutTests/svg/hittest/zero-length-butt-cap-path-expected.txt:6 > Added: svn:eol-style > + LF We normally use eol-style native instead of LF. Not sure why you’re doing it differently on these files. 550385 4 125705 schenney 2012-02-06 16:10:44 -0800 Comment on attachment 125705 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125705&action=review >> LayoutTests/svg/hittest/zero-length-butt-cap-path-expected.txt:1 >> +PASSED; PASSED; PASSED; PASSED; PASSED; PASSED; PASSED; PASSED; > > Test output is a little cryptic. Tests that make it clear in the output what they are testing are even better. I agree. I was uncertain about the balance of more JS code to construct good test output, vs test compactness. I'll play around with making things clearer, possibly converting all of the svg/hittest tests to use the JS test harnesses that other svg content uses. >> LayoutTests/svg/hittest/zero-length-butt-cap-path-expected.txt:6 >> + LF > > We normally use eol-style native instead of LF. Not sure why you’re doing it differently on these files. Probably just the result of editing in vim on linux. I didn't do anything special at all, or maybe it's a result of copying a problematic existing file as a starting point. 550452 5 125705 webkit.review.bot 2012-02-06 17:31:06 -0800 Comment on attachment 125705 Patch Clearing flags on attachment: 125705 Committed r106882: <http://trac.webkit.org/changeset/106882> 550453 6 webkit.review.bot 2012-02-06 17:31:16 -0800 All reviewed patches have been landed. Closing bug. 125705 2012-02-06 14:05:26 -0800 2012-02-06 17:31:06 -0800 Patch bug-76931-20120206170525.patch text/plain 14894 schenney SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNjg0NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAyLTA2ICBTdGVwaGVu IENoZW5uZXkgIDxzY2hlbm5leUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVuZGVyU1ZHU2hh cGU6OnN0cm9rZUNvbnRhaW5zIHdpbGwgZmFpbCBmb3Igc29tZSBzdHJva2VzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjkzMQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGluZyBzdXBwb3J0IGZvciBy b3VuZGVkIHplcm8tbGVuZ3RoIGVuZGNhcHMgZm9yIFNWRyBwYXRoIGhpdAorICAgICAgICB0ZXN0 aW5nLgorCisgICAgICAgIFRlc3RzOiBzdmcvaGl0dGVzdC96ZXJvLWxlbmd0aC1idXR0LWNhcC1w YXRoLnhodG1sCisgICAgICAgICAgICAgICBzdmcvaGl0dGVzdC96ZXJvLWxlbmd0aC1yb3VuZC1j YXAtcGF0aC54aHRtbAorICAgICAgICAgICAgICAgc3ZnL2hpdHRlc3QvemVyby1sZW5ndGgtc3F1 YXJlLWNhcC1wYXRoLnhodG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1No YXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1NoYXBlOjpzdHJva2VDb250YWlu cyk6CisKIDIwMTItMDItMDYgIEthbGV2IExlbWJlciAgPGthbGV2bGVtYmVyQGdtYWlsLmNvbT4K IAogICAgICAgICBbR1RLXSBBZGQgbWlzc2luZyBwYW5nbyBpbmNsdWRlIGRpciB0byBmaXggYnVp bGQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHU2hhcGUuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHU2hh cGUuY3BwCShyZXZpc2lvbiAxMDY4MzgpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1JlbmRlclNWR1NoYXBlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM2LDEzICsxMzYsMjEgQEAg Ym9vbCBSZW5kZXJTVkdTaGFwZTo6c3Ryb2tlQ29udGFpbnMoY29ucwogICAgIGlmIChyZXF1aXJl c1N0cm9rZSAmJiAhUmVuZGVyU1ZHUmVzb3VyY2U6OnN0cm9rZVBhaW50aW5nUmVzb3VyY2UodGhp cywgc3R5bGUoKSwgZmFsbGJhY2tDb2xvcikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAg IC8vIEZJWE1FOiBUaGlzIGlzIG5vdCBjb3JyZWN0IGZvciByb3VuZCBsaW5lY2Fwcy4gaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2OTMxCisgICAgY29uc3QgU1ZHUmVu ZGVyU3R5bGUqIHN2Z1N0eWxlID0gc3R5bGUoKS0+c3ZnU3R5bGUoKTsKICAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IG1femVyb0xlbmd0aExpbmVjYXBMb2NhdGlvbnMuc2l6ZSgpOyArK2kpIHsK LSAgICAgICAgaWYgKHplcm9MZW5ndGhTdWJwYXRoUmVjdChtX3plcm9MZW5ndGhMaW5lY2FwTG9j YXRpb25zW2ldLCB0aGlzLT5zdHJva2VXaWR0aCgpKS5jb250YWlucyhwb2ludCkpCi0gICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgQVNTRVJUKHN0eWxlKCktPnN2Z1N0eWxlKCktPmhh c1N0cm9rZSgpKTsKKyAgICAgICAgZmxvYXQgc3Ryb2tlV2lkdGggPSB0aGlzLT5zdHJva2VXaWR0 aCgpOworICAgICAgICBpZiAoc3R5bGUoKS0+c3ZnU3R5bGUoKS0+Y2FwU3R5bGUoKSA9PSBTcXVh cmVDYXApIHsKKyAgICAgICAgICAgIGlmICh6ZXJvTGVuZ3RoU3VicGF0aFJlY3QobV96ZXJvTGVu Z3RoTGluZWNhcExvY2F0aW9uc1tpXSwgc3Ryb2tlV2lkdGgpLmNvbnRhaW5zKHBvaW50KSkKKyAg ICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAg IEFTU0VSVChzdHlsZSgpLT5zdmdTdHlsZSgpLT5jYXBTdHlsZSgpID09IFJvdW5kQ2FwKTsKKyAg ICAgICAgICAgIEZsb2F0UG9pbnQgcmFkaXVzVmVjdG9yKHBvaW50LngoKSAtIG1femVyb0xlbmd0 aExpbmVjYXBMb2NhdGlvbnNbaV0ueCgpLCBwb2ludC55KCkgLSAgbV96ZXJvTGVuZ3RoTGluZWNh cExvY2F0aW9uc1tpXS55KCkpOworICAgICAgICAgICAgaWYgKHJhZGl1c1ZlY3Rvci5sZW5ndGhT cXVhcmVkKCkgPCBzdHJva2VXaWR0aCAqIHN0cm9rZVdpZHRoICogLjI1ZikKKyAgICAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQogICAgIH0KIAotICAgIGNvbnN0IFNWR1JlbmRl clN0eWxlKiBzdmdTdHlsZSA9IHN0eWxlKCktPnN2Z1N0eWxlKCk7CiAgICAgaWYgKCFzdmdTdHls ZS0+c3Ryb2tlRGFzaEFycmF5KCkuaXNFbXB0eSgpIHx8IHN2Z1N0eWxlLT5zdHJva2VNaXRlckxp bWl0KCkgIT0gc3ZnU3R5bGUtPmluaXRpYWxTdHJva2VNaXRlckxpbWl0KCkKICAgICAgICAgfHwg c3ZnU3R5bGUtPmpvaW5TdHlsZSgpICE9IHN2Z1N0eWxlLT5pbml0aWFsSm9pblN0eWxlKCkgfHwg c3ZnU3R5bGUtPmNhcFN0eWxlKCkgIT0gc3ZnU3R5bGUtPmluaXRpYWxDYXBTdHlsZSgpIHx8IHN0 YXRpY19jYXN0PFNWR0VsZW1lbnQqPihub2RlKCkpLT5pc1N0eWxlZCgpKSB7CiAgICAgICAgIGlm ICghbV9wYXRoKQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTA2ODQ3KQorKysgTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTItMDItMDYgIFN0ZXBo ZW4gQ2hlbm5leSAgPHNjaGVubmV5QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW5kZXJTVkdT aGFwZTo6c3Ryb2tlQ29udGFpbnMgd2lsbCBmYWlsIGZvciBzb21lIHN0cm9rZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2OTMxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmV3IHRlc3RzIGZvciBoaXQg dGVzdGluZyBhZ2FpbnN0IGFuIFNWRyBwYXRoIG9mIHplcm8gbGVuZ3RoIHdpdGgKKyAgICAgICAg ZW5kY2Fwcy4KKworICAgICAgICAqIHN2Zy9oaXR0ZXN0L3plcm8tbGVuZ3RoLWJ1dHQtY2FwLXBh dGgtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBzdmcvaGl0dGVzdC96ZXJvLWxlbmd0 aC1idXR0LWNhcC1wYXRoLnhodG1sOiBBZGRlZC4KKyAgICAgICAgKiBzdmcvaGl0dGVzdC96ZXJv LWxlbmd0aC1yb3VuZC1jYXAtcGF0aC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHN2 Zy9oaXR0ZXN0L3plcm8tbGVuZ3RoLXJvdW5kLWNhcC1wYXRoLnhodG1sOiBBZGRlZC4KKyAgICAg ICAgKiBzdmcvaGl0dGVzdC96ZXJvLWxlbmd0aC1zcXVhcmUtY2FwLXBhdGgtZXhwZWN0ZWQudHh0 OiBBZGRlZC4KKyAgICAgICAgKiBzdmcvaGl0dGVzdC96ZXJvLWxlbmd0aC1zcXVhcmUtY2FwLXBh dGgueGh0bWw6IEFkZGVkLgorCiAyMDEyLTAyLTA2ICBKdWxpZW4gQ2hhZmZyYWl4ICA8amNoYWZm cmFpeEB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgcmViYXNlbGluZSBhZnRlciBy MTA2ODM2LgpJbmRleDogTGF5b3V0VGVzdHMvc3ZnL2hpdHRlc3QvemVyby1sZW5ndGgtYnV0dC1j YXAtcGF0aC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvc3ZnL2hpdHRl c3QvemVyby1sZW5ndGgtYnV0dC1jYXAtcGF0aC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisr KyBMYXlvdXRUZXN0cy9zdmcvaGl0dGVzdC96ZXJvLWxlbmd0aC1idXR0LWNhcC1wYXRoLWV4cGVj dGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSBAQAorUEFTU0VEOyBQQVNTRUQ7IFBBU1NF RDsgUEFTU0VEOyBQQVNTRUQ7IFBBU1NFRDsgUEFTU0VEOyBQQVNTRUQ7CgpQcm9wZXJ0eSBjaGFu Z2VzIG9uOiBMYXlvdXRUZXN0cy9zdmcvaGl0dGVzdC96ZXJvLWxlbmd0aC1idXR0LWNhcC1wYXRo LWV4cGVjdGVkLnR4dApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBzdm46ZW9sLXN0eWxlCiAgICsgTEYKCklu ZGV4OiBMYXlvdXRUZXN0cy9zdmcvaGl0dGVzdC96ZXJvLWxlbmd0aC1idXR0LWNhcC1wYXRoLnho dG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3N2Zy9oaXR0ZXN0L3plcm8tbGVuZ3RoLWJ1 dHQtY2FwLXBhdGgueGh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9zdmcvaGl0dGVz dC96ZXJvLWxlbmd0aC1idXR0LWNhcC1wYXRoLnhodG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsx LDU3IEBACis8aHRtbCB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMTk5OS94aHRtbCc+CisgIDxo ZWFkPgorICAgIDxzdHlsZT4KKyAgICAgIGJvZHkgeworICAgICAgICAgIG1hcmdpbjogMHB4Owor ICAgICAgICAgIHBhZGRpbmc6IDBweDsKKyAgICAgICAgICBib3JkZXI6IDFweCBzb2xpZCBibGFj azsKKyAgICAgIH0KKyAgICA8L3N0eWxlPgorICA8L2hlYWQ+CisgIDxib2R5PgorICAgIDxzdmcg aWQ9ImJhY2tncm91bmQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9 IjEwMCIgaGVpZ2h0PSIxMDAiPgorICAgICAgPHBhdGggaWQ9InNxdWFyZSIgZD0nTTUwLDUwIHon IHN0cm9rZT0nZ3JlZW4nIHN0cm9rZS13aWR0aD0nMTAwJyBzdHJva2UtbGluZWNhcD0nYnV0dCcv PgorICAgIDwvc3ZnPgorICAgIDxzY3JpcHQ+PCFbQ0RBVEFbCisgICAgICBpZiAod2luZG93Lmxh eW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgICAgIHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxl ci5kdW1wQXNUZXh0KCk7CisgICAgICB9CisKKyAgICAgIHZhciByZXN1bHRTdHJpbmcgPSAiIjsK KworICAgICAgdmFyIGhpdEVsZW1lbnRFeHBlY3RlZDEgPSBkb2N1bWVudC5lbGVtZW50RnJvbVBv aW50KDUsIDUwKTsKKyAgICAgIHZhciBoaXRTdWNjZXNzMSA9IGhpdEVsZW1lbnRFeHBlY3RlZDEg JiYgaGl0RWxlbWVudEV4cGVjdGVkMSA9PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYmFja2dy b3VuZCIpOworICAgICAgcmVzdWx0U3RyaW5nICs9IGhpdFN1Y2Nlc3MxID8gIlBBU1NFRDsgIiA6 ICJGQUlMLCBoaXQgIiArIGhpdEVsZW1lbnRFeHBlY3RlZDEgKyAiIEAgNSwgNTA7ICI7CisKKyAg ICAgIHZhciBoaXRFbGVtZW50RXhwZWN0ZWQyID0gZG9jdW1lbnQuZWxlbWVudEZyb21Qb2ludCg5 NSwgNTApOworICAgICAgdmFyIGhpdFN1Y2Nlc3MyID0gaGl0RWxlbWVudEV4cGVjdGVkMiAmJiBo aXRFbGVtZW50RXhwZWN0ZWQyID09IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJiYWNrZ3JvdW5k Iik7CisgICAgICByZXN1bHRTdHJpbmcgKz0gaGl0U3VjY2VzczIgPyAiUEFTU0VEOyAiIDogIkZB SUwsIGhpdCAiICsgaGl0RWxlbWVudEV4cGVjdGVkMiArICIgQCA5NSwgNTA7ICI7CisKKyAgICAg IHZhciBoaXRFbGVtZW50RXhwZWN0ZWQzID0gZG9jdW1lbnQuZWxlbWVudEZyb21Qb2ludCg1MCwg NSk7CisgICAgICB2YXIgaGl0U3VjY2VzczMgPSBoaXRFbGVtZW50RXhwZWN0ZWQzICYmIGhpdEVs ZW1lbnRFeHBlY3RlZDMgPT0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImJhY2tncm91bmQiKTsK KyAgICAgIHJlc3VsdFN0cmluZyArPSBoaXRTdWNjZXNzMyA/ICJQQVNTRUQ7ICIgOiAiRkFJTCwg aGl0ICIgKyBoaXRFbGVtZW50RXhwZWN0ZWQzICsgIiBAIDUwLCA1OyAiOworCisgICAgICB2YXIg aGl0RWxlbWVudEV4cGVjdGVkNCA9IGRvY3VtZW50LmVsZW1lbnRGcm9tUG9pbnQoNTAsIDk1KTsK KyAgICAgIHZhciBoaXRTdWNjZXNzNCA9IGhpdEVsZW1lbnRFeHBlY3RlZDQgJiYgaGl0RWxlbWVu dEV4cGVjdGVkNCA9PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYmFja2dyb3VuZCIpOworICAg ICAgcmVzdWx0U3RyaW5nICs9IGhpdFN1Y2Nlc3M0ID8gIlBBU1NFRDsgIiA6ICJGQUlMLCBoaXQg IiArIGhpdEVsZW1lbnRFeHBlY3RlZDQgKyAiIEAgNTAsIDk1OyAiOworCisgICAgICBoaXRFbGVt ZW50RXhwZWN0ZWQxID0gZG9jdW1lbnQuZWxlbWVudEZyb21Qb2ludCg1LCA1KTsKKyAgICAgIGhp dFN1Y2Nlc3MxID0gaGl0RWxlbWVudEV4cGVjdGVkMSAmJiBoaXRFbGVtZW50RXhwZWN0ZWQxID09 IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJiYWNrZ3JvdW5kIik7CisgICAgICByZXN1bHRTdHJp bmcgKz0gaGl0U3VjY2VzczEgPyAiUEFTU0VEOyAiIDogIkZBSUwsIGhpdCAiICsgaGl0RWxlbWVu dEV4cGVjdGVkMSArICIgQCA1LCA1OyAiOworCisgICAgICBoaXRFbGVtZW50RXhwZWN0ZWQyID0g ZG9jdW1lbnQuZWxlbWVudEZyb21Qb2ludCg5NSwgNSk7CisgICAgICBoaXRTdWNjZXNzMiA9IGhp dEVsZW1lbnRFeHBlY3RlZDIgJiYgaGl0RWxlbWVudEV4cGVjdGVkMiA9PSBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgiYmFja2dyb3VuZCIpOworICAgICAgcmVzdWx0U3RyaW5nICs9IGhpdFN1Y2Nl c3MyID8gIlBBU1NFRDsgIiA6ICJGQUlMLCBoaXQgIiArIGhpdEVsZW1lbnRFeHBlY3RlZDIgKyAi IEAgOTUsIDU7ICI7CisKKyAgICAgIGhpdEVsZW1lbnRFeHBlY3RlZDMgPSBkb2N1bWVudC5lbGVt ZW50RnJvbVBvaW50KDUsIDk1KTsKKyAgICAgIGhpdFN1Y2Nlc3MzID0gaGl0RWxlbWVudEV4cGVj dGVkMyAmJiBoaXRFbGVtZW50RXhwZWN0ZWQzID09IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJi YWNrZ3JvdW5kIik7CisgICAgICByZXN1bHRTdHJpbmcgKz0gaGl0U3VjY2VzczMgPyAiUEFTU0VE OyAiIDogIkZBSUwsIGhpdCAiICsgaGl0RWxlbWVudEV4cGVjdGVkMyArICIgQCA1LCA5NTsgIjsK KworICAgICAgaGl0RWxlbWVudEV4cGVjdGVkNCA9IGRvY3VtZW50LmVsZW1lbnRGcm9tUG9pbnQo OTUsIDk1KTsKKyAgICAgIGhpdFN1Y2Nlc3M0ID0gaGl0RWxlbWVudEV4cGVjdGVkNCAmJiBoaXRF bGVtZW50RXhwZWN0ZWQ0ID09IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJiYWNrZ3JvdW5kIik7 CisgICAgICByZXN1bHRTdHJpbmcgKz0gaGl0U3VjY2VzczQgPyAiUEFTU0VEOyAiIDogIkZBSUws IGhpdCAiICsgaGl0RWxlbWVudEV4cGVjdGVkNCArICIgQCA5NSwgOTU7ICI7CisKKyAgICAgIGRv Y3VtZW50LmJvZHkuaW5uZXJIVE1MID0gcmVzdWx0U3RyaW5nOworICAgIF1dPjwvc2NyaXB0Pgor ICA8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9zdmcvaGl0dGVzdC96ZXJvLWxl bmd0aC1yb3VuZC1jYXAtcGF0aC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvc3ZnL2hpdHRlc3QvemVyby1sZW5ndGgtcm91bmQtY2FwLXBhdGgtZXhwZWN0ZWQudHh0CShy ZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvc3ZnL2hpdHRlc3QvemVyby1sZW5ndGgtcm91bmQt Y2FwLXBhdGgtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxIEBACitQQVNTRUQ7 IFBBU1NFRDsgUEFTU0VEOyBQQVNTRUQ7IFBBU1NFRDsgUEFTU0VEOyBQQVNTRUQ7IFBBU1NFRDsK ClByb3BlcnR5IGNoYW5nZXMgb246IExheW91dFRlc3RzL3N2Zy9oaXR0ZXN0L3plcm8tbGVuZ3Ro LXJvdW5kLWNhcC1wYXRoLWV4cGVjdGVkLnR4dApfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBzdm46ZW9sLXN0 eWxlCiAgICsgTEYKCkluZGV4OiBMYXlvdXRUZXN0cy9zdmcvaGl0dGVzdC96ZXJvLWxlbmd0aC1y b3VuZC1jYXAtcGF0aC54aHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9zdmcvaGl0dGVz dC96ZXJvLWxlbmd0aC1yb3VuZC1jYXAtcGF0aC54aHRtbAkocmV2aXNpb24gMCkKKysrIExheW91 dFRlc3RzL3N2Zy9oaXR0ZXN0L3plcm8tbGVuZ3RoLXJvdW5kLWNhcC1wYXRoLnhodG1sCShyZXZp c2lvbiAwKQpAQCAtMCwwICsxLDU3IEBACis8aHRtbCB4bWxucz0naHR0cDovL3d3dy53My5vcmcv MTk5OS94aHRtbCc+CisgIDxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgIGJvZHkgeworICAgICAg ICAgIG1hcmdpbjogMHB4OworICAgICAgICAgIHBhZGRpbmc6IDBweDsKKyAgICAgICAgICBib3Jk ZXI6IDFweCBzb2xpZCBibGFjazsKKyAgICAgIH0KKyAgICA8L3N0eWxlPgorICA8L2hlYWQ+Cisg IDxib2R5PgorICAgIDxzdmcgaWQ9ImJhY2tncm91bmQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9y Zy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCIgaGVpZ2h0PSIxMDAiPgorICAgICAgPHBhdGggaWQ9ImNp cmNsZSIgZD0nTTUwLDUwIHonIHN0cm9rZT0nZ3JlZW4nIHN0cm9rZS13aWR0aD0nMTAwJyBzdHJv a2UtbGluZWNhcD0ncm91bmQnLz4KKyAgICA8L3N2Zz4KKyAgICA8c2NyaXB0PjwhW0NEQVRBWwor ICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgICAgICB3aW5kb3cu bGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgICAgfQorCisgICAgICB2YXIg cmVzdWx0U3RyaW5nID0gIiI7CisKKyAgICAgIHZhciBoaXRFbGVtZW50RXhwZWN0ZWQxID0gZG9j dW1lbnQuZWxlbWVudEZyb21Qb2ludCg1LCA1MCk7CisgICAgICB2YXIgaGl0U3VjY2VzczEgPSBo aXRFbGVtZW50RXhwZWN0ZWQxICYmIGhpdEVsZW1lbnRFeHBlY3RlZDEgPT0gZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoImNpcmNsZSIpOworICAgICAgcmVzdWx0U3RyaW5nICs9IGhpdFN1Y2Nlc3Mx ID8gIlBBU1NFRDsgIiA6ICJGQUlMLCBoaXQgIiArIGhpdEVsZW1lbnRFeHBlY3RlZDEgKyAiIEAg NSwgNTA7ICI7CisKKyAgICAgIHZhciBoaXRFbGVtZW50RXhwZWN0ZWQyID0gZG9jdW1lbnQuZWxl bWVudEZyb21Qb2ludCg5NSwgNTApOworICAgICAgdmFyIGhpdFN1Y2Nlc3MyID0gaGl0RWxlbWVu dEV4cGVjdGVkMiAmJiBoaXRFbGVtZW50RXhwZWN0ZWQyID09IGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJjaXJjbGUiKTsKKyAgICAgIHJlc3VsdFN0cmluZyArPSBoaXRTdWNjZXNzMiA/ICJQQVNT RUQ7ICIgOiAiRkFJTCwgaGl0ICIgKyBoaXRFbGVtZW50RXhwZWN0ZWQyICsgIiBAIDk1LCA1MDsg IjsKKworICAgICAgdmFyIGhpdEVsZW1lbnRFeHBlY3RlZDMgPSBkb2N1bWVudC5lbGVtZW50RnJv bVBvaW50KDUwLCA1KTsKKyAgICAgIHZhciBoaXRTdWNjZXNzMyA9IGhpdEVsZW1lbnRFeHBlY3Rl ZDMgJiYgaGl0RWxlbWVudEV4cGVjdGVkMyA9PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY2ly Y2xlIik7CisgICAgICByZXN1bHRTdHJpbmcgKz0gaGl0U3VjY2VzczMgPyAiUEFTU0VEOyAiIDog IkZBSUwsIGhpdCAiICsgaGl0RWxlbWVudEV4cGVjdGVkMyArICIgQCA1MCwgNTsgIjsKKworICAg ICAgdmFyIGhpdEVsZW1lbnRFeHBlY3RlZDQgPSBkb2N1bWVudC5lbGVtZW50RnJvbVBvaW50KDUw LCA5NSk7CisgICAgICB2YXIgaGl0U3VjY2VzczQgPSBoaXRFbGVtZW50RXhwZWN0ZWQ0ICYmIGhp dEVsZW1lbnRFeHBlY3RlZDQgPT0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNpcmNsZSIpOwor ICAgICAgcmVzdWx0U3RyaW5nICs9IGhpdFN1Y2Nlc3M0ID8gIlBBU1NFRDsgIiA6ICJGQUlMLCBo aXQgIiArIGhpdEVsZW1lbnRFeHBlY3RlZDQgKyAiIEAgNTAsIDk1OyAiOworCisgICAgICBoaXRF bGVtZW50RXhwZWN0ZWQxID0gZG9jdW1lbnQuZWxlbWVudEZyb21Qb2ludCg1LCA1KTsKKyAgICAg IGhpdFN1Y2Nlc3MxID0gaGl0RWxlbWVudEV4cGVjdGVkMSAmJiBoaXRFbGVtZW50RXhwZWN0ZWQx ID09IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJiYWNrZ3JvdW5kIik7CisgICAgICByZXN1bHRT dHJpbmcgKz0gaGl0U3VjY2VzczEgPyAiUEFTU0VEOyAiIDogIkZBSUwsIGhpdCAiICsgaGl0RWxl bWVudEV4cGVjdGVkMSArICIgQCA1LCA1OyAiOworCisgICAgICBoaXRFbGVtZW50RXhwZWN0ZWQy ID0gZG9jdW1lbnQuZWxlbWVudEZyb21Qb2ludCg5NSwgNSk7CisgICAgICBoaXRTdWNjZXNzMiA9 IGhpdEVsZW1lbnRFeHBlY3RlZDIgJiYgaGl0RWxlbWVudEV4cGVjdGVkMiA9PSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiYmFja2dyb3VuZCIpOworICAgICAgcmVzdWx0U3RyaW5nICs9IGhpdFN1 Y2Nlc3MyID8gIlBBU1NFRDsgIiA6ICJGQUlMLCBoaXQgIiArIGhpdEVsZW1lbnRFeHBlY3RlZDIg KyAiIEAgOTUsIDU7ICI7CisKKyAgICAgIGhpdEVsZW1lbnRFeHBlY3RlZDMgPSBkb2N1bWVudC5l bGVtZW50RnJvbVBvaW50KDUsIDk1KTsKKyAgICAgIGhpdFN1Y2Nlc3MzID0gaGl0RWxlbWVudEV4 cGVjdGVkMyAmJiBoaXRFbGVtZW50RXhwZWN0ZWQzID09IGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJiYWNrZ3JvdW5kIik7CisgICAgICByZXN1bHRTdHJpbmcgKz0gaGl0U3VjY2VzczMgPyAiUEFT U0VEOyAiIDogIkZBSUwsIGhpdCAiICsgaGl0RWxlbWVudEV4cGVjdGVkMyArICIgQCA1LCA5NTsg IjsKKworICAgICAgaGl0RWxlbWVudEV4cGVjdGVkNCA9IGRvY3VtZW50LmVsZW1lbnRGcm9tUG9p bnQoOTUsIDk1KTsKKyAgICAgIGhpdFN1Y2Nlc3M0ID0gaGl0RWxlbWVudEV4cGVjdGVkNCAmJiBo aXRFbGVtZW50RXhwZWN0ZWQ0ID09IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJiYWNrZ3JvdW5k Iik7CisgICAgICByZXN1bHRTdHJpbmcgKz0gaGl0U3VjY2VzczQgPyAiUEFTU0VEOyAiIDogIkZB SUwsIGhpdCAiICsgaGl0RWxlbWVudEV4cGVjdGVkNCArICIgQCA5NSwgOTU7ICI7CisKKyAgICAg IGRvY3VtZW50LmJvZHkuaW5uZXJIVE1MID0gcmVzdWx0U3RyaW5nOworICAgIF1dPjwvc2NyaXB0 PgorICA8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9zdmcvaGl0dGVzdC96ZXJv LWxlbmd0aC1zcXVhcmUtY2FwLXBhdGgtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL3N2Zy9oaXR0ZXN0L3plcm8tbGVuZ3RoLXNxdWFyZS1jYXAtcGF0aC1leHBlY3RlZC50 eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9zdmcvaGl0dGVzdC96ZXJvLWxlbmd0aC1z cXVhcmUtY2FwLXBhdGgtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxIEBACitQ QVNTRUQ7IFBBU1NFRDsgUEFTU0VEOyBQQVNTRUQ7IFBBU1NFRDsgUEFTU0VEOyBQQVNTRUQ7IFBB U1NFRDsKClByb3BlcnR5IGNoYW5nZXMgb246IExheW91dFRlc3RzL3N2Zy9oaXR0ZXN0L3plcm8t bGVuZ3RoLXNxdWFyZS1jYXAtcGF0aC1leHBlY3RlZC50eHQKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpBZGRlZDogc3Zu OmVvbC1zdHlsZQogICArIExGCgpJbmRleDogTGF5b3V0VGVzdHMvc3ZnL2hpdHRlc3QvemVyby1s ZW5ndGgtc3F1YXJlLWNhcC1wYXRoLnhodG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3N2 Zy9oaXR0ZXN0L3plcm8tbGVuZ3RoLXNxdWFyZS1jYXAtcGF0aC54aHRtbAkocmV2aXNpb24gMCkK KysrIExheW91dFRlc3RzL3N2Zy9oaXR0ZXN0L3plcm8tbGVuZ3RoLXNxdWFyZS1jYXAtcGF0aC54 aHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw1NyBAQAorPGh0bWwgeG1sbnM9J2h0dHA6Ly93 d3cudzMub3JnLzE5OTkveGh0bWwnPgorICA8aGVhZD4KKyAgICA8c3R5bGU+CisgICAgICBib2R5 IHsKKyAgICAgICAgICBtYXJnaW46IDBweDsKKyAgICAgICAgICBwYWRkaW5nOiAwcHg7CisgICAg ICAgICAgYm9yZGVyOiAxcHggc29saWQgYmxhY2s7CisgICAgICB9CisgICAgPC9zdHlsZT4KKyAg PC9oZWFkPgorICA8Ym9keT4KKyAgICA8c3ZnIGlkPSJiYWNrZ3JvdW5kIiB4bWxucz0iaHR0cDov L3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAiIGhlaWdodD0iMTAwIj4KKyAgICAgIDxw YXRoIGlkPSJzcXVhcmUiIGQ9J001MCw1MCB6JyBzdHJva2U9J2dyZWVuJyBzdHJva2Utd2lkdGg9 JzEwMCcgc3Ryb2tlLWxpbmVjYXA9J3NxdWFyZScvPgorICAgIDwvc3ZnPgorICAgIDxzY3JpcHQ+ PCFbQ0RBVEFbCisgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAg ICAgIHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgICB9CisK KyAgICAgIHZhciByZXN1bHRTdHJpbmcgPSAiIjsKKworICAgICAgdmFyIGhpdEVsZW1lbnRFeHBl Y3RlZDEgPSBkb2N1bWVudC5lbGVtZW50RnJvbVBvaW50KDUsIDUwKTsKKyAgICAgIHZhciBoaXRT dWNjZXNzMSA9IGhpdEVsZW1lbnRFeHBlY3RlZDEgJiYgaGl0RWxlbWVudEV4cGVjdGVkMSA9PSBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgic3F1YXJlIik7CisgICAgICByZXN1bHRTdHJpbmcgKz0g aGl0U3VjY2VzczEgPyAiUEFTU0VEOyAiIDogIkZBSUwsIGhpdCAiICsgaGl0RWxlbWVudEV4cGVj dGVkMSArICIgQCA1LCA1MDsgIjsKKworICAgICAgdmFyIGhpdEVsZW1lbnRFeHBlY3RlZDIgPSBk b2N1bWVudC5lbGVtZW50RnJvbVBvaW50KDk1LCA1MCk7CisgICAgICB2YXIgaGl0U3VjY2VzczIg PSBoaXRFbGVtZW50RXhwZWN0ZWQyICYmIGhpdEVsZW1lbnRFeHBlY3RlZDIgPT0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoInNxdWFyZSIpOworICAgICAgcmVzdWx0U3RyaW5nICs9IGhpdFN1Y2Nl c3MyID8gIlBBU1NFRDsgIiA6ICJGQUlMLCBoaXQgIiArIGhpdEVsZW1lbnRFeHBlY3RlZDIgKyAi IEAgOTUsIDUwOyAiOworCisgICAgICB2YXIgaGl0RWxlbWVudEV4cGVjdGVkMyA9IGRvY3VtZW50 LmVsZW1lbnRGcm9tUG9pbnQoNTAsIDUpOworICAgICAgdmFyIGhpdFN1Y2Nlc3MzID0gaGl0RWxl bWVudEV4cGVjdGVkMyAmJiBoaXRFbGVtZW50RXhwZWN0ZWQzID09IGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCJzcXVhcmUiKTsKKyAgICAgIHJlc3VsdFN0cmluZyArPSBoaXRTdWNjZXNzMyA/ICJQ QVNTRUQ7ICIgOiAiRkFJTCwgaGl0ICIgKyBoaXRFbGVtZW50RXhwZWN0ZWQzICsgIiBAIDUwLCA1 OyAiOworCisgICAgICB2YXIgaGl0RWxlbWVudEV4cGVjdGVkNCA9IGRvY3VtZW50LmVsZW1lbnRG cm9tUG9pbnQoNTAsIDk1KTsKKyAgICAgIHZhciBoaXRTdWNjZXNzNCA9IGhpdEVsZW1lbnRFeHBl Y3RlZDQgJiYgaGl0RWxlbWVudEV4cGVjdGVkNCA9PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi c3F1YXJlIik7CisgICAgICByZXN1bHRTdHJpbmcgKz0gaGl0U3VjY2VzczQgPyAiUEFTU0VEOyAi IDogIkZBSUwsIGhpdCAiICsgaGl0RWxlbWVudEV4cGVjdGVkNCArICIgQCA1MCwgOTU7ICI7CisK KyAgICAgIGhpdEVsZW1lbnRFeHBlY3RlZDEgPSBkb2N1bWVudC5lbGVtZW50RnJvbVBvaW50KDUs IDUpOworICAgICAgaGl0U3VjY2VzczEgPSBoaXRFbGVtZW50RXhwZWN0ZWQxICYmIGhpdEVsZW1l bnRFeHBlY3RlZDEgPT0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNxdWFyZSIpOworICAgICAg cmVzdWx0U3RyaW5nICs9IGhpdFN1Y2Nlc3MxID8gIlBBU1NFRDsgIiA6ICJGQUlMLCBoaXQgIiAr IGhpdEVsZW1lbnRFeHBlY3RlZDEgKyAiIEAgNSwgNTsgIjsKKworICAgICAgaGl0RWxlbWVudEV4 cGVjdGVkMiA9IGRvY3VtZW50LmVsZW1lbnRGcm9tUG9pbnQoOTUsIDUpOworICAgICAgaGl0U3Vj Y2VzczIgPSBoaXRFbGVtZW50RXhwZWN0ZWQyICYmIGhpdEVsZW1lbnRFeHBlY3RlZDIgPT0gZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNxdWFyZSIpOworICAgICAgcmVzdWx0U3RyaW5nICs9IGhp dFN1Y2Nlc3MyID8gIlBBU1NFRDsgIiA6ICJGQUlMLCBoaXQgIiArIGhpdEVsZW1lbnRFeHBlY3Rl ZDIgKyAiIEAgOTUsIDU7ICI7CisKKyAgICAgIGhpdEVsZW1lbnRFeHBlY3RlZDMgPSBkb2N1bWVu dC5lbGVtZW50RnJvbVBvaW50KDUsIDk1KTsKKyAgICAgIGhpdFN1Y2Nlc3MzID0gaGl0RWxlbWVu dEV4cGVjdGVkMyAmJiBoaXRFbGVtZW50RXhwZWN0ZWQzID09IGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJzcXVhcmUiKTsKKyAgICAgIHJlc3VsdFN0cmluZyArPSBoaXRTdWNjZXNzMyA/ICJQQVNT RUQ7ICIgOiAiRkFJTCwgaGl0ICIgKyBoaXRFbGVtZW50RXhwZWN0ZWQzICsgIiBAIDUsIDk1OyAi OworCisgICAgICBoaXRFbGVtZW50RXhwZWN0ZWQ0ID0gZG9jdW1lbnQuZWxlbWVudEZyb21Qb2lu dCg5NSwgOTUpOworICAgICAgaGl0U3VjY2VzczQgPSBoaXRFbGVtZW50RXhwZWN0ZWQ0ICYmIGhp dEVsZW1lbnRFeHBlY3RlZDQgPT0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNxdWFyZSIpOwor ICAgICAgcmVzdWx0U3RyaW5nICs9IGhpdFN1Y2Nlc3M0ID8gIlBBU1NFRDsgIiA6ICJGQUlMLCBo aXQgIiArIGhpdEVsZW1lbnRFeHBlY3RlZDQgKyAiIEAgOTUsIDk1OyAiOworCisgICAgICBkb2N1 bWVudC5ib2R5LmlubmVySFRNTCA9IHJlc3VsdFN0cmluZzsKKyAgICBdXT48L3NjcmlwdD4KKyAg PC9ib2R5PgorPC9odG1sPgo=