89775 2012-06-22 11:40:53 -0700 RenderText’s minimum preferred width is incorrect when soft hyphens are used 2012-06-22 13:11:33 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz webkit-unassigned eric webkit.review.bot oldest_to_newest 655660 0 mitz 2012-06-22 11:40:53 -0700 The minimum preferred width computed in RenderText::computePreferredLogicalWidths does not include the width of the hyphenation string were hyphenation to occur at a soft hyphen. In addition to that, it behaves as if hyphenation can occur at a soft hyphen even when the 'hyphens' property is set to 'none'. 655666 1 149076 mitz 2012-06-22 11:48:49 -0700 Created attachment 149076 Include hyphen width in minimun preferred width, and ignore soft hyphens when 'hyphens' is 'none' 655674 2 149079 mitz 2012-06-22 11:55:13 -0700 Created attachment 149079 Include hyphen width in minimun preferred width, and ignore soft hyphens when 'hyphens' is 'none' 655679 3 149079 simon.fraser 2012-06-22 12:05:17 -0700 Comment on attachment 149079 Include hyphen width in minimun preferred width, and ignore soft hyphens when 'hyphens' is 'none' View in context: https://bugs.webkit.org/attachment.cgi?id=149079&action=review > Source/WebCore/rendering/RenderText.cpp:972 > + } else if (c == softHyphen && styleToUse->hyphens() != HyphensNone) { Maybe add RenderStyle::usesHyphens() to make this easier to read? 655712 4 mitz 2012-06-22 13:11:33 -0700 Fixed in <http://trac.webkit.org/r121050>. 149076 2012-06-22 11:48:49 -0700 2012-06-22 11:55:13 -0700 Include hyphen width in minimun preferred width, and ignore soft hyphens when 'hyphens' is 'none' 89775_r1.diff text/plain 6884 mitz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMTA0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA2LTIyICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuZGVyVGV4dOKAmXMgbWluaW11 bSBwcmVmZXJyZWQgd2lkdGggaXMgaW5jb3JyZWN0IHdoZW4gc29mdCBoeXBoZW5zIGFyZSB1c2Vk CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTc3NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZh c3QvdGV4dC9zb2Z0LWh5cGhlbi1taW4tcHJlZmVycmVkLXdpZHRoLmh0bWwKKworICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omh5cGhlbldpZHRo KTogQWRkZWQgdGhpcyBoZWxwZXIgZnVuY3Rpb24uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJU ZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6IEluIHBsYWNlcyB3aGVyZSB0aGlz IGZ1bmN0aW9uIHRlc3RzCisgICAgICAgIGZvciB0aGUgc29mdCBoeXBoZW4gY2hhcmFjdGVyLCBh ZGRlZCBhIGNoZWNrIHRoYXQgdGhlICdoeXBoZW5zJyBzdHlsZSBwcm9wZXJ0eSBpcyBub3Qgc2V0 CisgICAgICAgIHRvICdub25lJywgYmVjYXVzZSBpbiB0aGF0IGNhc2Ugc29mdCBoeXBoZW5zIGFy ZSBub3QgYnJlYWsgb3Bwb3J0dW5pdGllcy4gQWxzbyBhZGRlZCBhbgorICAgICAgICBleHBsaWNp dCBjaGVjayB0byBzdXBwcmVzcyBicmVhayBvcHBvcnR1bml0aWVzIGZyb20gaXNCcmVha2FibGUo KSBpZiB0aGUgb2NjdXIgYWZ0ZXIgYQorICAgICAgICBzb2Z0IGh5cGhlbiBhbmQgJ2h5cGhlbnMn IGlzIHNldCB0byAnbm9uZScuIEZpbmFsbHksIHdoZW4gbWVhc3VyaW5nIHRleHQgdXAgdG8gYSBw b3RlbnRpYWwKKyAgICAgICAgbGluZSBicmVhaywgYWRkZWQgdGhlIHdpZHRoIG9mIHRoZSBoeXBo ZW4gc3RyaW5nIHdoZW4gbmVlZGVkLgorCiAyMDEyLTA2LTIyICBCcmlhbiBTYWxvbW9uICA8YnNh bG9tb25AZ29vZ2xlLmNvbT4KIAogICAgICAgICBJbmNyZWFzZSB0aGUgR3JDb250ZXh0IHRleHR1 cmUgY2FjaGUgY291bnQgY2FwIHRvIDJLCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRleHQuY3BwCShyZXZpc2lvbiAxMjEwMjcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg4Miw2ICs4ODIsMTIgQEAgdm9p ZCBSZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbAogICAgICAgICBtX2tub3duVG9I YXZlTm9PdmVyZmxvd0FuZE5vRmFsbGJhY2tGb250cyA9IHRydWU7CiB9CiAKK3N0YXRpYyBpbmxp bmUgZmxvYXQgaHlwaGVuV2lkdGgoUmVuZGVyVGV4dCogcmVuZGVyZXIsIGNvbnN0IEZvbnQmIGZv bnQpCit7CisgICAgUmVuZGVyU3R5bGUqIHN0eWxlID0gcmVuZGVyZXItPnN0eWxlKCk7CisgICAg cmV0dXJuIGZvbnQud2lkdGgoUmVuZGVyQmxvY2s6OmNvbnN0cnVjdFRleHRSdW4ocmVuZGVyZXIs IGZvbnQsIHN0eWxlLT5oeXBoZW5TdHJpbmcoKS5zdHJpbmcoKSwgc3R5bGUpKTsKK30KKwogdm9p ZCBSZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyhmbG9hdCBsZWFkV2lk dGgsIEhhc2hTZXQ8Y29uc3QgU2ltcGxlRm9udERhdGEqPiYgZmFsbGJhY2tGb250cywgR2x5cGhP dmVyZmxvdyYgZ2x5cGhPdmVyZmxvdykKIHsKICAgICBBU1NFUlQobV9oYXNUYWIgfHwgcHJlZmVy cmVkTG9naWNhbFdpZHRoc0RpcnR5KCkgfHwgIW1fa25vd25Ub0hhdmVOb092ZXJmbG93QW5kTm9G YWxsYmFja0ZvbnRzKTsKQEAgLTk2Myw3ICs5NjksNyBAQCB2b2lkIFJlbmRlclRleHQ6OmNvbXB1 dGVQcmVmZXJyZWRMb2dpY2FsCiAgICAgICAgICAgICBBU1NFUlQobGFzdFdvcmRCb3VuZGFyeSA9 PSBpKTsKICAgICAgICAgICAgIGxhc3RXb3JkQm91bmRhcnkrKzsKICAgICAgICAgICAgIGNvbnRp bnVlOwotICAgICAgICB9IGVsc2UgaWYgKGMgPT0gc29mdEh5cGhlbikgeworICAgICAgICB9IGVs c2UgaWYgKGMgPT0gc29mdEh5cGhlbiAmJiBzdHlsZVRvVXNlLT5oeXBoZW5zKCkgIT0gSHlwaGVu c05vbmUpIHsKICAgICAgICAgICAgIGN1cnJNYXhXaWR0aCArPSB3aWR0aEZyb21DYWNoZShmLCBs YXN0V29yZEJvdW5kYXJ5LCBpIC0gbGFzdFdvcmRCb3VuZGFyeSwgbGVhZFdpZHRoICsgY3Vyck1h eFdpZHRoLCAmZmFsbGJhY2tGb250cywgJmdseXBoT3ZlcmZsb3cpOwogICAgICAgICAgICAgaWYg KGZpcnN0R2x5cGhMZWZ0T3ZlcmZsb3cgPCAwKQogICAgICAgICAgICAgICAgIGZpcnN0R2x5cGhM ZWZ0T3ZlcmZsb3cgPSBnbHlwaE92ZXJmbG93LmxlZnQ7CkBAIC05NzQsMTIgKzk4MCwxMiBAQCB2 b2lkIFJlbmRlclRleHQ6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsCiAgICAgICAgIGJvb2wgaGFz QnJlYWsgPSBicmVha0FsbCB8fCBpc0JyZWFrYWJsZShicmVha0l0ZXJhdG9yLCBpLCBuZXh0QnJl YWthYmxlLCBicmVha05CU1ApOwogICAgICAgICBib29sIGJldHdlZW5Xb3JkcyA9IHRydWU7CiAg ICAgICAgIGludCBqID0gaTsKLSAgICAgICAgd2hpbGUgKGMgIT0gJ1xuJyAmJiAhaXNTcGFjZUFj Y29yZGluZ1RvU3R5bGUoYywgc3R5bGVUb1VzZSkgJiYgYyAhPSAnXHQnICYmIGMgIT0gc29mdEh5 cGhlbikgeworICAgICAgICB3aGlsZSAoYyAhPSAnXG4nICYmICFpc1NwYWNlQWNjb3JkaW5nVG9T dHlsZShjLCBzdHlsZVRvVXNlKSAmJiBjICE9ICdcdCcgJiYgKGMgIT0gc29mdEh5cGhlbiB8fCBz dHlsZVRvVXNlLT5oeXBoZW5zKCkgPT0gSHlwaGVuc05vbmUpKSB7CiAgICAgICAgICAgICBqKys7 CiAgICAgICAgICAgICBpZiAoaiA9PSBsZW4pCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgICAgICBjID0gdHh0W2pdOwotICAgICAgICAgICAgaWYgKGlzQnJlYWthYmxlKGJyZWFrSXRl cmF0b3IsIGosIG5leHRCcmVha2FibGUsIGJyZWFrTkJTUCkpCisgICAgICAgICAgICBpZiAoaXNC cmVha2FibGUoYnJlYWtJdGVyYXRvciwgaiwgbmV4dEJyZWFrYWJsZSwgYnJlYWtOQlNQKSAmJiB0 eHRbaiAtIDFdICE9IHNvZnRIeXBoZW4pCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg ICAgICBpZiAoYnJlYWtBbGwpIHsKICAgICAgICAgICAgICAgICBiZXR3ZWVuV29yZHMgPSBmYWxz ZTsKQEAgLTk5Myw4ICs5OTksMTEgQEAgdm9pZCBSZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVycmVk TG9naWNhbAogICAgICAgICAgICAgZmxvYXQgdzsKICAgICAgICAgICAgIGlmICh3b3JkVHJhaWxp bmdTcGFjZVdpZHRoICYmIGlzU3BhY2UpCiAgICAgICAgICAgICAgICAgdyA9IHdpZHRoRnJvbUNh Y2hlKGYsIGksIHdvcmRMZW4gKyAxLCBsZWFkV2lkdGggKyBjdXJyTWF4V2lkdGgsICZmYWxsYmFj a0ZvbnRzLCAmZ2x5cGhPdmVyZmxvdykgLSB3b3JkVHJhaWxpbmdTcGFjZVdpZHRoOwotICAgICAg ICAgICAgZWxzZQorICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgdyA9IHdpZHRo RnJvbUNhY2hlKGYsIGksIHdvcmRMZW4sIGxlYWRXaWR0aCArIGN1cnJNYXhXaWR0aCwgJmZhbGxi YWNrRm9udHMsICZnbHlwaE92ZXJmbG93KTsKKyAgICAgICAgICAgICAgICBpZiAoYyA9PSBzb2Z0 SHlwaGVuICYmIHN0eWxlVG9Vc2UtPmh5cGhlbnMoKSAhPSBIeXBoZW5zTm9uZSkKKyAgICAgICAg ICAgICAgICAgICAgdyArPSBoeXBoZW5XaWR0aCh0aGlzLCBmKTsKKyAgICAgICAgICAgIH0KIAog ICAgICAgICAgICAgaWYgKGZpcnN0R2x5cGhMZWZ0T3ZlcmZsb3cgPCAwKQogICAgICAgICAgICAg ICAgIGZpcnN0R2x5cGhMZWZ0T3ZlcmZsb3cgPSBnbHlwaE92ZXJmbG93LmxlZnQ7CkluZGV4OiBM YXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAxMjEwNDUpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wNi0yMiAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBw bGUuY29tPgorCisgICAgICAgIFJlbmRlclRleHTigJlzIG1pbmltdW0gcHJlZmVycmVkIHdpZHRo IGlzIGluY29ycmVjdCB3aGVuIHNvZnQgaHlwaGVucyBhcmUgdXNlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk3NzUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvdGV4dC9zb2Z0LWh5cGhlbi1t aW4tcHJlZmVycmVkLXdpZHRoLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv dGV4dC9zb2Z0LWh5cGhlbi1taW4tcHJlZmVycmVkLXdpZHRoLmh0bWw6IEFkZGVkLgorCiAyMDEy LTA2LTIyICBTaWx2aWEgUGZlaWZmZXIgIDxzaWx2aWFwZkBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgW0Nocm9taXVtXSBBZGp1c3QgdGhlIGRpc3BsYXllZCBlbGVtZW50cyBvZiB0aGUgbmV3IENo cm9tZSBtZWRpYSBjb250cm9scy4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvdGV4dC9zb2Z0LWh5 cGhlbi1taW4tcHJlZmVycmVkLXdpZHRoLWV4cGVjdGVkLmh0bWwKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvZmFzdC90ZXh0L3NvZnQtaHlwaGVuLW1pbi1wcmVmZXJyZWQtd2lkdGgtZXhwZWN0 ZWQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvdGV4dC9zb2Z0LWh5cGhl bi1taW4tcHJlZmVycmVkLXdpZHRoLWV4cGVjdGVkLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAg KzEsMjkgQEAKKzxzdHlsZT4KKyAgICBkaXYgeworICAgICAgICBvdXRsaW5lOiBkYXNoZWQgdGhp biBsaWdodGJsdWU7CisgICAgICAgICAtd2Via2l0LWh5cGhlbmF0ZS1jaGFyYWN0ZXI6ICItIjsK KyAgICB9Cis8L3N0eWxlPgorPHA+CisgICAgVGhlcmUgc2hvdWxkIGJlIGEgaHlwaGVuIGF0IHRo ZSBlbmQgb2YgdGhlIGZpcnN0IGxpbmUsIGFuZCBpdCBzaG91bGQgbm90CisgICAgb3ZlcmZsb3cg dGhlIGJveC4KKzwvcD4KKzx0YWJsZSBjZWxsc3BhY2luZz0wIGNlbGxwYWRkaW5nPTA+CisgICAg PHRyPgorICAgICAgICA8dGQ+CisgICAgICAgICAgICA8ZGl2PmV4dHJhb3JkaW5hcjxzcGFuPi08 L3NwYW4+PGJyPmlseTwvZGl2PgorICAgICAgICA8L3RkPgorICAgICAgICA8dGQgc3R5bGU9Indp ZHRoOiAxMDAlIj48L3RkPgorICAgIDwvdHI+Cis8L3RhYmxlPgorPHA+CisgICAgVGhlIHRleHQg c2hvdWxkIG5vdCBvdmVyZmxvdyB0aGUgYm94LgorPC9wPgorPHRhYmxlIGNlbGxzcGFjaW5nPTAg Y2VsbHBhZGRpbmc9MD4KKyAgICA8dHI+CisgICAgICAgIDx0ZD4KKyAgICAgICAgICAgIDxkaXY+ ZXh0cmFvcmRpbmFyPHNwYW4+PC9zcGFuPmlseTwvZGl2PgorICAgICAgICA8L3RkPgorICAgICAg ICA8dGQgc3R5bGU9IndpZHRoOiAxMDAlIj48L3RkPgorICAgIDwvdHI+Cis8L3RhYmxlPgpJbmRl eDogTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3NvZnQtaHlwaGVuLW1pbi1wcmVmZXJyZWQtd2lkdGgu aHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3RleHQvc29mdC1oeXBoZW4tbWlu LXByZWZlcnJlZC13aWR0aC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC90 ZXh0L3NvZnQtaHlwaGVuLW1pbi1wcmVmZXJyZWQtd2lkdGguaHRtbAkocmV2aXNpb24gMCkKQEAg LTAsMCArMSwyOSBAQAorPHN0eWxlPgorICAgIGRpdiB7CisgICAgICAgIG91dGxpbmU6IGRhc2hl ZCB0aGluIGxpZ2h0Ymx1ZTsKKyAgICAgICAgIC13ZWJraXQtaHlwaGVuYXRlLWNoYXJhY3Rlcjog Ii0iOworICAgIH0KKzwvc3R5bGU+Cis8cD4KKyAgICBUaGVyZSBzaG91bGQgYmUgYSBoeXBoZW4g YXQgdGhlIGVuZCBvZiB0aGUgZmlyc3QgbGluZSwgYW5kIGl0IHNob3VsZCBub3QKKyAgICBvdmVy ZmxvdyB0aGUgYm94LgorPC9wPgorPHRhYmxlIGNlbGxzcGFjaW5nPTAgY2VsbHBhZGRpbmc9MD4K KyAgICA8dHI+CisgICAgICAgIDx0ZD4KKyAgICAgICAgICAgIDxkaXYgc3R5bGU9Ii13ZWJraXQt aHlwaGVuczogbWFudWFsOyI+ZXh0cmFvcmRpbmFyJnNoeTtpbHk8L2Rpdj4KKyAgICAgICAgPC90 ZD4KKyAgICAgICAgPHRkIHN0eWxlPSJ3aWR0aDogMTAwJSI+PC90ZD4KKyAgICA8L3RyPgorPC90 YWJsZT4KKzxwPgorICAgIFRoZSB0ZXh0IHNob3VsZCBub3Qgb3ZlcmZsb3cgdGhlIGJveC4KKzwv cD4KKzx0YWJsZSBjZWxsc3BhY2luZz0wIGNlbGxwYWRkaW5nPTA+CisgICAgPHRyPgorICAgICAg ICA8dGQ+CisgICAgICAgICAgICA8ZGl2IHN0eWxlPSItd2Via2l0LWh5cGhlbnM6IG5vbmU7Ij5l eHRyYW9yZGluYXImc2h5O2lseTwvZGl2PgorICAgICAgICA8L3RkPgorICAgICAgICA8dGQgc3R5 bGU9IndpZHRoOiAxMDAlIj48L3RkPgorICAgIDwvdHI+Cis8L3RhYmxlPgo= 149079 2012-06-22 11:55:13 -0700 2012-06-22 12:05:17 -0700 Include hyphen width in minimun preferred width, and ignore soft hyphens when 'hyphens' is 'none' 89775_r2.diff text/plain 6895 mitz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMTA0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA2LTIyICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuZGVyVGV4dOKAmXMgbWluaW11 bSBwcmVmZXJyZWQgd2lkdGggaXMgaW5jb3JyZWN0IHdoZW4gc29mdCBoeXBoZW5zIGFyZSB1c2Vk CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTc3NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZh c3QvdGV4dC9zb2Z0LWh5cGhlbi1taW4tcHJlZmVycmVkLXdpZHRoLmh0bWwKKworICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omh5cGhlbldpZHRo KTogQWRkZWQgdGhpcyBoZWxwZXIgZnVuY3Rpb24uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJU ZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6IEluIHBsYWNlcyB3aGVyZSB0aGlz IGZ1bmN0aW9uIHRlc3RzCisgICAgICAgIGZvciB0aGUgc29mdCBoeXBoZW4gY2hhcmFjdGVyLCBh ZGRlZCBhIGNoZWNrIHRoYXQgdGhlICdoeXBoZW5zJyBzdHlsZSBwcm9wZXJ0eSBpcyBub3Qgc2V0 CisgICAgICAgIHRvICdub25lJywgYmVjYXVzZSBpbiB0aGF0IGNhc2Ugc29mdCBoeXBoZW5zIGFy ZSBub3QgYnJlYWsgb3Bwb3J0dW5pdGllcy4gQWxzbyBhZGRlZCBhbgorICAgICAgICBleHBsaWNp dCBjaGVjayB0byBzdXBwcmVzcyBicmVhayBvcHBvcnR1bml0aWVzIGZyb20gaXNCcmVha2FibGUo KSBpZiB0aGUgb2NjdXIgYWZ0ZXIgYQorICAgICAgICBzb2Z0IGh5cGhlbiBhbmQgJ2h5cGhlbnMn IGlzIHNldCB0byAnbm9uZScuIEZpbmFsbHksIHdoZW4gbWVhc3VyaW5nIHRleHQgdXAgdG8gYSBw b3RlbnRpYWwKKyAgICAgICAgbGluZSBicmVhaywgYWRkZWQgdGhlIHdpZHRoIG9mIHRoZSBoeXBo ZW4gc3RyaW5nIHdoZW4gbmVlZGVkLgorCiAyMDEyLTA2LTIyICBCcmlhbiBTYWxvbW9uICA8YnNh bG9tb25AZ29vZ2xlLmNvbT4KIAogICAgICAgICBJbmNyZWFzZSB0aGUgR3JDb250ZXh0IHRleHR1 cmUgY2FjaGUgY291bnQgY2FwIHRvIDJLCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRleHQuY3BwCShyZXZpc2lvbiAxMjEwMjcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg4Miw2ICs4ODIsMTIgQEAgdm9p ZCBSZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbAogICAgICAgICBtX2tub3duVG9I YXZlTm9PdmVyZmxvd0FuZE5vRmFsbGJhY2tGb250cyA9IHRydWU7CiB9CiAKK3N0YXRpYyBpbmxp bmUgZmxvYXQgaHlwaGVuV2lkdGgoUmVuZGVyVGV4dCogcmVuZGVyZXIsIGNvbnN0IEZvbnQmIGZv bnQpCit7CisgICAgUmVuZGVyU3R5bGUqIHN0eWxlID0gcmVuZGVyZXItPnN0eWxlKCk7CisgICAg cmV0dXJuIGZvbnQud2lkdGgoUmVuZGVyQmxvY2s6OmNvbnN0cnVjdFRleHRSdW4ocmVuZGVyZXIs IGZvbnQsIHN0eWxlLT5oeXBoZW5TdHJpbmcoKS5zdHJpbmcoKSwgc3R5bGUpKTsKK30KKwogdm9p ZCBSZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyhmbG9hdCBsZWFkV2lk dGgsIEhhc2hTZXQ8Y29uc3QgU2ltcGxlRm9udERhdGEqPiYgZmFsbGJhY2tGb250cywgR2x5cGhP dmVyZmxvdyYgZ2x5cGhPdmVyZmxvdykKIHsKICAgICBBU1NFUlQobV9oYXNUYWIgfHwgcHJlZmVy cmVkTG9naWNhbFdpZHRoc0RpcnR5KCkgfHwgIW1fa25vd25Ub0hhdmVOb092ZXJmbG93QW5kTm9G YWxsYmFja0ZvbnRzKTsKQEAgLTk2Myw3ICs5NjksNyBAQCB2b2lkIFJlbmRlclRleHQ6OmNvbXB1 dGVQcmVmZXJyZWRMb2dpY2FsCiAgICAgICAgICAgICBBU1NFUlQobGFzdFdvcmRCb3VuZGFyeSA9 PSBpKTsKICAgICAgICAgICAgIGxhc3RXb3JkQm91bmRhcnkrKzsKICAgICAgICAgICAgIGNvbnRp bnVlOwotICAgICAgICB9IGVsc2UgaWYgKGMgPT0gc29mdEh5cGhlbikgeworICAgICAgICB9IGVs c2UgaWYgKGMgPT0gc29mdEh5cGhlbiAmJiBzdHlsZVRvVXNlLT5oeXBoZW5zKCkgIT0gSHlwaGVu c05vbmUpIHsKICAgICAgICAgICAgIGN1cnJNYXhXaWR0aCArPSB3aWR0aEZyb21DYWNoZShmLCBs YXN0V29yZEJvdW5kYXJ5LCBpIC0gbGFzdFdvcmRCb3VuZGFyeSwgbGVhZFdpZHRoICsgY3Vyck1h eFdpZHRoLCAmZmFsbGJhY2tGb250cywgJmdseXBoT3ZlcmZsb3cpOwogICAgICAgICAgICAgaWYg KGZpcnN0R2x5cGhMZWZ0T3ZlcmZsb3cgPCAwKQogICAgICAgICAgICAgICAgIGZpcnN0R2x5cGhM ZWZ0T3ZlcmZsb3cgPSBnbHlwaE92ZXJmbG93LmxlZnQ7CkBAIC05NzQsMTIgKzk4MCwxMiBAQCB2 b2lkIFJlbmRlclRleHQ6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsCiAgICAgICAgIGJvb2wgaGFz QnJlYWsgPSBicmVha0FsbCB8fCBpc0JyZWFrYWJsZShicmVha0l0ZXJhdG9yLCBpLCBuZXh0QnJl YWthYmxlLCBicmVha05CU1ApOwogICAgICAgICBib29sIGJldHdlZW5Xb3JkcyA9IHRydWU7CiAg ICAgICAgIGludCBqID0gaTsKLSAgICAgICAgd2hpbGUgKGMgIT0gJ1xuJyAmJiAhaXNTcGFjZUFj Y29yZGluZ1RvU3R5bGUoYywgc3R5bGVUb1VzZSkgJiYgYyAhPSAnXHQnICYmIGMgIT0gc29mdEh5 cGhlbikgeworICAgICAgICB3aGlsZSAoYyAhPSAnXG4nICYmICFpc1NwYWNlQWNjb3JkaW5nVG9T dHlsZShjLCBzdHlsZVRvVXNlKSAmJiBjICE9ICdcdCcgJiYgKGMgIT0gc29mdEh5cGhlbiB8fCBz dHlsZVRvVXNlLT5oeXBoZW5zKCkgPT0gSHlwaGVuc05vbmUpKSB7CiAgICAgICAgICAgICBqKys7 CiAgICAgICAgICAgICBpZiAoaiA9PSBsZW4pCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgICAgICBjID0gdHh0W2pdOwotICAgICAgICAgICAgaWYgKGlzQnJlYWthYmxlKGJyZWFrSXRl cmF0b3IsIGosIG5leHRCcmVha2FibGUsIGJyZWFrTkJTUCkpCisgICAgICAgICAgICBpZiAoaXNC cmVha2FibGUoYnJlYWtJdGVyYXRvciwgaiwgbmV4dEJyZWFrYWJsZSwgYnJlYWtOQlNQKSAmJiB0 eHRbaiAtIDFdICE9IHNvZnRIeXBoZW4pCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg ICAgICBpZiAoYnJlYWtBbGwpIHsKICAgICAgICAgICAgICAgICBiZXR3ZWVuV29yZHMgPSBmYWxz ZTsKQEAgLTk5Myw4ICs5OTksMTEgQEAgdm9pZCBSZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVycmVk TG9naWNhbAogICAgICAgICAgICAgZmxvYXQgdzsKICAgICAgICAgICAgIGlmICh3b3JkVHJhaWxp bmdTcGFjZVdpZHRoICYmIGlzU3BhY2UpCiAgICAgICAgICAgICAgICAgdyA9IHdpZHRoRnJvbUNh Y2hlKGYsIGksIHdvcmRMZW4gKyAxLCBsZWFkV2lkdGggKyBjdXJyTWF4V2lkdGgsICZmYWxsYmFj a0ZvbnRzLCAmZ2x5cGhPdmVyZmxvdykgLSB3b3JkVHJhaWxpbmdTcGFjZVdpZHRoOwotICAgICAg ICAgICAgZWxzZQorICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgdyA9IHdpZHRo RnJvbUNhY2hlKGYsIGksIHdvcmRMZW4sIGxlYWRXaWR0aCArIGN1cnJNYXhXaWR0aCwgJmZhbGxi YWNrRm9udHMsICZnbHlwaE92ZXJmbG93KTsKKyAgICAgICAgICAgICAgICBpZiAoYyA9PSBzb2Z0 SHlwaGVuICYmIHN0eWxlVG9Vc2UtPmh5cGhlbnMoKSAhPSBIeXBoZW5zTm9uZSkKKyAgICAgICAg ICAgICAgICAgICAgY3Vyck1pbldpZHRoICs9IGh5cGhlbldpZHRoKHRoaXMsIGYpOworICAgICAg ICAgICAgfQogCiAgICAgICAgICAgICBpZiAoZmlyc3RHbHlwaExlZnRPdmVyZmxvdyA8IDApCiAg ICAgICAgICAgICAgICAgZmlyc3RHbHlwaExlZnRPdmVyZmxvdyA9IGdseXBoT3ZlcmZsb3cubGVm dDsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMTA0NSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA2LTIyICBEYW4gQmVybnN0ZWlu ICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuZGVyVGV4dOKAmXMgbWluaW11bSBwcmVm ZXJyZWQgd2lkdGggaXMgaW5jb3JyZWN0IHdoZW4gc29mdCBoeXBoZW5zIGFyZSB1c2VkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTc3NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC90ZXh0L3Nv ZnQtaHlwaGVuLW1pbi1wcmVmZXJyZWQtd2lkdGgtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAg ICAgICogZmFzdC90ZXh0L3NvZnQtaHlwaGVuLW1pbi1wcmVmZXJyZWQtd2lkdGguaHRtbDogQWRk ZWQuCisKIDIwMTItMDYtMjIgIFNpbHZpYSBQZmVpZmZlciAgPHNpbHZpYXBmQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBbQ2hyb21pdW1dIEFkanVzdCB0aGUgZGlzcGxheWVkIGVsZW1lbnRzIG9m IHRoZSBuZXcgQ2hyb21lIG1lZGlhIGNvbnRyb2xzLgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC90 ZXh0L3NvZnQtaHlwaGVuLW1pbi1wcmVmZXJyZWQtd2lkdGgtZXhwZWN0ZWQuaHRtbAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3RleHQvc29mdC1oeXBoZW4tbWluLXByZWZlcnJlZC13 aWR0aC1leHBlY3RlZC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC90ZXh0 L3NvZnQtaHlwaGVuLW1pbi1wcmVmZXJyZWQtd2lkdGgtZXhwZWN0ZWQuaHRtbAkocmV2aXNpb24g MCkKQEAgLTAsMCArMSwyOSBAQAorPHN0eWxlPgorICAgIGRpdiB7CisgICAgICAgIG91dGxpbmU6 IGRhc2hlZCB0aGluIGxpZ2h0Ymx1ZTsKKyAgICAgICAgIC13ZWJraXQtaHlwaGVuYXRlLWNoYXJh Y3RlcjogIi0iOworICAgIH0KKzwvc3R5bGU+Cis8cD4KKyAgICBUaGVyZSBzaG91bGQgYmUgYSBo eXBoZW4gYXQgdGhlIGVuZCBvZiB0aGUgZmlyc3QgbGluZSwgYW5kIGl0IHNob3VsZCBub3QKKyAg ICBvdmVyZmxvdyB0aGUgYm94LgorPC9wPgorPHRhYmxlIGNlbGxzcGFjaW5nPTAgY2VsbHBhZGRp bmc9MD4KKyAgICA8dHI+CisgICAgICAgIDx0ZD4KKyAgICAgICAgICAgIDxkaXY+ZXh0cmFvcmRp bmFyPHNwYW4+LTwvc3Bhbj48YnI+aWx5PC9kaXY+CisgICAgICAgIDwvdGQ+CisgICAgICAgIDx0 ZCBzdHlsZT0id2lkdGg6IDEwMCUiPjwvdGQ+CisgICAgPC90cj4KKzwvdGFibGU+Cis8cD4KKyAg ICBUaGUgdGV4dCBzaG91bGQgbm90IG92ZXJmbG93IHRoZSBib3guCis8L3A+Cis8dGFibGUgY2Vs bHNwYWNpbmc9MCBjZWxscGFkZGluZz0wPgorICAgIDx0cj4KKyAgICAgICAgPHRkPgorICAgICAg ICAgICAgPGRpdj5leHRyYW9yZGluYXI8c3Bhbj48L3NwYW4+aWx5PC9kaXY+CisgICAgICAgIDwv dGQ+CisgICAgICAgIDx0ZCBzdHlsZT0id2lkdGg6IDEwMCUiPjwvdGQ+CisgICAgPC90cj4KKzwv dGFibGU+CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3RleHQvc29mdC1oeXBoZW4tbWluLXByZWZl cnJlZC13aWR0aC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvdGV4dC9zb2Z0 LWh5cGhlbi1taW4tcHJlZmVycmVkLXdpZHRoLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRU ZXN0cy9mYXN0L3RleHQvc29mdC1oeXBoZW4tbWluLXByZWZlcnJlZC13aWR0aC5odG1sCShyZXZp c2lvbiAwKQpAQCAtMCwwICsxLDI5IEBACis8c3R5bGU+CisgICAgZGl2IHsKKyAgICAgICAgb3V0 bGluZTogZGFzaGVkIHRoaW4gbGlnaHRibHVlOworICAgICAgICAgLXdlYmtpdC1oeXBoZW5hdGUt Y2hhcmFjdGVyOiAiLSI7CisgICAgfQorPC9zdHlsZT4KKzxwPgorICAgIFRoZXJlIHNob3VsZCBi ZSBhIGh5cGhlbiBhdCB0aGUgZW5kIG9mIHRoZSBmaXJzdCBsaW5lLCBhbmQgaXQgc2hvdWxkIG5v dAorICAgIG92ZXJmbG93IHRoZSBib3guCis8L3A+Cis8dGFibGUgY2VsbHNwYWNpbmc9MCBjZWxs cGFkZGluZz0wPgorICAgIDx0cj4KKyAgICAgICAgPHRkPgorICAgICAgICAgICAgPGRpdiBzdHls ZT0iLXdlYmtpdC1oeXBoZW5zOiBtYW51YWw7Ij5leHRyYW9yZGluYXImc2h5O2lseTwvZGl2Pgor ICAgICAgICA8L3RkPgorICAgICAgICA8dGQgc3R5bGU9IndpZHRoOiAxMDAlIj48L3RkPgorICAg IDwvdHI+Cis8L3RhYmxlPgorPHA+CisgICAgVGhlIHRleHQgc2hvdWxkIG5vdCBvdmVyZmxvdyB0 aGUgYm94LgorPC9wPgorPHRhYmxlIGNlbGxzcGFjaW5nPTAgY2VsbHBhZGRpbmc9MD4KKyAgICA8 dHI+CisgICAgICAgIDx0ZD4KKyAgICAgICAgICAgIDxkaXYgc3R5bGU9Ii13ZWJraXQtaHlwaGVu czogbm9uZTsiPmV4dHJhb3JkaW5hciZzaHk7aWx5PC9kaXY+CisgICAgICAgIDwvdGQ+CisgICAg ICAgIDx0ZCBzdHlsZT0id2lkdGg6IDEwMCUiPjwvdGQ+CisgICAgPC90cj4KKzwvdGFibGU+Cg==