84489 2012-04-20 13:49:46 -0700 Selection highlights of lines in adjoining blocks can overlap 2012-04-20 14:42:49 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mitz mitz oldest_to_newest 606866 0 mitz 2012-04-20 13:49:46 -0700 Selection highlights of lines in adjoining blocks can overlap 606871 1 mitz 2012-04-20 13:52:46 -0700 <rdar://problem/10786000> For example, if the selection spans the last line of one block and the first line of the next block, and those lines overlap (due to margins or line-height), the selection highlights will overlap. <div>first line</div><div style="margin-top: -1ex;">second line</div> 606878 2 138157 mitz 2012-04-20 14:03:54 -0700 Created attachment 138157 Use an adjusted selection top for highlighting when the last line in the preceding block is selected and overlaps 606924 3 mitz 2012-04-20 14:42:49 -0700 Fixed in <http://trac.webkit.org/r114784>. 138157 2012-04-20 14:03:54 -0700 2012-04-20 14:36:49 -0700 Use an adjusted selection top for highlighting when the last line in the preceding block is selected and overlaps bug-84489-20120420140351.patch text/plain 12237 mitz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNDc3NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA0LTIwICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEwNzg2 MDAwPiBTZWxlY3Rpb24gaGlnaGxpZ2h0cyBvZiBsaW5lcyBpbiBhZGpvaW5pbmcgYmxvY2tzIGNh biBvdmVybGFwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04NDQ4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRlc3Q6IGZhc3QvYmxvY2svbGluZS1sYXlvdXQvc2VsZWN0aW9uLWhpZ2hsaWdodC1vdmVybGFw Lmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9FbGxpcHNpc0JveC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpFbGxpcHNpc0JveDo6c2VsZWN0aW9uUmVjdCk6IENoYW5nZWQgdG8gdXNlCisgICAg ICAgIHNlbGVjdGlvbntUb3AsSGVpZ2h0fUFkanVzdGVkRm9yUHJlY2VkaW5nQmxvY2soKS4KKyAg ICAgICAgKiByZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ bmxpbmVUZXh0Qm94OjpwYWludFNlbGVjdGlvbik6IERpdHRvLgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6aW5saW5l U2VsZWN0aW9uR2Fwcyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmJs b2NrQmVmb3JlV2l0aGluU2VsZWN0aW9uUm9vdCk6IEFkZGVkLiBSZXR1cm5zIHRoZSBibG9jayB3 aGljaCBpcworICAgICAgICBsaWtlbHkgdG8gY29udGFpbiB0aGUgc2VsZWN0ZWQgbGluZSBqdXN0 IGJlZm9yZSB0aGUgZmlyc3QgbGluZSBpbiB0aGlzIGJsb2NrLCBpZiBpdCBpcworICAgICAgICB3 aXRoaW4gdGhlIHNhbWUgc2VsZWN0aW9uIHJvb3QuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmg6CisgICAgICAgICogcmVuZGVyaW5nL1Jvb3RJbmxpbmVCb3guY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Um9vdElubGluZUJveDo6c2VsZWN0aW9uVG9wQWRqdXN0ZWRGb3JQcmVjZWRp bmdCbG9jayk6IEFkZGVkLiBJZiB0aGUgc2VsZWN0aW9uCisgICAgICAgIHN0YXJ0cyBiZWZvcmUg b3VyIGJsb2NrLCBmaW5kcyB0aGUgbGFzdCBsaW5lIGluIHRoZSBwcmVjZWRpbmcgYmxvY2sgYW5k IGFkanVzdHMgdGhlIHNlbGVjdGlvbgorICAgICAgICB0b3AgdG8gYXZvaWQgb3ZlcmxhcCB3aXRo IHRoYXQgbGluZeKAmXMgc2VsZWN0aW9uIGJvdHRvbS4KKyAgICAgICAgKiByZW5kZXJpbmcvUm9v dElubGluZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6Um9vdElubGluZUJveDo6c2VsZWN0aW9u SGVpZ2h0QWRqdXN0ZWRGb3JQcmVjZWRpbmdCbG9jayk6IEFkZGVkLiBMaWtlCisgICAgICAgIHNl bGVjdGlvbkhlaWdodCgpLCBidXQgdXNlcyBzZWxlY3Rpb25Ub3BBZGp1c3RlZEZvclByZWNlZGlu Z0Jsb2NrKCkuCisKIDIwMTItMDQtMjAgIEVtaWwgQSBFa2x1bmQgIDxlYWVAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIEZpeCB1c2Ugb2YgTGF5b3V0VW5pdHMgaW4gRE9NTm9kZUhpZ2hsaWdodGVy CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRWxsaXBzaXNCb3guY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FbGxpcHNpc0JveC5jcHAJKHJldmlzaW9u IDExNDY0MCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FbGxpcHNpc0JveC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTc4LDcgKzc4LDcgQEAgSW50UmVjdCBFbGxpcHNpc0JveDo6c2VsZWN0 aW9uUmVjdCgpCiAgICAgUmVuZGVyU3R5bGUqIHN0eWxlID0gbV9yZW5kZXJlci0+c3R5bGUoaXNG aXJzdExpbmVTdHlsZSgpKTsKICAgICBjb25zdCBGb250JiBmb250ID0gc3R5bGUtPmZvbnQoKTsK ICAgICAvLyBGSVhNRTogV2h5IGlzIHRoaXMgYWx3YXlzIExUUj8gRml4IGJ5IHBhc3NpbmcgY29y cmVjdCB0ZXh0IHJ1biBmbGFncyBiZWxvdy4KLSAgICByZXR1cm4gZW5jbG9zaW5nSW50UmVjdChm b250LnNlbGVjdGlvblJlY3RGb3JUZXh0KFJlbmRlckJsb2NrOjpjb25zdHJ1Y3RUZXh0UnVuKHJl bmRlcmVyKCksIGZvbnQsIG1fc3RyLCBzdHlsZSwgVGV4dFJ1bjo6QWxsb3dUcmFpbGluZ0V4cGFu c2lvbiksIEludFBvaW50KHgoKSwgeSgpICsgcm9vdCgpLT5zZWxlY3Rpb25Ub3AoKSksIHJvb3Qo KS0+c2VsZWN0aW9uSGVpZ2h0KCkpKTsKKyAgICByZXR1cm4gZW5jbG9zaW5nSW50UmVjdChmb250 LnNlbGVjdGlvblJlY3RGb3JUZXh0KFJlbmRlckJsb2NrOjpjb25zdHJ1Y3RUZXh0UnVuKHJlbmRl cmVyKCksIGZvbnQsIG1fc3RyLCBzdHlsZSwgVGV4dFJ1bjo6QWxsb3dUcmFpbGluZ0V4cGFuc2lv biksIEludFBvaW50KHgoKSwgeSgpICsgcm9vdCgpLT5zZWxlY3Rpb25Ub3BBZGp1c3RlZEZvclBy ZWNlZGluZ0Jsb2NrKCkpLCByb290KCktPnNlbGVjdGlvbkhlaWdodEFkanVzdGVkRm9yUHJlY2Vk aW5nQmxvY2soKSkpOwogfQogCiB2b2lkIEVsbGlwc2lzQm94OjpwYWludFNlbGVjdGlvbihHcmFw aGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCwgUmVu ZGVyU3R5bGUqIHN0eWxlLCBjb25zdCBGb250JiBmb250KQpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcAkocmV2aXNpb24gMTE0NjQwKQorKysgU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04 NDEsOCArODQxLDEyIEBAIHZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnRTZWxlY3Rpb24oR3JhcGgK ICAgICBpZiAocmVzcGVjdEh5cGhlbikKICAgICAgICAgZVBvcyA9IHRleHRSdW4ubGVuZ3RoKCk7 CiAKLSAgICBpbnQgZGVsdGFZID0gcmVuZGVyZXIoKS0+c3R5bGUoKS0+aXNGbGlwcGVkTGluZXNX cml0aW5nTW9kZSgpID8gc2VsZWN0aW9uQm90dG9tKCkgLSBsb2dpY2FsQm90dG9tKCkgOiBsb2dp Y2FsVG9wKCkgLSBzZWxlY3Rpb25Ub3AoKTsKLSAgICBpbnQgc2VsSGVpZ2h0ID0gc2VsZWN0aW9u SGVpZ2h0KCk7CisgICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25Cb3R0b20gPSByb290KCktPnNlbGVj dGlvbkJvdHRvbSgpOworICAgIExheW91dFVuaXQgc2VsZWN0aW9uVG9wID0gcm9vdCgpLT5zZWxl Y3Rpb25Ub3BBZGp1c3RlZEZvclByZWNlZGluZ0Jsb2NrKCk7CisKKyAgICBpbnQgZGVsdGFZID0g cmVuZGVyZXIoKS0+c3R5bGUoKS0+aXNGbGlwcGVkTGluZXNXcml0aW5nTW9kZSgpID8gc2VsZWN0 aW9uQm90dG9tIC0gbG9naWNhbEJvdHRvbSgpIDogbG9naWNhbFRvcCgpIC0gc2VsZWN0aW9uVG9w OworICAgIGludCBzZWxIZWlnaHQgPSBtYXg8TGF5b3V0VW5pdD4oMCwgc2VsZWN0aW9uQm90dG9t IC0gc2VsZWN0aW9uVG9wKTsKKwogICAgIEZsb2F0UG9pbnQgbG9jYWxPcmlnaW4oYm94T3JpZ2lu LngoKSwgYm94T3JpZ2luLnkoKSAtIGRlbHRhWSk7CiAKICAgICBGbG9hdFJlY3QgY2xpcFJlY3Qo bG9jYWxPcmlnaW4sIEZsb2F0U2l6ZShtX2xvZ2ljYWxXaWR0aCwgc2VsSGVpZ2h0KSk7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHJldmlzaW9uIDExNDY0 MCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTMyMTMsOCArMzIxMyw4IEBAIEdhcFJlY3RzIFJlbmRlckJsb2NrOjppbmxpbmVT ZWxlY3Rpb25HYXAKIAogICAgIC8vIE5vdyBwYWludCB0aGUgZ2FwcyBmb3IgdGhlIGxpbmVzLgog ICAgIGZvciAoOyBjdXJyICYmIGN1cnItPmhhc1NlbGVjdGVkQ2hpbGRyZW4oKTsgY3VyciA9IGN1 cnItPm5leHRSb290Qm94KCkpIHsKLSAgICAgICAgTGF5b3V0VW5pdCBzZWxUb3AgPSAgY3Vyci0+ c2VsZWN0aW9uVG9wKCk7Ci0gICAgICAgIExheW91dFVuaXQgc2VsSGVpZ2h0ID0gY3Vyci0+c2Vs ZWN0aW9uSGVpZ2h0KCk7CisgICAgICAgIExheW91dFVuaXQgc2VsVG9wID0gIGN1cnItPnNlbGVj dGlvblRvcEFkanVzdGVkRm9yUHJlY2VkaW5nQmxvY2soKTsKKyAgICAgICAgTGF5b3V0VW5pdCBz ZWxIZWlnaHQgPSBjdXJyLT5zZWxlY3Rpb25IZWlnaHRBZGp1c3RlZEZvclByZWNlZGluZ0Jsb2Nr KCk7CiAKICAgICAgICAgaWYgKCFjb250YWluc1N0YXJ0ICYmICFsYXN0U2VsZWN0ZWRMaW5lICYm CiAgICAgICAgICAgICBzZWxlY3Rpb25TdGF0ZSgpICE9IFNlbGVjdGlvblN0YXJ0ICYmIHNlbGVj dGlvblN0YXRlKCkgIT0gU2VsZWN0aW9uQm90aCkKQEAgLTM0MDYsNiArMzQwNiwzNiBAQCBMYXlv dXRVbml0IFJlbmRlckJsb2NrOjpsb2dpY2FsUmlnaHRTZWxlCiAgICAgcmV0dXJuIGxvZ2ljYWxS aWdodDsKIH0KIAorUmVuZGVyQmxvY2sqIFJlbmRlckJsb2NrOjpibG9ja0JlZm9yZVdpdGhpblNl bGVjdGlvblJvb3QoTGF5b3V0U2l6ZSYgb2Zmc2V0KSBjb25zdAoreworICAgIGlmIChpc1NlbGVj dGlvblJvb3QoKSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBjb25zdCBSZW5kZXJCb3gqIG9i amVjdCA9IHRoaXM7CisgICAgUmVuZGVyQm94KiBzaWJsaW5nOworICAgIGRvIHsKKyAgICAgICAg c2libGluZyA9IG9iamVjdC0+cHJldmlvdXNTaWJsaW5nQm94KCk7CisgICAgICAgIHdoaWxlIChz aWJsaW5nICYmICghc2libGluZy0+aXNSZW5kZXJCbG9jaygpIHx8IHRvUmVuZGVyQmxvY2soc2li bGluZyktPmlzU2VsZWN0aW9uUm9vdCgpKSkKKyAgICAgICAgICAgIHNpYmxpbmcgPSBzaWJsaW5n LT5wcmV2aW91c1NpYmxpbmdCb3goKTsKKworICAgICAgICBvZmZzZXQgLT0gTGF5b3V0U2l6ZShv YmplY3QtPmxvZ2ljYWxMZWZ0KCksIG9iamVjdC0+bG9naWNhbFRvcCgpKTsKKyAgICAgICAgb2Jq ZWN0ID0gb2JqZWN0LT5wYXJlbnRCb3goKTsKKyAgICB9IHdoaWxlICghc2libGluZyAmJiBvYmpl Y3QgJiYgb2JqZWN0LT5pc1JlbmRlckJsb2NrKCkgJiYgIXRvUmVuZGVyQmxvY2sob2JqZWN0KS0+ aXNTZWxlY3Rpb25Sb290KCkpOworCisgICAgaWYgKCFzaWJsaW5nKQorICAgICAgICByZXR1cm4g MDsKKworICAgIG9mZnNldCArPSBMYXlvdXRTaXplKHNpYmxpbmctPmxvZ2ljYWxMZWZ0KCksIHNp YmxpbmctPmxvZ2ljYWxUb3AoKSk7CisKKyAgICBSZW5kZXJPYmplY3QqIGNoaWxkID0gc2libGlu Zy0+bGFzdENoaWxkKCk7CisgICAgd2hpbGUgKGNoaWxkICYmIGNoaWxkLT5pc1JlbmRlckJsb2Nr KCkpIHsKKyAgICAgICAgc2libGluZyA9IHRvUmVuZGVyQmxvY2soY2hpbGQpOworICAgICAgICBv ZmZzZXQgKz0gTGF5b3V0U2l6ZShzaWJsaW5nLT5sb2dpY2FsTGVmdCgpLCBzaWJsaW5nLT5sb2dp Y2FsVG9wKCkpOworICAgICAgICBjaGlsZCA9IHNpYmxpbmctPmxhc3RDaGlsZCgpOworICAgIH0K KyAgICByZXR1cm4gdG9SZW5kZXJCbG9jayhzaWJsaW5nKTsKK30KKwogdm9pZCBSZW5kZXJCbG9j azo6aW5zZXJ0UG9zaXRpb25lZE9iamVjdChSZW5kZXJCb3gqIG8pCiB7CiAgICAgQVNTRVJUKCFp c0Fub255bW91c0Jsb2NrKCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmgJKHJldmlzaW9uIDExNDY0MCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMTAsNiArMjEwLDggQEAgcHVibGljOgogICAg IExheW91dFJlY3QgbG9naWNhbFJpZ2h0U2VsZWN0aW9uR2FwKFJlbmRlckJsb2NrKiByb290Qmxv Y2ssIGNvbnN0IExheW91dFBvaW50JiByb290QmxvY2tQaHlzaWNhbFBvc2l0aW9uLCBjb25zdCBM YXlvdXRTaXplJiBvZmZzZXRGcm9tUm9vdEJsb2NrLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFJlbmRlck9iamVjdCogc2VsT2JqLCBMYXlvdXRVbml0IGxvZ2ljYWxS aWdodCwgTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIGNv bnN0IFBhaW50SW5mbyopOwogICAgIHZvaWQgZ2V0U2VsZWN0aW9uR2FwSW5mbyhTZWxlY3Rpb25T dGF0ZSwgYm9vbCYgbGVmdEdhcCwgYm9vbCYgcmlnaHRHYXApOworICAgIFJlbmRlckJsb2NrKiBi bG9ja0JlZm9yZVdpdGhpblNlbGVjdGlvblJvb3QoTGF5b3V0U2l6ZSYgb2Zmc2V0KSBjb25zdDsK KwogICAgIExheW91dFJlY3QgbG9naWNhbFJlY3RUb1BoeXNpY2FsUmVjdChjb25zdCBMYXlvdXRQ b2ludCYgcGh5c2ljYWxQb3NpdGlvbiwgY29uc3QgTGF5b3V0UmVjdCYgbG9naWNhbFJlY3QpOwog ICAgICAgICAKICAgICAvLyBIZWxwZXIgbWV0aG9kcyBmb3IgY29tcHV0aW5nIGxpbmUgY291bnRz IGFuZCBoZWlnaHRzIGZvciBsaW5lIGNvdW50cy4KQEAgLTgwMSw3ICs4MDMsNyBAQCBwcml2YXRl OgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBsYXN0TG9naWNh bFRvcCwgTGF5b3V0VW5pdCBsYXN0TG9naWNhbExlZnQsIExheW91dFVuaXQgbGFzdExvZ2ljYWxS aWdodCwgTGF5b3V0VW5pdCBsb2dpY2FsQm90dG9tLCBjb25zdCBQYWludEluZm8qKTsKICAgICBM YXlvdXRVbml0IGxvZ2ljYWxMZWZ0U2VsZWN0aW9uT2Zmc2V0KFJlbmRlckJsb2NrKiByb290Qmxv Y2ssIExheW91dFVuaXQgcG9zaXRpb24pOwogICAgIExheW91dFVuaXQgbG9naWNhbFJpZ2h0U2Vs ZWN0aW9uT2Zmc2V0KFJlbmRlckJsb2NrKiByb290QmxvY2ssIExheW91dFVuaXQgcG9zaXRpb24p OwotICAgIAorCiAgICAgdmlydHVhbCB2b2lkIGFic29sdXRlUmVjdHMoVmVjdG9yPEludFJlY3Q+ JiwgY29uc3QgTGF5b3V0UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0KSBjb25zdDsKICAgICB2aXJ0 dWFsIHZvaWQgYWJzb2x1dGVRdWFkcyhWZWN0b3I8RmxvYXRRdWFkPiYsIGJvb2wqIHdhc0ZpeGVk KSBjb25zdDsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jvb3RJbmxpbmVCb3gu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Sb290SW5saW5lQm94 LmNwcAkocmV2aXNpb24gMTE0NjQwKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jvb3RJ bmxpbmVCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NDUsNiArNTQ1LDI5IEBAIExheW91dFVu aXQgUm9vdElubGluZUJveDo6c2VsZWN0aW9uVG9wKCkKICAgICByZXR1cm4gcHJldkJvdHRvbTsK IH0KIAorTGF5b3V0VW5pdCBSb290SW5saW5lQm94OjpzZWxlY3Rpb25Ub3BBZGp1c3RlZEZvclBy ZWNlZGluZ0Jsb2NrKCkgY29uc3QKK3sKKyAgICBMYXlvdXRVbml0IHRvcCA9IHNlbGVjdGlvblRv cCgpOworCisgICAgUmVuZGVyT2JqZWN0OjpTZWxlY3Rpb25TdGF0ZSBibG9ja1NlbGVjdGlvblN0 YXRlID0gcm9vdCgpLT5ibG9jaygpLT5zZWxlY3Rpb25TdGF0ZSgpOworICAgIGlmIChibG9ja1Nl bGVjdGlvblN0YXRlICE9IFJlbmRlck9iamVjdDo6U2VsZWN0aW9uSW5zaWRlICYmIGJsb2NrU2Vs ZWN0aW9uU3RhdGUgIT0gUmVuZGVyT2JqZWN0OjpTZWxlY3Rpb25FbmQpCisgICAgICAgIHJldHVy biB0b3A7CisKKyAgICBMYXlvdXRTaXplIG9mZnNldFRvQmxvY2tCZWZvcmU7CisgICAgaWYgKFJl bmRlckJsb2NrKiBibG9jayA9IHJvb3QoKS0+YmxvY2soKS0+YmxvY2tCZWZvcmVXaXRoaW5TZWxl Y3Rpb25Sb290KG9mZnNldFRvQmxvY2tCZWZvcmUpKSB7CisgICAgICAgIGlmIChSb290SW5saW5l Qm94KiBsYXN0TGluZSA9IGJsb2NrLT5sYXN0Um9vdEJveCgpKSB7CisgICAgICAgICAgICBSZW5k ZXJPYmplY3Q6OlNlbGVjdGlvblN0YXRlIGxhc3RMaW5lU2VsZWN0aW9uU3RhdGUgPSBsYXN0TGlu ZS0+c2VsZWN0aW9uU3RhdGUoKTsKKyAgICAgICAgICAgIGlmIChsYXN0TGluZVNlbGVjdGlvblN0 YXRlICE9IFJlbmRlck9iamVjdDo6U2VsZWN0aW9uSW5zaWRlICYmIGxhc3RMaW5lU2VsZWN0aW9u U3RhdGUgIT0gUmVuZGVyT2JqZWN0OjpTZWxlY3Rpb25TdGFydCkKKyAgICAgICAgICAgICAgICBy ZXR1cm4gdG9wOworCisgICAgICAgICAgICBMYXlvdXRVbml0IGxhc3RMaW5lU2VsZWN0aW9uQm90 dG9tID0gbGFzdExpbmUtPnNlbGVjdGlvbkJvdHRvbSgpICsgb2Zmc2V0VG9CbG9ja0JlZm9yZS5o ZWlnaHQoKTsKKyAgICAgICAgICAgIHRvcCA9IG1heCh0b3AsIGxhc3RMaW5lU2VsZWN0aW9uQm90 dG9tKTsKKyAgICAgICAgfQorICAgIH0KKworICAgIHJldHVybiB0b3A7Cit9CisKIExheW91dFVu aXQgUm9vdElubGluZUJveDo6c2VsZWN0aW9uQm90dG9tKCkgY29uc3QKIHsKICAgICBMYXlvdXRV bml0IHNlbGVjdGlvbkJvdHRvbSA9IG1fbGluZUJvdHRvbTsKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9Sb290SW5saW5lQm94LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1Jvb3RJbmxpbmVCb3guaAkocmV2aXNpb24gMTE0NjQwKQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1Jvb3RJbmxpbmVCb3guaAkod29ya2luZyBjb3B5KQpAQCAtNjMsNiAr NjMsOSBAQCBwdWJsaWM6CiAgICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25Cb3R0b20oKSBjb25zdDsK ICAgICBMYXlvdXRVbml0IHNlbGVjdGlvbkhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1heDxMYXlv dXRVbml0PigwLCBzZWxlY3Rpb25Cb3R0b20oKSAtIHNlbGVjdGlvblRvcCgpKTsgfQogCisgICAg TGF5b3V0VW5pdCBzZWxlY3Rpb25Ub3BBZGp1c3RlZEZvclByZWNlZGluZ0Jsb2NrKCkgY29uc3Q7 CisgICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25IZWlnaHRBZGp1c3RlZEZvclByZWNlZGluZ0Jsb2Nr KCkgY29uc3QgeyByZXR1cm4gbWF4PExheW91dFVuaXQ+KDAsIHNlbGVjdGlvbkJvdHRvbSgpIC0g c2VsZWN0aW9uVG9wQWRqdXN0ZWRGb3JQcmVjZWRpbmdCbG9jaygpKTsgfQorCiAgICAgaW50IGJs b2NrRGlyZWN0aW9uUG9pbnRJbkxpbmUoKSBjb25zdCB7IHJldHVybiBtYXgobGluZVRvcCgpLCBz ZWxlY3Rpb25Ub3AoKSk7IH0KIAogICAgIExheW91dFVuaXQgYWxpZ25Cb3hlc0luQmxvY2tEaXJl Y3Rpb24oTGF5b3V0VW5pdCBoZWlnaHRPZkJsb2NrLCBHbHlwaE92ZXJmbG93QW5kRmFsbGJhY2tG b250c01hcCYsIFZlcnRpY2FsUG9zaXRpb25DYWNoZSYpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTE0 Nzc2KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTMgQEAKKzIwMTItMDQtMjAgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KKworICAg ICAgICBTZWxlY3Rpb24gaGlnaGxpZ2h0cyBvZiBsaW5lcyBpbiBhZGpvaW5pbmcgYmxvY2tzIGNh biBvdmVybGFwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04NDQ4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogZmFzdC9ibG9jay9saW5lLWxheW91dC9zZWxlY3Rpb24taGlnaGxpZ2h0LW92ZXJsYXAtZXhw ZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9ibG9jay9saW5lLWxheW91dC9zZWxl Y3Rpb24taGlnaGxpZ2h0LW92ZXJsYXAuaHRtbDogQWRkZWQuCisKIDIwMTItMDQtMjAgIERhdmlk IERvcndpbiAgPGRkb3J3aW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEVuYWJsZSBFbmNyeXB0 ZWQgTWVkaWEgdGVzdHMgb24gQ2hyb21pdW0gbm93IHRoYXQgQ2hyb21pdW0gc2lkZSBpcyBjb21t aXR0ZWQKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvYmxvY2svbGluZS1sYXlvdXQvc2VsZWN0aW9u LWhpZ2hsaWdodC1vdmVybGFwLWV4cGVjdGVkLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvZmFzdC9ibG9jay9saW5lLWxheW91dC9zZWxlY3Rpb24taGlnaGxpZ2h0LW92ZXJsYXAtZXhw ZWN0ZWQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvYmxvY2svbGluZS1s YXlvdXQvc2VsZWN0aW9uLWhpZ2hsaWdodC1vdmVybGFwLWV4cGVjdGVkLmh0bWwJKHJldmlzaW9u IDApCkBAIC0wLDAgKzEsMTYgQEAKKzxzdHlsZT4KKyAgICBib2R5IHsgZm9udC1zaXplOiA2NHB4 OyBmb250LWZhbWlseTogYWhlbTsgY29sb3I6IHRyYW5zcGFyZW50OyB9CisgICAgZGl2IHsgb3V0 bGluZTogMXB4IGRhc2hlZCBncmVlbjsgfQorICAgIGRpdiA+IGRpdiB7IG91dGxpbmU6IGluaXRp YWw7IGJhY2tncm91bmQtY29sb3I6IHJnYmEoMCwgMCwgMjU1LCAuNCk7IH0KKzwvc3R5bGU+Cis8 ZGl2PgorICAgIDxkaXYgc3R5bGU9ImhlaWdodDogMzBweDsgbWFyZ2luLWxlZnQ6IDEyOHB4OyI+ PC9kaXY+Cis8L2Rpdj4KKzxkaXY+CisgICAgPGRpdiBzdHlsZT0iaGVpZ2h0OiAxN3B4OyBtYXJn aW4tbGVmdDogMTI4cHg7Ij48L2Rpdj4KKyAgICA8ZGl2IHN0eWxlPSJoZWlnaHQ6IDQ3cHg7Ij48 L2Rpdj4KKzwvZGl2PgorPGRpdiBzdHlsZT0ibWFyZ2luLXRvcDogLTEwcHg7IGhlaWdodDogNjRw eDsiPgorICAgIDxkaXYgc3R5bGU9ImhlaWdodDogMTBweDsgYmFja2dyb3VuZC1jb2xvcjogdHJh bnNwYXJlbnQ7Ij48L2Rpdj4KKyAgICA8ZGl2IHN0eWxlPSJoZWlnaHQ6IDU0cHg7IHdpZHRoOiAy NTZweDsiPjwvZGl2PgorPC9kaXY+CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Jsb2NrL2xpbmUt bGF5b3V0L3NlbGVjdGlvbi1oaWdobGlnaHQtb3ZlcmxhcC5odG1sCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2Zhc3QvYmxvY2svbGluZS1sYXlvdXQvc2VsZWN0aW9uLWhpZ2hsaWdodC1vdmVy bGFwLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2Jsb2NrL2xpbmUtbGF5 b3V0L3NlbGVjdGlvbi1oaWdobGlnaHQtb3ZlcmxhcC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCww ICsxLDExIEBACis8c3R5bGU+CisgICAgYm9keSB7IGZvbnQtc2l6ZTogNjRweDsgZm9udC1mYW1p bHk6IGFoZW07IGNvbG9yOiB0cmFuc3BhcmVudDsgfQorICAgIGRpdiB7IG91dGxpbmU6IDFweCBk YXNoZWQgZ3JlZW47IH0KKyAgICBkaXY6OnNlbGVjdGlvbiB7IGJhY2tncm91bmQtY29sb3I6IHJn YmEoMCwgMCwgMjU1LCAuNCk7IH0KKzwvc3R5bGU+Cis8ZGl2IGlkPSJzdGFydCIgc3R5bGU9Imxp bmUtaGVpZ2h0OiAzMHB4OyI+cXVldWUgdGhlb3J5PC9kaXY+Cis8ZGl2PnByb2JsZW08L2Rpdj4K KzxkaXYgaWQ9ImVuZCIgc3R5bGU9Im1hcmdpbi10b3A6IC0xMHB4OyI+aW5mb3JtYXRpb248L2Rp dj4KKzxzY3JpcHQ+CisJZ2V0U2VsZWN0aW9uKCkuc2V0QmFzZUFuZEV4dGVudChkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgic3RhcnQiKS5maXJzdENoaWxkLCAyLCBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgiZW5kIikuZmlyc3RDaGlsZCwgNCk7Cis8L3NjcmlwdD4K