82540 2012-03-28 15:17:51 -0700 Fix rounding in RenderInline::paintOutlineForLine 2012-03-28 19:12:03 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 eae eae eric jchaffraix leviw simon.fraser webkit.review.bot oldest_to_newest 590506 0 eae 2012-03-28 15:17:51 -0700 Currently some of the values are computed by adding an offset to a rounded value. Instead we should always round (or pixel snap) as the very last step. 590508 1 134420 eae 2012-03-28 15:21:49 -0700 Created attachment 134420 Patch 590538 2 134420 eric 2012-03-28 15:46:05 -0700 Comment on attachment 134420 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134420&action=review LGTM. > Source/WebCore/ChangeLog:8 > + No new tests. Why is always more important than what. :) 590540 3 134420 eric 2012-03-28 15:46:33 -0700 Comment on attachment 134420 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134420&action=review > Source/WebCore/rendering/RenderInline.cpp:1473 > + int pixelSnappedLastLineLeft = roundToInt(paintOffset.x() + lastline.x()); > + int pixelSnappedLastLineRight = snapSizeToPixel(lastline.width(), paintOffset.x() + lastline.x()) + pixelSnappedLastLineLeft; > + > + int pixelSnappedNextLineLeft = roundToInt(paintOffset.x() + nextline.x()); > + int pixelSnappedNextLineRight = snapSizeToPixel(nextline.width(), paintOffset.x() + nextline.x()) + pixelSnappedNextLineLeft; I'm a little surprised we don't get these from an object, like some rect for the line... 590552 4 eae 2012-03-28 15:57:29 -0700 (In reply to comment #3) > (From update of attachment 134420 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=134420&action=review > > > Source/WebCore/rendering/RenderInline.cpp:1473 > > + int pixelSnappedLastLineLeft = roundToInt(paintOffset.x() + lastline.x()); > > + int pixelSnappedLastLineRight = snapSizeToPixel(lastline.width(), paintOffset.x() + lastline.x()) + pixelSnappedLastLineLeft; > > + > > + int pixelSnappedNextLineLeft = roundToInt(paintOffset.x() + nextline.x()); > > + int pixelSnappedNextLineRight = snapSizeToPixel(nextline.width(), paintOffset.x() + nextline.x()) + pixelSnappedNextLineLeft; > > I'm a little surprised we don't get these from an object, like some rect for the line... How do you mean? Compute a rect for each line and use that instead? > Why is always more important than what. :) Good point, I'll make sure to update the ChangeLog before I commit. 590562 5 134420 eric 2012-03-28 16:14:32 -0700 Comment on attachment 134420 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134420&action=review >>> Source/WebCore/rendering/RenderInline.cpp:1473 >>> + int pixelSnappedNextLineRight = snapSizeToPixel(nextline.width(), paintOffset.x() + nextline.x()) + pixelSnappedNextLineLeft; >> >> I'm a little surprised we don't get these from an object, like some rect for the line... > > How do you mean? Compute a rect for each line and use that instead? Honestly, I dont' have a clear suggestion, as I haven't fully paged in this code. But it seems like these are minX(), maxX() on LayoutRect? 590568 6 eae 2012-03-28 16:16:52 -0700 (In reply to comment #5) > Honestly, I dont' have a clear suggestion, as I haven't fully paged in this code. But it seems like these are minX(), maxX() on LayoutRect? Correct. I suppose we could use a rect for this and ignore the y axis. 590706 7 134463 eae 2012-03-28 18:23:06 -0700 Created attachment 134463 Patch 590712 8 134463 webkit.review.bot 2012-03-28 18:34:11 -0700 Comment on attachment 134463 Patch Rejecting attachment 134463 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 ERROR: /mnt/git/webkit-commit-queue/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/12194031 590713 9 134465 eae 2012-03-28 18:36:14 -0700 Created attachment 134465 Patch for landing 590752 10 134465 webkit.review.bot 2012-03-28 19:11:59 -0700 Comment on attachment 134465 Patch for landing Clearing flags on attachment: 134465 Committed r112492: <http://trac.webkit.org/changeset/112492> 590753 11 webkit.review.bot 2012-03-28 19:12:03 -0700 All reviewed patches have been landed. Closing bug. 134420 2012-03-28 15:21:49 -0700 2012-03-28 18:23:06 -0700 Patch bug-82540-20120328152148.patch text/plain 3906 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMjQ1MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAzLTI4ICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggcm91bmRpbmcgaW4gUmVu ZGVySW5saW5lOjpwYWludE91dGxpbmVGb3JMaW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjU0MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJJbmxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW5saW5lOjpwYWlu dE91dGxpbmVGb3JMaW5lKToKKyAgICAgICAgQ2hhbmdlIHBhaW50T3V0bGluZUZvckxpbmUgdG8g cGl4ZWwgc25hcCB0aGUgbGVmdCBhbmQgcmlnaHQgZWRnZXMgb2YgdGhlCisgICAgICAgIGxpbmVz IGluc3RlYWQgb2YgYWRkaW5nIHRoZSBvZmZzZXQgdG8gYW4gYWxyZWFkeSByb3VuZGVkIG51bWJl ci4KKwogMjAxMi0wMy0yMyAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxNjg1CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAkocmV2aXNpb24gMTEyMzI5 KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE0NjUsNiArMTQ2NSwxMiBAQCB2b2lkIFJlbmRlcklubGluZTo6cGFpbnRPdXRs aW5lRm9yTGluZShHCiAgICAgICAgIExheW91dFNpemUodGhpc2xpbmUud2lkdGgoKSArIG9mZnNl dCwgdGhpc2xpbmUuaGVpZ2h0KCkgKyBvZmZzZXQpKTsKIAogICAgIEludFJlY3QgcGl4ZWxTbmFw cGVkQm94ID0gcGl4ZWxTbmFwcGVkSW50UmVjdChib3gpOworCisgICAgaW50IHBpeGVsU25hcHBl ZExhc3RMaW5lTGVmdCA9IHJvdW5kVG9JbnQocGFpbnRPZmZzZXQueCgpICsgbGFzdGxpbmUueCgp KTsKKyAgICBpbnQgcGl4ZWxTbmFwcGVkTGFzdExpbmVSaWdodCA9IHNuYXBTaXplVG9QaXhlbChs YXN0bGluZS53aWR0aCgpLCBwYWludE9mZnNldC54KCkgKyBsYXN0bGluZS54KCkpICsgcGl4ZWxT bmFwcGVkTGFzdExpbmVMZWZ0OworCisgICAgaW50IHBpeGVsU25hcHBlZE5leHRMaW5lTGVmdCA9 IHJvdW5kVG9JbnQocGFpbnRPZmZzZXQueCgpICsgbmV4dGxpbmUueCgpKTsKKyAgICBpbnQgcGl4 ZWxTbmFwcGVkTmV4dExpbmVSaWdodCA9IHNuYXBTaXplVG9QaXhlbChuZXh0bGluZS53aWR0aCgp LCBwYWludE9mZnNldC54KCkgKyBuZXh0bGluZS54KCkpICsgcGl4ZWxTbmFwcGVkTmV4dExpbmVM ZWZ0OwogICAgIAogICAgIC8vIGxlZnQgZWRnZQogICAgIGRyYXdMaW5lRm9yQm94U2lkZShncmFw aGljc0NvbnRleHQsCkBAIC0xNDk0LDcgKzE1MDAsNyBAQCB2b2lkIFJlbmRlcklubGluZTo6cGFp bnRPdXRsaW5lRm9yTGluZShHCiAgICAgICAgIGRyYXdMaW5lRm9yQm94U2lkZShncmFwaGljc0Nv bnRleHQsCiAgICAgICAgICAgICBwaXhlbFNuYXBwZWRCb3gueCgpIC0gb3V0bGluZVdpZHRoLAog ICAgICAgICAgICAgcGl4ZWxTbmFwcGVkQm94LnkoKSAtIG91dGxpbmVXaWR0aCwKLSAgICAgICAg ICAgIG1pbihwaXhlbFNuYXBwZWRCb3gubWF4WCgpICsgb3V0bGluZVdpZHRoLCAobGFzdGxpbmUu aXNFbXB0eSgpID8gMTAwMDAwMCA6IHBhaW50T2Zmc2V0LngoKSArIGxhc3RsaW5lLngoKSkpLAor ICAgICAgICAgICAgbWluKHBpeGVsU25hcHBlZEJveC5tYXhYKCkgKyBvdXRsaW5lV2lkdGgsIChs YXN0bGluZS5pc0VtcHR5KCkgPyAxMDAwMDAwIDogcGl4ZWxTbmFwcGVkTGFzdExpbmVMZWZ0KSks CiAgICAgICAgICAgICBwaXhlbFNuYXBwZWRCb3gueSgpLAogICAgICAgICAgICAgQlNUb3AsIG91 dGxpbmVDb2xvciwgb3V0bGluZVN0eWxlLAogICAgICAgICAgICAgb3V0bGluZVdpZHRoLApAQCAt MTUwMyw3ICsxNTA5LDcgQEAgdm9pZCBSZW5kZXJJbmxpbmU6OnBhaW50T3V0bGluZUZvckxpbmUo RwogICAgIAogICAgIGlmIChsYXN0bGluZS5tYXhYKCkgPCB0aGlzbGluZS5tYXhYKCkpCiAgICAg ICAgIGRyYXdMaW5lRm9yQm94U2lkZShncmFwaGljc0NvbnRleHQsCi0gICAgICAgICAgICBtYXgo bGFzdGxpbmUuaXNFbXB0eSgpID8gLTEwMDAwMDAgOiBwYWludE9mZnNldC54KCkgKyBsYXN0bGlu ZS5tYXhYKCksIHBpeGVsU25hcHBlZEJveC54KCkgLSBvdXRsaW5lV2lkdGgpLAorICAgICAgICAg ICAgbWF4KGxhc3RsaW5lLmlzRW1wdHkoKSA/IC0xMDAwMDAwIDogcGl4ZWxTbmFwcGVkTGFzdExp bmVSaWdodCwgcGl4ZWxTbmFwcGVkQm94LngoKSAtIG91dGxpbmVXaWR0aCksCiAgICAgICAgICAg ICBwaXhlbFNuYXBwZWRCb3gueSgpIC0gb3V0bGluZVdpZHRoLAogICAgICAgICAgICAgcGl4ZWxT bmFwcGVkQm94Lm1heFgoKSArIG91dGxpbmVXaWR0aCwKICAgICAgICAgICAgIHBpeGVsU25hcHBl ZEJveC55KCksCkBAIC0xNTI3LDcgKzE1MzMsNyBAQCB2b2lkIFJlbmRlcklubGluZTo6cGFpbnRP dXRsaW5lRm9yTGluZShHCiAgICAgICAgIGRyYXdMaW5lRm9yQm94U2lkZShncmFwaGljc0NvbnRl eHQsCiAgICAgICAgICAgICBwaXhlbFNuYXBwZWRCb3gueCgpIC0gb3V0bGluZVdpZHRoLAogICAg ICAgICAgICAgcGl4ZWxTbmFwcGVkQm94Lm1heFkoKSwKLSAgICAgICAgICAgIG1pbihwaXhlbFNu YXBwZWRCb3gubWF4WCgpICsgb3V0bGluZVdpZHRoLCAhbmV4dGxpbmUuaXNFbXB0eSgpID8gcGFp bnRPZmZzZXQueCgpICsgbmV4dGxpbmUueCgpICsgMSA6IDEwMDAwMDApLAorICAgICAgICAgICAg bWluKHBpeGVsU25hcHBlZEJveC5tYXhYKCkgKyBvdXRsaW5lV2lkdGgsICFuZXh0bGluZS5pc0Vt cHR5KCkgPyBwaXhlbFNuYXBwZWROZXh0TGluZUxlZnQgKyAxIDogMTAwMDAwMCksCiAgICAgICAg ICAgICBwaXhlbFNuYXBwZWRCb3gubWF4WSgpICsgb3V0bGluZVdpZHRoLAogICAgICAgICAgICAg QlNCb3R0b20sIG91dGxpbmVDb2xvciwgb3V0bGluZVN0eWxlLAogICAgICAgICAgICAgb3V0bGlu ZVdpZHRoLApAQCAtMTUzNiw3ICsxNTQyLDcgQEAgdm9pZCBSZW5kZXJJbmxpbmU6OnBhaW50T3V0 bGluZUZvckxpbmUoRwogICAgIAogICAgIGlmIChuZXh0bGluZS5tYXhYKCkgPCB0aGlzbGluZS5t YXhYKCkpCiAgICAgICAgIGRyYXdMaW5lRm9yQm94U2lkZShncmFwaGljc0NvbnRleHQsCi0gICAg ICAgICAgICBtYXgoIW5leHRsaW5lLmlzRW1wdHkoKSA/IHBhaW50T2Zmc2V0LngoKSArIG5leHRs aW5lLm1heFgoKSA6IC0xMDAwMDAwLCBwaXhlbFNuYXBwZWRCb3gueCgpIC0gb3V0bGluZVdpZHRo KSwKKyAgICAgICAgICAgIG1heCghbmV4dGxpbmUuaXNFbXB0eSgpID8gcGl4ZWxTbmFwcGVkTmV4 dExpbmVSaWdodCA6IC0xMDAwMDAwLCBwaXhlbFNuYXBwZWRCb3gueCgpIC0gb3V0bGluZVdpZHRo KSwKICAgICAgICAgICAgIHBpeGVsU25hcHBlZEJveC5tYXhZKCksCiAgICAgICAgICAgICBwaXhl bFNuYXBwZWRCb3gubWF4WCgpICsgb3V0bGluZVdpZHRoLAogICAgICAgICAgICAgcGl4ZWxTbmFw cGVkQm94Lm1heFkoKSArIG91dGxpbmVXaWR0aCwK 134463 2012-03-28 18:23:06 -0700 2012-03-28 18:36:14 -0700 Patch 82540.patch text/plain 3737 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMjQ1MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAzLTI4ICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggcm91bmRpbmcgaW4gUmVu ZGVySW5saW5lOjpwYWludE91dGxpbmVGb3JMaW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjU0MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gY2hhbmdlIGluIGZ1bmN0aW9u YWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlcklubGluZTo6cGFpbnRPdXRsaW5lRm9yTGluZSk6CisgICAgICAgIENo YW5nZSBwYWludE91dGxpbmVGb3JMaW5lIHRvIHBpeGVsIHNuYXAgdGhlIGxlZnQgYW5kIHJpZ2h0 IGVkZ2VzIG9mIHRoZQorICAgICAgICBsaW5lcyBpbnN0ZWFkIG9mIGFkZGluZyB0aGUgb2Zmc2V0 IHRvIGFuIGFscmVhZHkgcm91bmRlZCBudW1iZXIuCisKIDIwMTItMDMtMjMgIERhdmlkIEh5YXR0 ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04MTY4NQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl cklubGluZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl cklubGluZS5jcHAJKHJldmlzaW9uIDExMjQ1MykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJJbmxpbmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDY1LDYgKzE0NjUsOCBAQCB2 b2lkIFJlbmRlcklubGluZTo6cGFpbnRPdXRsaW5lRm9yTGluZShHCiAgICAgICAgIExheW91dFNp emUodGhpc2xpbmUud2lkdGgoKSArIG9mZnNldCwgdGhpc2xpbmUuaGVpZ2h0KCkgKyBvZmZzZXQp KTsKIAogICAgIEludFJlY3QgcGl4ZWxTbmFwcGVkQm94ID0gcGl4ZWxTbmFwcGVkSW50UmVjdChi b3gpOworICAgIEludFJlY3QgcGl4ZWxTbmFwcGVkTGFzdExpbmUgPSBwaXhlbFNuYXBwZWRJbnRS ZWN0KHBhaW50T2Zmc2V0LngoKSArIGxhc3RsaW5lLngoKSwgMCwgbGFzdGxpbmUud2lkdGgoKSwg MCk7CisgICAgSW50UmVjdCBwaXhlbFNuYXBwZWROZXh0TGluZSA9IHBpeGVsU25hcHBlZEludFJl Y3QocGFpbnRPZmZzZXQueCgpICsgbmV4dGxpbmUueCgpLCAwLCBuZXh0bGluZS53aWR0aCgpLCAw KTsKICAgICAKICAgICAvLyBsZWZ0IGVkZ2UKICAgICBkcmF3TGluZUZvckJveFNpZGUoZ3JhcGhp Y3NDb250ZXh0LApAQCAtMTQ5NCw3ICsxNDk2LDcgQEAgdm9pZCBSZW5kZXJJbmxpbmU6OnBhaW50 T3V0bGluZUZvckxpbmUoRwogICAgICAgICBkcmF3TGluZUZvckJveFNpZGUoZ3JhcGhpY3NDb250 ZXh0LAogICAgICAgICAgICAgcGl4ZWxTbmFwcGVkQm94LngoKSAtIG91dGxpbmVXaWR0aCwKICAg ICAgICAgICAgIHBpeGVsU25hcHBlZEJveC55KCkgLSBvdXRsaW5lV2lkdGgsCi0gICAgICAgICAg ICBtaW4ocGl4ZWxTbmFwcGVkQm94Lm1heFgoKSArIG91dGxpbmVXaWR0aCwgKGxhc3RsaW5lLmlz RW1wdHkoKSA/IDEwMDAwMDAgOiBwYWludE9mZnNldC54KCkgKyBsYXN0bGluZS54KCkpKSwKKyAg ICAgICAgICAgIG1pbihwaXhlbFNuYXBwZWRCb3gubWF4WCgpICsgb3V0bGluZVdpZHRoLCAobGFz dGxpbmUuaXNFbXB0eSgpID8gMTAwMDAwMCA6IHBpeGVsU25hcHBlZExhc3RMaW5lLngoKSkpLAog ICAgICAgICAgICAgcGl4ZWxTbmFwcGVkQm94LnkoKSwKICAgICAgICAgICAgIEJTVG9wLCBvdXRs aW5lQ29sb3IsIG91dGxpbmVTdHlsZSwKICAgICAgICAgICAgIG91dGxpbmVXaWR0aCwKQEAgLTE1 MDMsNyArMTUwNSw3IEBAIHZvaWQgUmVuZGVySW5saW5lOjpwYWludE91dGxpbmVGb3JMaW5lKEcK ICAgICAKICAgICBpZiAobGFzdGxpbmUubWF4WCgpIDwgdGhpc2xpbmUubWF4WCgpKQogICAgICAg ICBkcmF3TGluZUZvckJveFNpZGUoZ3JhcGhpY3NDb250ZXh0LAotICAgICAgICAgICAgbWF4KGxh c3RsaW5lLmlzRW1wdHkoKSA/IC0xMDAwMDAwIDogcGFpbnRPZmZzZXQueCgpICsgbGFzdGxpbmUu bWF4WCgpLCBwaXhlbFNuYXBwZWRCb3gueCgpIC0gb3V0bGluZVdpZHRoKSwKKyAgICAgICAgICAg IG1heChsYXN0bGluZS5pc0VtcHR5KCkgPyAtMTAwMDAwMCA6IHBpeGVsU25hcHBlZExhc3RMaW5l Lm1heFgoKSwgcGl4ZWxTbmFwcGVkQm94LngoKSAtIG91dGxpbmVXaWR0aCksCiAgICAgICAgICAg ICBwaXhlbFNuYXBwZWRCb3gueSgpIC0gb3V0bGluZVdpZHRoLAogICAgICAgICAgICAgcGl4ZWxT bmFwcGVkQm94Lm1heFgoKSArIG91dGxpbmVXaWR0aCwKICAgICAgICAgICAgIHBpeGVsU25hcHBl ZEJveC55KCksCkBAIC0xNTI3LDcgKzE1MjksNyBAQCB2b2lkIFJlbmRlcklubGluZTo6cGFpbnRP dXRsaW5lRm9yTGluZShHCiAgICAgICAgIGRyYXdMaW5lRm9yQm94U2lkZShncmFwaGljc0NvbnRl eHQsCiAgICAgICAgICAgICBwaXhlbFNuYXBwZWRCb3gueCgpIC0gb3V0bGluZVdpZHRoLAogICAg ICAgICAgICAgcGl4ZWxTbmFwcGVkQm94Lm1heFkoKSwKLSAgICAgICAgICAgIG1pbihwaXhlbFNu YXBwZWRCb3gubWF4WCgpICsgb3V0bGluZVdpZHRoLCAhbmV4dGxpbmUuaXNFbXB0eSgpID8gcGFp bnRPZmZzZXQueCgpICsgbmV4dGxpbmUueCgpICsgMSA6IDEwMDAwMDApLAorICAgICAgICAgICAg bWluKHBpeGVsU25hcHBlZEJveC5tYXhYKCkgKyBvdXRsaW5lV2lkdGgsICFuZXh0bGluZS5pc0Vt cHR5KCkgPyBwaXhlbFNuYXBwZWROZXh0TGluZS54KCkgKyAxIDogMTAwMDAwMCksCiAgICAgICAg ICAgICBwaXhlbFNuYXBwZWRCb3gubWF4WSgpICsgb3V0bGluZVdpZHRoLAogICAgICAgICAgICAg QlNCb3R0b20sIG91dGxpbmVDb2xvciwgb3V0bGluZVN0eWxlLAogICAgICAgICAgICAgb3V0bGlu ZVdpZHRoLApAQCAtMTUzNiw3ICsxNTM4LDcgQEAgdm9pZCBSZW5kZXJJbmxpbmU6OnBhaW50T3V0 bGluZUZvckxpbmUoRwogICAgIAogICAgIGlmIChuZXh0bGluZS5tYXhYKCkgPCB0aGlzbGluZS5t YXhYKCkpCiAgICAgICAgIGRyYXdMaW5lRm9yQm94U2lkZShncmFwaGljc0NvbnRleHQsCi0gICAg ICAgICAgICBtYXgoIW5leHRsaW5lLmlzRW1wdHkoKSA/IHBhaW50T2Zmc2V0LngoKSArIG5leHRs aW5lLm1heFgoKSA6IC0xMDAwMDAwLCBwaXhlbFNuYXBwZWRCb3gueCgpIC0gb3V0bGluZVdpZHRo KSwKKyAgICAgICAgICAgIG1heCghbmV4dGxpbmUuaXNFbXB0eSgpID8gcGl4ZWxTbmFwcGVkTmV4 dExpbmUubWF4WCgpIDogLTEwMDAwMDAsIHBpeGVsU25hcHBlZEJveC54KCkgLSBvdXRsaW5lV2lk dGgpLAogICAgICAgICAgICAgcGl4ZWxTbmFwcGVkQm94Lm1heFkoKSwKICAgICAgICAgICAgIHBp eGVsU25hcHBlZEJveC5tYXhYKCkgKyBvdXRsaW5lV2lkdGgsCiAgICAgICAgICAgICBwaXhlbFNu YXBwZWRCb3gubWF4WSgpICsgb3V0bGluZVdpZHRoLAo= 134465 2012-03-28 18:36:14 -0700 2012-03-28 19:11:59 -0700 Patch for landing 82540.patch text/plain 3744 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgIChyZXZpc2lvbiAxMTI0NTMpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cgICh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDMtMjggIEVtaWwg QSBFa2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEZpeCByb3VuZGluZyBpbiBS ZW5kZXJJbmxpbmU6OnBhaW50T3V0bGluZUZvckxpbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyNTQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJp YyBTZWlkZWwuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBjaGFuZ2UgaW4gZnVuY3Rpb25h bGl0eS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVySW5saW5lOjpwYWludE91dGxpbmVGb3JMaW5lKToKKyAgICAgICAgQ2hh bmdlIHBhaW50T3V0bGluZUZvckxpbmUgdG8gcGl4ZWwgc25hcCB0aGUgbGVmdCBhbmQgcmlnaHQg ZWRnZXMgb2YgdGhlCisgICAgICAgIGxpbmVzIGluc3RlYWQgb2YgYWRkaW5nIHRoZSBvZmZzZXQg dG8gYW4gYWxyZWFkeSByb3VuZGVkIG51bWJlci4KKwogMjAxMi0wMy0yMyAgRGF2aWQgSHlhdHQg IDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTgxNjg1CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy SW5saW5lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy SW5saW5lLmNwcCAgICAgKHJldmlzaW9uIDExMjQ1MykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJJbmxpbmUuY3BwICAgICAod29ya2luZyBjb3B5KQpAQCAtMTQ2NSw2ICsxNDY1 LDggQEAgdm9pZCBSZW5kZXJJbmxpbmU6OnBhaW50T3V0bGluZUZvckxpbmUoRwogICAgICAgICBM YXlvdXRTaXplKHRoaXNsaW5lLndpZHRoKCkgKyBvZmZzZXQsIHRoaXNsaW5lLmhlaWdodCgpICsg b2Zmc2V0KSk7CiAKICAgICBJbnRSZWN0IHBpeGVsU25hcHBlZEJveCA9IHBpeGVsU25hcHBlZElu dFJlY3QoYm94KTsKKyAgICBJbnRSZWN0IHBpeGVsU25hcHBlZExhc3RMaW5lID0gcGl4ZWxTbmFw cGVkSW50UmVjdChwYWludE9mZnNldC54KCkgKyBsYXN0bGluZS54KCksIDAsIGxhc3RsaW5lLndp ZHRoKCksIDApOworICAgIEludFJlY3QgcGl4ZWxTbmFwcGVkTmV4dExpbmUgPSBwaXhlbFNuYXBw ZWRJbnRSZWN0KHBhaW50T2Zmc2V0LngoKSArIG5leHRsaW5lLngoKSwgMCwgbmV4dGxpbmUud2lk dGgoKSwgMCk7CiAgICAgCiAgICAgLy8gbGVmdCBlZGdlCiAgICAgZHJhd0xpbmVGb3JCb3hTaWRl KGdyYXBoaWNzQ29udGV4dCwKQEAgLTE0OTQsNyArMTQ5Niw3IEBAIHZvaWQgUmVuZGVySW5saW5l OjpwYWludE91dGxpbmVGb3JMaW5lKEcKICAgICAgICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBo aWNzQ29udGV4dCwKICAgICAgICAgICAgIHBpeGVsU25hcHBlZEJveC54KCkgLSBvdXRsaW5lV2lk dGgsCiAgICAgICAgICAgICBwaXhlbFNuYXBwZWRCb3gueSgpIC0gb3V0bGluZVdpZHRoLAotICAg ICAgICAgICAgbWluKHBpeGVsU25hcHBlZEJveC5tYXhYKCkgKyBvdXRsaW5lV2lkdGgsIChsYXN0 bGluZS5pc0VtcHR5KCkgPyAxMDAwMDAwIDogcGFpbnRPZmZzZXQueCgpICsgbGFzdGxpbmUueCgp KSksCisgICAgICAgICAgICBtaW4ocGl4ZWxTbmFwcGVkQm94Lm1heFgoKSArIG91dGxpbmVXaWR0 aCwgKGxhc3RsaW5lLmlzRW1wdHkoKSA/IDEwMDAwMDAgOiBwaXhlbFNuYXBwZWRMYXN0TGluZS54 KCkpKSwKICAgICAgICAgICAgIHBpeGVsU25hcHBlZEJveC55KCksCiAgICAgICAgICAgICBCU1Rv cCwgb3V0bGluZUNvbG9yLCBvdXRsaW5lU3R5bGUsCiAgICAgICAgICAgICBvdXRsaW5lV2lkdGgs CkBAIC0xNTAzLDcgKzE1MDUsNyBAQCB2b2lkIFJlbmRlcklubGluZTo6cGFpbnRPdXRsaW5lRm9y TGluZShHCiAgICAgCiAgICAgaWYgKGxhc3RsaW5lLm1heFgoKSA8IHRoaXNsaW5lLm1heFgoKSkK ICAgICAgICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4dCwKLSAgICAgICAgICAg IG1heChsYXN0bGluZS5pc0VtcHR5KCkgPyAtMTAwMDAwMCA6IHBhaW50T2Zmc2V0LngoKSArIGxh c3RsaW5lLm1heFgoKSwgcGl4ZWxTbmFwcGVkQm94LngoKSAtIG91dGxpbmVXaWR0aCksCisgICAg ICAgICAgICBtYXgobGFzdGxpbmUuaXNFbXB0eSgpID8gLTEwMDAwMDAgOiBwaXhlbFNuYXBwZWRM YXN0TGluZS5tYXhYKCksIHBpeGVsU25hcHBlZEJveC54KCkgLSBvdXRsaW5lV2lkdGgpLAogICAg ICAgICAgICAgcGl4ZWxTbmFwcGVkQm94LnkoKSAtIG91dGxpbmVXaWR0aCwKICAgICAgICAgICAg IHBpeGVsU25hcHBlZEJveC5tYXhYKCkgKyBvdXRsaW5lV2lkdGgsCiAgICAgICAgICAgICBwaXhl bFNuYXBwZWRCb3gueSgpLApAQCAtMTUyNyw3ICsxNTI5LDcgQEAgdm9pZCBSZW5kZXJJbmxpbmU6 OnBhaW50T3V0bGluZUZvckxpbmUoRwogICAgICAgICBkcmF3TGluZUZvckJveFNpZGUoZ3JhcGhp Y3NDb250ZXh0LAogICAgICAgICAgICAgcGl4ZWxTbmFwcGVkQm94LngoKSAtIG91dGxpbmVXaWR0 aCwKICAgICAgICAgICAgIHBpeGVsU25hcHBlZEJveC5tYXhZKCksCi0gICAgICAgICAgICBtaW4o cGl4ZWxTbmFwcGVkQm94Lm1heFgoKSArIG91dGxpbmVXaWR0aCwgIW5leHRsaW5lLmlzRW1wdHko KSA/IHBhaW50T2Zmc2V0LngoKSArIG5leHRsaW5lLngoKSArIDEgOiAxMDAwMDAwKSwKKyAgICAg ICAgICAgIG1pbihwaXhlbFNuYXBwZWRCb3gubWF4WCgpICsgb3V0bGluZVdpZHRoLCAhbmV4dGxp bmUuaXNFbXB0eSgpID8gcGl4ZWxTbmFwcGVkTmV4dExpbmUueCgpICsgMSA6IDEwMDAwMDApLAog ICAgICAgICAgICAgcGl4ZWxTbmFwcGVkQm94Lm1heFkoKSArIG91dGxpbmVXaWR0aCwKICAgICAg ICAgICAgIEJTQm90dG9tLCBvdXRsaW5lQ29sb3IsIG91dGxpbmVTdHlsZSwKICAgICAgICAgICAg IG91dGxpbmVXaWR0aCwKQEAgLTE1MzYsNyArMTUzOCw3IEBAIHZvaWQgUmVuZGVySW5saW5lOjpw YWludE91dGxpbmVGb3JMaW5lKEcKICAgICAKICAgICBpZiAobmV4dGxpbmUubWF4WCgpIDwgdGhp c2xpbmUubWF4WCgpKQogICAgICAgICBkcmF3TGluZUZvckJveFNpZGUoZ3JhcGhpY3NDb250ZXh0 LAotICAgICAgICAgICAgbWF4KCFuZXh0bGluZS5pc0VtcHR5KCkgPyBwYWludE9mZnNldC54KCkg KyBuZXh0bGluZS5tYXhYKCkgOiAtMTAwMDAwMCwgcGl4ZWxTbmFwcGVkQm94LngoKSAtIG91dGxp bmVXaWR0aCksCisgICAgICAgICAgICBtYXgoIW5leHRsaW5lLmlzRW1wdHkoKSA/IHBpeGVsU25h cHBlZE5leHRMaW5lLm1heFgoKSA6IC0xMDAwMDAwLCBwaXhlbFNuYXBwZWRCb3gueCgpIC0gb3V0 bGluZVdpZHRoKSwKICAgICAgICAgICAgIHBpeGVsU25hcHBlZEJveC5tYXhZKCksCiAgICAgICAg ICAgICBwaXhlbFNuYXBwZWRCb3gubWF4WCgpICsgb3V0bGluZVdpZHRoLAogICAgICAgICAgICAg cGl4ZWxTbmFwcGVkQm94Lm1heFkoKSArIG91dGxpbmVXaWR0aCwK