15595 2007-10-21 12:14:21 -0700 marker property doesn't show up correctly as "shorthand" in inspector 2008-03-30 23:51:36 -0700 1 1 1 Unclassified WebKit SVG 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned hyatt oldest_to_newest 59021 0 eric 2007-10-21 12:14:21 -0700 marker property doesn't show up correctly as "shorthand" in inspector SVG marker CSS property is parsed with some custom code in SVGCSSParser which seems to confuse the "shorthand" accessors on CSSComputedStyle. The inspector seems to display them as 3 properties instead of as one with a disclosure triangle. Additionally, it highlights "marker-start" as a real property in the inline style declaration, and fades marker-mid and marker-end as though they were implicit. I'm not sure if to fix this (minor) bug we'd need to fix the inspector or the SVG CSS parsing code. But probably best to fix the parsing code. 59022 1 16768 eric 2007-10-21 12:15:45 -0700 Created attachment 16768 example file with marker (use inspector to see bug) 75775 2 20201 rwlbuis 2008-03-29 11:41:38 -0700 Created attachment 20201 First attempt This patch makes the marker property show up much better in the Inspector. There is some confusion on the exact marker property syntax, see: http://lists.w3.org/Archives/Public/www-svg/2008Mar/0093.html I think that needs to be clarified before this can go in. As for tests, AFAIK it is impossible to test how it looks in the Inspector. However I guess it makes sense to test getPropertyValue("marker") on the CSSStyleDeclaration. In the meantime, the code can be reviewed I guess. Cheers, Rob. 75781 3 20201 eric 2008-03-29 12:09:58 -0700 Comment on attachment 20201 First attempt This looks good to me. But Hyatt should confirm. 75782 4 eric 2008-03-29 12:10:22 -0700 Adding our resident ShorthandScope expert to confirm this (simple) patch is correct. 75850 5 20217 rwlbuis 2008-03-30 13:06:50 -0700 Created attachment 20217 Now with testcase This one add a testcase for the changed getPropertyValue behaviour regarding marker. We now return the same value as Opera and FF do. Cheers, Rob. 75878 6 20217 darin 2008-03-30 16:43:41 -0700 Comment on attachment 20217 Now with testcase r=me 75906 7 rwlbuis 2008-03-30 23:51:36 -0700 Landed in r31453. 16768 2007-10-21 12:15:45 -0700 2007-10-21 12:15:45 -0700 example file with marker (use inspector to see bug) marker.svg image/svg+xml 355 eric PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRw Oi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICAgIDxkZWZzPgogICAgICAgIDxtYXJrZXIgaWQ9 InRlc3QiIHJlZlg9IjEuNSIgcmVmWT0iMS41Ij4KICAgICAgICAgICAgPHJlY3Qgd2lkdGg9IjMi IGhlaWdodD0iMyIgZmlsbD0iYmx1ZSIgLz4KICAgICAgICA8L21hcmtlcj4KICAgIDwvZGVmcz4K ICAgIDxwYXRoIGQ9Ik0gMjUgMjUgTCAxMDAgMTAwIEwgMjAwIDI1IHoiIHN0cm9rZT0ib3Jhbmdl IiBmaWxsPSJub25lIiBzdHJva2Utd2lkdGg9IjhweCIgc3R5bGU9Im1hcmtlcjogdXJsKCN0ZXN0 KSIgLz4KPC9zdmc+Cg== 20201 2008-03-29 11:41:38 -0700 2008-03-30 13:06:50 -0700 First attempt 15595.diff text/plain 4242 rwlbuis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMTQzNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDgtMDMtMjkgIFJvYiBCdWlzICA8YnVpc0BrZGUub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdBUk5JTkc6IE5P IFRFU1QgQ0FTRVMgQURERUQgT1IgQ0hBTkdFRAorCisgICAgICAgIE1ha2Ugc3VyZSBwYXJzaW5n IHRoZSBtYXJrZXIgcHJvcGVydHkgc2V0cyB0aGUgaW5kaXZpZHVhbAorICAgICAgICBtYXJrZXIg cHJvcGVydGllcyBhcyBpbXBsaWNpdCB3aXRoIG1hcmtlciBhcyBzaG9ydGhhbmQuCisgICAgICAg IEFsc28gbGV0IENTU1N0eWxlRGVjbGVyYXRpb246OmdldFByb3BlcnR5VmFsdWUgcmV0dXJuCisg ICAgICAgIHRoZSBjb3JyZWN0IHZhbHVlIGZvciB0aGUgbWFya2VyIHByb3BlcnR5LgorCisgICAg ICAgICogY3NzL0NTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkNTU011dGFibGVTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0eVZhbHVlKToKKyAgICAg ICAgKiBjc3MvQ1NTUGFyc2VyLmNwcDoKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmg6CisgICAg ICAgIChXZWJDb3JlOjpTaG9ydGhhbmRTY29wZTo6U2hvcnRoYW5kU2NvcGUpOgorICAgICAgICAo V2ViQ29yZTo6U2hvcnRoYW5kU2NvcGU6On5TaG9ydGhhbmRTY29wZSk6CisgICAgICAgICogY3Nz L1NWR0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlU1ZH VmFsdWUpOgorCiAyMDA4LTAzLTI5ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBTYW0uCkluZGV4OiBXZWJDb3JlL2Nzcy9DU1NNdXRhYmxlU3R5 bGVEZWNsYXJhdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9jc3MvQ1NTTXV0YWJsZVN0 eWxlRGVjbGFyYXRpb24uY3BwCShyZXZpc2lvbiAzMTQzMykKKysrIFdlYkNvcmUvY3NzL0NTU011 dGFibGVTdHlsZURlY2xhcmF0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTUyLDYgKzE1Miwx MyBAQCBTdHJpbmcgQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb246OmdldFByCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ1NTUHJvcGVydHlMaXN0U3R5bGVJbWFnZSB9 OwogICAgICAgICAgICAgcmV0dXJuIGdldFNob3J0aGFuZFZhbHVlKHByb3BlcnRpZXMsIDMpOwog ICAgICAgICB9CisjaWYgRU5BQkxFX1NWRworICAgICAgICBjYXNlIENTU1Byb3BlcnR5TWFya2Vy OiB7CisgICAgICAgICAgICBSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlID0gZ2V0UHJvcGVydHlDU1NW YWx1ZShDU1NQcm9wZXJ0eU1hcmtlclN0YXJ0KTsKKyAgICAgICAgICAgIGlmICh2YWx1ZSkKKyAg ICAgICAgICAgICAgICByZXR1cm4gdmFsdWUtPmNzc1RleHQoKTsKKyAgICAgICAgfQorI2VuZGlm CiAgICAgfQogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KSW5kZXg6IFdlYkNvcmUvY3NzL0NTU1Bh cnNlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAkocmV2aXNp b24gMzE0MzMpCisrKyBXZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xMTgsMjUgKzExOCw2IEBAIFZhbHVlTGlzdDo6flZhbHVlTGlzdCgpCiAgICAgICAgICAgICAg ZGVsZXRlIG1fdmFsdWVzW2ldLmZ1bmN0aW9uOwogfQogCi1uYW1lc3BhY2UgewotICAgIGNsYXNz IFNob3J0aGFuZFNjb3BlIHsKLSAgICBwdWJsaWM6Ci0gICAgICAgIFNob3J0aGFuZFNjb3BlKENT U1BhcnNlciogcGFyc2VyLCBpbnQgcHJvcElkKSA6IG1fcGFyc2VyKHBhcnNlcikKLSAgICAgICAg ewotICAgICAgICAgICAgaWYgKCEobV9wYXJzZXItPm1faW5QYXJzZVNob3J0aGFuZCsrKSkKLSAg ICAgICAgICAgICAgICBtX3BhcnNlci0+bV9jdXJyZW50U2hvcnRoYW5kID0gcHJvcElkOwotICAg ICAgICB9Ci0gICAgICAgIH5TaG9ydGhhbmRTY29wZSgpCi0gICAgICAgIHsKLSAgICAgICAgICAg IGlmICghKC0tbV9wYXJzZXItPm1faW5QYXJzZVNob3J0aGFuZCkpCi0gICAgICAgICAgICAgICAg bV9wYXJzZXItPm1fY3VycmVudFNob3J0aGFuZCA9IDA7Ci0gICAgICAgIH0KLQotICAgIHByaXZh dGU6Ci0gICAgICAgIENTU1BhcnNlciogbV9wYXJzZXI7Ci0gICAgfTsKLX0KLQogQ1NTUGFyc2Vy KiBDU1NQYXJzZXI6OmN1cnJlbnRQYXJzZXIgPSAwOwogCiBDU1NQYXJzZXI6OkNTU1BhcnNlcihi b29sIHN0cmljdFBhcnNpbmcpCkluZGV4OiBXZWJDb3JlL2Nzcy9DU1NQYXJzZXIuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2Nzcy9DU1NQYXJzZXIuaAkocmV2aXNpb24gMzE0MzMpCisrKyBXZWJD b3JlL2Nzcy9DU1NQYXJzZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMjkwLDYgKzI5MCwyMyBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgaW50IGNzc1Byb3BlcnR5SUQoY29uc3QgU3RyaW5nJik7 CiAgICAgaW50IGNzc1ZhbHVlS2V5d29yZElEKGNvbnN0IFBhcnNlU3RyaW5nJik7CiAKKyAgICBj bGFzcyBTaG9ydGhhbmRTY29wZSB7CisgICAgcHVibGljOgorICAgICAgICBTaG9ydGhhbmRTY29w ZShDU1NQYXJzZXIqIHBhcnNlciwgaW50IHByb3BJZCkgOiBtX3BhcnNlcihwYXJzZXIpCisgICAg ICAgIHsKKyAgICAgICAgICAgIGlmICghKG1fcGFyc2VyLT5tX2luUGFyc2VTaG9ydGhhbmQrKykp CisgICAgICAgICAgICAgICAgbV9wYXJzZXItPm1fY3VycmVudFNob3J0aGFuZCA9IHByb3BJZDsK KyAgICAgICAgfQorICAgICAgICB+U2hvcnRoYW5kU2NvcGUoKQorICAgICAgICB7CisgICAgICAg ICAgICBpZiAoISgtLW1fcGFyc2VyLT5tX2luUGFyc2VTaG9ydGhhbmQpKQorICAgICAgICAgICAg ICAgIG1fcGFyc2VyLT5tX2N1cnJlbnRTaG9ydGhhbmQgPSAwOworICAgICAgICB9CisKKyAgICBw cml2YXRlOgorICAgICAgICBDU1NQYXJzZXIqIG1fcGFyc2VyOworICAgIH07CisKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIENTU1BhcnNlcl9oCkluZGV4OiBXZWJDb3JlL2Nz cy9TVkdDU1NQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvY3NzL1NWR0NTU1BhcnNl ci5jcHAJKHJldmlzaW9uIDMxNDMzKQorKysgV2ViQ29yZS9jc3MvU1ZHQ1NTUGFyc2VyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjc2LDEwICsyNzYsMTUgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNl U1ZHVmFsdWUoaW50IHByb3BJZAogICAgIC8qIHNob3J0aGFuZCBwcm9wZXJ0aWVzICovCiAgICAg Y2FzZSBDU1NQcm9wZXJ0eU1hcmtlcjoKICAgICB7CisgICAgICAgIFNob3J0aGFuZFNjb3BlIHNj b3BlKHRoaXMsIHByb3BJZCk7CisgICAgICAgIG1faW1wbGljaXRTaG9ydGhhbmQgPSB0cnVlOwog ICAgICAgICBpZiAoIXBhcnNlVmFsdWUoQ1NTUHJvcGVydHlNYXJrZXJTdGFydCwgaW1wb3J0YW50 KSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgaWYgKHZhbHVlTGlzdC0+Y3Vy cmVudCgpKSB7CisgICAgICAgICAgICByb2xsYmFja0xhc3RQcm9wZXJ0aWVzKDEpOworICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CiAgICAgICAgIENTU1ZhbHVlICp2YWx1ZSA9 IHBhcnNlZFByb3BlcnRpZXNbbnVtUGFyc2VkUHJvcGVydGllcyAtIDFdLT52YWx1ZSgpOwotICAg ICAgICBtX2ltcGxpY2l0U2hvcnRoYW5kID0gdHJ1ZTsKICAgICAgICAgYWRkUHJvcGVydHkoQ1NT UHJvcGVydHlNYXJrZXJNaWQsIHZhbHVlLCBpbXBvcnRhbnQpOwogICAgICAgICBhZGRQcm9wZXJ0 eShDU1NQcm9wZXJ0eU1hcmtlckVuZCwgdmFsdWUsIGltcG9ydGFudCk7CiAgICAgICAgIG1faW1w bGljaXRTaG9ydGhhbmQgPSBmYWxzZTsK 20217 2008-03-30 13:06:50 -0700 2008-03-30 16:43:41 -0700 Now with testcase 15595.diff text/plain 6486 rwlbuis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMTQ0MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMDgtMDMtMzAgIFJvYiBCdWlzICA8YnVpc0BrZGUub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHA6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTk1CisgICAgICAgIG1hcmtlciBwcm9wZXJ0 eSBkb2Vzbid0IHNob3cgdXAgY29ycmVjdGx5IGFzICJzaG9ydGhhbmQiIGluIGluc3BlY3Rvcgor CisgICAgICAgIE1ha2Ugc3VyZSBwYXJzaW5nIHRoZSBtYXJrZXIgcHJvcGVydHkgc2V0cyB0aGUg aW5kaXZpZHVhbAorICAgICAgICBtYXJrZXIgcHJvcGVydGllcyBhcyBpbXBsaWNpdCB3aXRoIG1h cmtlciBhcyBzaG9ydGhhbmQuCisgICAgICAgIEFsc28gbGV0IENTU1N0eWxlRGVjbGVyYXRpb246 OmdldFByb3BlcnR5VmFsdWUgcmV0dXJuCisgICAgICAgIHRoZSBjb3JyZWN0IHZhbHVlIGZvciB0 aGUgbWFya2VyIHByb3BlcnR5LgorCisgICAgICAgICogY3NzL0NTU011dGFibGVTdHlsZURlY2xh cmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU011dGFibGVTdHlsZURlY2xhcmF0aW9u OjpnZXRQcm9wZXJ0eVZhbHVlKToKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmNwcDoKKyAgICAg ICAgKiBjc3MvQ1NTUGFyc2VyLmg6CisgICAgICAgIChXZWJDb3JlOjpTaG9ydGhhbmRTY29wZTo6 U2hvcnRoYW5kU2NvcGUpOgorICAgICAgICAoV2ViQ29yZTo6U2hvcnRoYW5kU2NvcGU6On5TaG9y dGhhbmRTY29wZSk6CisgICAgICAgICogY3NzL1NWR0NTU1BhcnNlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlU1ZHVmFsdWUpOgorCiAyMDA4LTAzLTMwICBIaXJveXVr aSBJa2V6b2UgIDxwb2luY2FyZUBpa2V6b2UubmV0PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFs cCBUb2tlci4KSW5kZXg6IFdlYkNvcmUvY3NzL0NTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5j cHAJKHJldmlzaW9uIDMxNDQyKQorKysgV2ViQ29yZS9jc3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFy YXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTIsNiArMTUyLDEzIEBAIFN0cmluZyBDU1NN dXRhYmxlU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHIKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBDU1NQcm9wZXJ0eUxpc3RTdHlsZUltYWdlIH07CiAgICAgICAgICAgICBy ZXR1cm4gZ2V0U2hvcnRoYW5kVmFsdWUocHJvcGVydGllcywgMyk7CiAgICAgICAgIH0KKyNpZiBF TkFCTEVfU1ZHCisgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlNYXJrZXI6IHsKKyAgICAgICAgICAg IFJlZlB0cjxDU1NWYWx1ZT4gdmFsdWUgPSBnZXRQcm9wZXJ0eUNTU1ZhbHVlKENTU1Byb3BlcnR5 TWFya2VyU3RhcnQpOworICAgICAgICAgICAgaWYgKHZhbHVlKQorICAgICAgICAgICAgICAgIHJl dHVybiB2YWx1ZS0+Y3NzVGV4dCgpOworICAgICAgICB9CisjZW5kaWYKICAgICB9CiAgICAgcmV0 dXJuIFN0cmluZygpOwogfQpJbmRleDogV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCShyZXZpc2lvbiAzMTQ0MikKKysrIFdl YkNvcmUvY3NzL0NTU1BhcnNlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExOCwyNSArMTE4LDYg QEAgVmFsdWVMaXN0Ojp+VmFsdWVMaXN0KCkKICAgICAgICAgICAgICBkZWxldGUgbV92YWx1ZXNb aV0uZnVuY3Rpb247CiB9CiAKLW5hbWVzcGFjZSB7Ci0gICAgY2xhc3MgU2hvcnRoYW5kU2NvcGUg ewotICAgIHB1YmxpYzoKLSAgICAgICAgU2hvcnRoYW5kU2NvcGUoQ1NTUGFyc2VyKiBwYXJzZXIs IGludCBwcm9wSWQpIDogbV9wYXJzZXIocGFyc2VyKQotICAgICAgICB7Ci0gICAgICAgICAgICBp ZiAoIShtX3BhcnNlci0+bV9pblBhcnNlU2hvcnRoYW5kKyspKQotICAgICAgICAgICAgICAgIG1f cGFyc2VyLT5tX2N1cnJlbnRTaG9ydGhhbmQgPSBwcm9wSWQ7Ci0gICAgICAgIH0KLSAgICAgICAg flNob3J0aGFuZFNjb3BlKCkKLSAgICAgICAgewotICAgICAgICAgICAgaWYgKCEoLS1tX3BhcnNl ci0+bV9pblBhcnNlU2hvcnRoYW5kKSkKLSAgICAgICAgICAgICAgICBtX3BhcnNlci0+bV9jdXJy ZW50U2hvcnRoYW5kID0gMDsKLSAgICAgICAgfQotCi0gICAgcHJpdmF0ZToKLSAgICAgICAgQ1NT UGFyc2VyKiBtX3BhcnNlcjsKLSAgICB9OwotfQotCiBDU1NQYXJzZXIqIENTU1BhcnNlcjo6Y3Vy cmVudFBhcnNlciA9IDA7CiAKIENTU1BhcnNlcjo6Q1NTUGFyc2VyKGJvb2wgc3RyaWN0UGFyc2lu ZykKSW5kZXg6IFdlYkNvcmUvY3NzL0NTU1BhcnNlci5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv Y3NzL0NTU1BhcnNlci5oCShyZXZpc2lvbiAzMTQ0MikKKysrIFdlYkNvcmUvY3NzL0NTU1BhcnNl ci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOTAsNiArMjkwLDIzIEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICBpbnQgY3NzUHJvcGVydHlJRChjb25zdCBTdHJpbmcmKTsKICAgICBpbnQgY3NzVmFs dWVLZXl3b3JkSUQoY29uc3QgUGFyc2VTdHJpbmcmKTsKIAorICAgIGNsYXNzIFNob3J0aGFuZFNj b3BlIHsKKyAgICBwdWJsaWM6CisgICAgICAgIFNob3J0aGFuZFNjb3BlKENTU1BhcnNlciogcGFy c2VyLCBpbnQgcHJvcElkKSA6IG1fcGFyc2VyKHBhcnNlcikKKyAgICAgICAgeworICAgICAgICAg ICAgaWYgKCEobV9wYXJzZXItPm1faW5QYXJzZVNob3J0aGFuZCsrKSkKKyAgICAgICAgICAgICAg ICBtX3BhcnNlci0+bV9jdXJyZW50U2hvcnRoYW5kID0gcHJvcElkOworICAgICAgICB9CisgICAg ICAgIH5TaG9ydGhhbmRTY29wZSgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmICghKC0tbV9w YXJzZXItPm1faW5QYXJzZVNob3J0aGFuZCkpCisgICAgICAgICAgICAgICAgbV9wYXJzZXItPm1f Y3VycmVudFNob3J0aGFuZCA9IDA7CisgICAgICAgIH0KKworICAgIHByaXZhdGU6CisgICAgICAg IENTU1BhcnNlciogbV9wYXJzZXI7CisgICAgfTsKKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQog CiAjZW5kaWYgLy8gQ1NTUGFyc2VyX2gKSW5kZXg6IFdlYkNvcmUvY3NzL1NWR0NTU1BhcnNlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9jc3MvU1ZHQ1NTUGFyc2VyLmNwcAkocmV2aXNpb24g MzE0NDIpCisrKyBXZWJDb3JlL2Nzcy9TVkdDU1NQYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yNzYsMTAgKzI3NiwxNSBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VTVkdWYWx1ZShpbnQgcHJv cElkCiAgICAgLyogc2hvcnRoYW5kIHByb3BlcnRpZXMgKi8KICAgICBjYXNlIENTU1Byb3BlcnR5 TWFya2VyOgogICAgIHsKKyAgICAgICAgU2hvcnRoYW5kU2NvcGUgc2NvcGUodGhpcywgcHJvcElk KTsKKyAgICAgICAgbV9pbXBsaWNpdFNob3J0aGFuZCA9IHRydWU7CiAgICAgICAgIGlmICghcGFy c2VWYWx1ZShDU1NQcm9wZXJ0eU1hcmtlclN0YXJ0LCBpbXBvcnRhbnQpKQogICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICBpZiAodmFsdWVMaXN0LT5jdXJyZW50KCkpIHsKKyAgICAg ICAgICAgIHJvbGxiYWNrTGFzdFByb3BlcnRpZXMoMSk7CisgICAgICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgICAgIH0KICAgICAgICAgQ1NTVmFsdWUgKnZhbHVlID0gcGFyc2VkUHJvcGVydGll c1tudW1QYXJzZWRQcm9wZXJ0aWVzIC0gMV0tPnZhbHVlKCk7Ci0gICAgICAgIG1faW1wbGljaXRT aG9ydGhhbmQgPSB0cnVlOwogICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eU1hcmtlck1p ZCwgdmFsdWUsIGltcG9ydGFudCk7CiAgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5TWFy a2VyRW5kLCB2YWx1ZSwgaW1wb3J0YW50KTsKICAgICAgICAgbV9pbXBsaWNpdFNob3J0aGFuZCA9 IGZhbHNlOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMzE0NDIpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAwOC0wMy0zMCAgUm9iIEJ1aXMg IDxidWlzQGtkZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGVzdGNhc2UgZm9yOgorICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTU5NQorICAgICAgICBtYXJrZXIgcHJvcGVydHkgZG9lc24ndCBzaG93 IHVwIGNvcnJlY3RseSBhcyAic2hvcnRoYW5kIiBpbiBpbnNwZWN0b3IKKworICAgICAgICAqIHN2 Zy9jdXN0b20vbWFya2VyLWdldFByb3BlcnR5VmFsdWUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBzdmcvY3VzdG9tL21hcmtlci1nZXRQcm9wZXJ0eVZhbHVlLnN2ZzogQWRkZWQuCisK IDIwMDgtMDMtMzAgIFJvYiBCdWlzICA8YnVpc0BrZGUub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IE9saXZlci4KSW5kZXg6IExheW91dFRlc3RzL3N2Zy9jdXN0b20vbWFya2VyLWdldFByb3Bl cnR5VmFsdWUtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3N2Zy9jdXN0 b20vbWFya2VyLWdldFByb3BlcnR5VmFsdWUtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysg TGF5b3V0VGVzdHMvc3ZnL2N1c3RvbS9tYXJrZXItZ2V0UHJvcGVydHlWYWx1ZS1leHBlY3RlZC50 eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEgQEAKK3VybCgjdGVzdCkgUEFTU0VECkluZGV4OiBM YXlvdXRUZXN0cy9zdmcvY3VzdG9tL21hcmtlci1nZXRQcm9wZXJ0eVZhbHVlLnN2Zwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9zdmcvY3VzdG9tL21hcmtlci1nZXRQcm9wZXJ0eVZhbHVlLnN2 ZwkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3N2Zy9jdXN0b20vbWFya2VyLWdldFByb3Bl cnR5VmFsdWUuc3ZnCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDIzIEBACis8P3htbCB2ZXJzaW9u PSIxLjAiIGVuY29kaW5nPSJVVEYtOCI/PgorPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIG9ubG9hZD0icnVuVGVzdCgpIj4KKyAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2VjbWFz Y3JpcHQiPjwhW0NEQVRBWworCisgICAgZnVuY3Rpb24gZXhwZWN0KHN0cmluZywgdmFsKSB7Cisg ICAgICB2YXIgYiA9IHN0cmluZyA9PSB2YWw7CisgICAgICB2YXIgbWVzc2FnZSA9IChzdHJpbmcg KyAiIikgKyAiICIgKyAgKGIgPyAiUEFTU0VEIiA6ICJGQUlMRUQgKGFjdHVhbDogJyIgKyBzdHJp bmcgKyAiJyBleHBlY3RlZDogJyIgKyB2YWwgKyAiJykiKTsKKyAgICAgIHZhciB0eHQgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50TlMoImh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiwgInRleHQi KTsKKyAgICAgIHZhciB0ZXh0Tm9kZSA9IGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKG1lc3NhZ2Up OworICAgICAgdHh0LmFwcGVuZENoaWxkKHRleHROb2RlKTsKKyAgICAgIGRvY3VtZW50LnJvb3RF bGVtZW50LmFwcGVuZENoaWxkKHR4dCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gcnVuVGVzdCgp IHsKKyAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxheW91 dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKworICAgICAgdmFyIGUgPSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgicmVjdCIpOworICAgICAgZXhwZWN0KGUuc3R5bGUuZ2V0UHJvcGVydHlW YWx1ZSgibWFya2VyIiksICJ1cmwoI3Rlc3QpIik7CisgICAgfQorICBdXT48L3NjcmlwdD4gIAor ICAgIDxyZWN0IHZpc2liaWxpdHk9ImhpZGRlbiIgd2lkdGg9IjEwMCIgaGVpZ2h0PSIxMDAiIGlk PSJyZWN0IiBzdHlsZT0ibWFya2VyOiB1cmwoI3Rlc3QpIi8+Cis8L3N2Zz4K