105600 2012-12-20 18:35:47 -0800 REGRESSION (r138196): Regions with text-overflow: ellipsis; are being ellipsized unnecessarily 2012-12-28 10:34:39 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://github.com/scalatra/scalatra/ InRadar, Regression P1 Normal --- 1 mrowe eae eae eric leviw mitz ojan.autocc webkit-bug-importer webkit.review.bot oldest_to_newest 796031 0 mrowe 2012-12-20 18:35:47 -0800 After <http://trac.webkit.org/changeset/138196> I'm seeing unnecessarily ellipsized text on a number of different websites. For instance, on <https://github.com/scalatra/scalatra/> the folder listing includes many ellipsized items. In particular, the first item "akka" is displayed as "ak…" even though the following item is substantially longer and is not itself truncated. This is also visible on Facebook in the news feed sorting widget. "Most recent" is truncated to "Must rece…", even though there's clearly room for the "nt" to be displayed. 796035 1 webkit-bug-importer 2012-12-20 18:37:10 -0800 <rdar://problem/12922386> 796073 2 leviw 2012-12-20 19:50:59 -0800 If this is urgent for anyone, feel free to roll out the patch. Otherwise Emil or I will take a look tomorrow AM PST (assuming he doesn't look at it tonight). 796352 3 eae 2012-12-21 09:53:03 -0800 Looking into this now. 796392 4 eae 2012-12-21 11:19:08 -0800 I have not been able to reproduce the problem on the github site listed above nor on facebook in a tip of tree safari build regardless of zoom level. 796397 5 mitz 2012-12-21 11:34:27 -0800 You may need to disable screen font substitution and/or enable kerning and ligatures by default to see this. The relevant user defaults are: WebKitScreenFontSubstitutionEnabled WebKitKerningAndLigaturesEnabledByDefault 796401 6 mitz 2012-12-21 11:40:55 -0800 (In reply to comment #5) > You may need to disable screen font substitution and/or enable kerning and ligatures by default to see this. The relevant user defaults are: > > WebKitScreenFontSubstitutionEnabled This is actually a WebKit preference, so for Safari’s WebKit2 content view you’ll need to use com.apple.Safari.ContentPageGroupIdentifier.WebKit2ScreenFontSubstitutionEnabled > WebKitKerningAndLigaturesEnabledByDefault 796406 7 eae 2012-12-21 11:51:49 -0800 Tried setting the defaults as but still does not reproduce. Are there any other settings I might need (or perhaps the defaults needs to be set in a different way)? $ defaults write com.apple.Safari WebKitScreenFontSubstitutionEnabled 1 $ defaults write com.apple.Safari WebKitKerningAndLigaturesEnabledByDefault 1 $ defaults write com.apple.Safari.ContentPageGroupIdentifier WebKit2ScreenFontSubstitutionEnabled 1 796407 8 mrowe 2012-12-21 11:53:55 -0800 The last one should be: $ defaults write com.apple.Safari com.apple.Safari.ContentPageGroupIdentifier.WebKit2ScreenFontSubstitutionEnabled 1 796418 9 eae 2012-12-21 12:27:30 -0800 (In reply to comment #8) > The last one should be: > > $ defaults write com.apple.Safari com.apple.Safari.ContentPageGroupIdentifier.WebKit2ScreenFontSubstitutionEnabled 1 Ah, thanks. Sadly I'm still not able to reproduce the problem. 796673 10 mitz 2012-12-22 09:41:51 -0800 (In reply to comment #9) > (In reply to comment #8) > > The last one should be: > > > > $ defaults write com.apple.Safari com.apple.Safari.ContentPageGroupIdentifier.WebKit2ScreenFontSubstitutionEnabled 1 > > Ah, thanks. Sadly I'm still not able to reproduce the problem. 1 (or YES) is the default on Mountain Lion and earlier. In order to be able to reproduce the problem, please try $ defaults write com.apple.Safari com.apple.Safari.ContentPageGroupIdentifier.WebKit2ScreenFontSubstitutionEnabled 0 797343 11 eae 2012-12-26 10:26:59 -0800 (In reply to comment #10) > 1 (or YES) is the default on Mountain Lion and earlier. In order to be able to reproduce the problem, please try > > $ defaults write com.apple.Safari com.apple.Safari.ContentPageGroupIdentifier.WebKit2ScreenFontSubstitutionEnabled 0 That did the trick, thanks! 797375 12 180761 eae 2012-12-26 13:00:10 -0800 Created attachment 180761 Patch 797433 13 180761 darin 2012-12-26 17:44:46 -0800 Comment on attachment 180761 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180761&action=review > Source/WebCore/rendering/RenderBlockLineLayout.cpp:3206 > + int lineBoxEdge = ltr ? snapSizeToPixel(curr->x() + curr->logicalWidth(), curr->x()) : snapSizeToPixel(curr->x(), 0); Is there a way to write the two snaps more consistently. I’m concerned that curr->x() ends up being the reference value when it’s LTR, but 0 when it’s RTL. Does not seem quite right. And the test case only covers LTR, so the RTL code could be wrong and the test would not show us. 797616 14 eae 2012-12-27 10:36:35 -0800 (In reply to comment #13) > (From update of attachment 180761 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=180761&action=review > > > Source/WebCore/rendering/RenderBlockLineLayout.cpp:3206 > > + int lineBoxEdge = ltr ? snapSizeToPixel(curr->x() + curr->logicalWidth(), curr->x()) : snapSizeToPixel(curr->x(), 0); > > Is there a way to write the two snaps more consistently. I’m concerned that curr->x() ends up being the reference value when it’s LTR, but 0 when it’s RTL. Does not seem quite right. And the test case only covers LTR, so the RTL code could be wrong and the test would not show us. I tested with both LTR and RTL content and both resulted in incorrect truncation. The proposed change fixes the problem for both LTR and RTL and the snapping matches the logic we use for snapping rtl content elsewhere. I'll updated the patch to include a test for RTL content. 797618 15 180811 eae 2012-12-27 10:37:15 -0800 Created attachment 180811 Patch for landing 797935 16 eae 2012-12-28 10:34:39 -0800 Committed r138543: <http://trac.webkit.org/changeset/138543> 180761 2012-12-26 13:00:10 -0800 2012-12-27 10:37:15 -0800 Patch bug-105600-20121226125723.patch text/plain 4702 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzODQ4MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEyLTI2ICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTM4MTk2 KTogUmVnaW9ucyB3aXRoIHRleHQtb3ZlcmZsb3c6IGVsbGlwc2lzOyBhcmUgYmVpbmcgZWxsaXBz aXplZCB1bm5lY2Vzc2FyaWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDU2MDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KyAgICAgICAgCisgICAgICAgIFBpeGVsLXNuYXAgbGluZUJveEVkZ2UgYmVmb3JlIGNvbXBhcmlu ZyB3aXRoIHRoZSBibG9jayBlZGdlIGFzCisgICAgICAgIHRoZSBsaW5lQm94IGVkZ2UgaXNuJ3Qg Z3VhcmFudGVlZCB0byBiZSBzbmFwcGVkIHRvIGRldmljZSBwaXhlbHMKKyAgICAgICAgb24gYWxs IHBsYXRmb3Jtcy4KKworICAgICAgICBUZXN0OiBmYXN0L3N1Yi1waXhlbC9lbGxpcHNpcy10YWJs ZS5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjaGVja0xpbmVzRm9yVGV4dE92ZXJmbG93 KToKKwogMjAxMi0xMi0yNiAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAg ICAgICAgW01hY10gTWVtb3J5UHJlc3N1cmVIYW5kbGVyOiBPY2Nhc2lvbmFsIGNyYXNoZXMgaW4g dW5pbnN0YWxsKCkgd2hlbiByZXNwb25kaW5nIHRvIG1lbW9yeSBwcmVzc3VyZSBzaWduYWwuCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5 b3V0LmNwcAkocmV2aXNpb24gMTM4NDgyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrTGluZUxheW91dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyMDMsNyArMzIwMyw3 IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNoZWNrTGluZXNGb3JUZXh0T3ZlcmYKICAgICAgICAgLy8g aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTQ2MQogICAgICAgICBp bnQgYmxvY2tSaWdodEVkZ2UgPSBzbmFwU2l6ZVRvUGl4ZWwobG9naWNhbFJpZ2h0T2Zmc2V0Rm9y TGluZShjdXJyLT5saW5lVG9wKCksIGZpcnN0TGluZSksIGN1cnItPngoKSk7CiAgICAgICAgIGlu dCBibG9ja0xlZnRFZGdlID0gcGl4ZWxTbmFwcGVkTG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKGN1 cnItPmxpbmVUb3AoKSwgZmlyc3RMaW5lKTsKLSAgICAgICAgTGF5b3V0VW5pdCBsaW5lQm94RWRn ZSA9IGx0ciA/IGN1cnItPngoKSArIGN1cnItPmxvZ2ljYWxXaWR0aCgpIDogY3Vyci0+eCgpOwor ICAgICAgICBpbnQgbGluZUJveEVkZ2UgPSBsdHIgPyBzbmFwU2l6ZVRvUGl4ZWwoY3Vyci0+eCgp ICsgY3Vyci0+bG9naWNhbFdpZHRoKCksIGN1cnItPngoKSkgOiBzbmFwU2l6ZVRvUGl4ZWwoY3Vy ci0+eCgpLCAwKTsKICAgICAgICAgaWYgKChsdHIgJiYgbGluZUJveEVkZ2UgPiBibG9ja1JpZ2h0 RWRnZSkgfHwgKCFsdHIgJiYgbGluZUJveEVkZ2UgPCBibG9ja0xlZnRFZGdlKSkgewogICAgICAg ICAgICAgLy8gVGhpcyBsaW5lIHNwaWxscyBvdXQgb2Ygb3VyIGJveCBpbiB0aGUgYXBwcm9wcmlh dGUgZGlyZWN0aW9uLiAgTm93IHdlIG5lZWQgdG8gc2VlIGlmIHRoZSBsaW5lCiAgICAgICAgICAg ICAvLyBjYW4gYmUgdHJ1bmNhdGVkLiAgSW4gb3JkZXIgZm9yIHRydW5jYXRpb24gdG8gYmUgcG9z c2libGUsIHRoZSBsaW5lIG11c3QgaGF2ZSBzdWZmaWNpZW50IHNwYWNlIHRvCkluZGV4OiBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShy ZXZpc2lvbiAxMzg0ODIpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxNSBAQAorMjAxMi0xMi0yNiAgRW1pbCBBIEVrbHVuZCAgPGVhZUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjEzODE5Nik6IFJlZ2lvbnMgd2l0aCB0ZXh0 LW92ZXJmbG93OiBlbGxpcHNpczsgYXJlIGJlaW5nIGVsbGlwc2l6ZWQgdW5uZWNlc3NhcmlseQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1NjAwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBB ZGQgdGVzdCBmb3IgdGV4dC1vdmVyZmxvdzogZWxsaXBzaXMgaW5zaWRlIGEgdGFibGUuIAorCisg ICAgICAgICogZmFzdC9zdWItcGl4ZWwvZWxsaXBzaXMtdGFibGUtZXhwZWN0ZWQuaHRtbDogQWRk ZWQuCisgICAgICAgICogZmFzdC9zdWItcGl4ZWwvZWxsaXBzaXMtdGFibGUuaHRtbDogQWRkZWQu CisKIDIwMTItMTItMjYgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogZXh0cmFjdCBKUyBoZWFwIHByb2ZpbGVyIHNwZWNpZmlj cyBpbnRvIEpTSGVhcFNuYXBzaG90LmpzCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3N1Yi1waXhl bC9lbGxpcHNpcy10YWJsZS1leHBlY3RlZC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L2Zhc3Qvc3ViLXBpeGVsL2VsbGlwc2lzLXRhYmxlLWV4cGVjdGVkLmh0bWwJKHJldmlzaW9uIDAp CisrKyBMYXlvdXRUZXN0cy9mYXN0L3N1Yi1waXhlbC9lbGxpcHNpcy10YWJsZS1leHBlY3RlZC5o dG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1s PgorICAgIDxoZWFkPgorICAgICAgICA8c3R5bGU+CisgICAgICAgICAgICB0ZCA+IGEgeworICAg ICAgICAgICAgICAgIG1heC13aWR0aDogMTI1cHg7CisgICAgICAgICAgICAgICAgZGlzcGxheTog aW5saW5lLWJsb2NrOworICAgICAgICAgICAgICAgIG92ZXJmbG93OiBoaWRkZW47CisgICAgICAg ICAgICAgICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgPC9z dHlsZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+CisgICAgICAgIDx0YWJsZSBjZWxscGFkZGlu Zz0iMCIgY2VsbHNwYWNpbmc9IjAiPgorICAgICAgICAgICAgPHRib2R5PgorICAgICAgICAgICAg ICAgIDx0cj48dGQ+PGEgaHJlZj0iIyI+YWtrYTwvYT48L3RkPjwvdHI+CisgICAgICAgICAgICAg ICAgPHRyPjx0ZD48YSBocmVmPSIjIj5zbGY0ajwvYT48L3RkPjwvdHI+CisgICAgICAgICAgICA8 L3Rib2R5PgorICAgICAgICA8L3RhYmxlPgorICAgICAgICA8cD4KKyAgICAgICAgICAgIE5vbmUg b2YgdGhlIGxpbmVzIGFib3ZlIHNob3VsZCBiZSB0cnVuY2F0ZWQuCisgICAgICAgIDwvcD4KKyAg ICA8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3N1Yi1waXhlbC9lbGxp cHNpcy10YWJsZS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3Qvc3ViLXBpeGVs L2VsbGlwc2lzLXRhYmxlLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3N1 Yi1waXhlbC9lbGxpcHNpcy10YWJsZS5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI1IEBA Cis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c3R5bGU+Cisg ICAgICAgICAgICB0ZCA+IGEgeworICAgICAgICAgICAgICAgIG1heC13aWR0aDogMTI1cHg7Cisg ICAgICAgICAgICAgICAgZGlzcGxheTogaW5saW5lLWJsb2NrOworICAgICAgICAgICAgICAgIG92 ZXJmbG93OiBoaWRkZW47CisgICAgICAgICAgICAgICAgdGV4dC1vdmVyZmxvdzogZWxsaXBzaXM7 CisgICAgICAgICAgICAgICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgPC9zdHlsZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+CisgICAgICAgIDx0YWJsZSBj ZWxscGFkZGluZz0iMCIgY2VsbHNwYWNpbmc9IjAiPgorICAgICAgICAgICAgPHRib2R5PgorICAg ICAgICAgICAgICAgIDx0cj48dGQ+PGEgaHJlZj0iIyI+YWtrYTwvYT48L3RkPjwvdHI+CisgICAg ICAgICAgICAgICAgPHRyPjx0ZD48YSBocmVmPSIjIj5zbGY0ajwvYT48L3RkPjwvdHI+CisgICAg ICAgICAgICA8L3Rib2R5PgorICAgICAgICA8L3RhYmxlPgorICAgICAgICA8cD4KKyAgICAgICAg ICAgIE5vbmUgb2YgdGhlIGxpbmVzIGFib3ZlIHNob3VsZCBiZSB0cnVuY2F0ZWQuCisgICAgICAg IDwvcD4KKyAgICA8L2JvZHk+Cis8L2h0bWw+Cg== 180811 2012-12-27 10:37:15 -0800 2012-12-27 10:37:15 -0800 Patch for landing patch-for-landing text/plain 5428 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzODUwOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEyLTI3ICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTM4MTk2 KTogUmVnaW9ucyB3aXRoIHRleHQtb3ZlcmZsb3c6IGVsbGlwc2lzOyBhcmUgYmVpbmcgZWxsaXBz aXplZCB1bm5lY2Vzc2FyaWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDU2MDAKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKyAg ICAgICAgCisgICAgICAgIFBpeGVsLXNuYXAgbGluZUJveEVkZ2UgYmVmb3JlIGNvbXBhcmluZyB3 aXRoIHRoZSBibG9jayBlZGdlIGFzCisgICAgICAgIHRoZSBsaW5lQm94IGVkZ2UgaXNuJ3QgZ3Vh cmFudGVlZCB0byBiZSBzbmFwcGVkIHRvIGRldmljZSBwaXhlbHMKKyAgICAgICAgb24gYWxsIHBs YXRmb3Jtcy4KKworICAgICAgICBUZXN0OiBmYXN0L3N1Yi1waXhlbC9lbGxpcHNpcy10YWJsZS5o dG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjaGVja0xpbmVzRm9yVGV4dE92ZXJmbG93KToK KwogMjAxMi0xMi0yNyAgSHVhbmcgRG9uZ3N1bmcgIDxsdXh0ZWxsYUBjb21wYW55MTAwLm5ldD4K IAogICAgICAgICBbVGV4TWFwXSBNaW5vciByZWZhY3RvcmluZyBvZiBUZXh0dXJlTWFwcGVyTGF5 ZXIuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tM aW5lTGF5b3V0LmNwcAkocmV2aXNpb24gMTM4NTA4KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyMDMsNyAr MzIwMyw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNoZWNrTGluZXNGb3JUZXh0T3ZlcmYKICAgICAg ICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTQ2MQogICAg ICAgICBpbnQgYmxvY2tSaWdodEVkZ2UgPSBzbmFwU2l6ZVRvUGl4ZWwobG9naWNhbFJpZ2h0T2Zm c2V0Rm9yTGluZShjdXJyLT5saW5lVG9wKCksIGZpcnN0TGluZSksIGN1cnItPngoKSk7CiAgICAg ICAgIGludCBibG9ja0xlZnRFZGdlID0gcGl4ZWxTbmFwcGVkTG9naWNhbExlZnRPZmZzZXRGb3JM aW5lKGN1cnItPmxpbmVUb3AoKSwgZmlyc3RMaW5lKTsKLSAgICAgICAgTGF5b3V0VW5pdCBsaW5l Qm94RWRnZSA9IGx0ciA/IGN1cnItPngoKSArIGN1cnItPmxvZ2ljYWxXaWR0aCgpIDogY3Vyci0+ eCgpOworICAgICAgICBpbnQgbGluZUJveEVkZ2UgPSBsdHIgPyBzbmFwU2l6ZVRvUGl4ZWwoY3Vy ci0+eCgpICsgY3Vyci0+bG9naWNhbFdpZHRoKCksIGN1cnItPngoKSkgOiBzbmFwU2l6ZVRvUGl4 ZWwoY3Vyci0+eCgpLCAwKTsKICAgICAgICAgaWYgKChsdHIgJiYgbGluZUJveEVkZ2UgPiBibG9j a1JpZ2h0RWRnZSkgfHwgKCFsdHIgJiYgbGluZUJveEVkZ2UgPCBibG9ja0xlZnRFZGdlKSkgewog ICAgICAgICAgICAgLy8gVGhpcyBsaW5lIHNwaWxscyBvdXQgb2Ygb3VyIGJveCBpbiB0aGUgYXBw cm9wcmlhdGUgZGlyZWN0aW9uLiAgTm93IHdlIG5lZWQgdG8gc2VlIGlmIHRoZSBsaW5lCiAgICAg ICAgICAgICAvLyBjYW4gYmUgdHJ1bmNhdGVkLiAgSW4gb3JkZXIgZm9yIHRydW5jYXRpb24gdG8g YmUgcG9zc2libGUsIHRoZSBsaW5lIG11c3QgaGF2ZSBzdWZmaWNpZW50IHNwYWNlIHRvCkluZGV4 OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCShyZXZpc2lvbiAxMzg1MDgpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0xMi0yNyAgRW1pbCBBIEVrbHVuZCAgPGVhZUBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjEzODE5Nik6IFJlZ2lvbnMgd2l0 aCB0ZXh0LW92ZXJmbG93OiBlbGxpcHNpczsgYXJlIGJlaW5nIGVsbGlwc2l6ZWQgdW5uZWNlc3Nh cmlseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1 NjAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisgICAgICAgIAorICAgICAg ICBBZGQgdGVzdCBmb3IgdGV4dC1vdmVyZmxvdzogZWxsaXBzaXMgaW5zaWRlIGEgdGFibGUuIAor CisgICAgICAgICogZmFzdC9zdWItcGl4ZWwvZWxsaXBzaXMtdGFibGUtZXhwZWN0ZWQuaHRtbDog QWRkZWQuCisgICAgICAgICogZmFzdC9zdWItcGl4ZWwvZWxsaXBzaXMtdGFibGUuaHRtbDogQWRk ZWQuCisKIDIwMTItMTItMjcgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogW1JlZ3Jlc3Npb25dIENhbiBub3Qgc2V0IGJyZWFr cG9pbnRzIGluIHNjcmlwdHMgbG9hZGVkIHdpdGggc291cmNlIG1hcC4KSW5kZXg6IExheW91dFRl c3RzL2Zhc3Qvc3ViLXBpeGVsL2VsbGlwc2lzLXRhYmxlLWV4cGVjdGVkLmh0bWwKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9zdWItcGl4ZWwvZWxsaXBzaXMtdGFibGUtZXhwZWN0ZWQu aHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3Qvc3ViLXBpeGVsL2VsbGlwc2lz LXRhYmxlLWV4cGVjdGVkLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMzQgQEAKKzwhRE9D VFlQRSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDxtZXRhIGNoYXJzZXQ9InV0 Zi04Ij4gCisgICAgICAgIDxzdHlsZT4KKyAgICAgICAgICAgIHRkID4gYSB7CisgICAgICAgICAg ICAgICAgbWF4LXdpZHRoOiAxMjVweDsKKyAgICAgICAgICAgICAgICBkaXNwbGF5OiBpbmxpbmUt YmxvY2s7CisgICAgICAgICAgICAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKKyAgICAgICAgICAgICAg ICB3aGl0ZS1zcGFjZTogbm93cmFwOworICAgICAgICAgICAgfQorICAgICAgICAgICAgLnJ0bCB0 ZCB7CisgICAgICAgICAgICAgICAgZGlyZWN0aW9uOiBydGw7CisgICAgICAgICAgICB9CisgICAg ICAgIDwvc3R5bGU+CisgICAgPC9oZWFkPgorICAgIDxib2R5PgorICAgICAgICA8dGFibGUgY2Vs bHBhZGRpbmc9IjAiIGNlbGxzcGFjaW5nPSIwIj4KKyAgICAgICAgICAgIDx0Ym9keT4KKyAgICAg ICAgICAgICAgICA8dHI+PHRkPjxhIGhyZWY9IiMiPmFra2E8L2E+PC90ZD48L3RyPgorICAgICAg ICAgICAgICAgIDx0cj48dGQ+PGEgaHJlZj0iIyI+c2xmNGo8L2E+PC90ZD48L3RyPgorICAgICAg ICAgICAgPC90Ym9keT4KKyAgICAgICAgPC90YWJsZT4KKyAgICAgICAgPHRhYmxlIGNsYXNzPSJy dGwiIGNlbGxwYWRkaW5nPSIwIiBjZWxsc3BhY2luZz0iMCI+CisgICAgICAgICAgICA8dGJvZHk+ CisgICAgICAgICAgICAgICAgPHRyPjx0ZD48YSBocmVmPSIjIj7XnteZ157XmdefINec16nXnteQ 15w8L2E+PC90ZD48L3RyPgorICAgICAgICAgICAgICAgIDx0cj48dGQ+PGEgaHJlZj0iIyI+2KfZ hNmK2YXZitmGINil2YTZiSDYp9mE2YrYs9in2LE8L2E+PC90ZD48L3RyPgorICAgICAgICAgICAg PC90Ym9keT4KKyAgICAgICAgPC90YWJsZT4KKyAgICAgICAgPHA+CisgICAgICAgICAgICBOb25l IG9mIHRoZSBsaW5lcyBhYm92ZSBzaG91bGQgYmUgdHJ1bmNhdGVkLgorICAgICAgICA8L3A+Cisg ICAgPC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9zdWItcGl4ZWwvZWxs aXBzaXMtdGFibGUuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3N1Yi1waXhl bC9lbGxpcHNpcy10YWJsZS5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9z dWItcGl4ZWwvZWxsaXBzaXMtdGFibGUuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzNSBA QAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPG1ldGEgY2hh cnNldD0idXRmLTgiPiAKKyAgICAgICAgPHN0eWxlPgorICAgICAgICAgICAgdGQgPiBhIHsKKyAg ICAgICAgICAgICAgICBtYXgtd2lkdGg6IDEyNXB4OworICAgICAgICAgICAgICAgIGRpc3BsYXk6 IGlubGluZS1ibG9jazsKKyAgICAgICAgICAgICAgICBvdmVyZmxvdzogaGlkZGVuOworICAgICAg ICAgICAgICAgIHRleHQtb3ZlcmZsb3c6IGVsbGlwc2lzOworICAgICAgICAgICAgICAgIHdoaXRl LXNwYWNlOiBub3dyYXA7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAucnRsIHRkIHsKKyAg ICAgICAgICAgICAgICBkaXJlY3Rpb246IHJ0bDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgPC9z dHlsZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+CisgICAgICAgIDx0YWJsZSBjZWxscGFkZGlu Zz0iMCIgY2VsbHNwYWNpbmc9IjAiPgorICAgICAgICAgICAgPHRib2R5PgorICAgICAgICAgICAg ICAgIDx0cj48dGQ+PGEgaHJlZj0iIyI+YWtrYTwvYT48L3RkPjwvdHI+CisgICAgICAgICAgICAg ICAgPHRyPjx0ZD48YSBocmVmPSIjIj5zbGY0ajwvYT48L3RkPjwvdHI+CisgICAgICAgICAgICA8 L3Rib2R5PgorICAgICAgICA8L3RhYmxlPgorICAgICAgICA8dGFibGUgY2xhc3M9InJ0bCIgY2Vs bHBhZGRpbmc9IjAiIGNlbGxzcGFjaW5nPSIwIj4KKyAgICAgICAgICAgIDx0Ym9keT4KKyAgICAg ICAgICAgICAgICA8dHI+PHRkPjxhIGhyZWY9IiMiPtee15nXnteZ158g15zXqdee15DXnDwvYT48 L3RkPjwvdHI+CisgICAgICAgICAgICAgICAgPHRyPjx0ZD48YSBocmVmPSIjIj7Yp9mE2YrZhdmK 2YYg2KXZhNmJINin2YTZitiz2KfYsTwvYT48L3RkPjwvdHI+CisgICAgICAgICAgICA8L3Rib2R5 PgorICAgICAgICA8L3RhYmxlPgorICAgICAgICA8cD4KKyAgICAgICAgICAgIE5vbmUgb2YgdGhl IGxpbmVzIGFib3ZlIHNob3VsZCBiZSB0cnVuY2F0ZWQuCisgICAgICAgIDwvcD4KKyAgICA8L2Jv ZHk+Cis8L2h0bWw+Cg==