62045 2011-06-03 13:15:53 -0700 Convert RenderBox::clipRect to IntPoint 2011-06-06 13:38:06 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 eae eae ap commit-queue eric leviw simon.fraser webkit.review.bot oldest_to_newest 415122 0 eae 2011-06-03 13:15:53 -0700 Ongoing tx, ty to IntPoint conversion 415138 1 95957 eae 2011-06-03 13:42:09 -0700 Created attachment 95957 Patch 415144 2 95957 eric 2011-06-03 13:46:42 -0700 Comment on attachment 95957 Patch OK. 415238 3 95957 commit-queue 2011-06-03 15:25:40 -0700 Comment on attachment 95957 Patch Rejecting attachment 95957 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-8', 'apply-..." exit_code: 2 Last 500 characters of output: dering/RenderBox.h patching file Source/WebCore/rendering/RenderLayer.cpp Hunk #1 FAILED at 3394. Hunk #2 FAILED at 3456. Hunk #3 succeeded at 3512 (offset -15 lines). 2 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/rendering/RenderLayer.cpp.rej patching file Source/WebCore/rendering/RenderLayerBacking.cpp Hunk #1 succeeded at 319 (offset -1 lines). Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Eric Seidel', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/8757885 415261 4 95979 eae 2011-06-03 16:01:04 -0700 Created attachment 95979 Patch for landing 415447 5 95979 webkit.review.bot 2011-06-04 03:33:41 -0700 Comment on attachment 95979 Patch for landing Rejecting attachment 95979 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-01', '--port..." exit_code: 2 Last 500 characters of output: ). patching file Source/WebCore/rendering/RenderBox.h Hunk #1 FAILED at 346. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/rendering/RenderBox.h.rej patching file Source/WebCore/rendering/RenderLayer.cpp Hunk #2 succeeded at 3441 with fuzz 1. Hunk #3 succeeded at 3512 with fuzz 2. patching file Source/WebCore/rendering/RenderLayerBacking.cpp Hunk #1 succeeded at 319 with fuzz 1. Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/8760731 415911 6 96100 eae 2011-06-06 11:32:35 -0700 Created attachment 96100 Patch for landing 415957 7 96100 webkit.review.bot 2011-06-06 12:57:50 -0700 Comment on attachment 96100 Patch for landing Clearing flags on attachment: 96100 Committed r88183: <http://trac.webkit.org/changeset/88183> 415958 8 webkit.review.bot 2011-06-06 12:57:55 -0700 All reviewed patches have been landed. Closing bug. 415978 9 commit-queue 2011-06-06 13:38:06 -0700 The commit-queue encountered the following flaky tests while processing attachment 96100: http/tests/websocket/tests/frame-length-longer-than-buffer.html bug 61837 (author: abarth@webkit.org) The commit-queue is continuing to process your patch. 95957 2011-06-03 13:42:09 -0700 2011-06-03 16:00:58 -0700 Patch bug-62045-20110603134208.patch text/plain 6314 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MDQ2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDYtMDMgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIENvbnZlcnQgUmVuZGVyQm94OjpjbGlwUmVjdCB0byBJbnRQb2lu dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIwNDUK KworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvSW50UmVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6SW50UmVjdDo6Y29udHJh Y3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQm94OjpjbGlwUmVjdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5o OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllcjo6Y2FsY3VsYXRlQ2xpcFJlY3RzKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckxheWVyOjpjYWxjdWxhdGVSZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll cjo6cmVwYWludEJsb2NrU2VsZWN0aW9uR2Fwcyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjbGlwQm94KToKKwogMjAxMS0w Ni0wMyAgQWxleGlzIE1lbmFyZCAgPGFsZXhpcy5tZW5hcmRAb3BlbmJvc3NhLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5nLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvSW50UmVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ludFJlY3QuaAkocmV2aXNpb24gODc4NjUpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbnRSZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTExMyw2 ICsxMTMsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGV4cGFuZChjb25zdCBJbnRTaXplJiBzaXpl KSB7IG1fbG9jYXRpb24gKz0gc2l6ZTsgfQogICAgIHZvaWQgZXhwYW5kKGludCBkdywgaW50IGRo KSB7IG1fc2l6ZS5leHBhbmQoZHcsIGRoKTsgfQorICAgIHZvaWQgY29udHJhY3QoaW50IGR3LCBp bnQgZGgpIHsgbV9zaXplLmV4cGFuZCgtZHcsIC1kaCk7IH0KIAogICAgIHZvaWQgc2hpZnRYRWRn ZVRvKGludCBlZGdlKQogICAgIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwCShyZXZpc2lvbiA4Nzg2NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTU5LDMyICsxMTU5LDI4IEBAIEludFJlY3Qg UmVuZGVyQm94OjpvdmVyZmxvd0NsaXBSZWN0KGludCAKICAgICByZXR1cm4gSW50UmVjdChjbGlw WCwgY2xpcFksIGNsaXBXaWR0aCwgY2xpcEhlaWdodCk7CiB9CiAKLUludFJlY3QgUmVuZGVyQm94 OjpjbGlwUmVjdChpbnQgdHgsIGludCB0eSkKK0ludFJlY3QgUmVuZGVyQm94OjpjbGlwUmVjdChj b25zdCBJbnRQb2ludCYgbG9jYXRpb24pCiB7Ci0gICAgaW50IGNsaXBYID0gdHg7Ci0gICAgaW50 IGNsaXBZID0gdHk7Ci0gICAgaW50IGNsaXBXaWR0aCA9IHdpZHRoKCk7Ci0gICAgaW50IGNsaXBI ZWlnaHQgPSBoZWlnaHQoKTsKLQorICAgIEludFJlY3QgY2xpcFJlY3QobG9jYXRpb24sIHNpemUo KSk7CiAgICAgaWYgKCFzdHlsZSgpLT5jbGlwTGVmdCgpLmlzQXV0bygpKSB7CiAgICAgICAgIGlu dCBjID0gc3R5bGUoKS0+Y2xpcExlZnQoKS5jYWxjVmFsdWUod2lkdGgoKSk7Ci0gICAgICAgIGNs aXBYICs9IGM7Ci0gICAgICAgIGNsaXBXaWR0aCAtPSBjOworICAgICAgICBjbGlwUmVjdC5tb3Zl KGMsIDApOworICAgICAgICBjbGlwUmVjdC5jb250cmFjdChjLCAwKTsKICAgICB9CiAKICAgICBp ZiAoIXN0eWxlKCktPmNsaXBSaWdodCgpLmlzQXV0bygpKQotICAgICAgICBjbGlwV2lkdGggLT0g d2lkdGgoKSAtIHN0eWxlKCktPmNsaXBSaWdodCgpLmNhbGNWYWx1ZSh3aWR0aCgpKTsKKyAgICAg ICAgY2xpcFJlY3QuY29udHJhY3Qod2lkdGgoKSAtIHN0eWxlKCktPmNsaXBSaWdodCgpLmNhbGNW YWx1ZSh3aWR0aCgpKSwgMCk7CiAKICAgICBpZiAoIXN0eWxlKCktPmNsaXBUb3AoKS5pc0F1dG8o KSkgewogICAgICAgICBpbnQgYyA9IHN0eWxlKCktPmNsaXBUb3AoKS5jYWxjVmFsdWUoaGVpZ2h0 KCkpOwotICAgICAgICBjbGlwWSArPSBjOwotICAgICAgICBjbGlwSGVpZ2h0IC09IGM7CisgICAg ICAgIGNsaXBSZWN0Lm1vdmUoMCwgYyk7CisgICAgICAgIGNsaXBSZWN0LmNvbnRyYWN0KDAsIGMp OwogICAgIH0KIAogICAgIGlmICghc3R5bGUoKS0+Y2xpcEJvdHRvbSgpLmlzQXV0bygpKQotICAg ICAgICBjbGlwSGVpZ2h0IC09IGhlaWdodCgpIC0gc3R5bGUoKS0+Y2xpcEJvdHRvbSgpLmNhbGNW YWx1ZShoZWlnaHQoKSk7CisgICAgICAgIGNsaXBSZWN0LmNvbnRyYWN0KDAsIGhlaWdodCgpIC0g c3R5bGUoKS0+Y2xpcEJvdHRvbSgpLmNhbGNWYWx1ZShoZWlnaHQoKSkpOwogCi0gICAgcmV0dXJu IEludFJlY3QoY2xpcFgsIGNsaXBZLCBjbGlwV2lkdGgsIGNsaXBIZWlnaHQpOworICAgIHJldHVy biBjbGlwUmVjdDsKIH0KIAogaW50IFJlbmRlckJveDo6Y29udGFpbmluZ0Jsb2NrTG9naWNhbFdp ZHRoRm9yQ29udGVudCgpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5oCShyZXZpc2lvbiA4Nzg2NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guaAkod29ya2luZyBjb3B5KQpAQCAtMzQ2LDcgKzM0Niw3IEBAIHB1YmxpYzoKICAgICB2aXJ0 dWFsIEludFJlY3QgbG9jYWxDYXJldFJlY3QoSW5saW5lQm94KiwgaW50IGNhcmV0T2Zmc2V0LCBp bnQqIGV4dHJhV2lkdGhUb0VuZE9mTGluZSA9IDApOwogCiAgICAgdmlydHVhbCBJbnRSZWN0IG92 ZXJmbG93Q2xpcFJlY3QoaW50IHR4LCBpbnQgdHksIE92ZXJsYXlTY3JvbGxiYXJTaXplUmVsZXZh bmN5IHJlbGV2YW5jeSA9IElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplKTsKLSAgICBJbnRSZWN0 IGNsaXBSZWN0KGludCB0eCwgaW50IHR5KTsKKyAgICBJbnRSZWN0IGNsaXBSZWN0KGNvbnN0IElu dFBvaW50JiBsb2NhdGlvbik7CiAgICAgdmlydHVhbCBib29sIGhhc0NvbnRyb2xDbGlwKCkgY29u c3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIEludFJlY3QgY29udHJvbENsaXBSZWN0 KGNvbnN0IEludFBvaW50JikgY29uc3QgeyByZXR1cm4gSW50UmVjdCgpOyB9CiAgICAgYm9vbCBw dXNoQ29udGVudHNDbGlwKFBhaW50SW5mbyYsIGludCB0eCwgaW50IHR5KTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAkocmV2aXNpb24gODc4NjUpCisrKyBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zMzk0LDcgKzMzOTQsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpjYWxjdWxhdGVDbGlwUmVjdHMo Y29uCiAgICAgICAgICAgICAgICAgY2xpcFJlY3RzLnNldFBvc0NsaXBSZWN0KGludGVyc2VjdGlv bihuZXdPdmVyZmxvd0NsaXAsIGNsaXBSZWN0cy5wb3NDbGlwUmVjdCgpKSk7CiAgICAgICAgIH0K ICAgICAgICAgaWYgKHJlbmRlcmVyKCktPmhhc0NsaXAoKSkgewotICAgICAgICAgICAgSW50UmVj dCBuZXdQb3NDbGlwID0gdG9SZW5kZXJCb3gocmVuZGVyZXIoKSktPmNsaXBSZWN0KHgsIHkpOwor ICAgICAgICAgICAgSW50UmVjdCBuZXdQb3NDbGlwID0gdG9SZW5kZXJCb3gocmVuZGVyZXIoKSkt PmNsaXBSZWN0KEludFBvaW50KHgsIHkpKTsKICAgICAgICAgICAgIGNsaXBSZWN0cy5zZXRQb3ND bGlwUmVjdChpbnRlcnNlY3Rpb24obmV3UG9zQ2xpcCwgY2xpcFJlY3RzLnBvc0NsaXBSZWN0KCkp KTsKICAgICAgICAgICAgIGNsaXBSZWN0cy5zZXRPdmVyZmxvd0NsaXBSZWN0KGludGVyc2VjdGlv bihuZXdQb3NDbGlwLCBjbGlwUmVjdHMub3ZlcmZsb3dDbGlwUmVjdCgpKSk7CiAgICAgICAgICAg ICBjbGlwUmVjdHMuc2V0Rml4ZWRDbGlwUmVjdChpbnRlcnNlY3Rpb24obmV3UG9zQ2xpcCwgY2xp cFJlY3RzLmZpeGVkQ2xpcFJlY3QoKSkpOwpAQCAtMzQ1Niw3ICszNDU2LDcgQEAgdm9pZCBSZW5k ZXJMYXllcjo6Y2FsY3VsYXRlUmVjdHMoY29uc3QgUgogICAgICAgICAgICAgZm9yZWdyb3VuZFJl Y3QuaW50ZXJzZWN0KHRvUmVuZGVyQm94KHJlbmRlcmVyKCkpLT5vdmVyZmxvd0NsaXBSZWN0KHgs IHksIHJlbGV2YW5jeSkpOwogICAgICAgICBpZiAocmVuZGVyZXIoKS0+aGFzQ2xpcCgpKSB7CiAg ICAgICAgICAgICAvLyBDbGlwIGFwcGxpZXMgdG8gKnVzKiBhcyB3ZWxsLCBzbyBnbyBhaGVhZCBh bmQgdXBkYXRlIHRoZSBkYW1hZ2VSZWN0LgotICAgICAgICAgICAgSW50UmVjdCBuZXdQb3NDbGlw ID0gdG9SZW5kZXJCb3gocmVuZGVyZXIoKSktPmNsaXBSZWN0KHgsIHkpOworICAgICAgICAgICAg SW50UmVjdCBuZXdQb3NDbGlwID0gdG9SZW5kZXJCb3gocmVuZGVyZXIoKSktPmNsaXBSZWN0KElu dFBvaW50KHgsIHkpKTsKICAgICAgICAgICAgIGJhY2tncm91bmRSZWN0LmludGVyc2VjdChuZXdQ b3NDbGlwKTsKICAgICAgICAgICAgIGZvcmVncm91bmRSZWN0LmludGVyc2VjdChuZXdQb3NDbGlw KTsKICAgICAgICAgICAgIG91dGxpbmVSZWN0LmludGVyc2VjdChuZXdQb3NDbGlwKTsKQEAgLTM1 MjcsNyArMzUyNyw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnJlcGFpbnRCbG9ja1NlbGVjdGlvbkcK ICAgICBpZiAocmVuZGVyZXIoKS0+aGFzT3ZlcmZsb3dDbGlwKCkpCiAgICAgICAgIHJlY3QuaW50 ZXJzZWN0KHRvUmVuZGVyQm94KHJlbmRlcmVyKCkpLT5vdmVyZmxvd0NsaXBSZWN0KDAsIDApKTsK ICAgICBpZiAocmVuZGVyZXIoKS0+aGFzQ2xpcCgpKQotICAgICAgICByZWN0LmludGVyc2VjdCh0 b1JlbmRlckJveChyZW5kZXJlcigpKS0+Y2xpcFJlY3QoMCwgMCkpOworICAgICAgICByZWN0Lmlu dGVyc2VjdCh0b1JlbmRlckJveChyZW5kZXJlcigpKS0+Y2xpcFJlY3QoSW50UG9pbnQoKSkpOwog ICAgIGlmICghcmVjdC5pc0VtcHR5KCkpCiAgICAgICAgIHJlbmRlcmVyKCktPnJlcGFpbnRSZWN0 YW5nbGUocmVjdCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJCYWNraW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJCYWNraW5nLmNwcAkocmV2aXNpb24gODc4NjUpCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIwLDcg KzMyMCw3IEBAIHN0YXRpYyBJbnRSZWN0IGNsaXBCb3goUmVuZGVyQm94KiByZW5kZXIKICAgICAg ICAgcmVzdWx0ID0gcmVuZGVyZXItPm92ZXJmbG93Q2xpcFJlY3QoMCwgMCk7CiAKICAgICBpZiAo cmVuZGVyZXItPmhhc0NsaXAoKSkKLSAgICAgICAgcmVzdWx0LmludGVyc2VjdChyZW5kZXJlci0+ Y2xpcFJlY3QoMCwgMCkpOworICAgICAgICByZXN1bHQuaW50ZXJzZWN0KHJlbmRlcmVyLT5jbGlw UmVjdChJbnRQb2ludCgpKSk7CiAKICAgICByZXR1cm4gcmVzdWx0OwogfQo= 95979 2011-06-03 16:01:04 -0700 2011-06-06 11:32:32 -0700 Patch for landing bug-62045-20110603160103.patch text/plain 6343 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MDY5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDYtMDMgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2Vp ZGVsLgorCisgICAgICAgIENvbnZlcnQgUmVuZGVyQm94OjpjbGlwUmVjdCB0byBJbnRQb2ludAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIwNDUKKwor ICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvSW50UmVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6SW50UmVjdDo6Y29udHJhY3Qp OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyQm94OjpjbGlwUmVjdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5oOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllcjo6Y2FsY3VsYXRlQ2xpcFJlY3RzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyOjpjYWxjdWxhdGVSZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6 cmVwYWludEJsb2NrU2VsZWN0aW9uR2Fwcyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxh eWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjbGlwQm94KToKKwogMjAxMS0wNS0z MSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvSW50UmVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0ludFJlY3QuaAkocmV2aXNpb24gODgwNjkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9JbnRSZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTExMyw2ICsxMTMsNyBA QCBwdWJsaWM6CiAKICAgICB2b2lkIGV4cGFuZChjb25zdCBJbnRTaXplJiBzaXplKSB7IG1fbG9j YXRpb24gKz0gc2l6ZTsgfQogICAgIHZvaWQgZXhwYW5kKGludCBkdywgaW50IGRoKSB7IG1fc2l6 ZS5leHBhbmQoZHcsIGRoKTsgfQorICAgIHZvaWQgY29udHJhY3QoaW50IGR3LCBpbnQgZGgpIHsg bV9zaXplLmV4cGFuZCgtZHcsIC1kaCk7IH0KIAogICAgIHZvaWQgc2hpZnRYRWRnZVRvKGludCBl ZGdlKQogICAgIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCShy ZXZpc2lvbiA4ODA2OSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMTU3LDMyICsxMTU3LDI4IEBAIEludFJlY3QgUmVuZGVyQm94 OjpvdmVyZmxvd0NsaXBSZWN0KGludCAKICAgICByZXR1cm4gSW50UmVjdChjbGlwWCwgY2xpcFks IGNsaXBXaWR0aCwgY2xpcEhlaWdodCk7CiB9CiAKLUludFJlY3QgUmVuZGVyQm94OjpjbGlwUmVj dChpbnQgdHgsIGludCB0eSkKK0ludFJlY3QgUmVuZGVyQm94OjpjbGlwUmVjdChjb25zdCBJbnRQ b2ludCYgbG9jYXRpb24pCiB7Ci0gICAgaW50IGNsaXBYID0gdHg7Ci0gICAgaW50IGNsaXBZID0g dHk7Ci0gICAgaW50IGNsaXBXaWR0aCA9IHdpZHRoKCk7Ci0gICAgaW50IGNsaXBIZWlnaHQgPSBo ZWlnaHQoKTsKLQorICAgIEludFJlY3QgY2xpcFJlY3QobG9jYXRpb24sIHNpemUoKSk7CiAgICAg aWYgKCFzdHlsZSgpLT5jbGlwTGVmdCgpLmlzQXV0bygpKSB7CiAgICAgICAgIGludCBjID0gc3R5 bGUoKS0+Y2xpcExlZnQoKS5jYWxjVmFsdWUod2lkdGgoKSk7Ci0gICAgICAgIGNsaXBYICs9IGM7 Ci0gICAgICAgIGNsaXBXaWR0aCAtPSBjOworICAgICAgICBjbGlwUmVjdC5tb3ZlKGMsIDApOwor ICAgICAgICBjbGlwUmVjdC5jb250cmFjdChjLCAwKTsKICAgICB9CiAKICAgICBpZiAoIXN0eWxl KCktPmNsaXBSaWdodCgpLmlzQXV0bygpKQotICAgICAgICBjbGlwV2lkdGggLT0gd2lkdGgoKSAt IHN0eWxlKCktPmNsaXBSaWdodCgpLmNhbGNWYWx1ZSh3aWR0aCgpKTsKKyAgICAgICAgY2xpcFJl Y3QuY29udHJhY3Qod2lkdGgoKSAtIHN0eWxlKCktPmNsaXBSaWdodCgpLmNhbGNWYWx1ZSh3aWR0 aCgpKSwgMCk7CiAKICAgICBpZiAoIXN0eWxlKCktPmNsaXBUb3AoKS5pc0F1dG8oKSkgewogICAg ICAgICBpbnQgYyA9IHN0eWxlKCktPmNsaXBUb3AoKS5jYWxjVmFsdWUoaGVpZ2h0KCkpOwotICAg ICAgICBjbGlwWSArPSBjOwotICAgICAgICBjbGlwSGVpZ2h0IC09IGM7CisgICAgICAgIGNsaXBS ZWN0Lm1vdmUoMCwgYyk7CisgICAgICAgIGNsaXBSZWN0LmNvbnRyYWN0KDAsIGMpOwogICAgIH0K IAogICAgIGlmICghc3R5bGUoKS0+Y2xpcEJvdHRvbSgpLmlzQXV0bygpKQotICAgICAgICBjbGlw SGVpZ2h0IC09IGhlaWdodCgpIC0gc3R5bGUoKS0+Y2xpcEJvdHRvbSgpLmNhbGNWYWx1ZShoZWln aHQoKSk7CisgICAgICAgIGNsaXBSZWN0LmNvbnRyYWN0KDAsIGhlaWdodCgpIC0gc3R5bGUoKS0+ Y2xpcEJvdHRvbSgpLmNhbGNWYWx1ZShoZWlnaHQoKSkpOwogCi0gICAgcmV0dXJuIEludFJlY3Qo Y2xpcFgsIGNsaXBZLCBjbGlwV2lkdGgsIGNsaXBIZWlnaHQpOworICAgIHJldHVybiBjbGlwUmVj dDsKIH0KIAogaW50IFJlbmRlckJveDo6Y29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29u dGVudCgpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCShyZXZp c2lvbiA4ODA2OSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAkod29y a2luZyBjb3B5KQpAQCAtMzQ2LDcgKzM0Niw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIEludFJl Y3QgbG9jYWxDYXJldFJlY3QoSW5saW5lQm94KiwgaW50IGNhcmV0T2Zmc2V0LCBpbnQqIGV4dHJh V2lkdGhUb0VuZE9mTGluZSA9IDApOwogCiAgICAgdmlydHVhbCBJbnRSZWN0IG92ZXJmbG93Q2xp cFJlY3QoaW50IHR4LCBpbnQgdHksIE92ZXJsYXlTY3JvbGxiYXJTaXplUmVsZXZhbmN5IHJlbGV2 YW5jeSA9IElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplKTsKLSAgICBJbnRSZWN0IGNsaXBSZWN0 KGludCB0eCwgaW50IHR5KTsKKyAgICBJbnRSZWN0IGNsaXBSZWN0KGNvbnN0IEludFBvaW50JiBs b2NhdGlvbik7CiAgICAgdmlydHVhbCBib29sIGhhc0NvbnRyb2xDbGlwKCkgY29uc3QgeyByZXR1 cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIEludFJlY3QgY29udHJvbENsaXBSZWN0KGNvbnN0IElu dFBvaW50JikgY29uc3QgeyByZXR1cm4gSW50UmVjdCgpOyB9CiAgICAgYm9vbCBwdXNoQ29udGVu dHNDbGlwKFBhaW50SW5mbyYsIGludCB0eCwgaW50IHR5KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAkocmV2aXNpb24gODgwNjkpCisrKyBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMzgwLDcg KzMzODAsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpjYWxjdWxhdGVDbGlwUmVjdHMoY29uCiAgICAg ICAgICAgICAgICAgY2xpcFJlY3RzLnNldFBvc0NsaXBSZWN0KGludGVyc2VjdGlvbihuZXdPdmVy Zmxvd0NsaXAsIGNsaXBSZWN0cy5wb3NDbGlwUmVjdCgpKSk7CiAgICAgICAgIH0KICAgICAgICAg aWYgKHJlbmRlcmVyKCktPmhhc0NsaXAoKSkgewotICAgICAgICAgICAgSW50UmVjdCBuZXdQb3ND bGlwID0gdG9SZW5kZXJCb3gocmVuZGVyZXIoKSktPmNsaXBSZWN0KG9mZnNldC54KCksIG9mZnNl dC55KCkpOworICAgICAgICAgICAgSW50UmVjdCBuZXdQb3NDbGlwID0gdG9SZW5kZXJCb3gocmVu ZGVyZXIoKSktPmNsaXBSZWN0KG9mZnNldCk7CiAgICAgICAgICAgICBjbGlwUmVjdHMuc2V0UG9z Q2xpcFJlY3QoaW50ZXJzZWN0aW9uKG5ld1Bvc0NsaXAsIGNsaXBSZWN0cy5wb3NDbGlwUmVjdCgp KSk7CiAgICAgICAgICAgICBjbGlwUmVjdHMuc2V0T3ZlcmZsb3dDbGlwUmVjdChpbnRlcnNlY3Rp b24obmV3UG9zQ2xpcCwgY2xpcFJlY3RzLm92ZXJmbG93Q2xpcFJlY3QoKSkpOwogICAgICAgICAg ICAgY2xpcFJlY3RzLnNldEZpeGVkQ2xpcFJlY3QoaW50ZXJzZWN0aW9uKG5ld1Bvc0NsaXAsIGNs aXBSZWN0cy5maXhlZENsaXBSZWN0KCkpKTsKQEAgLTM0NDEsNyArMzQ0MSw3IEBAIHZvaWQgUmVu ZGVyTGF5ZXI6OmNhbGN1bGF0ZVJlY3RzKGNvbnN0IFIKICAgICAgICAgICAgIGZvcmVncm91bmRS ZWN0LmludGVyc2VjdCh0b1JlbmRlckJveChyZW5kZXJlcigpKS0+b3ZlcmZsb3dDbGlwUmVjdChv ZmZzZXQueCgpLCBvZmZzZXQueSgpLCByZWxldmFuY3kpKTsKICAgICAgICAgaWYgKHJlbmRlcmVy KCktPmhhc0NsaXAoKSkgewogICAgICAgICAgICAgLy8gQ2xpcCBhcHBsaWVzIHRvICp1cyogYXMg d2VsbCwgc28gZ28gYWhlYWQgYW5kIHVwZGF0ZSB0aGUgZGFtYWdlUmVjdC4KLSAgICAgICAgICAg IEludFJlY3QgbmV3UG9zQ2xpcCA9IHRvUmVuZGVyQm94KHJlbmRlcmVyKCkpLT5jbGlwUmVjdChv ZmZzZXQueCgpLCBvZmZzZXQueSgpKTsKKyAgICAgICAgICAgIEludFJlY3QgbmV3UG9zQ2xpcCA9 IHRvUmVuZGVyQm94KHJlbmRlcmVyKCkpLT5jbGlwUmVjdChvZmZzZXQpOwogICAgICAgICAgICAg YmFja2dyb3VuZFJlY3QuaW50ZXJzZWN0KG5ld1Bvc0NsaXApOwogICAgICAgICAgICAgZm9yZWdy b3VuZFJlY3QuaW50ZXJzZWN0KG5ld1Bvc0NsaXApOwogICAgICAgICAgICAgb3V0bGluZVJlY3Qu aW50ZXJzZWN0KG5ld1Bvc0NsaXApOwpAQCAtMzUxMiw3ICszNTEyLDcgQEAgdm9pZCBSZW5kZXJM YXllcjo6cmVwYWludEJsb2NrU2VsZWN0aW9uRwogICAgIGlmIChyZW5kZXJlcigpLT5oYXNPdmVy Zmxvd0NsaXAoKSkKICAgICAgICAgcmVjdC5pbnRlcnNlY3QodG9SZW5kZXJCb3gocmVuZGVyZXIo KSktPm92ZXJmbG93Q2xpcFJlY3QoMCwgMCkpOwogICAgIGlmIChyZW5kZXJlcigpLT5oYXNDbGlw KCkpCi0gICAgICAgIHJlY3QuaW50ZXJzZWN0KHRvUmVuZGVyQm94KHJlbmRlcmVyKCkpLT5jbGlw UmVjdCgwLCAwKSk7CisgICAgICAgIHJlY3QuaW50ZXJzZWN0KHRvUmVuZGVyQm94KHJlbmRlcmVy KCkpLT5jbGlwUmVjdChJbnRQb2ludCgpKSk7CiAgICAgaWYgKCFyZWN0LmlzRW1wdHkoKSkKICAg ICAgICAgcmVuZGVyZXIoKS0+cmVwYWludFJlY3RhbmdsZShyZWN0KTsKIH0KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCShyZXZpc2lv biA4ODA2OSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMTksNyArMzE5LDcgQEAgc3RhdGljIEludFJlY3QgY2xp cEJveChSZW5kZXJCb3gqIHJlbmRlcgogICAgICAgICByZXN1bHQgPSByZW5kZXJlci0+b3ZlcmZs b3dDbGlwUmVjdCgwLCAwKTsKIAogICAgIGlmIChyZW5kZXJlci0+aGFzQ2xpcCgpKQotICAgICAg ICByZXN1bHQuaW50ZXJzZWN0KHJlbmRlcmVyLT5jbGlwUmVjdCgwLCAwKSk7CisgICAgICAgIHJl c3VsdC5pbnRlcnNlY3QocmVuZGVyZXItPmNsaXBSZWN0KEludFBvaW50KCkpKTsKIAogICAgIHJl dHVybiByZXN1bHQ7CiB9Cg== 96100 2011-06-06 11:32:35 -0700 2011-06-06 12:57:50 -0700 Patch for landing bug-62045-20110606113234.patch text/plain 5725 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MTc0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDYtMDYgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2Vp ZGVsLgorCisgICAgICAgIENvbnZlcnQgUmVuZGVyQm94OjpjbGlwUmVjdCB0byBJbnRQb2ludAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIwNDUKKwor ICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNsaXBSZWN0KToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjYWxjdWxhdGVD bGlwUmVjdHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZVJlY3Rz KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpyZXBhaW50QmxvY2tTZWxlY3Rpb25H YXBzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmNsaXBCb3gpOgorCiAyMDExLTA2LTA2ICBTaGlzaGlyIEFncmF3YWwgIDxz aGlzaGlyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb255IEdlbnRpbGNv cmUuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkocmV2aXNpb24g ODgxNzEpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTE0OSwzMiArMTE0OSwyOCBAQCBJbnRSZWN0IFJlbmRlckJveDo6b3ZlcmZs b3dDbGlwUmVjdChjb25zCiAgICAgcmV0dXJuIGNsaXBSZWN0OwogfQogCi1JbnRSZWN0IFJlbmRl ckJveDo6Y2xpcFJlY3QoaW50IHR4LCBpbnQgdHkpCitJbnRSZWN0IFJlbmRlckJveDo6Y2xpcFJl Y3QoY29uc3QgSW50UG9pbnQmIGxvY2F0aW9uKQogewotICAgIGludCBjbGlwWCA9IHR4OwotICAg IGludCBjbGlwWSA9IHR5OwotICAgIGludCBjbGlwV2lkdGggPSB3aWR0aCgpOwotICAgIGludCBj bGlwSGVpZ2h0ID0gaGVpZ2h0KCk7Ci0KKyAgICBJbnRSZWN0IGNsaXBSZWN0KGxvY2F0aW9uLCBz aXplKCkpOwogICAgIGlmICghc3R5bGUoKS0+Y2xpcExlZnQoKS5pc0F1dG8oKSkgewogICAgICAg ICBpbnQgYyA9IHN0eWxlKCktPmNsaXBMZWZ0KCkuY2FsY1ZhbHVlKHdpZHRoKCkpOwotICAgICAg ICBjbGlwWCArPSBjOwotICAgICAgICBjbGlwV2lkdGggLT0gYzsKKyAgICAgICAgY2xpcFJlY3Qu bW92ZShjLCAwKTsKKyAgICAgICAgY2xpcFJlY3QuY29udHJhY3QoYywgMCk7CiAgICAgfQogCiAg ICAgaWYgKCFzdHlsZSgpLT5jbGlwUmlnaHQoKS5pc0F1dG8oKSkKLSAgICAgICAgY2xpcFdpZHRo IC09IHdpZHRoKCkgLSBzdHlsZSgpLT5jbGlwUmlnaHQoKS5jYWxjVmFsdWUod2lkdGgoKSk7Cisg ICAgICAgIGNsaXBSZWN0LmNvbnRyYWN0KHdpZHRoKCkgLSBzdHlsZSgpLT5jbGlwUmlnaHQoKS5j YWxjVmFsdWUod2lkdGgoKSksIDApOwogCiAgICAgaWYgKCFzdHlsZSgpLT5jbGlwVG9wKCkuaXNB dXRvKCkpIHsKICAgICAgICAgaW50IGMgPSBzdHlsZSgpLT5jbGlwVG9wKCkuY2FsY1ZhbHVlKGhl aWdodCgpKTsKLSAgICAgICAgY2xpcFkgKz0gYzsKLSAgICAgICAgY2xpcEhlaWdodCAtPSBjOwor ICAgICAgICBjbGlwUmVjdC5tb3ZlKDAsIGMpOworICAgICAgICBjbGlwUmVjdC5jb250cmFjdCgw LCBjKTsKICAgICB9CiAKICAgICBpZiAoIXN0eWxlKCktPmNsaXBCb3R0b20oKS5pc0F1dG8oKSkK LSAgICAgICAgY2xpcEhlaWdodCAtPSBoZWlnaHQoKSAtIHN0eWxlKCktPmNsaXBCb3R0b20oKS5j YWxjVmFsdWUoaGVpZ2h0KCkpOworICAgICAgICBjbGlwUmVjdC5jb250cmFjdCgwLCBoZWlnaHQo KSAtIHN0eWxlKCktPmNsaXBCb3R0b20oKS5jYWxjVmFsdWUoaGVpZ2h0KCkpKTsKIAotICAgIHJl dHVybiBJbnRSZWN0KGNsaXBYLCBjbGlwWSwgY2xpcFdpZHRoLCBjbGlwSGVpZ2h0KTsKKyAgICBy ZXR1cm4gY2xpcFJlY3Q7CiB9CiAKIGludCBSZW5kZXJCb3g6OmNvbnRhaW5pbmdCbG9ja0xvZ2lj YWxXaWR0aEZvckNvbnRlbnQoKSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guaAkocmV2aXNpb24gODgxNzEpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmgJKHdvcmtpbmcgY29weSkKQEAgLTM0Niw3ICszNDYsNyBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCBJbnRSZWN0IGxvY2FsQ2FyZXRSZWN0KElubGluZUJveCosIGludCBjYXJldE9mZnNl dCwgaW50KiBleHRyYVdpZHRoVG9FbmRPZkxpbmUgPSAwKTsKIAogICAgIHZpcnR1YWwgSW50UmVj dCBvdmVyZmxvd0NsaXBSZWN0KGNvbnN0IEludFBvaW50JiBsb2NhdGlvbiwgT3ZlcmxheVNjcm9s bGJhclNpemVSZWxldmFuY3kgPSBJZ25vcmVPdmVybGF5U2Nyb2xsYmFyU2l6ZSk7Ci0gICAgSW50 UmVjdCBjbGlwUmVjdChpbnQgdHgsIGludCB0eSk7CisgICAgSW50UmVjdCBjbGlwUmVjdChjb25z dCBJbnRQb2ludCYgbG9jYXRpb24pOwogICAgIHZpcnR1YWwgYm9vbCBoYXNDb250cm9sQ2xpcCgp IGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCBJbnRSZWN0IGNvbnRyb2xDbGlw UmVjdChjb25zdCBJbnRQb2ludCYpIGNvbnN0IHsgcmV0dXJuIEludFJlY3QoKTsgfQogICAgIGJv b2wgcHVzaENvbnRlbnRzQ2xpcChQYWludEluZm8mLCBpbnQgdHgsIGludCB0eSk7CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAJKHJldmlzaW9uIDg4MTcxKQor KysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzM4MCw3ICszMzgwLDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6Y2FsY3VsYXRlQ2xpcFJl Y3RzKGNvbgogICAgICAgICAgICAgICAgIGNsaXBSZWN0cy5zZXRQb3NDbGlwUmVjdChpbnRlcnNl Y3Rpb24obmV3T3ZlcmZsb3dDbGlwLCBjbGlwUmVjdHMucG9zQ2xpcFJlY3QoKSkpOwogICAgICAg ICB9CiAgICAgICAgIGlmIChyZW5kZXJlcigpLT5oYXNDbGlwKCkpIHsKLSAgICAgICAgICAgIElu dFJlY3QgbmV3UG9zQ2xpcCA9IHRvUmVuZGVyQm94KHJlbmRlcmVyKCkpLT5jbGlwUmVjdChvZmZz ZXQueCgpLCBvZmZzZXQueSgpKTsKKyAgICAgICAgICAgIEludFJlY3QgbmV3UG9zQ2xpcCA9IHRv UmVuZGVyQm94KHJlbmRlcmVyKCkpLT5jbGlwUmVjdChvZmZzZXQpOwogICAgICAgICAgICAgY2xp cFJlY3RzLnNldFBvc0NsaXBSZWN0KGludGVyc2VjdGlvbihuZXdQb3NDbGlwLCBjbGlwUmVjdHMu cG9zQ2xpcFJlY3QoKSkpOwogICAgICAgICAgICAgY2xpcFJlY3RzLnNldE92ZXJmbG93Q2xpcFJl Y3QoaW50ZXJzZWN0aW9uKG5ld1Bvc0NsaXAsIGNsaXBSZWN0cy5vdmVyZmxvd0NsaXBSZWN0KCkp KTsKICAgICAgICAgICAgIGNsaXBSZWN0cy5zZXRGaXhlZENsaXBSZWN0KGludGVyc2VjdGlvbihu ZXdQb3NDbGlwLCBjbGlwUmVjdHMuZml4ZWRDbGlwUmVjdCgpKSk7CkBAIC0zNDQxLDcgKzM0NDEs NyBAQCB2b2lkIFJlbmRlckxheWVyOjpjYWxjdWxhdGVSZWN0cyhjb25zdCBSCiAgICAgICAgICAg ICBmb3JlZ3JvdW5kUmVjdC5pbnRlcnNlY3QodG9SZW5kZXJCb3gocmVuZGVyZXIoKSktPm92ZXJm bG93Q2xpcFJlY3Qob2Zmc2V0LCByZWxldmFuY3kpKTsKICAgICAgICAgaWYgKHJlbmRlcmVyKCkt Pmhhc0NsaXAoKSkgewogICAgICAgICAgICAgLy8gQ2xpcCBhcHBsaWVzIHRvICp1cyogYXMgd2Vs bCwgc28gZ28gYWhlYWQgYW5kIHVwZGF0ZSB0aGUgZGFtYWdlUmVjdC4KLSAgICAgICAgICAgIElu dFJlY3QgbmV3UG9zQ2xpcCA9IHRvUmVuZGVyQm94KHJlbmRlcmVyKCkpLT5jbGlwUmVjdChvZmZz ZXQueCgpLCBvZmZzZXQueSgpKTsKKyAgICAgICAgICAgIEludFJlY3QgbmV3UG9zQ2xpcCA9IHRv UmVuZGVyQm94KHJlbmRlcmVyKCkpLT5jbGlwUmVjdChvZmZzZXQpOwogICAgICAgICAgICAgYmFj a2dyb3VuZFJlY3QuaW50ZXJzZWN0KG5ld1Bvc0NsaXApOwogICAgICAgICAgICAgZm9yZWdyb3Vu ZFJlY3QuaW50ZXJzZWN0KG5ld1Bvc0NsaXApOwogICAgICAgICAgICAgb3V0bGluZVJlY3QuaW50 ZXJzZWN0KG5ld1Bvc0NsaXApOwpAQCAtMzUxMiw3ICszNTEyLDcgQEAgdm9pZCBSZW5kZXJMYXll cjo6cmVwYWludEJsb2NrU2VsZWN0aW9uRwogICAgIGlmIChyZW5kZXJlcigpLT5oYXNPdmVyZmxv d0NsaXAoKSkKICAgICAgICAgcmVjdC5pbnRlcnNlY3QodG9SZW5kZXJCb3gocmVuZGVyZXIoKSkt Pm92ZXJmbG93Q2xpcFJlY3QoSW50UG9pbnQoKSkpOwogICAgIGlmIChyZW5kZXJlcigpLT5oYXND bGlwKCkpCi0gICAgICAgIHJlY3QuaW50ZXJzZWN0KHRvUmVuZGVyQm94KHJlbmRlcmVyKCkpLT5j bGlwUmVjdCgwLCAwKSk7CisgICAgICAgIHJlY3QuaW50ZXJzZWN0KHRvUmVuZGVyQm94KHJlbmRl cmVyKCkpLT5jbGlwUmVjdChJbnRQb2ludCgpKSk7CiAgICAgaWYgKCFyZWN0LmlzRW1wdHkoKSkK ICAgICAgICAgcmVuZGVyZXIoKS0+cmVwYWludFJlY3RhbmdsZShyZWN0KTsKIH0KSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCShyZXZp c2lvbiA4ODE3MSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tp bmcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMTksNyArMzE5LDcgQEAgc3RhdGljIEludFJlY3Qg Y2xpcEJveChSZW5kZXJCb3gqIHJlbmRlcgogICAgICAgICByZXN1bHQgPSByZW5kZXJlci0+b3Zl cmZsb3dDbGlwUmVjdChJbnRQb2ludCgpKTsKIAogICAgIGlmIChyZW5kZXJlci0+aGFzQ2xpcCgp KQotICAgICAgICByZXN1bHQuaW50ZXJzZWN0KHJlbmRlcmVyLT5jbGlwUmVjdCgwLCAwKSk7Cisg ICAgICAgIHJlc3VsdC5pbnRlcnNlY3QocmVuZGVyZXItPmNsaXBSZWN0KEludFBvaW50KCkpKTsK IAogICAgIHJldHVybiByZXN1bHQ7CiB9Cg==