27388 2009-07-17 14:21:33 -0700 [Chromium] CSS dotted/dashed borders in Chromium/skia are generally hosed 2009-07-27 17:51:09 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC Windows XP RESOLVED FIXED http://crbug.com/474 P2 Normal --- 1 senorblanco senorblanco dglazkov fishd levin senorblanco oldest_to_newest 132702 0 senorblanco 2009-07-17 14:21:33 -0700 Dotted and dashed 1px borders in Chromium/skia draw weird antialiased grey lines instead of distinct dots. See: http://crbug.com/474 132705 1 32970 senorblanco 2009-07-17 14:25:33 -0700 Created attachment 32970 Fix for 1px CSS border issue 133253 2 32970 eric 2009-07-20 15:13:57 -0700 Comment on attachment 32970 Fix for 1px CSS border issue Not much for me to say here. As long as this passes tests, it looks sane. Sad that we can't share more of this code. 133425 3 levin 2009-07-21 02:56:14 -0700 Committed as http://trac.webkit.org/changeset/46157 134560 4 senorblanco 2009-07-24 08:05:56 -0700 This fix may be causing reliability problems in Chromium. Reverting. 134561 5 33448 senorblanco 2009-07-24 08:09:23 -0700 Created attachment 33448 Revert of previous patch. 134577 6 33448 levin 2009-07-24 09:05:32 -0700 Comment on attachment 33448 Revert of previous patch. Verified that it is simply a revert and (essentially) rubberstamping. 134597 7 fishd 2009-07-24 10:44:41 -0700 Landed as: http://trac.webkit.org/changeset/46363 134903 8 senorblanco 2009-07-27 06:49:56 -0700 Reopening this bug, since the fix was reverted. 134909 9 33544 senorblanco 2009-07-27 07:09:50 -0700 Created attachment 33544 Re-apply (unrevert) the patch. 134920 10 33448 levin 2009-07-27 08:13:53 -0700 Comment on attachment 33448 Revert of previous patch. Clearing the r+ since this patch was applied (and the bug has ben re-opened). 134921 11 33544 levin 2009-07-27 08:16:13 -0700 Comment on attachment 33544 Re-apply (unrevert) the patch. Really reviewed by Eric really. I verified that this is the same patch that Eric r+ before. 135074 12 levin 2009-07-27 17:51:09 -0700 Committed (again) as http://trac.webkit.org/changeset/46447 32970 2009-07-17 14:25:33 -0700 2009-07-24 08:09:23 -0700 Fix for 1px CSS border issue webkit_border_webkit.patch text/plain 5996 senorblanco SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjA1NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDctMTcgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3Mzg4CisKKyAg ICAgICAgRml4IGRvdHRlZCBhbmQgZGFzaGVkIGJvcmRlcnMgb24gQ2hyb21pdW0vc2tpYS4gIFRo aXMgZm9sbG93cworICAgICAgICB0aGUgbG9naWMgaW4gdGhlIENnIHBhdGgsIHNvIHJlc3VsdHMg YXJlIG11Y2ggY2xvc2VyIHRvIFNhZmFyaSBub3cgCisgICAgICAgIChzb21lIHRlc3RzIHdvbid0 IGJlIGV4YWN0bHkgdGhlIHNhbWUgZHVlIHRvIGZvbnQgbGF5b3V0IGRpZmZlcmVuY2VzKS4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwOgorICAgICAg ICAoUGxhdGZvcm1Db250ZXh0U2tpYTo6c2V0dXBQYWludEZvclN0cm9raW5nKToKKwogMjAwOS0w Ny0xNyAgRHJldyBXaWxzb24gIDxhdHdpbHNvbkBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhdmlkIExldmluLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lh L0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcAkocmV2aXNpb24gNDYwNDEpCisr KyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTUzMCwxNiArNTMwLDQ2IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0 OjpkcmF3TGluZShjb25zdCBJbnQKICAgICAvLyBwcm9iYWJseSB3b3J0aCB0aGUgc3BlZWQgdXAg b2Ygbm8gc3F1YXJlIHJvb3QsIHdoaWNoIGFsc28gd29uJ3QgYmUgZXhhY3QuCiAgICAgU2tQb2lu dCBkaXNwID0gcHRzWzFdIC0gcHRzWzBdOwogICAgIGludCBsZW5ndGggPSBTa1NjYWxhclJvdW5k KGRpc3AuZlggKyBkaXNwLmZZKTsKLSAgICBpbnQgd2lkdGggPSByb3VuZGYoCi0gICAgICAgIHBs YXRmb3JtQ29udGV4dCgpLT5zZXR1cFBhaW50Rm9yU3Ryb2tpbmcoJnBhaW50LCAwLCBsZW5ndGgp KTsKKyAgICBwbGF0Zm9ybUNvbnRleHQoKS0+c2V0dXBQYWludEZvclN0cm9raW5nKCZwYWludCwg MCwgbGVuZ3RoKTsKKyAgICBpbnQgd2lkdGggPSByb3VuZGYoc3Ryb2tlVGhpY2tuZXNzKCkpOwor ICAgIGJvb2wgaXNWZXJ0aWNhbExpbmUgPSBwdHNbMF0uZlggPT0gcHRzWzFdLmZYOworCisgICAg aWYgKHN0cm9rZVN0eWxlKCkgPT0gRG90dGVkU3Ryb2tlIHx8IHN0cm9rZVN0eWxlKCkgPT0gRGFz aGVkU3Ryb2tlKSB7CisgICAgICAgIC8vIERvIGEgcmVjdCBmaWxsIG9mIG91ciBlbmRwb2ludHMu ICBUaGlzIGVuc3VyZXMgd2UgYWx3YXlzIGhhdmUgdGhlCisgICAgICAgIC8vIGFwcGVhcmFuY2Ug b2YgYmVpbmcgYSBib3JkZXIuICBXZSB0aGVuIGRyYXcgdGhlIGFjdHVhbCBkb3R0ZWQvZGFzaGVk IGxpbmUuCisgICAgICAgIAorICAgICAgICBTa1JlY3QgcjEsIHIyOworICAgICAgICByMS5zZXQo cHRzWzBdLmZYLCBwdHNbMF0uZlksIHB0c1swXS5mWCArIHdpZHRoLCBwdHNbMF0uZlkgKyB3aWR0 aCk7CisgICAgICAgIHIyLnNldChwdHNbMV0uZlgsIHB0c1sxXS5mWSwgcHRzWzFdLmZYICsgd2lk dGgsIHB0c1sxXS5mWSArIHdpZHRoKTsKKworICAgICAgICBpZiAoaXNWZXJ0aWNhbExpbmUpIHsK KyAgICAgICAgICAgIHIxLm9mZnNldCgtd2lkdGggLyAyLCAwKTsKKyAgICAgICAgICAgIHIyLm9m ZnNldCgtd2lkdGggLyAyLCAtd2lkdGgpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAg cjEub2Zmc2V0KDAsIC13aWR0aCAvIDIpOworICAgICAgICAgICAgcjIub2Zmc2V0KC13aWR0aCwg LXdpZHRoIC8gMik7CisgICAgICAgIH0KKyAgICAgICAgU2tQYWludCBmaWxsUGFpbnQ7CisgICAg ICAgIGZpbGxQYWludC5zZXRDb2xvcihwYWludC5nZXRDb2xvcigpKTsKKyAgICAgICAgcGxhdGZv cm1Db250ZXh0KCktPmNhbnZhcygpLT5kcmF3UmVjdChyMSwgZmlsbFBhaW50KTsKKyAgICAgICAg cGxhdGZvcm1Db250ZXh0KCktPmNhbnZhcygpLT5kcmF3UmVjdChyMiwgZmlsbFBhaW50KTsKIAot ICAgIC8vICJCb3Jyb3dlZCIgdGhpcyBjb21tZW50IGFuZCBpZGVhIGZyb20gR3JhcGhpY3NDb250 ZXh0Q0cuY3BwCisgICAgICAgIC8vIFNpbmNlIHdlJ3ZlIGFscmVhZHkgcmVuZGVyZWQgdGhlIGVu ZGNhcHMsIGFkanVzdCB0aGUgZW5kcG9pbnRzIHRvIAorICAgICAgICAvLyBleGNsdWRlIHRoZW0g ZnJvbSB0aGUgbGluZSBpdHNlbGYuCisgICAgICAgIGlmIChpc1ZlcnRpY2FsTGluZSkgeworICAg ICAgICAgICAgcHRzWzBdLmZZICs9IHdpZHRoOworICAgICAgICAgICAgcHRzWzFdLmZZIC09IHdp ZHRoOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgcHRzWzBdLmZYICs9IHdpZHRoOwor ICAgICAgICAgICAgcHRzWzFdLmZYIC09IHdpZHRoOworICAgICAgICB9CisgICAgfQorICAgICAg ICAvLyAiQm9ycm93ZWQiIHRoaXMgY29tbWVudCBhbmQgaWRlYSBmcm9tIEdyYXBoaWNzQ29udGV4 dENHLmNwcAogICAgIC8vIEZvciBvZGQgd2lkdGhzLCB3ZSBhZGQgaW4gMC41IHRvIHRoZSBhcHBy b3ByaWF0ZSB4L3kgc28gdGhhdCB0aGUgZmxvYXQKICAgICAvLyBhcml0aG1ldGljIHdvcmtzIG91 dC4gIEZvciBleGFtcGxlLCB3aXRoIGEgYm9yZGVyIHdpZHRoIG9mIDMsIEtIVE1MIHdpbGwKICAg ICAvLyBwYXNzIHVzICh5MSt5MikvMiwgZS5nLiwgKDUwKzUzKS8yID0gMTAzLzIgPSA1MSB3aGVu IHdlIHdhbnQgNTEuNS4gIEl0IGlzCiAgICAgLy8gYWx3YXlzIHRydWUgdGhhdCBhbiBldmVuIHdp ZHRoIGdhdmUgdXMgYSBwZXJmZWN0IHBvc2l0aW9uLCBidXQgYW4gb2RkCiAgICAgLy8gd2lkdGgg Z2F2ZSB1cyBhIHBvc2l0aW9uIHRoYXQgaXMgb2ZmIGJ5IGV4YWN0bHkgMC41LgotICAgIGJvb2wg aXNWZXJ0aWNhbExpbmUgPSBwdHNbMF0uZlggPT0gcHRzWzFdLmZYOwogCiAgICAgaWYgKHdpZHRo ICYgMSkgeyAgLy8gT2RkLgogICAgICAgICBpZiAoaXNWZXJ0aWNhbExpbmUpIHsKSW5kZXg6IFdl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0 U2tpYS5jcHAJKHJldmlzaW9uIDQ2MDQxKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9z a2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMzgsMjAgKzMz OCwyNiBAQCBmbG9hdCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpzZXR1cFBhaW50Rm9yCiAgICAgICAg ICAgICB3aWR0aCA9IG1fc3RhdGUtPm1fZGFzaFJhdGlvICogd2lkdGg7CiAgICAgICAgICAgICAv LyBGYWxsIHRocm91Z2guCiAgICAgICAgIGNhc2UgV2ViQ29yZTo6RG90dGVkU3Ryb2tlOgotICAg ICAgICAgICAgU2tTY2FsYXIgZGFzaExlbmd0aDsKLSAgICAgICAgICAgIGlmIChsZW5ndGgpIHsK LSAgICAgICAgICAgICAgICAvLyBEZXRlcm1pbmUgYWJvdXQgaG93IG1hbnkgZGFzaGVzIG9yIGRv dHMgd2Ugc2hvdWxkIGhhdmUuCi0gICAgICAgICAgICAgICAgZmxvYXQgcm91bmRlZFdpZHRoID0g cm91bmRmKHdpZHRoKTsKLSAgICAgICAgICAgICAgICBpbnQgbnVtRGFzaGVzID0gcm91bmRlZFdp ZHRoID8gKGxlbmd0aCAvIHJvdW5kZWRXaWR0aCkgOiBsZW5ndGg7Ci0gICAgICAgICAgICAgICAg aWYgKCEobnVtRGFzaGVzICYgMSkpCi0gICAgICAgICAgICAgICAgICAgIG51bURhc2hlcysrOyAg ICAvLyBNYWtlIGl0IG9kZCBzbyB3ZSBlbmQgb24gYSBkYXNoL2RvdC4KLSAgICAgICAgICAgICAg ICAvLyBVc2UgdGhlIG51bWJlciBvZiBkYXNoZXMgdG8gZGV0ZXJtaW5lIHRoZSBsZW5ndGggb2Yg YQotICAgICAgICAgICAgICAgIC8vIGRhc2gvZG90LCB3aGljaCB3aWxsIGJlIGFwcHJveGltYXRl bHkgd2lkdGgKLSAgICAgICAgICAgICAgICBkYXNoTGVuZ3RoID0gU2tTY2FsYXJEaXYoU2tJbnRU b1NjYWxhcihsZW5ndGgpLCBTa0ludFRvU2NhbGFyKG51bURhc2hlcykpOwotICAgICAgICAgICAg fSBlbHNlCi0gICAgICAgICAgICAgICAgZGFzaExlbmd0aCA9IFNrRmxvYXRUb1NjYWxhcih3aWR0 aCk7Ci0gICAgICAgICAgICBTa1NjYWxhciBpbnRlcnZhbHNbMl0gPSB7IGRhc2hMZW5ndGgsIGRh c2hMZW5ndGggfTsKLSAgICAgICAgICAgIHBhaW50LT5zZXRQYXRoRWZmZWN0KG5ldyBTa0Rhc2hQ YXRoRWZmZWN0KGludGVydmFscywgMiwgMCkpLT51bnJlZigpOworICAgICAgICAgICAgLy8gVHJ1 bmNhdGUgdGhlIHdpZHRoLCBzaW5jZSB3ZSBkb24ndCB3YW50IGZ1enp5IGRvdHMgb3IgZGFzaGVz LgorICAgICAgICAgICAgaW50IGRhc2hMZW5ndGggPSBzdGF0aWNfY2FzdDxpbnQ+KHdpZHRoKTsK KyAgICAgICAgICAgIC8vIFN1YnRyYWN0IG9mZiB0aGUgZW5kY2Fwcywgc2luY2UgdGhleSdyZSBy ZW5kZXJlZCBzZXBhcmF0ZWx5LgorICAgICAgICAgICAgaW50IGRpc3RhbmNlID0gbGVuZ3RoIC0g MiAqIHN0YXRpY19jYXN0PGludD4obV9zdGF0ZS0+bV9zdHJva2VUaGlja25lc3MpOworICAgICAg ICAgICAgaW50IHBoYXNlID0gMTsKKyAgICAgICAgICAgIGlmIChkYXNoTGVuZ3RoID4gMSkgewor ICAgICAgICAgICAgICAgIC8vIERldGVybWluZSBob3cgbWFueSBkYXNoZXMgb3IgZG90cyB3ZSBz aG91bGQgaGF2ZS4KKyAgICAgICAgICAgICAgICBpbnQgbnVtRGFzaGVzID0gZGlzdGFuY2UgLyBk YXNoTGVuZ3RoOworICAgICAgICAgICAgICAgIGludCByZW1haW5kZXIgPSBkaXN0YW5jZSAlIGRh c2hMZW5ndGg7CisgICAgICAgICAgICAgICAgLy8gQWRqdXN0IHRoZSBwaGFzZSB0byBjZW50ZXIg dGhlIGRhc2hlcyB3aXRoaW4gdGhlIGxpbmUuCisgICAgICAgICAgICAgICAgaWYgKG51bURhc2hl cyAlIDIgPT0gMCkKKyAgICAgICAgICAgICAgICAgICAgLy8gRXZlbjogIHNoaWZ0IHJpZ2h0IGhh bGYgYSBkYXNoLCBtaW51cyBoYWxmIHRoZSByZW1haW5kZXIKKyAgICAgICAgICAgICAgICAgICAg cGhhc2UgPSAoZGFzaExlbmd0aCAtIHJlbWFpbmRlcikgLyAyOworICAgICAgICAgICAgICAgIGVs c2UKKyAgICAgICAgICAgICAgICAgICAgLy8gT2RkOiAgc2hpZnQgcmlnaHQgYSBmdWxsIGRhc2gs IG1pbnVzIGhhbGYgdGhlIHJlbWFpbmRlcgorICAgICAgICAgICAgICAgICAgICBwaGFzZSA9IGRh c2hMZW5ndGggLSByZW1haW5kZXIgLyAyOworICAgICAgICAgICAgfQorICAgICAgICAgICAgU2tT Y2FsYXIgZGFzaExlbmd0aFNrID0gU2tJbnRUb1NjYWxhcihkYXNoTGVuZ3RoKTsKKyAgICAgICAg ICAgIFNrU2NhbGFyIGludGVydmFsc1syXSA9IHsgZGFzaExlbmd0aFNrLCBkYXNoTGVuZ3RoU2sg fTsKKyAgICAgICAgICAgIHBhaW50LT5zZXRQYXRoRWZmZWN0KG5ldyBTa0Rhc2hQYXRoRWZmZWN0 KGludGVydmFscywgMiwgU2tJbnRUb1NjYWxhcihwaGFzZSkpKS0+dW5yZWYoKTsKICAgICAgICAg fQogICAgIH0KIAo= 33448 2009-07-24 08:09:23 -0700 2009-07-27 08:13:52 -0700 Revert of previous patch. webkit_border_revert.patch text/plain 5910 senorblanco SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjM1NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMDctMjQgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgUmV2ZXJ0aW5nIHI0NjE1Nywgc2luY2UgaXQgbWF5IGJlIGNhdXNpbmcgcHJvYmxlbXMg d2l0aCBDaHJvbWl1bQorICAgICAgICByZWxpYWJpbGl0eSAoc2VlIGh0dHA6Ly9jcmJ1Zy5jb20v MTc1NjkpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNzM4OAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRl eHRTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmUp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5j cHA6CisgICAgICAgIChQbGF0Zm9ybUNvbnRleHRTa2lhOjpzZXR1cFBhaW50Rm9yU3Ryb2tpbmcp OgorCiAyMDA5LTA3LTI0ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBCdWlsZCBmaXggZm9yIDY0IGJpdCBMaW51eC4KSW5kZXg6IFdl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0 U2tpYS5jcHAJKHJldmlzaW9uIDQ2MzU0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9z a2lhL0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MzAsNDYgKzUz MCwxNiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmUoY29uc3QgSW50CiAgICAgLy8g cHJvYmFibHkgd29ydGggdGhlIHNwZWVkIHVwIG9mIG5vIHNxdWFyZSByb290LCB3aGljaCBhbHNv IHdvbid0IGJlIGV4YWN0LgogICAgIFNrUG9pbnQgZGlzcCA9IHB0c1sxXSAtIHB0c1swXTsKICAg ICBpbnQgbGVuZ3RoID0gU2tTY2FsYXJSb3VuZChkaXNwLmZYICsgZGlzcC5mWSk7Ci0gICAgcGxh dGZvcm1Db250ZXh0KCktPnNldHVwUGFpbnRGb3JTdHJva2luZygmcGFpbnQsIDAsIGxlbmd0aCk7 Ci0gICAgaW50IHdpZHRoID0gcm91bmRmKHN0cm9rZVRoaWNrbmVzcygpKTsKLSAgICBib29sIGlz VmVydGljYWxMaW5lID0gcHRzWzBdLmZYID09IHB0c1sxXS5mWDsKLQotICAgIGlmIChzdHJva2VT dHlsZSgpID09IERvdHRlZFN0cm9rZSB8fCBzdHJva2VTdHlsZSgpID09IERhc2hlZFN0cm9rZSkg ewotICAgICAgICAvLyBEbyBhIHJlY3QgZmlsbCBvZiBvdXIgZW5kcG9pbnRzLiAgVGhpcyBlbnN1 cmVzIHdlIGFsd2F5cyBoYXZlIHRoZQotICAgICAgICAvLyBhcHBlYXJhbmNlIG9mIGJlaW5nIGEg Ym9yZGVyLiAgV2UgdGhlbiBkcmF3IHRoZSBhY3R1YWwgZG90dGVkL2Rhc2hlZCBsaW5lLgotICAg ICAgICAKLSAgICAgICAgU2tSZWN0IHIxLCByMjsKLSAgICAgICAgcjEuc2V0KHB0c1swXS5mWCwg cHRzWzBdLmZZLCBwdHNbMF0uZlggKyB3aWR0aCwgcHRzWzBdLmZZICsgd2lkdGgpOwotICAgICAg ICByMi5zZXQocHRzWzFdLmZYLCBwdHNbMV0uZlksIHB0c1sxXS5mWCArIHdpZHRoLCBwdHNbMV0u ZlkgKyB3aWR0aCk7Ci0KLSAgICAgICAgaWYgKGlzVmVydGljYWxMaW5lKSB7Ci0gICAgICAgICAg ICByMS5vZmZzZXQoLXdpZHRoIC8gMiwgMCk7Ci0gICAgICAgICAgICByMi5vZmZzZXQoLXdpZHRo IC8gMiwgLXdpZHRoKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHIxLm9mZnNldCgw LCAtd2lkdGggLyAyKTsKLSAgICAgICAgICAgIHIyLm9mZnNldCgtd2lkdGgsIC13aWR0aCAvIDIp OwotICAgICAgICB9Ci0gICAgICAgIFNrUGFpbnQgZmlsbFBhaW50OwotICAgICAgICBmaWxsUGFp bnQuc2V0Q29sb3IocGFpbnQuZ2V0Q29sb3IoKSk7Ci0gICAgICAgIHBsYXRmb3JtQ29udGV4dCgp LT5jYW52YXMoKS0+ZHJhd1JlY3QocjEsIGZpbGxQYWludCk7Ci0gICAgICAgIHBsYXRmb3JtQ29u dGV4dCgpLT5jYW52YXMoKS0+ZHJhd1JlY3QocjIsIGZpbGxQYWludCk7CisgICAgaW50IHdpZHRo ID0gcm91bmRmKAorICAgICAgICBwbGF0Zm9ybUNvbnRleHQoKS0+c2V0dXBQYWludEZvclN0cm9r aW5nKCZwYWludCwgMCwgbGVuZ3RoKSk7CiAKLSAgICAgICAgLy8gU2luY2Ugd2UndmUgYWxyZWFk eSByZW5kZXJlZCB0aGUgZW5kY2FwcywgYWRqdXN0IHRoZSBlbmRwb2ludHMgdG8gCi0gICAgICAg IC8vIGV4Y2x1ZGUgdGhlbSBmcm9tIHRoZSBsaW5lIGl0c2VsZi4KLSAgICAgICAgaWYgKGlzVmVy dGljYWxMaW5lKSB7Ci0gICAgICAgICAgICBwdHNbMF0uZlkgKz0gd2lkdGg7Ci0gICAgICAgICAg ICBwdHNbMV0uZlkgLT0gd2lkdGg7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBwdHNb MF0uZlggKz0gd2lkdGg7Ci0gICAgICAgICAgICBwdHNbMV0uZlggLT0gd2lkdGg7Ci0gICAgICAg IH0KLSAgICB9Ci0gICAgICAgIC8vICJCb3Jyb3dlZCIgdGhpcyBjb21tZW50IGFuZCBpZGVhIGZy b20gR3JhcGhpY3NDb250ZXh0Q0cuY3BwCisgICAgLy8gIkJvcnJvd2VkIiB0aGlzIGNvbW1lbnQg YW5kIGlkZWEgZnJvbSBHcmFwaGljc0NvbnRleHRDRy5jcHAKICAgICAvLyBGb3Igb2RkIHdpZHRo cywgd2UgYWRkIGluIDAuNSB0byB0aGUgYXBwcm9wcmlhdGUgeC95IHNvIHRoYXQgdGhlIGZsb2F0 CiAgICAgLy8gYXJpdGhtZXRpYyB3b3JrcyBvdXQuICBGb3IgZXhhbXBsZSwgd2l0aCBhIGJvcmRl ciB3aWR0aCBvZiAzLCBLSFRNTCB3aWxsCiAgICAgLy8gcGFzcyB1cyAoeTEreTIpLzIsIGUuZy4s ICg1MCs1MykvMiA9IDEwMy8yID0gNTEgd2hlbiB3ZSB3YW50IDUxLjUuICBJdCBpcwogICAgIC8v IGFsd2F5cyB0cnVlIHRoYXQgYW4gZXZlbiB3aWR0aCBnYXZlIHVzIGEgcGVyZmVjdCBwb3NpdGlv biwgYnV0IGFuIG9kZAogICAgIC8vIHdpZHRoIGdhdmUgdXMgYSBwb3NpdGlvbiB0aGF0IGlzIG9m ZiBieSBleGFjdGx5IDAuNS4KKyAgICBib29sIGlzVmVydGljYWxMaW5lID0gcHRzWzBdLmZYID09 IHB0c1sxXS5mWDsKIAogICAgIGlmICh3aWR0aCAmIDEpIHsgIC8vIE9kZC4KICAgICAgICAgaWYg KGlzVmVydGljYWxMaW5lKSB7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEv UGxhdGZvcm1Db250ZXh0U2tpYS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCShyZXZpc2lvbiA0NjM1NCkKKysr IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzM4LDI2ICszMzgsMjAgQEAgZmxvYXQgUGxhdGZvcm1Db250ZXh0 U2tpYTo6c2V0dXBQYWludEZvcgogICAgICAgICAgICAgd2lkdGggPSBtX3N0YXRlLT5tX2Rhc2hS YXRpbyAqIHdpZHRoOwogICAgICAgICAgICAgLy8gRmFsbCB0aHJvdWdoLgogICAgICAgICBjYXNl IFdlYkNvcmU6OkRvdHRlZFN0cm9rZToKLSAgICAgICAgICAgIC8vIFRydW5jYXRlIHRoZSB3aWR0 aCwgc2luY2Ugd2UgZG9uJ3Qgd2FudCBmdXp6eSBkb3RzIG9yIGRhc2hlcy4KLSAgICAgICAgICAg IGludCBkYXNoTGVuZ3RoID0gc3RhdGljX2Nhc3Q8aW50Pih3aWR0aCk7Ci0gICAgICAgICAgICAv LyBTdWJ0cmFjdCBvZmYgdGhlIGVuZGNhcHMsIHNpbmNlIHRoZXkncmUgcmVuZGVyZWQgc2VwYXJh dGVseS4KLSAgICAgICAgICAgIGludCBkaXN0YW5jZSA9IGxlbmd0aCAtIDIgKiBzdGF0aWNfY2Fz dDxpbnQ+KG1fc3RhdGUtPm1fc3Ryb2tlVGhpY2tuZXNzKTsKLSAgICAgICAgICAgIGludCBwaGFz ZSA9IDE7Ci0gICAgICAgICAgICBpZiAoZGFzaExlbmd0aCA+IDEpIHsKLSAgICAgICAgICAgICAg ICAvLyBEZXRlcm1pbmUgaG93IG1hbnkgZGFzaGVzIG9yIGRvdHMgd2Ugc2hvdWxkIGhhdmUuCi0g ICAgICAgICAgICAgICAgaW50IG51bURhc2hlcyA9IGRpc3RhbmNlIC8gZGFzaExlbmd0aDsKLSAg ICAgICAgICAgICAgICBpbnQgcmVtYWluZGVyID0gZGlzdGFuY2UgJSBkYXNoTGVuZ3RoOwotICAg ICAgICAgICAgICAgIC8vIEFkanVzdCB0aGUgcGhhc2UgdG8gY2VudGVyIHRoZSBkYXNoZXMgd2l0 aGluIHRoZSBsaW5lLgotICAgICAgICAgICAgICAgIGlmIChudW1EYXNoZXMgJSAyID09IDApCi0g ICAgICAgICAgICAgICAgICAgIC8vIEV2ZW46ICBzaGlmdCByaWdodCBoYWxmIGEgZGFzaCwgbWlu dXMgaGFsZiB0aGUgcmVtYWluZGVyCi0gICAgICAgICAgICAgICAgICAgIHBoYXNlID0gKGRhc2hM ZW5ndGggLSByZW1haW5kZXIpIC8gMjsKLSAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAg ICAgICAgICAgIC8vIE9kZDogIHNoaWZ0IHJpZ2h0IGEgZnVsbCBkYXNoLCBtaW51cyBoYWxmIHRo ZSByZW1haW5kZXIKLSAgICAgICAgICAgICAgICAgICAgcGhhc2UgPSBkYXNoTGVuZ3RoIC0gcmVt YWluZGVyIC8gMjsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIFNrU2NhbGFyIGRhc2hMZW5n dGhTayA9IFNrSW50VG9TY2FsYXIoZGFzaExlbmd0aCk7Ci0gICAgICAgICAgICBTa1NjYWxhciBp bnRlcnZhbHNbMl0gPSB7IGRhc2hMZW5ndGhTaywgZGFzaExlbmd0aFNrIH07Ci0gICAgICAgICAg ICBwYWludC0+c2V0UGF0aEVmZmVjdChuZXcgU2tEYXNoUGF0aEVmZmVjdChpbnRlcnZhbHMsIDIs IFNrSW50VG9TY2FsYXIocGhhc2UpKSktPnVucmVmKCk7CisgICAgICAgICAgICBTa1NjYWxhciBk YXNoTGVuZ3RoOworICAgICAgICAgICAgaWYgKGxlbmd0aCkgeworICAgICAgICAgICAgICAgIC8v IERldGVybWluZSBhYm91dCBob3cgbWFueSBkYXNoZXMgb3IgZG90cyB3ZSBzaG91bGQgaGF2ZS4K KyAgICAgICAgICAgICAgICBmbG9hdCByb3VuZGVkV2lkdGggPSByb3VuZGYod2lkdGgpOworICAg ICAgICAgICAgICAgIGludCBudW1EYXNoZXMgPSByb3VuZGVkV2lkdGggPyAobGVuZ3RoIC8gcm91 bmRlZFdpZHRoKSA6IGxlbmd0aDsKKyAgICAgICAgICAgICAgICBpZiAoIShudW1EYXNoZXMgJiAx KSkKKyAgICAgICAgICAgICAgICAgICAgbnVtRGFzaGVzKys7ICAgIC8vIE1ha2UgaXQgb2RkIHNv IHdlIGVuZCBvbiBhIGRhc2gvZG90LgorICAgICAgICAgICAgICAgIC8vIFVzZSB0aGUgbnVtYmVy IG9mIGRhc2hlcyB0byBkZXRlcm1pbmUgdGhlIGxlbmd0aCBvZiBhCisgICAgICAgICAgICAgICAg Ly8gZGFzaC9kb3QsIHdoaWNoIHdpbGwgYmUgYXBwcm94aW1hdGVseSB3aWR0aAorICAgICAgICAg ICAgICAgIGRhc2hMZW5ndGggPSBTa1NjYWxhckRpdihTa0ludFRvU2NhbGFyKGxlbmd0aCksIFNr SW50VG9TY2FsYXIobnVtRGFzaGVzKSk7CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAg ICAgICBkYXNoTGVuZ3RoID0gU2tGbG9hdFRvU2NhbGFyKHdpZHRoKTsKKyAgICAgICAgICAgIFNr U2NhbGFyIGludGVydmFsc1syXSA9IHsgZGFzaExlbmd0aCwgZGFzaExlbmd0aCB9OworICAgICAg ICAgICAgcGFpbnQtPnNldFBhdGhFZmZlY3QobmV3IFNrRGFzaFBhdGhFZmZlY3QoaW50ZXJ2YWxz LCAyLCAwKSktPnVucmVmKCk7CiAgICAgICAgIH0KICAgICB9CiAK 33544 2009-07-27 07:09:50 -0700 2009-07-27 08:16:13 -0700 Re-apply (unrevert) the patch. webkit_border_webkit.patch text/plain 5961 senorblanco SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjQxNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDctMjcgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgUmUtYXBwbHkgY2hyb21pdW0vc2tpYSBib3JkZXIgZml4IChvcmlnaW5hbGx5IGxhbmRl ZCBpbiByNDYxNTcsCisgICAgICAgIHJldmVydGVkIGluIHI0NjM2MyksIHNpbmNlIGl0IHdhcyBu b3QgdGhlIGNhdXNlIG9mIHRoZSByZWxpYWJpbGl0eQorICAgICAgICBmYWlsdXJlcyBpbiBDaHJv bWl1bS4KKworICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NzM4OAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRT a2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmUpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHA6 CisgICAgICAgIChQbGF0Zm9ybUNvbnRleHRTa2lhOjpzZXR1cFBhaW50Rm9yU3Ryb2tpbmcpOgor CiAyMDA5LTA3LTI3ICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9yLmFybmUudmVzdGJvQG5va2lhLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5j cHAJKHJldmlzaW9uIDQ2NDE2KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dy YXBoaWNzQ29udGV4dFNraWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MzAsMTYgKzUzMCw0NiBA QCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmUoY29uc3QgSW50CiAgICAgLy8gcHJvYmFi bHkgd29ydGggdGhlIHNwZWVkIHVwIG9mIG5vIHNxdWFyZSByb290LCB3aGljaCBhbHNvIHdvbid0 IGJlIGV4YWN0LgogICAgIFNrUG9pbnQgZGlzcCA9IHB0c1sxXSAtIHB0c1swXTsKICAgICBpbnQg bGVuZ3RoID0gU2tTY2FsYXJSb3VuZChkaXNwLmZYICsgZGlzcC5mWSk7Ci0gICAgaW50IHdpZHRo ID0gcm91bmRmKAotICAgICAgICBwbGF0Zm9ybUNvbnRleHQoKS0+c2V0dXBQYWludEZvclN0cm9r aW5nKCZwYWludCwgMCwgbGVuZ3RoKSk7CisgICAgcGxhdGZvcm1Db250ZXh0KCktPnNldHVwUGFp bnRGb3JTdHJva2luZygmcGFpbnQsIDAsIGxlbmd0aCk7CisgICAgaW50IHdpZHRoID0gcm91bmRm KHN0cm9rZVRoaWNrbmVzcygpKTsKKyAgICBib29sIGlzVmVydGljYWxMaW5lID0gcHRzWzBdLmZY ID09IHB0c1sxXS5mWDsKKworICAgIGlmIChzdHJva2VTdHlsZSgpID09IERvdHRlZFN0cm9rZSB8 fCBzdHJva2VTdHlsZSgpID09IERhc2hlZFN0cm9rZSkgeworICAgICAgICAvLyBEbyBhIHJlY3Qg ZmlsbCBvZiBvdXIgZW5kcG9pbnRzLiAgVGhpcyBlbnN1cmVzIHdlIGFsd2F5cyBoYXZlIHRoZQor ICAgICAgICAvLyBhcHBlYXJhbmNlIG9mIGJlaW5nIGEgYm9yZGVyLiAgV2UgdGhlbiBkcmF3IHRo ZSBhY3R1YWwgZG90dGVkL2Rhc2hlZCBsaW5lLgorICAgICAgICAKKyAgICAgICAgU2tSZWN0IHIx LCByMjsKKyAgICAgICAgcjEuc2V0KHB0c1swXS5mWCwgcHRzWzBdLmZZLCBwdHNbMF0uZlggKyB3 aWR0aCwgcHRzWzBdLmZZICsgd2lkdGgpOworICAgICAgICByMi5zZXQocHRzWzFdLmZYLCBwdHNb MV0uZlksIHB0c1sxXS5mWCArIHdpZHRoLCBwdHNbMV0uZlkgKyB3aWR0aCk7CisKKyAgICAgICAg aWYgKGlzVmVydGljYWxMaW5lKSB7CisgICAgICAgICAgICByMS5vZmZzZXQoLXdpZHRoIC8gMiwg MCk7CisgICAgICAgICAgICByMi5vZmZzZXQoLXdpZHRoIC8gMiwgLXdpZHRoKTsKKyAgICAgICAg fSBlbHNlIHsKKyAgICAgICAgICAgIHIxLm9mZnNldCgwLCAtd2lkdGggLyAyKTsKKyAgICAgICAg ICAgIHIyLm9mZnNldCgtd2lkdGgsIC13aWR0aCAvIDIpOworICAgICAgICB9CisgICAgICAgIFNr UGFpbnQgZmlsbFBhaW50OworICAgICAgICBmaWxsUGFpbnQuc2V0Q29sb3IocGFpbnQuZ2V0Q29s b3IoKSk7CisgICAgICAgIHBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKS0+ZHJhd1JlY3QocjEs IGZpbGxQYWludCk7CisgICAgICAgIHBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKS0+ZHJhd1Jl Y3QocjIsIGZpbGxQYWludCk7CiAKLSAgICAvLyAiQm9ycm93ZWQiIHRoaXMgY29tbWVudCBhbmQg aWRlYSBmcm9tIEdyYXBoaWNzQ29udGV4dENHLmNwcAorICAgICAgICAvLyBTaW5jZSB3ZSd2ZSBh bHJlYWR5IHJlbmRlcmVkIHRoZSBlbmRjYXBzLCBhZGp1c3QgdGhlIGVuZHBvaW50cyB0byAKKyAg ICAgICAgLy8gZXhjbHVkZSB0aGVtIGZyb20gdGhlIGxpbmUgaXRzZWxmLgorICAgICAgICBpZiAo aXNWZXJ0aWNhbExpbmUpIHsKKyAgICAgICAgICAgIHB0c1swXS5mWSArPSB3aWR0aDsKKyAgICAg ICAgICAgIHB0c1sxXS5mWSAtPSB3aWR0aDsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAg IHB0c1swXS5mWCArPSB3aWR0aDsKKyAgICAgICAgICAgIHB0c1sxXS5mWCAtPSB3aWR0aDsKKyAg ICAgICAgfQorICAgIH0KKyAgICAgICAgLy8gIkJvcnJvd2VkIiB0aGlzIGNvbW1lbnQgYW5kIGlk ZWEgZnJvbSBHcmFwaGljc0NvbnRleHRDRy5jcHAKICAgICAvLyBGb3Igb2RkIHdpZHRocywgd2Ug YWRkIGluIDAuNSB0byB0aGUgYXBwcm9wcmlhdGUgeC95IHNvIHRoYXQgdGhlIGZsb2F0CiAgICAg Ly8gYXJpdGhtZXRpYyB3b3JrcyBvdXQuICBGb3IgZXhhbXBsZSwgd2l0aCBhIGJvcmRlciB3aWR0 aCBvZiAzLCBLSFRNTCB3aWxsCiAgICAgLy8gcGFzcyB1cyAoeTEreTIpLzIsIGUuZy4sICg1MCs1 MykvMiA9IDEwMy8yID0gNTEgd2hlbiB3ZSB3YW50IDUxLjUuICBJdCBpcwogICAgIC8vIGFsd2F5 cyB0cnVlIHRoYXQgYW4gZXZlbiB3aWR0aCBnYXZlIHVzIGEgcGVyZmVjdCBwb3NpdGlvbiwgYnV0 IGFuIG9kZAogICAgIC8vIHdpZHRoIGdhdmUgdXMgYSBwb3NpdGlvbiB0aGF0IGlzIG9mZiBieSBl eGFjdGx5IDAuNS4KLSAgICBib29sIGlzVmVydGljYWxMaW5lID0gcHRzWzBdLmZYID09IHB0c1sx XS5mWDsKIAogICAgIGlmICh3aWR0aCAmIDEpIHsgIC8vIE9kZC4KICAgICAgICAgaWYgKGlzVmVy dGljYWxMaW5lKSB7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZv cm1Db250ZXh0U2tpYS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCShyZXZpc2lvbiA0NjQxNikKKysrIFdlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMzM4LDIwICszMzgsMjYgQEAgZmxvYXQgUGxhdGZvcm1Db250ZXh0U2tpYTo6 c2V0dXBQYWludEZvcgogICAgICAgICAgICAgd2lkdGggPSBtX3N0YXRlLT5tX2Rhc2hSYXRpbyAq IHdpZHRoOwogICAgICAgICAgICAgLy8gRmFsbCB0aHJvdWdoLgogICAgICAgICBjYXNlIFdlYkNv cmU6OkRvdHRlZFN0cm9rZToKLSAgICAgICAgICAgIFNrU2NhbGFyIGRhc2hMZW5ndGg7Ci0gICAg ICAgICAgICBpZiAobGVuZ3RoKSB7Ci0gICAgICAgICAgICAgICAgLy8gRGV0ZXJtaW5lIGFib3V0 IGhvdyBtYW55IGRhc2hlcyBvciBkb3RzIHdlIHNob3VsZCBoYXZlLgotICAgICAgICAgICAgICAg IGZsb2F0IHJvdW5kZWRXaWR0aCA9IHJvdW5kZih3aWR0aCk7Ci0gICAgICAgICAgICAgICAgaW50 IG51bURhc2hlcyA9IHJvdW5kZWRXaWR0aCA/IChsZW5ndGggLyByb3VuZGVkV2lkdGgpIDogbGVu Z3RoOwotICAgICAgICAgICAgICAgIGlmICghKG51bURhc2hlcyAmIDEpKQotICAgICAgICAgICAg ICAgICAgICBudW1EYXNoZXMrKzsgICAgLy8gTWFrZSBpdCBvZGQgc28gd2UgZW5kIG9uIGEgZGFz aC9kb3QuCi0gICAgICAgICAgICAgICAgLy8gVXNlIHRoZSBudW1iZXIgb2YgZGFzaGVzIHRvIGRl dGVybWluZSB0aGUgbGVuZ3RoIG9mIGEKLSAgICAgICAgICAgICAgICAvLyBkYXNoL2RvdCwgd2hp Y2ggd2lsbCBiZSBhcHByb3hpbWF0ZWx5IHdpZHRoCi0gICAgICAgICAgICAgICAgZGFzaExlbmd0 aCA9IFNrU2NhbGFyRGl2KFNrSW50VG9TY2FsYXIobGVuZ3RoKSwgU2tJbnRUb1NjYWxhcihudW1E YXNoZXMpKTsKLSAgICAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgICAgIGRhc2hMZW5ndGgg PSBTa0Zsb2F0VG9TY2FsYXIod2lkdGgpOwotICAgICAgICAgICAgU2tTY2FsYXIgaW50ZXJ2YWxz WzJdID0geyBkYXNoTGVuZ3RoLCBkYXNoTGVuZ3RoIH07Ci0gICAgICAgICAgICBwYWludC0+c2V0 UGF0aEVmZmVjdChuZXcgU2tEYXNoUGF0aEVmZmVjdChpbnRlcnZhbHMsIDIsIDApKS0+dW5yZWYo KTsKKyAgICAgICAgICAgIC8vIFRydW5jYXRlIHRoZSB3aWR0aCwgc2luY2Ugd2UgZG9uJ3Qgd2Fu dCBmdXp6eSBkb3RzIG9yIGRhc2hlcy4KKyAgICAgICAgICAgIGludCBkYXNoTGVuZ3RoID0gc3Rh dGljX2Nhc3Q8aW50Pih3aWR0aCk7CisgICAgICAgICAgICAvLyBTdWJ0cmFjdCBvZmYgdGhlIGVu ZGNhcHMsIHNpbmNlIHRoZXkncmUgcmVuZGVyZWQgc2VwYXJhdGVseS4KKyAgICAgICAgICAgIGlu dCBkaXN0YW5jZSA9IGxlbmd0aCAtIDIgKiBzdGF0aWNfY2FzdDxpbnQ+KG1fc3RhdGUtPm1fc3Ry b2tlVGhpY2tuZXNzKTsKKyAgICAgICAgICAgIGludCBwaGFzZSA9IDE7CisgICAgICAgICAgICBp ZiAoZGFzaExlbmd0aCA+IDEpIHsKKyAgICAgICAgICAgICAgICAvLyBEZXRlcm1pbmUgaG93IG1h bnkgZGFzaGVzIG9yIGRvdHMgd2Ugc2hvdWxkIGhhdmUuCisgICAgICAgICAgICAgICAgaW50IG51 bURhc2hlcyA9IGRpc3RhbmNlIC8gZGFzaExlbmd0aDsKKyAgICAgICAgICAgICAgICBpbnQgcmVt YWluZGVyID0gZGlzdGFuY2UgJSBkYXNoTGVuZ3RoOworICAgICAgICAgICAgICAgIC8vIEFkanVz dCB0aGUgcGhhc2UgdG8gY2VudGVyIHRoZSBkYXNoZXMgd2l0aGluIHRoZSBsaW5lLgorICAgICAg ICAgICAgICAgIGlmIChudW1EYXNoZXMgJSAyID09IDApCisgICAgICAgICAgICAgICAgICAgIC8v IEV2ZW46ICBzaGlmdCByaWdodCBoYWxmIGEgZGFzaCwgbWludXMgaGFsZiB0aGUgcmVtYWluZGVy CisgICAgICAgICAgICAgICAgICAgIHBoYXNlID0gKGRhc2hMZW5ndGggLSByZW1haW5kZXIpIC8g MjsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIC8vIE9kZDogIHNo aWZ0IHJpZ2h0IGEgZnVsbCBkYXNoLCBtaW51cyBoYWxmIHRoZSByZW1haW5kZXIKKyAgICAgICAg ICAgICAgICAgICAgcGhhc2UgPSBkYXNoTGVuZ3RoIC0gcmVtYWluZGVyIC8gMjsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIFNrU2NhbGFyIGRhc2hMZW5ndGhTayA9IFNrSW50VG9TY2FsYXIo ZGFzaExlbmd0aCk7CisgICAgICAgICAgICBTa1NjYWxhciBpbnRlcnZhbHNbMl0gPSB7IGRhc2hM ZW5ndGhTaywgZGFzaExlbmd0aFNrIH07CisgICAgICAgICAgICBwYWludC0+c2V0UGF0aEVmZmVj dChuZXcgU2tEYXNoUGF0aEVmZmVjdChpbnRlcnZhbHMsIDIsIFNrSW50VG9TY2FsYXIocGhhc2Up KSktPnVucmVmKCk7CiAgICAgICAgIH0KICAgICB9CiAK