141367 2015-02-08 03:34:24 -0800 list-style-image with SVG image renders at incorrect size 2015-07-10 08:22:00 -0700 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) All All RESOLVED FIXED BlinkMergeCandidate P1 Critical --- 1 thomasmulhall410 sabouhallawa a9016009 commit-queue dbates erwin esprehn+autocc glenn jonlee kondapallykalyan pdr sabouhallawa thomasmulhall410 zimmermann oldest_to_newest 1067662 0 thomasmulhall410 2015-02-08 03:34:24 -0800 Hi there seems to be a bug in webkit where it is showing the svg small on ios where it is showing correctly on other browsers. Please read more https://code.google.com/p/chromium/issues/detail?id=350734 here. The problem seems to when you set the width and height of background not image and then it shows correctly in ie,chrome and other browsers ecept on ios. 1067663 1 thomasmulhall410 2015-02-08 03:46:01 -0800 the problem happens in iOS all version. so could this please get this fixed. 1068746 2 thomasmulhall410 2015-02-12 14:22:57 -0800 Please fix it. 1068799 3 thomasmulhall410 2015-02-12 17:01:11 -0800 This problem is only with ios since I can only try it on ios and not safari. this may be a webkit problem. please could someone fix this. This should not be an issue on the iOS os. 1068927 4 thomasmulhall410 2015-02-13 09:29:29 -0800 The problem is also described here https://phabricator.wikimedia.org/T37338 and does it on Wikimedia. 1069390 5 erwin 2015-02-16 01:02:51 -0800 To summarize: The core problem is that the intrinsic size of the SVG is ignored when used in list-style-image. This results in the SVG not being sized correctly when the device resolution is higher than 1dppx. This was fixed in Chromium as linked by OP. 1069398 6 thomasmulhall410 2015-02-16 02:32:06 -0800 Thanks for summerising the question. 1084629 7 thomasmulhall410 2015-04-12 03:18:04 -0700 It seems this was fixed in chromium. Here is the code review. https://codereview.chromium.org/197203003/patch/1/10003 1084632 8 thomasmulhall410 2015-04-12 03:27:50 -0700 Found where the code should be fixed https://trac.webkit.org/browser/trunk/Source/WebCore/rendering/RenderListMarker.cpp#L1377 1084633 9 thomasmulhall410 2015-04-12 03:40:58 -0700 And the code to fix the issue from chromium is at https://chromium.googlesource.com/chromium/blink/+/master/Source/core/layout/LayoutListMarker.cpp on line 1183. 1084838 10 250644 sabouhallawa 2015-04-13 09:50:15 -0700 Created attachment 250644 test case 1084839 11 250645 sabouhallawa 2015-04-13 09:50:44 -0700 Created attachment 250645 Expected 1084849 12 250648 sabouhallawa 2015-04-13 10:15:51 -0700 Created attachment 250648 Patch 1084854 13 250648 darin 2015-04-13 10:19:44 -0700 Comment on attachment 250648 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=250648&action=review > Source/WebCore/rendering/RenderListMarker.cpp:1427 > int bulletWidth = style().fontMetrics().ascent() / 2; I wonder if we really want to round up to an integer here before converting to a LayoutSize. Worth talking to Zalan about which kind of rounding/snapping is best here. 1084887 14 250648 zalan 2015-04-13 11:27:01 -0700 Comment on attachment 250648 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=250648&action=review >> Source/WebCore/rendering/RenderListMarker.cpp:1427 >> int bulletWidth = style().fontMetrics().ascent() / 2; > > I wonder if we really want to round up to an integer here before converting to a LayoutSize. Worth talking to Zalan about which kind of rounding/snapping is best here. updateContent() is called during layout and we normally snap at painting. There are a few exceptions, but rule of thumb of snapping is that it should only happen right before painting. Please use LayoutUnit instead of int. -to avoid any kind of rounding/snapping here. 1084898 15 250662 sabouhallawa 2015-04-13 12:05:56 -0700 Created attachment 250662 Patch 1084899 16 sabouhallawa 2015-04-13 12:07:37 -0700 (In reply to comment #14) > Comment on attachment 250648 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=250648&action=review > > >> Source/WebCore/rendering/RenderListMarker.cpp:1427 > >> int bulletWidth = style().fontMetrics().ascent() / 2; > > > > I wonder if we really want to round up to an integer here before converting to a LayoutSize. Worth talking to Zalan about which kind of rounding/snapping is best here. > > updateContent() is called during layout and we normally snap at painting. > There are a few exceptions, but rule of thumb of snapping is that it should > only happen right before painting. > Please use LayoutUnit instead of int. -to avoid any kind of > rounding/snapping here. As suggested, I changed the bulletWidth in RenderListMarker::updateContent() to be of type LayoutUnit to avoid the integer rounding. 1084916 17 thomasmulhall410 2015-04-13 12:45:08 -0700 Thankyou. 1084930 18 250662 commit-queue 2015-04-13 13:03:21 -0700 Comment on attachment 250662 Patch Clearing flags on attachment: 250662 Committed r182751: <http://trac.webkit.org/changeset/182751> 1084931 19 commit-queue 2015-04-13 13:03:29 -0700 All reviewed patches have been landed. Closing bug. 1084932 20 sabouhallawa 2015-04-13 13:05:20 -0700 rdar://problem/20396634 1105718 21 thomasmulhall410 2015-06-30 10:39:02 -0700 When will Apple include a updated WebKit because iOS 8.4 doesn't seem to show list style image correctly for svg still. 1108613 22 jonlee 2015-07-10 08:06:29 -0700 (In reply to comment #21) > When will Apple include a updated WebKit because iOS 8.4 doesn't seem to > show list style image correctly for svg still. You may wish to try out the recently released public beta. 1108618 23 thomasmulhall410 2015-07-10 08:22:00 -0700 (In reply to comment #22) > (In reply to comment #21) > > When will Apple include a updated WebKit because iOS 8.4 doesn't seem to > > show list style image correctly for svg still. > > You may wish to try out the recently released public beta. Hi yes it is fixed in ios 9. 250644 2015-04-13 09:50:15 -0700 2015-04-13 09:50:15 -0700 test case test097.html text/html 283 sabouhallawa PCFET0NUWVBFIGh0bWw+CjxzdHlsZT4KICBsaSB7IGxpc3Qtc3R5bGUtaW1hZ2U6IHVybCgnZGF0 YTppbWFnZS9zdmcreG1sLCBcCiAgICA8c3ZnIHdpZHRoPSIzMHB4IiBoZWlnaHQ9IjFweCIgeG1s bnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4gXAogICAgICA8bGluZSB4Mj0iMzAiIHN0 cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSJibGFjayIvPiBcCiAgICA8L3N2Zz4nKTsKICB9Cjwvc3R5 bGU+Cjx1bD4KICA8bGk+QnVsbGV0IDE8L2xpPgogIDxsaT5CdWxsZXQgMjwvbGk+CjwvdWw+Cg== 250645 2015-04-13 09:50:44 -0700 2015-04-13 09:50:44 -0700 Expected test098.html text/html 301 sabouhallawa PCFET0NUWVBFIGh0bWw+CjxzdHlsZT4KICBsaSB7IGxpc3Qtc3R5bGUtaW1hZ2U6IHVybCgnZGF0 YTppbWFnZS9wbmc7YmFzZTY0LGlWQk9SdzBLR2dvQUFBQU5TVWhFVWdBQUFCNEEgXAogICAgQUFB QkNBUUFBQUJqdWRabkFBQUFBbUpMUjBRQS80ZVB6TDhBQUFBSmNFaFpjd0FBQ3hNQUFBc1RBUUNh bkJnQUFBQU9TVVJCVkFqWFkyVDQgXAogICAgejBBMkFBQTdQd0VCTituY0lBQUFBQUJKUlU1RXJr SmdnZz09Jyk7CiAgfQo8L3N0eWxlPgo8dWw+CiAgPGxpPkJ1bGxldCAxPC9saT4KICA8bGk+QnVs bGV0IDI8L2xpPgo8L3VsPg== 250648 2015-04-13 10:15:51 -0700 2015-04-13 12:05:52 -0700 Patch bug-141367-20150413101456.patch text/plain 4231 sabouhallawa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjczNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA0LTEzICBTYWlkIEFi b3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgbGlzdC1zdHls ZS1pbWFnZSB3aXRoIFNWRyBpbWFnZSByZW5kZXJzIGF0IGluY29ycmVjdCBzaXplLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxMzY3LgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhpcyBw YXRjaCBpbXBvcnRzIGh0dHBzOi8vY29kZXJldmlldy5jaHJvbWl1bS5vcmcvMTk3MjAzMDAzLgor CisgICAgICAgIFdoZW4gdXNpbmcgYW4gU1ZHIGFzIGxpc3QgbWFya2VyIGltYWdlLCBkb24ndCB1 bmNvbmRpdGlvbmFsbHkgc2V0IHRoZQorICAgICAgICBkaW1lbnNpb25zIHRvIGEgc3F1YXJlIHdp dGggdGhlIGRpbWVuc2lvbnMgb2YgYXNjZW50IC8gMiwgYnV0IHJhdGhlcgorICAgICAgICBkZXRl cm1pbmUgYSBzdWl0YWJsZSBzaXplIHVzaW5nIGludHJpbnNpYyBkaW1lbnNpb25zIChhbmQgcmF0 aW8pLgorCisgICAgICAgIFRlc3Q6IHN2Zy9hcy1saXN0LWltYWdlL3N2Zy1saXN0LWltYWdlLWlu dHJpbnNpYy1zaXplLTEuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RNYXJr ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdE1hcmtlcjo6dXBkYXRlQ29udGVu dCk6CisKIDIwMTUtMDQtMTIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtDb2NvYV0gTG9jYWxpemFibGUgc3RyaW5ncyBhcmUgaW5jb25zaXN0ZW50IGFuZCBuZWVk IHRvIGJlIHJlZ2VuZXJhdGVkCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGlzdE1hcmtlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxpc3RNYXJrZXIuY3BwCShyZXZpc2lvbiAxODI2NzQpCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGlzdE1hcmtlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0MjUsNyAr MTQyNSw5IEBAIHZvaWQgUmVuZGVyTGlzdE1hcmtlcjo6dXBkYXRlQ29udGVudCgpCiAgICAgICAg IC8vIEZJWE1FOiBUaGlzIGlzIGEgc29tZXdoYXQgYXJiaXRyYXJ5IHdpZHRoLiAgR2VuZXJhdGVk IGltYWdlcyBmb3IgbWFya2VycyByZWFsbHkgd29uJ3QgYmVjb21lIHBhcnRpY3VsYXJseSB1c2Vm dWwKICAgICAgICAgLy8gdW50aWwgd2Ugc3VwcG9ydCB0aGUgQ1NTMyBtYXJrZXIgcHNldWRvY2xh c3MgdG8gYWxsb3cgY29udHJvbCBvdmVyIHRoZSB3aWR0aCBhbmQgaGVpZ2h0IG9mIHRoZSBtYXJr ZXIgYm94LgogICAgICAgICBpbnQgYnVsbGV0V2lkdGggPSBzdHlsZSgpLmZvbnRNZXRyaWNzKCku YXNjZW50KCkgLyAyOwotICAgICAgICBtX2ltYWdlLT5zZXRDb250YWluZXJTaXplRm9yUmVuZGVy ZXIodGhpcywgRmxvYXRTaXplKGJ1bGxldFdpZHRoLCBidWxsZXRXaWR0aCksIHN0eWxlKCkuZWZm ZWN0aXZlWm9vbSgpKTsKKyAgICAgICAgTGF5b3V0U2l6ZSBkZWZhdWx0QnVsbGV0U2l6ZShidWxs ZXRXaWR0aCwgYnVsbGV0V2lkdGgpOworICAgICAgICBMYXlvdXRTaXplIGltYWdlU2l6ZSA9IGNh bGN1bGF0ZUltYWdlSW50cmluc2ljRGltZW5zaW9ucyhtX2ltYWdlLmdldCgpLCBkZWZhdWx0QnVs bGV0U2l6ZSwgRG9Ob3RTY2FsZUJ5RWZmZWN0aXZlWm9vbSk7CisgICAgICAgIG1faW1hZ2UtPnNl dENvbnRhaW5lclNpemVGb3JSZW5kZXJlcih0aGlzLCBpbWFnZVNpemUsIHN0eWxlKCkuZWZmZWN0 aXZlWm9vbSgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApJbmRleDogTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24g MTgyNzM2KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTYgQEAKKzIwMTUtMDQtMTMgIFNhaWQgQWJvdS1IYWxsYXdhICA8c2Fib3VoYWxsYXdhQGFw cGxlLmNvbT4KKworICAgICAgICBsaXN0LXN0eWxlLWltYWdlIHdpdGggU1ZHIGltYWdlIHJlbmRl cnMgYXQgaW5jb3JyZWN0IHNpemUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDEzNjcuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRW5zdXJlIHRoZSBTVkcgaW1hZ2UgZ2V0cyB0aGUgY29ycmVjdCBzaXpl IHdoZW4gdXNlZCBhcyBhbiBpbWFnZSBsaXN0LgorCisgICAgICAgICogc3ZnL2FzLWxpc3QtaW1h Z2U6IEFkZGVkLgorICAgICAgICAqIHN2Zy9hcy1saXN0LWltYWdlL3N2Zy1saXN0LWltYWdlLWlu dHJpbnNpYy1zaXplLTEtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogc3ZnL2FzLWxp c3QtaW1hZ2Uvc3ZnLWxpc3QtaW1hZ2UtaW50cmluc2ljLXNpemUtMS5odG1sOiBBZGRlZC4KKwog MjAxNS0wNC0xMyAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFtFRkxdIFVwZGF0ZSB0YWJsZS9tb3ppbGxhIGV4cGVjdGVkIGZpbGVzIGFmdGVyIHIxODI2 MjAKSW5kZXg6IExheW91dFRlc3RzL3N2Zy9hcy1saXN0LWltYWdlL3N2Zy1saXN0LWltYWdlLWlu dHJpbnNpYy1zaXplLTEtZXhwZWN0ZWQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9z dmcvYXMtbGlzdC1pbWFnZS9zdmctbGlzdC1pbWFnZS1pbnRyaW5zaWMtc2l6ZS0xLWV4cGVjdGVk Lmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9zdmcvYXMtbGlzdC1pbWFnZS9zdmct bGlzdC1pbWFnZS1pbnRyaW5zaWMtc2l6ZS0xLWV4cGVjdGVkLmh0bWwJKHdvcmtpbmcgY29weSkK QEAgLTAsMCArMSwxMSBAQAorPCFET0NUWVBFIGh0bWw+Cis8c3R5bGU+CisgIGxpIHsgbGlzdC1z dHlsZS1pbWFnZTogdXJsKCdkYXRhOmltYWdlL3BuZztiYXNlNjQsIFwKKyAgICBpVkJPUncwS0dn b0FBQUFOU1VoRVVnQUFBQjRBQUFBQkNBUUFBQUJqdWRabkFBQUFBbUpMUjBRQS80ZVB6TDhBQUFB SmNFaFpjd0EgXAorICAgIEFDeE1BQUFzVEFRQ2FuQmdBQUFBT1NVUkJWQWpYWTJUNHowQTJBQUE3 UHdFQk4rbmNJQUFBQUFCSlJVNUVya0pnZ2c9PScpOworICB9Cis8L3N0eWxlPgorPHVsPgorICA8 bGk+QnVsbGV0IDE8L2xpPgorICA8bGk+QnVsbGV0IDI8L2xpPgorPC91bD4KXCBObyBuZXdsaW5l IGF0IGVuZCBvZiBmaWxlCkluZGV4OiBMYXlvdXRUZXN0cy9zdmcvYXMtbGlzdC1pbWFnZS9zdmct bGlzdC1pbWFnZS1pbnRyaW5zaWMtc2l6ZS0xLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvc3ZnL2FzLWxpc3QtaW1hZ2Uvc3ZnLWxpc3QtaW1hZ2UtaW50cmluc2ljLXNpemUtMS5odG1s CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvc3ZnL2FzLWxpc3QtaW1hZ2Uvc3ZnLWxpc3Qt aW1hZ2UtaW50cmluc2ljLXNpemUtMS5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMTIg QEAKKzwhRE9DVFlQRSBodG1sPgorPHN0eWxlPgorICBsaSB7IGxpc3Qtc3R5bGUtaW1hZ2U6IHVy bCgnZGF0YTppbWFnZS9zdmcreG1sLCBcCisgICAgPHN2ZyB3aWR0aD0iMzBweCIgaGVpZ2h0PSIx cHgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+IFwKKyAgICAgIDxsaW5lIHgy PSIzMCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9ImJsYWNrIi8+IFwKKyAgICA8L3N2Zz4nKTsK KyAgfQorPC9zdHlsZT4KKzx1bD4KKyAgPGxpPkJ1bGxldCAxPC9saT4KKyAgPGxpPkJ1bGxldCAy PC9saT4KKzwvdWw+Cg== 250662 2015-04-13 12:05:56 -0700 2015-04-13 13:03:21 -0700 Patch bug-141367-20150413120501.patch text/plain 4330 sabouhallawa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjczNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA0LTEzICBTYWlkIEFi b3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgbGlzdC1zdHls ZS1pbWFnZSB3aXRoIFNWRyBpbWFnZSByZW5kZXJzIGF0IGluY29ycmVjdCBzaXplLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxMzY3LgorCisgICAg ICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorICAgICAgICAKKyAgICAgICAgVGhpcyBwYXRj aCBpbXBvcnRzIGh0dHBzOi8vY29kZXJldmlldy5jaHJvbWl1bS5vcmcvMTk3MjAzMDAzLgorCisg ICAgICAgIFdoZW4gdXNpbmcgYW4gU1ZHIGFzIGxpc3QgbWFya2VyIGltYWdlLCBkb24ndCB1bmNv bmRpdGlvbmFsbHkgc2V0IHRoZQorICAgICAgICBkaW1lbnNpb25zIHRvIGEgc3F1YXJlIHdpdGgg dGhlIGRpbWVuc2lvbnMgb2YgYXNjZW50IC8gMiwgYnV0IHJhdGhlcgorICAgICAgICBkZXRlcm1p bmUgYSBzdWl0YWJsZSBzaXplIHVzaW5nIGludHJpbnNpYyBkaW1lbnNpb25zIChhbmQgcmF0aW8p LgorCisgICAgICAgIFRlc3Q6IHN2Zy9hcy1saXN0LWltYWdlL3N2Zy1saXN0LWltYWdlLWludHJp bnNpYy1zaXplLTEuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RNYXJrZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdE1hcmtlcjo6dXBkYXRlQ29udGVudCk6 CisKIDIwMTUtMDQtMTIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAg IFtDb2NvYV0gTG9jYWxpemFibGUgc3RyaW5ncyBhcmUgaW5jb25zaXN0ZW50IGFuZCBuZWVkIHRv IGJlIHJlZ2VuZXJhdGVkCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlz dE1hcmtlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxpc3RNYXJrZXIuY3BwCShyZXZpc2lvbiAxODI2NzQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGlzdE1hcmtlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0MjQsOCArMTQy NCwxMCBAQCB2b2lkIFJlbmRlckxpc3RNYXJrZXI6OnVwZGF0ZUNvbnRlbnQoKQogICAgIGlmIChp c0ltYWdlKCkpIHsKICAgICAgICAgLy8gRklYTUU6IFRoaXMgaXMgYSBzb21ld2hhdCBhcmJpdHJh cnkgd2lkdGguICBHZW5lcmF0ZWQgaW1hZ2VzIGZvciBtYXJrZXJzIHJlYWxseSB3b24ndCBiZWNv bWUgcGFydGljdWxhcmx5IHVzZWZ1bAogICAgICAgICAvLyB1bnRpbCB3ZSBzdXBwb3J0IHRoZSBD U1MzIG1hcmtlciBwc2V1ZG9jbGFzcyB0byBhbGxvdyBjb250cm9sIG92ZXIgdGhlIHdpZHRoIGFu ZCBoZWlnaHQgb2YgdGhlIG1hcmtlciBib3guCi0gICAgICAgIGludCBidWxsZXRXaWR0aCA9IHN0 eWxlKCkuZm9udE1ldHJpY3MoKS5hc2NlbnQoKSAvIDI7Ci0gICAgICAgIG1faW1hZ2UtPnNldENv bnRhaW5lclNpemVGb3JSZW5kZXJlcih0aGlzLCBGbG9hdFNpemUoYnVsbGV0V2lkdGgsIGJ1bGxl dFdpZHRoKSwgc3R5bGUoKS5lZmZlY3RpdmVab29tKCkpOworICAgICAgICBMYXlvdXRVbml0IGJ1 bGxldFdpZHRoID0gc3R5bGUoKS5mb250TWV0cmljcygpLmFzY2VudCgpIC8gTGF5b3V0VW5pdCgy KTsKKyAgICAgICAgTGF5b3V0U2l6ZSBkZWZhdWx0QnVsbGV0U2l6ZShidWxsZXRXaWR0aCwgYnVs bGV0V2lkdGgpOworICAgICAgICBMYXlvdXRTaXplIGltYWdlU2l6ZSA9IGNhbGN1bGF0ZUltYWdl SW50cmluc2ljRGltZW5zaW9ucyhtX2ltYWdlLmdldCgpLCBkZWZhdWx0QnVsbGV0U2l6ZSwgRG9O b3RTY2FsZUJ5RWZmZWN0aXZlWm9vbSk7CisgICAgICAgIG1faW1hZ2UtPnNldENvbnRhaW5lclNp emVGb3JSZW5kZXJlcih0aGlzLCBpbWFnZVNpemUsIHN0eWxlKCkuZWZmZWN0aXZlWm9vbSgpKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTgyNzM2KQorKysg TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIw MTUtMDQtMTMgIFNhaWQgQWJvdS1IYWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxlLmNvbT4KKwor ICAgICAgICBsaXN0LXN0eWxlLWltYWdlIHdpdGggU1ZHIGltYWdlIHJlbmRlcnMgYXQgaW5jb3Jy ZWN0IHNpemUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNDEzNjcuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAg RW5zdXJlIHRoZSBTVkcgaW1hZ2UgZ2V0cyB0aGUgY29ycmVjdCBzaXplIHdoZW4gdXNlZCBhcyBh biBpbWFnZSBsaXN0LgorCisgICAgICAgICogc3ZnL2FzLWxpc3QtaW1hZ2U6IEFkZGVkLgorICAg ICAgICAqIHN2Zy9hcy1saXN0LWltYWdlL3N2Zy1saXN0LWltYWdlLWludHJpbnNpYy1zaXplLTEt ZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogc3ZnL2FzLWxpc3QtaW1hZ2Uvc3ZnLWxp c3QtaW1hZ2UtaW50cmluc2ljLXNpemUtMS5odG1sOiBBZGRlZC4KKwogMjAxNS0wNC0xMyAgQ3Nh YmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtFRkxdIFVwZGF0 ZSB0YWJsZS9tb3ppbGxhIGV4cGVjdGVkIGZpbGVzIGFmdGVyIHIxODI2MjAKSW5kZXg6IExheW91 dFRlc3RzL3N2Zy9hcy1saXN0LWltYWdlL3N2Zy1saXN0LWltYWdlLWludHJpbnNpYy1zaXplLTEt ZXhwZWN0ZWQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9zdmcvYXMtbGlzdC1pbWFn ZS9zdmctbGlzdC1pbWFnZS1pbnRyaW5zaWMtc2l6ZS0xLWV4cGVjdGVkLmh0bWwJKHJldmlzaW9u IDApCisrKyBMYXlvdXRUZXN0cy9zdmcvYXMtbGlzdC1pbWFnZS9zdmctbGlzdC1pbWFnZS1pbnRy aW5zaWMtc2l6ZS0xLWV4cGVjdGVkLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxMSBA QAorPCFET0NUWVBFIGh0bWw+Cis8c3R5bGU+CisgIGxpIHsgbGlzdC1zdHlsZS1pbWFnZTogdXJs KCdkYXRhOmltYWdlL3BuZztiYXNlNjQsIFwKKyAgICBpVkJPUncwS0dnb0FBQUFOU1VoRVVnQUFB QjRBQUFBQkNBUUFBQUJqdWRabkFBQUFBbUpMUjBRQS80ZVB6TDhBQUFBSmNFaFpjd0EgXAorICAg IEFDeE1BQUFzVEFRQ2FuQmdBQUFBT1NVUkJWQWpYWTJUNHowQTJBQUE3UHdFQk4rbmNJQUFBQUFC SlJVNUVya0pnZ2c9PScpOworICB9Cis8L3N0eWxlPgorPHVsPgorICA8bGk+QnVsbGV0IDE8L2xp PgorICA8bGk+QnVsbGV0IDI8L2xpPgorPC91bD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxl CkluZGV4OiBMYXlvdXRUZXN0cy9zdmcvYXMtbGlzdC1pbWFnZS9zdmctbGlzdC1pbWFnZS1pbnRy aW5zaWMtc2l6ZS0xLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvc3ZnL2FzLWxpc3Qt aW1hZ2Uvc3ZnLWxpc3QtaW1hZ2UtaW50cmluc2ljLXNpemUtMS5odG1sCShyZXZpc2lvbiAwKQor KysgTGF5b3V0VGVzdHMvc3ZnL2FzLWxpc3QtaW1hZ2Uvc3ZnLWxpc3QtaW1hZ2UtaW50cmluc2lj LXNpemUtMS5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMTIgQEAKKzwhRE9DVFlQRSBo dG1sPgorPHN0eWxlPgorICBsaSB7IGxpc3Qtc3R5bGUtaW1hZ2U6IHVybCgnZGF0YTppbWFnZS9z dmcreG1sLCBcCisgICAgPHN2ZyB3aWR0aD0iMzBweCIgaGVpZ2h0PSIxcHgiIHhtbG5zPSJodHRw Oi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+IFwKKyAgICAgIDxsaW5lIHgyPSIzMCIgc3Ryb2tlLXdp ZHRoPSIyIiBzdHJva2U9ImJsYWNrIi8+IFwKKyAgICA8L3N2Zz4nKTsKKyAgfQorPC9zdHlsZT4K Kzx1bD4KKyAgPGxpPkJ1bGxldCAxPC9saT4KKyAgPGxpPkJ1bGxldCAyPC9saT4KKzwvdWw+Cg==