4695 2005-08-27 03:41:46 -0700 <span> in word-spaced text breaks width calculation, causes overflow 2005-12-02 01:09:15 -0800 1 1 1 Unclassified WebKit Layout and Rendering 420+ Mac OS X 10.4 VERIFIED FIXED P2 Normal --- 1 mitz hyatt oliver oldest_to_newest 17742 0 mitz 2005-08-27 03:41:46 -0700 When there's a <span> that ends with a space in text with word-spacing!=0, some width calculations are wrong, and as a result the line breaks too late and text overflows. See testcase for example. 17743 1 3607 mitz 2005-08-27 03:42:45 -0700 Created attachment 3607 testcase 17745 2 oliver 2005-08-27 04:33:05 -0700 More wordspacing woes, confirmed in ToT as at 27/8 18187 3 mitz 2005-09-01 10:13:36 -0700 The current way of handling word-spacing, which is to apply it a-postriori in many different places, seems somewhat problematic to me. With the exception of negative word-spacing, I can't see what's wrong with applying it during text width calculation (i.e. in -[WebTextRenderer floatWidth...] and such ; whenever they decide that something is a space and has the width of a space, they should add word-spacing to its width). Currently, some spaces (mostly leading spaces) are initially given the width of a normal space. I tried this approach in my first patch for bug 4672, but ran into problems with negative spacing. I think I'll give it another try, because I think it could simplify things significantly. 23822 4 4629 mitz 2005-11-08 13:38:33 -0800 Created attachment 4629 check for non-whitespace ahead 23825 5 4629 mitz 2005-11-08 14:25:39 -0800 Comment on attachment 4629 check for non-whitespace ahead Bad idea 23893 6 4654 mitz 2005-11-09 15:09:34 -0800 Created attachment 4654 Proposed patch Add word spacing only when (and if) measuring the space that's responsible for it. 23894 7 4654 mitz 2005-11-09 15:12:39 -0800 Comment on attachment 4654 Proposed patch Passes all layout tests except fast/css/word-space-extra.html, where the new result is the correct one. 24030 8 4654 hyatt 2005-11-14 11:33:57 -0800 Comment on attachment 4654 Proposed patch r=me 3607 2005-08-27 03:42:45 -0700 2005-08-27 03:42:45 -0700 testcase wordSpacing.html text/html 374 mitz PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEgVHJhbnNpdGlvbmFs Ly9FTiIgCiJodHRwOi8vd3d3LnczLm9yZy9UUi9odG1sNC9sb29zZS5kdGQiPgo8aHRtbD4NCjxo ZWFkPg0KPHRpdGxlPldvcmQtc3BhY2luZzwvdGl0bGU+DQo8L2hlYWQ+DQo8Ym9keT4KPGRpdiBz dHlsZT0id2lkdGg6MjAwcHg7IHdvcmQtc3BhY2luZzoyMHB4OyBiYWNrZ3JvdW5kOnllbGxvdzsg Zm9udC1mYW1pbHk6VGltZXM7IGZvbnQtc2l6ZToxNnB4OyI+Ck92ZXJmbG93IHNob3VsZCA8c3Bh biBzdHlsZT0idGV4dC1kZWNvcmF0aW9uOnVuZGVybGluZTsiPm5vdCA8L3NwYW4+ZXZlbiBiZSB0 b2xlcmF0ZWQuCjwvZGl2Pgo8L2JvZHk+CjwvaHRtbD4= 4629 2005-11-08 13:38:33 -0800 2005-11-08 14:25:39 -0800 check for non-whitespace ahead 4695_r2.patch text/plain 2168 mitz SW5kZXg6IGJpZGkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJDb3JlL2to dG1sL3JlbmRlcmluZy9iaWRpLmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xNTYKZGlmZiAt cCAtdSAtcjEuMTU2IGJpZGkuY3BwCi0tLSBiaWRpLmNwcAkzIE5vdiAyMDA1IDIzOjUzOjU3IC0w MDAwCTEuMTU2CisrKyBiaWRpLmNwcAk4IE5vdiAyMDA1IDIxOjM2OjQ0IC0wMDAwCkBAIC0yMTYy LDggKzIxNjIsMjggQEAgQmlkaUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcgog ICAgICAgICAgICAgICAgICAgICAgICAgYXBwbGllZFN0YXJ0V2lkdGggPSB0cnVlOwogICAgICAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgICAg ICBhcHBseVdvcmRTcGFjaW5nID0gKHdvcmRTcGFjaW5nICYmIGN1cnJlbnRDaGFyYWN0ZXJJc1Nw YWNlICYmICFwcmV2aW91c0NoYXJhY3RlcklzU3BhY2UgJiYKLSAgICAgICAgICAgICAgICAgICAg ICAgICF0LT5jb250YWluc09ubHlXaGl0ZXNwYWNlKHBvcysxLCBzdHJsZW4tKHBvcysxKSkpOwor ICAgICAgICAgICAgICAgICAgICBhcHBseVdvcmRTcGFjaW5nID0gZmFsc2U7CisgICAgICAgICAg ICAgICAgICAgIGlmICh3b3JkU3BhY2luZyAmJiBjdXJyZW50Q2hhcmFjdGVySXNTcGFjZSAmJiAh cHJldmlvdXNDaGFyYWN0ZXJJc1NwYWNlKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAo IXQtPmNvbnRhaW5zT25seVdoaXRlc3BhY2UocG9zICsgMSwgc3RybGVuIC0gKHBvcyArIDEpKSkK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBhcHBseVdvcmRTcGFjaW5nID0gdHJ1ZTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgICAgICAgICAgICAg IFJlbmRlck9iamVjdCogY3Vyck9iaiA9IG87CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg d2hpbGUgKChjdXJyT2JqID0gYmlkaU5leHQoc3RhcnQuYmxvY2ssIGN1cnJPYmosIGJpZGkpKSkg eworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoIWN1cnJPYmotPmlzRmxvYXRp bmcoKSAmJiAoIWN1cnJPYmotPmlzUG9zaXRpb25lZCgpIHx8IGN1cnJPYmotPmhhc1N0YXRpY1go KSB8fCBjdXJyT2JqLT5oYXNTdGF0aWNZKCkgfHwgIWN1cnJPYmotPmNvbnRhaW5lcigpLT5pc0lu bGluZUZsb3coKSkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChj dXJyT2JqLT5pc1RleHQoKSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFJlbmRlclRleHQqIGN1cnJUZXh0ID0gc3RhdGljX2Nhc3Q8UmVuZGVyVGV4dCo+KGN1cnJP YmopOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICghY3VyclRl eHQtPmNvbnRhaW5zT25seVdoaXRlc3BhY2UoMCwgY3VyclRleHQtPnN0cmluZ0xlbmd0aCgpKSkg eworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhcHBseVdvcmRT cGFjaW5nID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBhcHBseVdvcmRTcGFjaW5nID0gdHJ1ZTsKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAgICAgICAgIGlmIChvLT5z dHlsZSgpLT5hdXRvV3JhcCgpICYmIHcgKyB0bXBXID4gd2lkdGggJiYgdyA9PSAwKSB7CiAgICAg ICAgICAgICAgICAgICAgICAgICBpbnQgZmIgPSBuZWFyZXN0RmxvYXRCb3R0b20obV9oZWlnaHQp Owo= 4654 2005-11-09 15:09:34 -0800 2005-11-14 11:33:57 -0800 Proposed patch 4695_r4.patch text/plain 7215 mitz SW5kZXg6IGJpZGkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJDb3JlL2to dG1sL3JlbmRlcmluZy9iaWRpLmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xNTYKZGlmZiAt cCAtdSAtcjEuMTU2IGJpZGkuY3BwCi0tLSBiaWRpLmNwcAkzIE5vdiAyMDA1IDIzOjUzOjU3IC0w MDAwCTEuMTU2CisrKyBiaWRpLmNwcAk5IE5vdiAyMDA1IDIzOjA2OjMzIC0wMDAwCkBAIC0yMDc3 LDYgKzIwNzcsNyBAQCBCaWRpSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyCiAg ICAgICAgICAgICAvLyBwcm9wb3J0aW9uYWwgZm9udCwgbmVlZHMgYSBiaXQgbW9yZSB3b3JrLgog ICAgICAgICAgICAgaW50IGxhc3RTcGFjZSA9IHBvczsKICAgICAgICAgICAgIGludCB3b3JkU3Bh Y2luZyA9IG8tPnN0eWxlKCktPndvcmRTcGFjaW5nKCk7CisgICAgICAgICAgICBpbnQgbGFzdFNw YWNlV29yZFNwYWNpbmcgPSAwOwogCiAgICAgICAgICAgICBib29sIGFwcGxpZWRTdGFydFdpZHRo ID0gcG9zID4gMDsgLy8gSWYgdGhlIHNwYW4gb3JpZ2luYXRlZCBvbiBhIHByZXZpb3VzIGxpbmUs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gdGhlbiBh c3N1bWUgdGhlIHN0YXJ0IHdpZHRoIGhhcyBiZWVuIGFwcGxpZWQuCkBAIC0yMTEwLDcgKzIxMTEs NyBAQCBCaWRpSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgYWRkTWlkcG9pbnQoZW5kTWlkKTsKICAgICAgICAgICAgICAgICAg ICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgLy8gQWRkIHRoZSB3aWR0aCB1cCB0byBi dXQgbm90IGluY2x1ZGluZyB0aGUgaHlwaGVuLgotICAgICAgICAgICAgICAgICAgICAgICAgdG1w VyArPSB0LT53aWR0aChsYXN0U3BhY2UsIHBvcyAtIGxhc3RTcGFjZSwgZiwgdyt0bXBXKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIHRtcFcgKz0gdC0+d2lkdGgobGFzdFNwYWNlLCBwb3MgLSBs YXN0U3BhY2UsIGYsIHcrdG1wVykgKyBsYXN0U3BhY2VXb3JkU3BhY2luZzsKICAgICAgICAgICAg ICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgLy8gRm9yIHdyYXBwaW5nIHRl eHQgb25seSwgaW5jbHVkZSB0aGUgaHlwaGVuLiAgV2UgbmVlZCB0byBlbnN1cmUgaXQgd2lsbCBm aXQKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIG9uIHRoZSBsaW5lIGlmIGl0IHNob3dzIHdo ZW4gd2UgYnJlYWsuCkBAIC0yMTIzLDYgKzIxMjQsNyBAQCBCaWRpSXRlcmF0b3IgUmVuZGVyQmxv Y2s6OmZpbmROZXh0TGluZUJyCiAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAg ICAgICBwb3MrKzsKICAgICAgICAgICAgICAgICAgICAgbGVuLS07CisgICAgICAgICAgICAgICAg ICAgIGxhc3RTcGFjZVdvcmRTcGFjaW5nID0gMDsKICAgICAgICAgICAgICAgICAgICAgbGFzdFNw YWNlID0gcG9zOyAvLyBDaGVlc3kgaGFjayB0byBwcmV2ZW50IGFkZGluZyBpbiB3aWR0aHMgb2Yg dGhlIHJ1biB0d2ljZS4KICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAg ICAgICAgfQpAQCAtMjE0NSw2ICsyMTQ3LDcgQEAgQmlkaUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpm aW5kTmV4dExpbmVCcgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIFN0b3AgaWdub3Jp bmcgc3BhY2VzIGFuZCBiZWdpbiBhdCB0aGlzCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Ly8gbmV3IHBvaW50LgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlnbm9yaW5nU3BhY2Vz ID0gZmFsc2U7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGFzdFNwYWNlV29yZFNwYWNp bmcgPSAwOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxhc3RTcGFjZSA9IHBvczsgLy8g ZS5nLiwgIkZvbyAgICBnb28iLCBkb24ndCBhZGQgaW4gYW55IG9mIHRoZSBpZ25vcmVkIHNwYWNl cy4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICBCaWRpSXRlcmF0b3Igc3RhcnRNaWQgKCAw LCBvLCBwb3MgKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhZGRNaWRwb2ludChzdGFy dE1pZCk7CkBAIC0yMTU2LDE0ICsyMTU5LDEzIEBAIEJpZGlJdGVyYXRvciBSZW5kZXJCbG9jazo6 ZmluZE5leHRMaW5lQnIKICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICAgICAgfQogCi0gICAgICAgICAgICAgICAgICAgIHRtcFcgKz0gdC0+d2lkdGgobGFzdFNwYWNl LCBwb3MgLSBsYXN0U3BhY2UsIGYsIHcrdG1wVyk7CisgICAgICAgICAgICAgICAgICAgIHRtcFcg Kz0gdC0+d2lkdGgobGFzdFNwYWNlLCBwb3MgLSBsYXN0U3BhY2UsIGYsIHcrdG1wVykgKyBsYXN0 U3BhY2VXb3JkU3BhY2luZzsKICAgICAgICAgICAgICAgICAgICAgaWYgKCFhcHBsaWVkU3RhcnRX aWR0aCkgewogICAgICAgICAgICAgICAgICAgICAgICAgdG1wVyArPSBpbmxpbmVXaWR0aChvLCB0 cnVlLCBmYWxzZSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBhcHBsaWVkU3RhcnRXaWR0aCA9 IHRydWU7CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgCi0gICAg ICAgICAgICAgICAgICAgIGFwcGx5V29yZFNwYWNpbmcgPSAod29yZFNwYWNpbmcgJiYgY3VycmVu dENoYXJhY3RlcklzU3BhY2UgJiYgIXByZXZpb3VzQ2hhcmFjdGVySXNTcGFjZSAmJgotICAgICAg ICAgICAgICAgICAgICAgICAgIXQtPmNvbnRhaW5zT25seVdoaXRlc3BhY2UocG9zKzEsIHN0cmxl bi0ocG9zKzEpKSk7CisgICAgICAgICAgICAgICAgICAgIGFwcGx5V29yZFNwYWNpbmcgPSAgd29y ZFNwYWNpbmcgJiYgY3VycmVudENoYXJhY3RlcklzU3BhY2UgJiYgIXByZXZpb3VzQ2hhcmFjdGVy SXNTcGFjZTsKIAogICAgICAgICAgICAgICAgICAgICBpZiAoby0+c3R5bGUoKS0+YXV0b1dyYXAo KSAmJiB3ICsgdG1wVyA+IHdpZHRoICYmIHcgPT0gMCkgewogICAgICAgICAgICAgICAgICAgICAg ICAgaW50IGZiID0gbmVhcmVzdEZsb2F0Qm90dG9tKG1faGVpZ2h0KTsKQEAgLTIxODYsNyArMjE4 OCw4IEBAIEJpZGlJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lQnIKICAgICAgICAg ICAgICAgICAgICAgaWYgKG8tPnN0eWxlKCktPmF1dG9XcmFwKCkgfHwgYnJlYWtXb3Jkcykgewog ICAgICAgICAgICAgICAgICAgICAgICAgLy8gSWYgd2UgYnJlYWsgb25seSBhZnRlciB3aGl0ZS1z cGFjZSwgY29uc2lkZXIgdGhlIGN1cnJlbnQgY2hhcmFjdGVyCiAgICAgICAgICAgICAgICAgICAg ICAgICAvLyBhcyBjYW5kaWRhdGUgd2lkdGggZm9yIHRoaXMgbGluZS4KLSAgICAgICAgICAgICAg ICAgICAgICAgIGludCBjaGFyV2lkdGggPSBvLT5zdHlsZSgpLT5icmVha09ubHlBZnRlcldoaXRl U3BhY2UoKSA/IHQtPndpZHRoKHBvcywgMSwgZiwgdyArIHRtcFcpIDogMDsKKyAgICAgICAgICAg ICAgICAgICAgICAgIGludCBjaGFyV2lkdGggPSBvLT5zdHlsZSgpLT5icmVha09ubHlBZnRlcldo aXRlU3BhY2UoKSA/CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHQtPndpZHRoKHBvcywgMSwgZiwgdyArIHRtcFcpICsgKGFwcGx5V29yZFNwYWNpbmcgPyB3b3Jk U3BhY2luZyA6IDApIDogMDsKICAgICAgICAgICAgICAgICAgICAgICAgIGlmICh3ICsgdG1wVyAr IGNoYXJXaWR0aCA+IHdpZHRoKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG8t PnN0eWxlKCktPmJyZWFrT25seUFmdGVyV2hpdGVTcGFjZSgpKSB7CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIC8vIENoZWNrIGlmIGxpbmUgaXMgdG9vIGJpZyBldmVuIHdpdGhvdXQg dGhlIGV4dHJhIHNwYWNlCkBAIC0yMjIwLDExICsyMjIzLDkgQEAgQmlkaUl0ZXJhdG9yIFJlbmRl ckJsb2NrOjpmaW5kTmV4dExpbmVCcgogICAgICAgICAgICAgICAgICAgICAgICAgbEJyZWFrLnBv cyA9IHBvczsKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAKKyAg ICAgICAgICAgICAgICAgICAgbGFzdFNwYWNlV29yZFNwYWNpbmcgPSBhcHBseVdvcmRTcGFjaW5n ID8gd29yZFNwYWNpbmcgOiAwOwogICAgICAgICAgICAgICAgICAgICBsYXN0U3BhY2UgPSBwb3M7 CiAgICAgICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgICAgICBpZiAoYXBwbHlXb3Jk U3BhY2luZykKLSAgICAgICAgICAgICAgICAgICAgICAgIHcgKz0gd29yZFNwYWNpbmc7Ci0gICAg ICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgaWYgKCFpZ25vcmluZ1Nw YWNlcyAmJiBvLT5zdHlsZSgpLT5jb2xsYXBzZVdoaXRlU3BhY2UoKSkgewogICAgICAgICAgICAg ICAgICAgICAgICAgLy8gSWYgd2UgZW5jb3VudGVyIGEgbmV3bGluZSwgb3IgaWYgd2UgZW5jb3Vu dGVyIGEKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIHNlY29uZCBzcGFjZSwgd2UgbmVlZCB0 byBnbyBhaGVhZCBhbmQgYnJlYWsgdXAgdGhpcwpAQCAtMjIzNiw3ICsyMjM3LDYgQEAgQmlkaUl0 ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcgogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIC8vIHNwYWNlcy4gQ3JlYXRlIGEgbWlkcG9pbnQgdG8gdGVybWluYXRlIHRoZSBydW4K ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBiZWZvcmUgdGhlIHNlY29uZCBzcGFjZS4g CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYWRkTWlkcG9pbnQoaWdub3JlU3RhcnQpOwot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxhc3RTcGFjZSA9IHBvczsKICAgICAgICAgICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0K QEAgLTIyNDQsNiArMjI0NCw3IEBAIEJpZGlJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRM aW5lQnIKICAgICAgICAgICAgICAgICAgICAgLy8gU3RvcCBpZ25vcmluZyBzcGFjZXMgYW5kIGJl Z2luIGF0IHRoaXMKICAgICAgICAgICAgICAgICAgICAgLy8gbmV3IHBvaW50LgogICAgICAgICAg ICAgICAgICAgICBpZ25vcmluZ1NwYWNlcyA9IGZhbHNlOworICAgICAgICAgICAgICAgICAgICBs YXN0U3BhY2VXb3JkU3BhY2luZyA9IGFwcGx5V29yZFNwYWNpbmcgPyB3b3JkU3BhY2luZyA6IDA7 CiAgICAgICAgICAgICAgICAgICAgIGxhc3RTcGFjZSA9IHBvczsgLy8gZS5nLiwgIkZvbyAgICBn b28iLCBkb24ndCBhZGQgaW4gYW55IG9mIHRoZSBpZ25vcmVkIHNwYWNlcy4KICAgICAgICAgICAg ICAgICAgICAgQmlkaUl0ZXJhdG9yIHN0YXJ0TWlkICggMCwgbywgcG9zICk7CiAgICAgICAgICAg ICAgICAgICAgIGFkZE1pZHBvaW50KHN0YXJ0TWlkKTsKQEAgLTIyNzIsNyArMjI3Myw3IEBAIEJp ZGlJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lQnIKICAgICAgICAgICAgIAogICAg ICAgICAgICAgLy8gSU1QT1JUQU5UOiBwb3MgaXMgPiBsZW5ndGggaGVyZSEKICAgICAgICAgICAg IGlmICghaWdub3JpbmdTcGFjZXMpCi0gICAgICAgICAgICAgICAgdG1wVyArPSB0LT53aWR0aChs YXN0U3BhY2UsIHBvcyAtIGxhc3RTcGFjZSwgZiwgdyt0bXBXKTsKKyAgICAgICAgICAgICAgICB0 bXBXICs9IHQtPndpZHRoKGxhc3RTcGFjZSwgcG9zIC0gbGFzdFNwYWNlLCBmLCB3K3RtcFcpICsg bGFzdFNwYWNlV29yZFNwYWNpbmc7CiAgICAgICAgICAgICBpZiAoIWFwcGxpZWRTdGFydFdpZHRo KQogICAgICAgICAgICAgICAgIHRtcFcgKz0gaW5saW5lV2lkdGgobywgdHJ1ZSwgZmFsc2UpOwog ICAgICAgICAgICAgaWYgKCFhcHBsaWVkRW5kV2lkdGgpCkBAIC0yMjkzLDEzICsyMjk0LDEyIEBA IEJpZGlJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lQnIKICAgICAgICAgICAgICAg ICAgICAgY2hlY2tGb3JCcmVhayA9IGZhbHNlOwogICAgICAgICAgICAgICAgICAgICBSZW5kZXJU ZXh0KiBuZXh0VGV4dCA9IHN0YXRpY19jYXN0PFJlbmRlclRleHQqPihuZXh0KTsKICAgICAgICAg ICAgICAgICAgICAgaWYgKG5leHRUZXh0LT5zdHJpbmdMZW5ndGgoKSAhPSAwKSB7Ci0JICAgICAg ICAgICAgICAgICAgICBRQ2hhciBjID0gbmV4dFRleHQtPnRleHQoKVswXTsKKyAgICAgICAgICAg ICAgICAgICAgICAgIFFDaGFyIGMgPSBuZXh0VGV4dC0+dGV4dCgpWzBdOwogICAgICAgICAgICAg ICAgICAgICAgICAgaWYgKGMgPT0gJyAnIHx8IGMgPT0gJ1x0JyB8fCAoYyA9PSAnXG4nICYmICFu ZXh0LT5zdHlsZSgpLT5wcmVzZXJ2ZU5ld2xpbmUoKSkpIHsKLSAgICAgICAgICAgICAgICAgICAg ICAgIAkvLyBJZiB0aGUgbmV4dCBpdGVtIG9uIHRoZSBsaW5lIGlzIHRleHQsIGFuZCBpZiB3ZSBk aWQgbm90IGVuZCB3aXRoCi0gICAgICAgICAgICAgICAgICAgICAgICAJLy8gYSBzcGFjZSwgdGhl biB0aGUgbmV4dCB0ZXh0IHJ1biBjb250aW51ZXMgb3VyIHdvcmQgKGFuZCBzbyBpdCBuZWVkcyB0 bwotICAgICAgICAgICAgICAgICAgICAgICAJIAkvLyBrZWVwIGFkZGluZyB0byB8dG1wV3wuICBK dXN0IHVwZGF0ZSBhbmQgY29udGludWUuCi0gCQkJCQkJCWNoZWNrRm9yQnJlYWsgPSB0cnVlOwot ICAgICAgICAgICAgICAgICAgICAgICAgCXRtcFcgKz0gbmV4dFRleHQtPmh0bWxGb250KG1fZmly c3RMaW5lKS0+Z2V0V29yZFNwYWNpbmcoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAv LyBJZiB0aGUgbmV4dCBpdGVtIG9uIHRoZSBsaW5lIGlzIHRleHQsIGFuZCBpZiB3ZSBkaWQgbm90 IGVuZCB3aXRoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gYSBzcGFjZSwgdGhlbiB0 aGUgbmV4dCB0ZXh0IHJ1biBjb250aW51ZXMgb3VyIHdvcmQgKGFuZCBzbyBpdCBuZWVkcyB0bwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGtlZXAgYWRkaW5nIHRvIHx0bXBXfC4gIEp1 c3QgdXBkYXRlIGFuZCBjb250aW51ZS4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGVj a0ZvckJyZWFrID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAg ICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBib29sIGNhblBsYWNlT25MaW5lID0gKHcg KyB0bXBXIDw9IHdpZHRoKzEpIHx8ICFhdXRvV3JhcDsK