40381 2010-06-09 11:49:55 -0700 [Qt] for debugging purposes I'm contributing back my FPS counter in the AnimationQtBase 2010-07-08 23:45:53 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Enhancement --- 38744 1 smagnuso webkit-unassigned commit-queue jedrzej.nowacki kenneth noam oldest_to_newest 235915 0 smagnuso 2010-06-09 11:49:55 -0700 Just hoping to have some way to compare changes in the graphicslayer between two sets of changes 235942 1 58277 smagnuso 2010-06-09 12:39:01 -0700 Created attachment 58277 Simply start a timer and count frames in the AnimationQtBase and spit out the FPS count at the end of a single animation. 237213 2 kenneth 2010-06-11 18:52:06 -0700 No'am, is this useful? 237225 3 noam 2010-06-11 19:27:10 -0700 It's not necessarily useful for me; but if it's useful for Sam and it's cleaned up for style a bit I have no objection. 237312 4 58559 smagnuso 2010-06-12 10:24:06 -0700 Created attachment 58559 Proposed patch with proper coding style 238830 5 58559 jedrzej.nowacki 2010-06-16 06:18:56 -0700 Comment on attachment 58559 Proposed patch with proper coding style Sam, the patch cann't be applied (you can check why by clicking on the violet "style" button) there are a few coding style issues, could you fix them? What about autotests? 238922 6 58898 smagnuso 2010-06-16 09:28:45 -0700 Created attachment 58898 Pull from origin and reapply patch, fix style issues. 238923 7 smagnuso 2010-06-16 09:29:46 -0700 (In reply to comment #5) > (From update of attachment 58559 [details]) > Sam, the patch cann't be applied (you can check why by clicking on the violet "style" button) > Thanks for that, I've pulled and resubmitted the patch. > there are a few coding style issues, could you fix them? Fixed. > What about autotests? I noted in the ChangeLog now that this is only a debugging aid and doesn't need a test. 238930 8 58898 kenneth 2010-06-16 09:57:18 -0700 Comment on attachment 58898 Pull from origin and reapply patch, fix style issues. In the future please make style changes not belonging to the patch itself in a separate patch WebCore/platform/graphics/qt/GraphicsLayerQt.cpp:45 + #define QT_DEBUG_FPS 1 You really want to summit it with 1 here? WebCore/platform/graphics/qt/GraphicsLayerQt.cpp:1131 + if ( newState == Running && oldState == Stopped ) { wrong style WebCore/platform/graphics/qt/GraphicsLayerQt.cpp:1135 + } else if ( newState == Stopped && oldState == Running ) { here as well WebCore/platform/graphics/qt/GraphicsLayerQt.cpp:1192 + int m_frames; here as well 238931 9 noam 2010-06-16 09:59:02 -0700 Agree with kenneth, this should be an opt-in (disabled by default) 238946 10 58904 smagnuso 2010-06-16 10:31:55 -0700 Created attachment 58904 Fix comments in last review 240319 11 58904 commit-queue 2010-06-19 05:15:16 -0700 Comment on attachment 58904 Fix comments in last review Rejecting patch 58904 from commit-queue. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Kenneth Rohde Christiansen', u'--force']" exit_code: 1 Last 500 characters of output: hangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebCore/platform/graphics/qt/GraphicsLayerQt.cpp Hunk #3 FAILED at 335. Hunk #4 FAILED at 658. Hunk #5 FAILED at 932. Hunk #6 succeeded at 1244 with fuzz 1 (offset 119 lines). Hunk #7 succeeded at 1299 with fuzz 2 (offset 118 lines). Hunk #8 succeeded at 1360 with fuzz 1 (offset 120 lines). Hunk #9 succeeded at 1411 (offset 121 lines). 3 out of 9 hunks FAILED -- saving rejects to file WebCore/platform/graphics/qt/GraphicsLayerQt.cpp.rej Full output: http://webkit-commit-queue.appspot.com/results/3286377 240921 12 59300 smagnuso 2010-06-21 15:25:47 -0700 Created attachment 59300 rebase and rediff 240922 13 smagnuso 2010-06-21 15:26:27 -0700 (In reply to comment #11) > (From update of attachment 58904 [details]) > Rejecting patch 58904 from commit-queue. > I'm not clear why this went wrong at all - I didn't see any conflicts in the change. I've rebase'd to origin and done the diff again, hope that solves it. 240949 14 59300 noam 2010-06-21 16:18:14 -0700 Comment on attachment 59300 rebase and rediff Clearing the flags, it still doesn't apply cleanly, we're working on it :) 241419 15 58904 eric 2010-06-22 13:23:54 -0700 Comment on attachment 58904 Fix comments in last review Cleared Kenneth Rohde Christiansen's review+ from obsolete attachment 58904 so that this bug does not appear in http://webkit.org/pending-commit. 241513 16 59435 smagnuso 2010-06-22 16:11:17 -0700 Created attachment 59435 Rediff against trunk 243063 17 59435 commit-queue 2010-06-25 10:13:31 -0700 Comment on attachment 59435 Rediff against trunk Rejecting patch 59435 from commit-queue. Unexpected failure when processing patch! Please file a bug against webkit-patch. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=webkit-commit-queue.appspot.com', 'land-attachment', '--force-clean', '--build', '--non-interactive', '--ignore-builders', '--build-style=both', '--quiet', 59435, '--test', '--parent-command=commit-queue', '--no-update']" exit_code: 1 Last 500 characters of output: webkitpy/tool/commands/stepsequence.py", line 60, in _run step(tool, options).run(state) File "/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 68, in run if self._has_valid_reviewer(changelog_entry): File "/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 50, in _has_valid_reviewer if changelog_entry.reviewer(): AttributeError: 'NoneType' object has no attribute 'reviewer' 243084 18 59435 abarth 2010-06-25 11:14:27 -0700 Comment on attachment 59435 Rediff against trunk + 2010-06-09 Sam Magnuson <smagnuson@netflix.com> Your ChangeLog is malformed. 243088 19 59781 smagnuso 2010-06-25 11:24:34 -0700 Created attachment 59781 Patch 243090 20 smagnuso 2010-06-25 11:24:51 -0700 (In reply to comment #18) > (From update of attachment 59435 [details]) > + 2010-06-09 Sam Magnuson <smagnuson@netflix.com> > > Your ChangeLog is malformed. Fixed. 248769 21 59781 commit-queue 2010-07-08 23:45:47 -0700 Comment on attachment 59781 Patch Clearing flags on attachment: 59781 Committed r62899: <http://trac.webkit.org/changeset/62899> 248770 22 commit-queue 2010-07-08 23:45:53 -0700 All reviewed patches have been landed. Closing bug. 58277 2010-06-09 12:39:01 -0700 2010-06-12 10:24:06 -0700 Simply start a timer and count frames in the AnimationQtBase and spit out the FPS count at the end of a single animation. 0006-add-in-the-fps-counter.patch text/plain 4248 smagnuso RnJvbSAxM2Q5Zjk4M2FhOWM3MGRmYTBkMzQ1MGZjYjhiN2FhZGExZGU0Y2EzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBzbWFnbnVzb24gPHNtYWdudXNvQGdtYWlsLmNvbT4KRGF0ZTog VHVlLCA4IEp1biAyMDEwIDEyOjM1OjE5IC0wNzAwClN1YmplY3Q6IFtQQVRDSCA2LzhdIGFkZCBp biB0aGUgZnBzIGNvdW50ZXIKCmNoYW5nZWxvZyBmb3IgZTY4Yzc1ODFiMmZmZDhhNjA5M2YzOTAz YWJmODcyODZjNTAxN2M0ZgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB8ICAgMTkgKysrKysrKysrKysrKysKIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcCB8ICAgMjkgKysrKysrKysrKysrKysrKysrKyst CiAyIGZpbGVzIGNoYW5nZWQsIDQ2IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxOTdm MDlkLi44YTYyMWQwIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMiw2ICsyLDI1IEBACiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCiAKKwlbUXRdIGZvciBkZWJ1Z2dpbmcgcHVycG9zZXMgbmljZSBJJ20gY29udHJp YnV0aW5nIGJhY2sgbXkgRlBTCisJY291bnRlciBpbiB0aGUgQW5pbWF0aW9uUXRCYXNlCisJaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwMzgxCisKKwlTaW1wbHkgc3Rh cnQgYSB0aW1lciBhbmQgY291bnQgZnJhbWVzIGluIHRoZSBBbmltYXRpb25RdEJhc2UgYW5kCisJ c3BpdCBvdXQgdGhlIEZQUyBjb3VudCBhdCB0aGUgZW5kIG9mIGEgc2luZ2xlIGFuaW1hdGlvbi4K KwkKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0 aW9uUXQ6OnVwZGF0ZVN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvblF0Ojp1cGRh dGVDdXJyZW50VGltZSk6CisgICAgICAgIChXZWJDb3JlOjpUcmFuc2Zvcm1BbmltYXRpb25RdDo6 dXBkYXRlU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6T3BhY2l0eUFuaW1hdGlvblF0Ojp1cGRh dGVTdGF0ZSk6CisKKzIwMTAtMDYtMDkgIFNhbSBNYWdudXNvbiAgPHNtYWdudXNvbkBuZXRmbGl4 LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogCVtRdF0gV2hl biBhIGxheWVyIGlzIHJlYWxseSBvcGFxdWUgKGllIGhhcyBhIGJhY2tncm91bmQgY29sb3IgdGhh dAogCWhhcyAyNTUgYWxwaGEpIHdlIHNob3VsZCBmaWxsIHRoZSBsYXllciB3aXRoIHRoYXQgY29s b3IgdG8gdGVsbCBRdAogCXRoYXQgdGhlIHBpeGVtYXAgaGFzIG5vIGFscGhhLgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwCmluZGV4IDgxYmMx OTguLjlhNTNhZDggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3Jh cGhpY3NMYXllclF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBo aWNzTGF5ZXJRdC5jcHAKQEAgLTI5LDYgKzI5LDcgQEAKICNpbmNsdWRlICJVbml0QmV6aWVyLmgi CiAjaW5jbHVkZSA8UXRDb3JlL3FhYnN0cmFjdGFuaW1hdGlvbi5oPgogI2luY2x1ZGUgPFF0Q29y ZS9xZGVidWcuaD4KKyNpbmNsdWRlIDxRdENvcmUvcWRhdGV0aW1lLmg+CiAjaW5jbHVkZSA8UXRD b3JlL3FtZXRhb2JqZWN0Lmg+CiAjaW5jbHVkZSA8UXRDb3JlL3FzZXQuaD4KICNpbmNsdWRlIDxR dENvcmUvcXRpbWVyLmg+CkBAIC00MSw2ICs0Miw3IEBACiAjaW5jbHVkZSA8UXRHdWkvcXBpeG1h cGNhY2hlLmg+CiAjaW5jbHVkZSA8UXRHdWkvcXN0eWxlb3B0aW9uLmg+CiAKKyNkZWZpbmUgTkZf REVCVUdfRlBTCiAvLyNkZWZpbmUgTkZfREVCVUdfQ0FDSEVEVU1QCiAvLyNkZWZpbmUgTkZfREVC VUdfUkVDQUNIRQogCkBAIC0xMjQwLDYgKzEyNDIsMjIgQEAgcHJvdGVjdGVkOgogICAgIC8vIHRo aXMgaXMgdGhlIHBhcnQgdGhhdCBkaWZmZXJzIGJldHdlZW4gYW5pbWF0ZWQgcHJvcGVydGllcwog ICAgIHZpcnR1YWwgdm9pZCBhcHBseUZyYW1lKGNvbnN0IFQmIGZyb21WYWx1ZSwgY29uc3QgVCYg dG9WYWx1ZSwgcXJlYWwgcHJvZ3Jlc3MpID0gMDsKIAorICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVT dGF0ZShRQWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG5ld1N0YXRlLCBRQWJzdHJhY3RBbmltYXRp b246OlN0YXRlIG9sZFN0YXRlKQorICAgIHsKKyNpZmRlZiBORl9ERUJVR19GUFMKKyAgICAgICAg aWYgKG5ld1N0YXRlID09IFJ1bm5pbmcgJiYgb2xkU3RhdGUgPT0gU3RvcHBlZCApIHsKKwkJCXFE ZWJ1ZyggIkFuaW1hdGlvbiBTdGFydGVkISIgKTsKKwkJCW1fZnJhbWVzID0gMDsKKwkJCW1fZHVy YXRpb24uc3RhcnQoKTsKKwkJfSBlbHNlIGlmIChuZXdTdGF0ZSA9PSBTdG9wcGVkICYmIG9sZFN0 YXRlID09IFJ1bm5pbmcgKSB7CisJCQljb25zdCBpbnQgZHVyYXRpb24gPSBtX2R1cmF0aW9uLmVs YXBzZWQoKTsKKwkJCXFEZWJ1ZyggIkFuaW1hdGlvbiBFbmRlZCEgJWRtcyBbJWYgRlBTXSIsIGR1 cmF0aW9uLAorCQkJCQkoMTAwMCAvICgoKGZsb2F0KWR1cmF0aW9uKSAvIG1fZnJhbWVzKSkgKTsK KwkJfQorI2VuZGlmCisgICAgICAgIEFuaW1hdGlvblF0QmFzZTo6dXBkYXRlU3RhdGUobmV3U3Rh dGUsIG9sZFN0YXRlKTsKKwl9CisKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQ3VycmVudFRpbWUo aW50IGN1cnJlbnRUaW1lKQogICAgIHsKICAgICAgICAgaWYgKCFtX2xheWVyKQpAQCAtMTI4MCw5 ICsxMjk4LDE2IEBAIHByb3RlY3RlZDoKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgPyBwcm9ncmVzcwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICA6IGFwcGx5VGltaW5nRnVuY3Rpb24odGltaW5nRnVuYywgKHByb2dyZXNzIC0gaXQua2V5 KCkpIC8gKGl0Mi5rZXkoKSAtIGl0LmtleSgpKSwgZHVyYXRpb24oKSk7CiAgICAgICAgIGFwcGx5 RnJhbWUoZnJvbVZhbHVlLCB0b1ZhbHVlLCBwcm9ncmVzcyk7CisjaWZkZWYgTkZfREVCVUdfRlBT CisJCSsrbV9mcmFtZXM7CisjZW5kaWYKICAgICB9CiAKICAgICBRTWFwPHFyZWFsLCBLZXlmcmFt ZVZhbHVlUXQ8VD4gPiBtX2tleWZyYW1lVmFsdWVzOworI2lmZGVmIE5GX0RFQlVHX0ZQUworCVFU aW1lIG1fZHVyYXRpb247CisJaW50ICAgbV9mcmFtZXM7CisjZW5kaWYKIH07CiAKIGNsYXNzIFRy YW5zZm9ybUFuaW1hdGlvblF0IDogcHVibGljIEFuaW1hdGlvblF0PFRyYW5zZm9ybU9wZXJhdGlv bnM+IHsKQEAgLTEzMzIsNyArMTM1Nyw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCB1 cGRhdGVTdGF0ZShRQWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG5ld1N0YXRlLCBRQWJzdHJhY3RB bmltYXRpb246OlN0YXRlIG9sZFN0YXRlKQogICAgIHsKLSAgICAgICAgQW5pbWF0aW9uUXRCYXNl Ojp1cGRhdGVTdGF0ZShuZXdTdGF0ZSwgb2xkU3RhdGUpOworICAgICAgICBBbmltYXRpb25RdDxU cmFuc2Zvcm1PcGVyYXRpb25zPjo6dXBkYXRlU3RhdGUobmV3U3RhdGUsIG9sZFN0YXRlKTsKICAg ICAgICAgaWYgKCFtX2xheWVyKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBtX2xheWVy LmRhdGEoKS0+Zmx1c2hDaGFuZ2VzKHRydWUpOwpAQCAtMTM4NCw3ICsxNDA5LDcgQEAgcHVibGlj OgogCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVN0YXRlKFFBYnN0cmFjdEFuaW1hdGlvbjo6U3Rh dGUgbmV3U3RhdGUsIFFBYnN0cmFjdEFuaW1hdGlvbjo6U3RhdGUgb2xkU3RhdGUpCiAgICAgewot ICAgICAgICBRQWJzdHJhY3RBbmltYXRpb246OnVwZGF0ZVN0YXRlKG5ld1N0YXRlLCBvbGRTdGF0 ZSk7CisgICAgICAgIEFuaW1hdGlvblF0PHFyZWFsPjo6dXBkYXRlU3RhdGUobmV3U3RhdGUsIG9s ZFN0YXRlKTsKIAogICAgICAgICBpZiAobV9sYXllcikKICAgICAgICAgICAgIG1fbGF5ZXIuZGF0 YSgpLT5tX29wYWNpdHlBbmltYXRpb25SdW5uaW5nID0gKG5ld1N0YXRlID09IFFBYnN0cmFjdEFu aW1hdGlvbjo6UnVubmluZyk7Ci0tIAoxLjcuMQoK 58559 2010-06-12 10:24:06 -0700 2010-06-16 09:28:45 -0700 Proposed patch with proper coding style bug-40381.patch text/plain 5221 smagnuso RnJvbSA0ZWYwMmM2ZjkyMWQxMzFmZTA0ZDliZTU4Yzk1OTU2Y2M0YzNmMjFmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTYW0gTWFnbnVzb24gPHNtYWdudXNvbkBuZXRmbGl4LmNvbT4K RGF0ZTogRnJpLCAxMSBKdW4gMjAxMCAyMzozNjoxOCAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gZm9yIGRlYnVnZ2luZyBwdXJwb3NlcyBJJ20gY29udHJpYnV0aW5nIGJhY2sgbXkgRlBTIGNv dW50ZXIgaW4gdGhlIEFuaW1hdGlvblF0QmFzZQogYnVnIC0gNDAzODEKCi0tLQogV2ViQ29yZS9D aGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxOSArKysrKysrKysr KwogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwIHwgICAz NiArKysrKysrKysrKysrKysrKysrLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDUwIGluc2VydGlvbnMo KyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCAxZDlkNzM5Li4zOTg3NDU3IDEwMDY0NAotLS0gYS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEw LTA2LTA5ICBTYW0gTWFnbnVzb24gIDxzbWFnbnVzb25AbmV0ZmxpeC5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBmb3IgZGVidWdnaW5n IHB1cnBvc2VzIG5pY2UgSSdtIGNvbnRyaWJ1dGluZyBiYWNrIG15IEZQUworICAgICAgICBjb3Vu dGVyIGluIHRoZSBBbmltYXRpb25RdEJhc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQwMzgxCisKKyAgICAgICAgU2ltcGx5IHN0YXJ0IGEgdGltZXIg YW5kIGNvdW50IGZyYW1lcyBpbiB0aGUgQW5pbWF0aW9uUXRCYXNlIGFuZAorICAgICAgICBzcGl0 IG91dCB0aGUgRlBTIGNvdW50IGF0IHRoZSBlbmQgb2YgYSBzaW5nbGUgYW5pbWF0aW9uLgorICAg ICAgICAKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QW5p bWF0aW9uUXQ6OnVwZGF0ZVN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvblF0Ojp1 cGRhdGVDdXJyZW50VGltZSk6CisgICAgICAgIChXZWJDb3JlOjpUcmFuc2Zvcm1BbmltYXRpb25R dDo6dXBkYXRlU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6T3BhY2l0eUFuaW1hdGlvblF0Ojp1 cGRhdGVTdGF0ZSk6CisKIDIwMTAtMDYtMDcgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1 cmNvdHRlQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0 LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcApp bmRleCBiZTQ0ZmNhLi5kNGNlZGJhIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9xdC9HcmFwaGljc0xheWVyUXQuY3BwCkBAIC0yOCw2ICsyOCw3IEBACiAjaW5jbHVkZSAiVHJh bnNsYXRlVHJhbnNmb3JtT3BlcmF0aW9uLmgiCiAjaW5jbHVkZSAiVW5pdEJlemllci5oIgogI2lu Y2x1ZGUgPFF0Q29yZS9xYWJzdHJhY3RhbmltYXRpb24uaD4KKyNpbmNsdWRlIDxRdENvcmUvcWRh dGV0aW1lLmg+CiAjaW5jbHVkZSA8UXRDb3JlL3FkZWJ1Zy5oPgogI2luY2x1ZGUgPFF0Q29yZS9x bWV0YW9iamVjdC5oPgogI2luY2x1ZGUgPFF0Q29yZS9xc2V0Lmg+CkBAIC00MSw2ICs0Miw4IEBA CiAjaW5jbHVkZSA8UXRHdWkvcXBpeG1hcGNhY2hlLmg+CiAjaW5jbHVkZSA8UXRHdWkvcXN0eWxl b3B0aW9uLmg+CiAKKyNkZWZpbmUgTkZfREVCVUdfRlBTCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogI2lmbmRlZiBRVF9OT19HUkFQSElDU0VGRkVDVApAQCAtMzMxLDcgKzMzNCw3IEBAIFFQaXht YXAgR3JhcGhpY3NMYXllclF0SW1wbDo6cmVjYWNoZShjb25zdCBRUmVnaW9uJiByZWdpb25Ub1Vw ZGF0ZSkKICAgICBwYWludGVyLnNldENvbXBvc2l0aW9uTW9kZShRUGFpbnRlcjo6Q29tcG9zaXRp b25Nb2RlX1NvdXJjZU92ZXIpOwogICAgIG1fbGF5ZXItPnBhaW50R3JhcGhpY3NMYXllckNvbnRl bnRzKGdjLCByZWdpb24uYm91bmRpbmdSZWN0KCkpOwogCi0gICAgbV9iYWNraW5nU3RvcmVLZXkg PSBRUGl4bWFwQ2FjaGU6Omluc2VydChwaXhtYXApOyAgICAKKyAgICBtX2JhY2tpbmdTdG9yZUtl eSA9IFFQaXhtYXBDYWNoZTo6aW5zZXJ0KHBpeG1hcCk7CiAgICAgcmV0dXJuIHBpeG1hcDsKIH0K IApAQCAtNjU0LDcgKzY1Nyw3IEBAIGFmdGVyTGF5ZXJDaGFuZ2VzOgogICAgICAgICB1cGRhdGVU cmFuc2Zvcm0oKTsKIAogICAgIGlmICghcmVjdXJzaXZlKQotICAgICAgICByZXR1cm47ICAgIAor ICAgICAgICByZXR1cm47CiAKICAgICBRTGlzdDxRR3JhcGhpY3NJdGVtKj4gY2hpbGRyZW4gPSBj aGlsZEl0ZW1zKCk7CiAgICAgaWYgKG1fc3RhdGUubWFza0xheWVyKQpAQCAtOTI4LDcgKzkzMSw3 IEBAIHZvaWQgR3JhcGhpY3NMYXllclF0OjpzZXRDb250ZW50c1RvSW1hZ2UoSW1hZ2UqIGltYWdl KQogICAgICAgICAgICAgbV9pbXBsLT5tX3BlbmRpbmdDb250ZW50LnBpeG1hcCA9ICpweG07CiAg ICAgICAgICAgICBtX2ltcGwtPm1fcGVuZGluZ0NvbnRlbnQuY29udGVudFR5cGUgPSBHcmFwaGlj c0xheWVyUXRJbXBsOjpQaXhtYXBDb250ZW50VHlwZTsKICAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgfSAgICAgICAgCisgICAgICAgIH0KICAgICB9CiAgICAgbV9pbXBsLT5tX3BlbmRpbmdD b250ZW50LnBpeG1hcCA9IFFQaXhtYXAoKTsKIH0KQEAgLTExMjEsNiArMTEyNCwyMiBAQCBwcm90 ZWN0ZWQ6CiAgICAgLy8gdGhpcyBpcyB0aGUgcGFydCB0aGF0IGRpZmZlcnMgYmV0d2VlbiBhbmlt YXRlZCBwcm9wZXJ0aWVzCiAgICAgdmlydHVhbCB2b2lkIGFwcGx5RnJhbWUoY29uc3QgVCYgZnJv bVZhbHVlLCBjb25zdCBUJiB0b1ZhbHVlLCBxcmVhbCBwcm9ncmVzcykgPSAwOwogCisgICAgdmly dHVhbCB2b2lkIHVwZGF0ZVN0YXRlKFFBYnN0cmFjdEFuaW1hdGlvbjo6U3RhdGUgbmV3U3RhdGUs IFFBYnN0cmFjdEFuaW1hdGlvbjo6U3RhdGUgb2xkU3RhdGUpCisgICAgeworI2lmZGVmIE5GX0RF QlVHX0ZQUworICAgICAgICBpZiAoIG5ld1N0YXRlID09IFJ1bm5pbmcgJiYgb2xkU3RhdGUgPT0g U3RvcHBlZCApIHsKKyAgICAgICAgICAgIHFEZWJ1ZygiQW5pbWF0aW9uIFN0YXJ0ZWQhIik7Cisg ICAgICAgICAgICBtX2ZyYW1lcyA9IDA7CisgICAgICAgICAgICBtX2R1cmF0aW9uLnN0YXJ0KCk7 CisgICAgICAgIH0gZWxzZSBpZiAoIG5ld1N0YXRlID09IFN0b3BwZWQgJiYgb2xkU3RhdGUgPT0g UnVubmluZyApIHsKKyAgICAgICAgICAgIGNvbnN0IGludCBkdXJhdGlvbiA9IG1fZHVyYXRpb24u ZWxhcHNlZCgpOworICAgICAgICAgICAgcURlYnVnKCJBbmltYXRpb24gRW5kZWQhICVkbXMgWyVm IEZQU10iLCBkdXJhdGlvbiwKKyAgICAgICAgICAgICAgICAgICAgKDEwMDAgLyAoKChmbG9hdClk dXJhdGlvbikgLyBtX2ZyYW1lcykpKTsKKyAgICAgICAgfQorI2VuZGlmCisgICAgICAgIEFuaW1h dGlvblF0QmFzZTo6dXBkYXRlU3RhdGUobmV3U3RhdGUsIG9sZFN0YXRlKTsKKyAgICB9CisKICAg ICB2aXJ0dWFsIHZvaWQgdXBkYXRlQ3VycmVudFRpbWUoaW50IGN1cnJlbnRUaW1lKQogICAgIHsK ICAgICAgICAgaWYgKCFtX2xheWVyKQpAQCAtMTE2MSw5ICsxMTgwLDE2IEBAIHByb3RlY3RlZDoK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPyBwcm9ncmVzcwogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6IGFwcGx5VGltaW5nRnVuY3Rp b24odGltaW5nRnVuYywgKHByb2dyZXNzIC0gaXQua2V5KCkpIC8gKGl0Mi5rZXkoKSAtIGl0Lmtl eSgpKSwgZHVyYXRpb24oKSk7CiAgICAgICAgIGFwcGx5RnJhbWUoZnJvbVZhbHVlLCB0b1ZhbHVl LCBwcm9ncmVzcyk7CisjaWZkZWYgTkZfREVCVUdfRlBTCisgICAgICAgICAgICAgICAgKyttX2Zy YW1lczsKKyNlbmRpZgogICAgIH0KIAogICAgIFFNYXA8cXJlYWwsIEtleWZyYW1lVmFsdWVRdDxU PiA+IG1fa2V5ZnJhbWVWYWx1ZXM7CisjaWZkZWYgTkZfREVCVUdfRlBTCisgICAgICAgIFFUaW1l IG1fZHVyYXRpb247CisgICAgICAgIGludCAgIG1fZnJhbWVzOworI2VuZGlmCiB9OwogCiBjbGFz cyBUcmFuc2Zvcm1BbmltYXRpb25RdCA6IHB1YmxpYyBBbmltYXRpb25RdDxUcmFuc2Zvcm1PcGVy YXRpb25zPiB7CkBAIC0xMjEzLDcgKzEyMzksNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZv aWQgdXBkYXRlU3RhdGUoUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSBuZXdTdGF0ZSwgUUFic3Ry YWN0QW5pbWF0aW9uOjpTdGF0ZSBvbGRTdGF0ZSkKICAgICB7Ci0gICAgICAgIEFuaW1hdGlvblF0 QmFzZTo6dXBkYXRlU3RhdGUobmV3U3RhdGUsIG9sZFN0YXRlKTsKKyAgICAgICAgQW5pbWF0aW9u UXQ8VHJhbnNmb3JtT3BlcmF0aW9ucz46OnVwZGF0ZVN0YXRlKG5ld1N0YXRlLCBvbGRTdGF0ZSk7 CiAgICAgICAgIGlmICghbV9sYXllcikKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgbV9s YXllci5kYXRhKCktPmZsdXNoQ2hhbmdlcyh0cnVlKTsKQEAgLTEyNjMsNyArMTI4OSw3IEBAIHB1 YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVTdGF0ZShRQWJzdHJhY3RBbmltYXRpb246 OlN0YXRlIG5ld1N0YXRlLCBRQWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG9sZFN0YXRlKQogICAg IHsKLSAgICAgICAgUUFic3RyYWN0QW5pbWF0aW9uOjp1cGRhdGVTdGF0ZShuZXdTdGF0ZSwgb2xk U3RhdGUpOworICAgICAgICBBbmltYXRpb25RdDxxcmVhbD46OnVwZGF0ZVN0YXRlKG5ld1N0YXRl LCBvbGRTdGF0ZSk7CiAKICAgICAgICAgaWYgKG1fbGF5ZXIpCiAgICAgICAgICAgICBtX2xheWVy LmRhdGEoKS0+bV9vcGFjaXR5QW5pbWF0aW9uUnVubmluZyA9IChuZXdTdGF0ZSA9PSBRQWJzdHJh Y3RBbmltYXRpb246OlJ1bm5pbmcpOwotLSAKMS43LjEKCg== 58898 2010-06-16 09:28:45 -0700 2010-06-16 10:31:55 -0700 Pull from origin and reapply patch, fix style issues. bug-40381.patch text/plain 5156 smagnuso RnJvbSBkNWIxZTQ3MzcxZjQzMDQ0MDgwZmYzMDk0MzNkOWQwZDQyMzExYzRmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTYW0gTWFnbnVzb24gPHNtYWdudXNvbkBuZXRmbGl4LmNvbT4K RGF0ZTogRnJpLCAxMSBKdW4gMjAxMCAyMzozNjoxOCAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gZm9yIGRlYnVnZ2luZyBwdXJwb3NlcyBJJ20gY29udHJpYnV0aW5nIGJhY2sgbXkgRlBTIGNv dW50ZXIgaW4gdGhlIEFuaW1hdGlvblF0QmFzZQogYnVnIC0gNDAzODEKCi0tLQogV2ViQ29yZS9D aGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxOSArKysrKysrKysr KwogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwIHwgICAz NiArKysrKysrKysrKysrKysrKysrLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDUwIGluc2VydGlvbnMo KyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCBlMDQ3MjlkLi43NjhiNzQwIDEwMDY0NAotLS0gYS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEw LTA2LTA5ICBTYW0gTWFnbnVzb24gIDxzbWFnbnVzb25AbmV0ZmxpeC5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBmb3IgZGVidWdnaW5n IHB1cnBvc2VzIG5pY2UgSSdtIGNvbnRyaWJ1dGluZyBiYWNrIG15IEZQUworICAgICAgICBjb3Vu dGVyIGluIHRoZSBBbmltYXRpb25RdEJhc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQwMzgxCisKKyAgICAgICAgU2ltcGx5IHN0YXJ0IGEgdGltZXIg YW5kIGNvdW50IGZyYW1lcyBpbiB0aGUgQW5pbWF0aW9uUXRCYXNlIGFuZAorICAgICAgICBzcGl0 IG91dCB0aGUgRlBTIGNvdW50IGF0IHRoZSBlbmQgb2YgYSBzaW5nbGUgYW5pbWF0aW9uLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0czogdGhpcyBpcyBhIHNpbXBsZSBkZWJ1Z2dpbmcgYWlkLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkFuaW1hdGlvblF0Ojp1cGRhdGVTdGF0ZSk6CisgICAgICAgIChXZWJDb3Jl OjpBbmltYXRpb25RdDo6dXBkYXRlQ3VycmVudFRpbWUpOgorICAgICAgICAoV2ViQ29yZTo6VHJh bnNmb3JtQW5pbWF0aW9uUXQ6OnVwZGF0ZVN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6Ok9wYWNp dHlBbmltYXRpb25RdDo6dXBkYXRlU3RhdGUpOgorCiAyMDEwLTA2LTEzICBOb2FtIFJvc2VudGhh bCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmlj IFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhp Y3NMYXllclF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXll clF0LmNwcAppbmRleCBhZDJlYzljLi40ODVkNzI0IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwCkBAIC0yOCw2ICsyOCw3IEBACiAjaW5j bHVkZSAiVHJhbnNsYXRlVHJhbnNmb3JtT3BlcmF0aW9uLmgiCiAjaW5jbHVkZSAiVW5pdEJlemll ci5oIgogI2luY2x1ZGUgPFF0Q29yZS9xYWJzdHJhY3RhbmltYXRpb24uaD4KKyNpbmNsdWRlIDxR dENvcmUvcWRhdGV0aW1lLmg+CiAjaW5jbHVkZSA8UXRDb3JlL3FkZWJ1Zy5oPgogI2luY2x1ZGUg PFF0Q29yZS9xbWV0YW9iamVjdC5oPgogI2luY2x1ZGUgPFF0Q29yZS9xc2V0Lmg+CkBAIC00MSw2 ICs0Miw4IEBACiAjaW5jbHVkZSA8UXRHdWkvcXBpeG1hcGNhY2hlLmg+CiAjaW5jbHVkZSA8UXRH dWkvcXN0eWxlb3B0aW9uLmg+CiAKKyNkZWZpbmUgUVRfREVCVUdfRlBTIDEKKwogbmFtZXNwYWNl IFdlYkNvcmUgewogCiAjaWZuZGVmIFFUX05PX0dSQVBISUNTRUZGRUNUCkBAIC0zMzIsNyArMzM1 LDcgQEAgUVBpeG1hcCBHcmFwaGljc0xheWVyUXRJbXBsOjpyZWNhY2hlKGNvbnN0IFFSZWdpb24m IHJlZ2lvblRvVXBkYXRlKQogICAgIG1fbGF5ZXItPnBhaW50R3JhcGhpY3NMYXllckNvbnRlbnRz KGdjLCByZWdpb24uYm91bmRpbmdSZWN0KCkpOwogICAgIHBhaW50ZXIuZW5kKCk7CiAKLSAgICBt X2JhY2tpbmdTdG9yZUtleSA9IFFQaXhtYXBDYWNoZTo6aW5zZXJ0KHBpeG1hcCk7ICAgIAorICAg IG1fYmFja2luZ1N0b3JlS2V5ID0gUVBpeG1hcENhY2hlOjppbnNlcnQocGl4bWFwKTsKICAgICBy ZXR1cm4gcGl4bWFwOwogfQogCkBAIC02NTUsNyArNjU4LDcgQEAgYWZ0ZXJMYXllckNoYW5nZXM6 CiAgICAgICAgIHVwZGF0ZVRyYW5zZm9ybSgpOwogCiAgICAgaWYgKCFyZWN1cnNpdmUpCi0gICAg ICAgIHJldHVybjsgICAgCisgICAgICAgIHJldHVybjsKIAogICAgIFFMaXN0PFFHcmFwaGljc0l0 ZW0qPiBjaGlsZHJlbiA9IGNoaWxkSXRlbXMoKTsKICAgICBpZiAobV9zdGF0ZS5tYXNrTGF5ZXIp CkBAIC05MjksNyArOTMyLDcgQEAgdm9pZCBHcmFwaGljc0xheWVyUXQ6OnNldENvbnRlbnRzVG9J bWFnZShJbWFnZSogaW1hZ2UpCiAgICAgICAgICAgICBtX2ltcGwtPm1fcGVuZGluZ0NvbnRlbnQu cGl4bWFwID0gKnB4bTsKICAgICAgICAgICAgIG1faW1wbC0+bV9wZW5kaW5nQ29udGVudC5jb250 ZW50VHlwZSA9IEdyYXBoaWNzTGF5ZXJRdEltcGw6OlBpeG1hcENvbnRlbnRUeXBlOwogICAgICAg ICAgICAgcmV0dXJuOwotICAgICAgICB9ICAgICAgICAKKyAgICAgICAgfQogICAgIH0KICAgICBt X2ltcGwtPm1fcGVuZGluZ0NvbnRlbnQucGl4bWFwID0gUVBpeG1hcCgpOwogfQpAQCAtMTEyMiw2 ICsxMTI1LDIyIEBAIHByb3RlY3RlZDoKICAgICAvLyB0aGlzIGlzIHRoZSBwYXJ0IHRoYXQgZGlm ZmVycyBiZXR3ZWVuIGFuaW1hdGVkIHByb3BlcnRpZXMKICAgICB2aXJ0dWFsIHZvaWQgYXBwbHlG cmFtZShjb25zdCBUJiBmcm9tVmFsdWUsIGNvbnN0IFQmIHRvVmFsdWUsIHFyZWFsIHByb2dyZXNz KSA9IDA7CiAKKyAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU3RhdGUoUUFic3RyYWN0QW5pbWF0aW9u OjpTdGF0ZSBuZXdTdGF0ZSwgUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSBvbGRTdGF0ZSkKKyAg ICB7CisjaWYgUVRfREVCVUdfRlBTCisgICAgICAgIGlmICggbmV3U3RhdGUgPT0gUnVubmluZyAm JiBvbGRTdGF0ZSA9PSBTdG9wcGVkICkgeworICAgICAgICAgICAgcURlYnVnKCJBbmltYXRpb24g U3RhcnRlZCEiKTsKKyAgICAgICAgICAgIG1fZnJhbWVzID0gMDsKKyAgICAgICAgICAgIG1fZHVy YXRpb24uc3RhcnQoKTsKKyAgICAgICAgfSBlbHNlIGlmICggbmV3U3RhdGUgPT0gU3RvcHBlZCAm JiBvbGRTdGF0ZSA9PSBSdW5uaW5nICkgeworICAgICAgICAgICAgY29uc3QgaW50IGR1cmF0aW9u ID0gbV9kdXJhdGlvbi5lbGFwc2VkKCk7CisgICAgICAgICAgICBxRGVidWcoIkFuaW1hdGlvbiBF bmRlZCEgJWRtcyBbJWYgRlBTXSIsIGR1cmF0aW9uLAorICAgICAgICAgICAgICAgICAgICAoMTAw MCAvICgoKGZsb2F0KWR1cmF0aW9uKSAvIG1fZnJhbWVzKSkpOworICAgICAgICB9CisjZW5kaWYK KyAgICAgICAgQW5pbWF0aW9uUXRCYXNlOjp1cGRhdGVTdGF0ZShuZXdTdGF0ZSwgb2xkU3RhdGUp OworICAgIH0KKwogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVDdXJyZW50VGltZShpbnQgY3VycmVu dFRpbWUpCiAgICAgewogICAgICAgICBpZiAoIW1fbGF5ZXIpCkBAIC0xMTYyLDkgKzExODEsMTYg QEAgcHJvdGVjdGVkOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA/ IHByb2dyZXNzCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogYXBw bHlUaW1pbmdGdW5jdGlvbih0aW1pbmdGdW5jLCAocHJvZ3Jlc3MgLSBpdC5rZXkoKSkgLyAoaXQy LmtleSgpIC0gaXQua2V5KCkpLCBkdXJhdGlvbigpKTsKICAgICAgICAgYXBwbHlGcmFtZShmcm9t VmFsdWUsIHRvVmFsdWUsIHByb2dyZXNzKTsKKyNpZiBRVF9ERUJVR19GUFMKKyAgICAgICAgKytt X2ZyYW1lczsKKyNlbmRpZgogICAgIH0KIAogICAgIFFNYXA8cXJlYWwsIEtleWZyYW1lVmFsdWVR dDxUPiA+IG1fa2V5ZnJhbWVWYWx1ZXM7CisjaWYgUVRfREVCVUdfRlBTCisgICAgUVRpbWUgbV9k dXJhdGlvbjsKKyAgICBpbnQgICBtX2ZyYW1lczsKKyNlbmRpZgogfTsKIAogY2xhc3MgVHJhbnNm b3JtQW5pbWF0aW9uUXQgOiBwdWJsaWMgQW5pbWF0aW9uUXQ8VHJhbnNmb3JtT3BlcmF0aW9ucz4g ewpAQCAtMTIxNCw3ICsxMjQwLDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0 ZVN0YXRlKFFBYnN0cmFjdEFuaW1hdGlvbjo6U3RhdGUgbmV3U3RhdGUsIFFBYnN0cmFjdEFuaW1h dGlvbjo6U3RhdGUgb2xkU3RhdGUpCiAgICAgewotICAgICAgICBBbmltYXRpb25RdEJhc2U6OnVw ZGF0ZVN0YXRlKG5ld1N0YXRlLCBvbGRTdGF0ZSk7CisgICAgICAgIEFuaW1hdGlvblF0PFRyYW5z Zm9ybU9wZXJhdGlvbnM+Ojp1cGRhdGVTdGF0ZShuZXdTdGF0ZSwgb2xkU3RhdGUpOwogICAgICAg ICBpZiAoIW1fbGF5ZXIpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIG1fbGF5ZXIuZGF0 YSgpLT5mbHVzaENoYW5nZXModHJ1ZSk7CkBAIC0xMjY0LDcgKzEyOTAsNyBAQCBwdWJsaWM6CiAK ICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU3RhdGUoUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSBu ZXdTdGF0ZSwgUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSBvbGRTdGF0ZSkKICAgICB7Ci0gICAg ICAgIFFBYnN0cmFjdEFuaW1hdGlvbjo6dXBkYXRlU3RhdGUobmV3U3RhdGUsIG9sZFN0YXRlKTsK KyAgICAgICAgQW5pbWF0aW9uUXQ8cXJlYWw+Ojp1cGRhdGVTdGF0ZShuZXdTdGF0ZSwgb2xkU3Rh dGUpOwogCiAgICAgICAgIGlmIChtX2xheWVyKQogICAgICAgICAgICAgbV9sYXllci5kYXRhKCkt Pm1fb3BhY2l0eUFuaW1hdGlvblJ1bm5pbmcgPSAobmV3U3RhdGUgPT0gUUFic3RyYWN0QW5pbWF0 aW9uOjpSdW5uaW5nKTsKLS0gCjEuNy4xCgo= 58904 2010-06-16 10:31:55 -0700 2010-06-22 13:23:53 -0700 Fix comments in last review bug-40381.patch text/plain 5149 smagnuso RnJvbSBkZjdkYWRjNDRmYmVmM2U2YjYzMDg1NTEzYzgxZDU1MWVjMTg4MDIxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTYW0gTWFnbnVzb24gPHNtYWdudXNvbkBuZXRmbGl4LmNvbT4K RGF0ZTogRnJpLCAxMSBKdW4gMjAxMCAyMzozNjoxOCAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gZm9yIGRlYnVnZ2luZyBwdXJwb3NlcyBJJ20gY29udHJpYnV0aW5nIGJhY2sgbXkgRlBTIGNv dW50ZXIgaW4gdGhlIEFuaW1hdGlvblF0QmFzZQoKYnVnIC0gNDAzODEKLS0tCiBXZWJDb3JlL0No YW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE5ICsrKysrKysrKysr CiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAgfCAgIDM2 ICsrKysrKysrKysrKysrKysrKystLS0KIDIgZmlsZXMgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygr KSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNv cmUvQ2hhbmdlTG9nCmluZGV4IGUwNDcyOWQuLjc2OGI3NDAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAt MDYtMDkgIFNhbSBNYWdudXNvbiAgPHNtYWdudXNvbkBuZXRmbGl4LmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIGZvciBkZWJ1Z2dpbmcg cHVycG9zZXMgbmljZSBJJ20gY29udHJpYnV0aW5nIGJhY2sgbXkgRlBTCisgICAgICAgIGNvdW50 ZXIgaW4gdGhlIEFuaW1hdGlvblF0QmFzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDAzODEKKworICAgICAgICBTaW1wbHkgc3RhcnQgYSB0aW1lciBh bmQgY291bnQgZnJhbWVzIGluIHRoZSBBbmltYXRpb25RdEJhc2UgYW5kCisgICAgICAgIHNwaXQg b3V0IHRoZSBGUFMgY291bnQgYXQgdGhlIGVuZCBvZiBhIHNpbmdsZSBhbmltYXRpb24uCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzOiB0aGlzIGlzIGEgc2ltcGxlIGRlYnVnZ2luZyBhaWQuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6QW5pbWF0aW9uUXQ6OnVwZGF0ZVN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6 OkFuaW1hdGlvblF0Ojp1cGRhdGVDdXJyZW50VGltZSk6CisgICAgICAgIChXZWJDb3JlOjpUcmFu c2Zvcm1BbmltYXRpb25RdDo6dXBkYXRlU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6T3BhY2l0 eUFuaW1hdGlvblF0Ojp1cGRhdGVTdGF0ZSk6CisKIDIwMTAtMDYtMTMgIE5vYW0gUm9zZW50aGFs ICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMg U2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGlj c0xheWVyUXQuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVy UXQuY3BwCmluZGV4IGFkMmVjOWMuLjVlZmM2ZmQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNs dWRlICJUcmFuc2xhdGVUcmFuc2Zvcm1PcGVyYXRpb24uaCIKICNpbmNsdWRlICJVbml0QmV6aWVy LmgiCiAjaW5jbHVkZSA8UXRDb3JlL3FhYnN0cmFjdGFuaW1hdGlvbi5oPgorI2luY2x1ZGUgPFF0 Q29yZS9xZGF0ZXRpbWUuaD4KICNpbmNsdWRlIDxRdENvcmUvcWRlYnVnLmg+CiAjaW5jbHVkZSA8 UXRDb3JlL3FtZXRhb2JqZWN0Lmg+CiAjaW5jbHVkZSA8UXRDb3JlL3FzZXQuaD4KQEAgLTQxLDYg KzQyLDggQEAKICNpbmNsdWRlIDxRdEd1aS9xcGl4bWFwY2FjaGUuaD4KICNpbmNsdWRlIDxRdEd1 aS9xc3R5bGVvcHRpb24uaD4KIAorI2RlZmluZSBRVF9ERUJVR19GUFMgMAorCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKICNpZm5kZWYgUVRfTk9fR1JBUEhJQ1NFRkZFQ1QKQEAgLTMzMiw3ICszMzUs NyBAQCBRUGl4bWFwIEdyYXBoaWNzTGF5ZXJRdEltcGw6OnJlY2FjaGUoY29uc3QgUVJlZ2lvbiYg cmVnaW9uVG9VcGRhdGUpCiAgICAgbV9sYXllci0+cGFpbnRHcmFwaGljc0xheWVyQ29udGVudHMo Z2MsIHJlZ2lvbi5ib3VuZGluZ1JlY3QoKSk7CiAgICAgcGFpbnRlci5lbmQoKTsKIAotICAgIG1f YmFja2luZ1N0b3JlS2V5ID0gUVBpeG1hcENhY2hlOjppbnNlcnQocGl4bWFwKTsgICAgCisgICAg bV9iYWNraW5nU3RvcmVLZXkgPSBRUGl4bWFwQ2FjaGU6Omluc2VydChwaXhtYXApOwogICAgIHJl dHVybiBwaXhtYXA7CiB9CiAKQEAgLTY1NSw3ICs2NTgsNyBAQCBhZnRlckxheWVyQ2hhbmdlczoK ICAgICAgICAgdXBkYXRlVHJhbnNmb3JtKCk7CiAKICAgICBpZiAoIXJlY3Vyc2l2ZSkKLSAgICAg ICAgcmV0dXJuOyAgICAKKyAgICAgICAgcmV0dXJuOwogCiAgICAgUUxpc3Q8UUdyYXBoaWNzSXRl bSo+IGNoaWxkcmVuID0gY2hpbGRJdGVtcygpOwogICAgIGlmIChtX3N0YXRlLm1hc2tMYXllcikK QEAgLTkyOSw3ICs5MzIsNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJRdDo6c2V0Q29udGVudHNUb0lt YWdlKEltYWdlKiBpbWFnZSkKICAgICAgICAgICAgIG1faW1wbC0+bV9wZW5kaW5nQ29udGVudC5w aXhtYXAgPSAqcHhtOwogICAgICAgICAgICAgbV9pbXBsLT5tX3BlbmRpbmdDb250ZW50LmNvbnRl bnRUeXBlID0gR3JhcGhpY3NMYXllclF0SW1wbDo6UGl4bWFwQ29udGVudFR5cGU7CiAgICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgIH0gICAgICAgIAorICAgICAgICB9CiAgICAgfQogICAgIG1f aW1wbC0+bV9wZW5kaW5nQ29udGVudC5waXhtYXAgPSBRUGl4bWFwKCk7CiB9CkBAIC0xMTIyLDYg KzExMjUsMjIgQEAgcHJvdGVjdGVkOgogICAgIC8vIHRoaXMgaXMgdGhlIHBhcnQgdGhhdCBkaWZm ZXJzIGJldHdlZW4gYW5pbWF0ZWQgcHJvcGVydGllcwogICAgIHZpcnR1YWwgdm9pZCBhcHBseUZy YW1lKGNvbnN0IFQmIGZyb21WYWx1ZSwgY29uc3QgVCYgdG9WYWx1ZSwgcXJlYWwgcHJvZ3Jlc3Mp ID0gMDsKIAorICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVTdGF0ZShRQWJzdHJhY3RBbmltYXRpb246 OlN0YXRlIG5ld1N0YXRlLCBRQWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG9sZFN0YXRlKQorICAg IHsKKyNpZiBRVF9ERUJVR19GUFMKKyAgICAgICAgaWYgKG5ld1N0YXRlID09IFJ1bm5pbmcgJiYg b2xkU3RhdGUgPT0gU3RvcHBlZCkgeworICAgICAgICAgICAgcURlYnVnKCJBbmltYXRpb24gU3Rh cnRlZCEiKTsKKyAgICAgICAgICAgIG1fZnJhbWVzID0gMDsKKyAgICAgICAgICAgIG1fZHVyYXRp b24uc3RhcnQoKTsKKyAgICAgICAgfSBlbHNlIGlmIChuZXdTdGF0ZSA9PSBTdG9wcGVkICYmIG9s ZFN0YXRlID09IFJ1bm5pbmcpIHsKKyAgICAgICAgICAgIGNvbnN0IGludCBkdXJhdGlvbiA9IG1f ZHVyYXRpb24uZWxhcHNlZCgpOworICAgICAgICAgICAgcURlYnVnKCJBbmltYXRpb24gRW5kZWQh ICVkbXMgWyVmIEZQU10iLCBkdXJhdGlvbiwKKyAgICAgICAgICAgICAgICAgICAgKDEwMDAgLyAo KChmbG9hdClkdXJhdGlvbikgLyBtX2ZyYW1lcykpKTsKKyAgICAgICAgfQorI2VuZGlmCisgICAg ICAgIEFuaW1hdGlvblF0QmFzZTo6dXBkYXRlU3RhdGUobmV3U3RhdGUsIG9sZFN0YXRlKTsKKyAg ICB9CisKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQ3VycmVudFRpbWUoaW50IGN1cnJlbnRUaW1l KQogICAgIHsKICAgICAgICAgaWYgKCFtX2xheWVyKQpAQCAtMTE2Miw5ICsxMTgxLDE2IEBAIHBy b3RlY3RlZDoKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPyBwcm9n cmVzcwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6IGFwcGx5VGlt aW5nRnVuY3Rpb24odGltaW5nRnVuYywgKHByb2dyZXNzIC0gaXQua2V5KCkpIC8gKGl0Mi5rZXko KSAtIGl0LmtleSgpKSwgZHVyYXRpb24oKSk7CiAgICAgICAgIGFwcGx5RnJhbWUoZnJvbVZhbHVl LCB0b1ZhbHVlLCBwcm9ncmVzcyk7CisjaWYgUVRfREVCVUdfRlBTCisgICAgICAgICsrbV9mcmFt ZXM7CisjZW5kaWYKICAgICB9CiAKICAgICBRTWFwPHFyZWFsLCBLZXlmcmFtZVZhbHVlUXQ8VD4g PiBtX2tleWZyYW1lVmFsdWVzOworI2lmIFFUX0RFQlVHX0ZQUworICAgIFFUaW1lIG1fZHVyYXRp b247CisgICAgaW50IG1fZnJhbWVzOworI2VuZGlmCiB9OwogCiBjbGFzcyBUcmFuc2Zvcm1Bbmlt YXRpb25RdCA6IHB1YmxpYyBBbmltYXRpb25RdDxUcmFuc2Zvcm1PcGVyYXRpb25zPiB7CkBAIC0x MjE0LDcgKzEyNDAsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU3RhdGUo UUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSBuZXdTdGF0ZSwgUUFic3RyYWN0QW5pbWF0aW9uOjpT dGF0ZSBvbGRTdGF0ZSkKICAgICB7Ci0gICAgICAgIEFuaW1hdGlvblF0QmFzZTo6dXBkYXRlU3Rh dGUobmV3U3RhdGUsIG9sZFN0YXRlKTsKKyAgICAgICAgQW5pbWF0aW9uUXQ8VHJhbnNmb3JtT3Bl cmF0aW9ucz46OnVwZGF0ZVN0YXRlKG5ld1N0YXRlLCBvbGRTdGF0ZSk7CiAgICAgICAgIGlmICgh bV9sYXllcikKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgbV9sYXllci5kYXRhKCktPmZs dXNoQ2hhbmdlcyh0cnVlKTsKQEAgLTEyNjQsNyArMTI5MCw3IEBAIHB1YmxpYzoKIAogICAgIHZp cnR1YWwgdm9pZCB1cGRhdGVTdGF0ZShRQWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG5ld1N0YXRl LCBRQWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG9sZFN0YXRlKQogICAgIHsKLSAgICAgICAgUUFi c3RyYWN0QW5pbWF0aW9uOjp1cGRhdGVTdGF0ZShuZXdTdGF0ZSwgb2xkU3RhdGUpOworICAgICAg ICBBbmltYXRpb25RdDxxcmVhbD46OnVwZGF0ZVN0YXRlKG5ld1N0YXRlLCBvbGRTdGF0ZSk7CiAK ICAgICAgICAgaWYgKG1fbGF5ZXIpCiAgICAgICAgICAgICBtX2xheWVyLmRhdGEoKS0+bV9vcGFj aXR5QW5pbWF0aW9uUnVubmluZyA9IChuZXdTdGF0ZSA9PSBRQWJzdHJhY3RBbmltYXRpb246OlJ1 bm5pbmcpOwotLSAKMS43LjEKCg== 59300 2010-06-21 15:25:47 -0700 2010-06-22 16:11:17 -0700 rebase and rediff bug-40381.patch text/plain 5146 smagnuso RnJvbSAwYjllYjhmZjgzMDgyM2FhZDc4YzZmZTg1MDQzZTI2ODAzMTBhZjRmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTYW0gTWFnbnVzb24gPHNtYWdudXNvbkBuZXRmbGl4LmNvbT4K RGF0ZTogRnJpLCAxMSBKdW4gMjAxMCAyMzozNjoxOCAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gZm9yIGRlYnVnZ2luZyBwdXJwb3NlcyBJJ20gY29udHJpYnV0aW5nIGJhY2sgbXkgRlBTIGNv dW50ZXIgaW4gdGhlIEFuaW1hdGlvblF0QmFzZQoKYnVnIC0gNDAzODEKLS0tCiBXZWJDb3JlL0No YW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE5ICsrKysrKysrKysr CiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAgfCAgIDM2 ICsrKysrKysrKysrKysrKysrKystLS0KIDIgZmlsZXMgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygr KSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNv cmUvQ2hhbmdlTG9nCmluZGV4IGZkMjU5ZTAuLjA1NzI5N2QgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAt MDYtMDkgIFNhbSBNYWdudXNvbiAgPHNtYWdudXNvbkBuZXRmbGl4LmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIGZvciBkZWJ1Z2dpbmcg cHVycG9zZXMgbmljZSBJJ20gY29udHJpYnV0aW5nIGJhY2sgbXkgRlBTCisgICAgICAgIGNvdW50 ZXIgaW4gdGhlIEFuaW1hdGlvblF0QmFzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDAzODEKKworICAgICAgICBTaW1wbHkgc3RhcnQgYSB0aW1lciBh bmQgY291bnQgZnJhbWVzIGluIHRoZSBBbmltYXRpb25RdEJhc2UgYW5kCisgICAgICAgIHNwaXQg b3V0IHRoZSBGUFMgY291bnQgYXQgdGhlIGVuZCBvZiBhIHNpbmdsZSBhbmltYXRpb24uCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzOiB0aGlzIGlzIGEgc2ltcGxlIGRlYnVnZ2luZyBhaWQuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6QW5pbWF0aW9uUXQ6OnVwZGF0ZVN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6 OkFuaW1hdGlvblF0Ojp1cGRhdGVDdXJyZW50VGltZSk6CisgICAgICAgIChXZWJDb3JlOjpUcmFu c2Zvcm1BbmltYXRpb25RdDo6dXBkYXRlU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6T3BhY2l0 eUFuaW1hdGlvblF0Ojp1cGRhdGVTdGF0ZSk6CisKIDIwMTAtMDYtMjEgIEJhbGF6cyBLZWxlbWVu ICA8a2JAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNt YW5uLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xh eWVyUXQuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQu Y3BwCmluZGV4IGFkMmVjOWMuLjVlZmM2ZmQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRl ICJUcmFuc2xhdGVUcmFuc2Zvcm1PcGVyYXRpb24uaCIKICNpbmNsdWRlICJVbml0QmV6aWVyLmgi CiAjaW5jbHVkZSA8UXRDb3JlL3FhYnN0cmFjdGFuaW1hdGlvbi5oPgorI2luY2x1ZGUgPFF0Q29y ZS9xZGF0ZXRpbWUuaD4KICNpbmNsdWRlIDxRdENvcmUvcWRlYnVnLmg+CiAjaW5jbHVkZSA8UXRD b3JlL3FtZXRhb2JqZWN0Lmg+CiAjaW5jbHVkZSA8UXRDb3JlL3FzZXQuaD4KQEAgLTQxLDYgKzQy LDggQEAKICNpbmNsdWRlIDxRdEd1aS9xcGl4bWFwY2FjaGUuaD4KICNpbmNsdWRlIDxRdEd1aS9x c3R5bGVvcHRpb24uaD4KIAorI2RlZmluZSBRVF9ERUJVR19GUFMgMAorCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKICNpZm5kZWYgUVRfTk9fR1JBUEhJQ1NFRkZFQ1QKQEAgLTMzMiw3ICszMzUsNyBA QCBRUGl4bWFwIEdyYXBoaWNzTGF5ZXJRdEltcGw6OnJlY2FjaGUoY29uc3QgUVJlZ2lvbiYgcmVn aW9uVG9VcGRhdGUpCiAgICAgbV9sYXllci0+cGFpbnRHcmFwaGljc0xheWVyQ29udGVudHMoZ2Ms IHJlZ2lvbi5ib3VuZGluZ1JlY3QoKSk7CiAgICAgcGFpbnRlci5lbmQoKTsKIAotICAgIG1fYmFj a2luZ1N0b3JlS2V5ID0gUVBpeG1hcENhY2hlOjppbnNlcnQocGl4bWFwKTsgICAgCisgICAgbV9i YWNraW5nU3RvcmVLZXkgPSBRUGl4bWFwQ2FjaGU6Omluc2VydChwaXhtYXApOwogICAgIHJldHVy biBwaXhtYXA7CiB9CiAKQEAgLTY1NSw3ICs2NTgsNyBAQCBhZnRlckxheWVyQ2hhbmdlczoKICAg ICAgICAgdXBkYXRlVHJhbnNmb3JtKCk7CiAKICAgICBpZiAoIXJlY3Vyc2l2ZSkKLSAgICAgICAg cmV0dXJuOyAgICAKKyAgICAgICAgcmV0dXJuOwogCiAgICAgUUxpc3Q8UUdyYXBoaWNzSXRlbSo+ IGNoaWxkcmVuID0gY2hpbGRJdGVtcygpOwogICAgIGlmIChtX3N0YXRlLm1hc2tMYXllcikKQEAg LTkyOSw3ICs5MzIsNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJRdDo6c2V0Q29udGVudHNUb0ltYWdl KEltYWdlKiBpbWFnZSkKICAgICAgICAgICAgIG1faW1wbC0+bV9wZW5kaW5nQ29udGVudC5waXht YXAgPSAqcHhtOwogICAgICAgICAgICAgbV9pbXBsLT5tX3BlbmRpbmdDb250ZW50LmNvbnRlbnRU eXBlID0gR3JhcGhpY3NMYXllclF0SW1wbDo6UGl4bWFwQ29udGVudFR5cGU7CiAgICAgICAgICAg ICByZXR1cm47Ci0gICAgICAgIH0gICAgICAgIAorICAgICAgICB9CiAgICAgfQogICAgIG1faW1w bC0+bV9wZW5kaW5nQ29udGVudC5waXhtYXAgPSBRUGl4bWFwKCk7CiB9CkBAIC0xMTIyLDYgKzEx MjUsMjIgQEAgcHJvdGVjdGVkOgogICAgIC8vIHRoaXMgaXMgdGhlIHBhcnQgdGhhdCBkaWZmZXJz IGJldHdlZW4gYW5pbWF0ZWQgcHJvcGVydGllcwogICAgIHZpcnR1YWwgdm9pZCBhcHBseUZyYW1l KGNvbnN0IFQmIGZyb21WYWx1ZSwgY29uc3QgVCYgdG9WYWx1ZSwgcXJlYWwgcHJvZ3Jlc3MpID0g MDsKIAorICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVTdGF0ZShRQWJzdHJhY3RBbmltYXRpb246OlN0 YXRlIG5ld1N0YXRlLCBRQWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG9sZFN0YXRlKQorICAgIHsK KyNpZiBRVF9ERUJVR19GUFMKKyAgICAgICAgaWYgKG5ld1N0YXRlID09IFJ1bm5pbmcgJiYgb2xk U3RhdGUgPT0gU3RvcHBlZCkgeworICAgICAgICAgICAgcURlYnVnKCJBbmltYXRpb24gU3RhcnRl ZCEiKTsKKyAgICAgICAgICAgIG1fZnJhbWVzID0gMDsKKyAgICAgICAgICAgIG1fZHVyYXRpb24u c3RhcnQoKTsKKyAgICAgICAgfSBlbHNlIGlmIChuZXdTdGF0ZSA9PSBTdG9wcGVkICYmIG9sZFN0 YXRlID09IFJ1bm5pbmcpIHsKKyAgICAgICAgICAgIGNvbnN0IGludCBkdXJhdGlvbiA9IG1fZHVy YXRpb24uZWxhcHNlZCgpOworICAgICAgICAgICAgcURlYnVnKCJBbmltYXRpb24gRW5kZWQhICVk bXMgWyVmIEZQU10iLCBkdXJhdGlvbiwKKyAgICAgICAgICAgICAgICAgICAgKDEwMDAgLyAoKChm bG9hdClkdXJhdGlvbikgLyBtX2ZyYW1lcykpKTsKKyAgICAgICAgfQorI2VuZGlmCisgICAgICAg IEFuaW1hdGlvblF0QmFzZTo6dXBkYXRlU3RhdGUobmV3U3RhdGUsIG9sZFN0YXRlKTsKKyAgICB9 CisKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQ3VycmVudFRpbWUoaW50IGN1cnJlbnRUaW1lKQog ICAgIHsKICAgICAgICAgaWYgKCFtX2xheWVyKQpAQCAtMTE2Miw5ICsxMTgxLDE2IEBAIHByb3Rl Y3RlZDoKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPyBwcm9ncmVz cwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6IGFwcGx5VGltaW5n RnVuY3Rpb24odGltaW5nRnVuYywgKHByb2dyZXNzIC0gaXQua2V5KCkpIC8gKGl0Mi5rZXkoKSAt IGl0LmtleSgpKSwgZHVyYXRpb24oKSk7CiAgICAgICAgIGFwcGx5RnJhbWUoZnJvbVZhbHVlLCB0 b1ZhbHVlLCBwcm9ncmVzcyk7CisjaWYgUVRfREVCVUdfRlBTCisgICAgICAgICsrbV9mcmFtZXM7 CisjZW5kaWYKICAgICB9CiAKICAgICBRTWFwPHFyZWFsLCBLZXlmcmFtZVZhbHVlUXQ8VD4gPiBt X2tleWZyYW1lVmFsdWVzOworI2lmIFFUX0RFQlVHX0ZQUworICAgIFFUaW1lIG1fZHVyYXRpb247 CisgICAgaW50IG1fZnJhbWVzOworI2VuZGlmCiB9OwogCiBjbGFzcyBUcmFuc2Zvcm1BbmltYXRp b25RdCA6IHB1YmxpYyBBbmltYXRpb25RdDxUcmFuc2Zvcm1PcGVyYXRpb25zPiB7CkBAIC0xMjE0 LDcgKzEyNDAsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU3RhdGUoUUFi c3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSBuZXdTdGF0ZSwgUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0 ZSBvbGRTdGF0ZSkKICAgICB7Ci0gICAgICAgIEFuaW1hdGlvblF0QmFzZTo6dXBkYXRlU3RhdGUo bmV3U3RhdGUsIG9sZFN0YXRlKTsKKyAgICAgICAgQW5pbWF0aW9uUXQ8VHJhbnNmb3JtT3BlcmF0 aW9ucz46OnVwZGF0ZVN0YXRlKG5ld1N0YXRlLCBvbGRTdGF0ZSk7CiAgICAgICAgIGlmICghbV9s YXllcikKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgbV9sYXllci5kYXRhKCktPmZsdXNo Q2hhbmdlcyh0cnVlKTsKQEAgLTEyNjQsNyArMTI5MCw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1 YWwgdm9pZCB1cGRhdGVTdGF0ZShRQWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG5ld1N0YXRlLCBR QWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG9sZFN0YXRlKQogICAgIHsKLSAgICAgICAgUUFic3Ry YWN0QW5pbWF0aW9uOjp1cGRhdGVTdGF0ZShuZXdTdGF0ZSwgb2xkU3RhdGUpOworICAgICAgICBB bmltYXRpb25RdDxxcmVhbD46OnVwZGF0ZVN0YXRlKG5ld1N0YXRlLCBvbGRTdGF0ZSk7CiAKICAg ICAgICAgaWYgKG1fbGF5ZXIpCiAgICAgICAgICAgICBtX2xheWVyLmRhdGEoKS0+bV9vcGFjaXR5 QW5pbWF0aW9uUnVubmluZyA9IChuZXdTdGF0ZSA9PSBRQWJzdHJhY3RBbmltYXRpb246OlJ1bm5p bmcpOwotLSAKMS43LjEKCg== 59435 2010-06-22 16:11:17 -0700 2010-06-25 11:24:30 -0700 Rediff against trunk bug-40381.patch text/plain 4323 smagnuso RnJvbSBkOTMyNDhmNjg1OGJkYjI3ZjdjMzExYmZhOWI0NDE5YjNkN2M2ZWIxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTYW0gTWFnbnVzb24gPHNtYWdudXNvbkBuZXRmbGl4LmNvbT4K RGF0ZTogTW9uLCAyMSBKdW4gMjAxMCAyMjozMTo1MiAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gZm9yIGRlYnVnZ2luZyBwdXJwb3NlcyBuaWNlIEknbSBjb250cmlidXRpbmcgYmFjayBteSBG UFMgY291bnRlciBpbiB0aGUgQW5pbWF0aW9uUXRCYXNlCiBidWctNDAzODEKCi0tLQogV2ViQ29y ZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxOSArKysrKysr KysrKysrCiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAg fCAgIDMyICsrKysrKysrKysrKysrKysrKysrLQogMiBmaWxlcyBjaGFuZ2VkLCA0OSBpbnNlcnRp b25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjliMTY3OS4uNzBlNTRiNSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAor ICAgICAgICAyMDEwLTA2LTA5ICBTYW0gTWFnbnVzb24gIDxzbWFnbnVzb25AbmV0ZmxpeC5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBm b3IgZGVidWdnaW5nIHB1cnBvc2VzIG5pY2UgSSdtIGNvbnRyaWJ1dGluZyBiYWNrIG15IEZQUwor ICAgICAgICBjb3VudGVyIGluIHRoZSBBbmltYXRpb25RdEJhc2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwMzgxCisKKyAgICAgICAgU2ltcGx5IHN0 YXJ0IGEgdGltZXIgYW5kIGNvdW50IGZyYW1lcyBpbiB0aGUgQW5pbWF0aW9uUXRCYXNlIGFuZAor ICAgICAgICBzcGl0IG91dCB0aGUgRlBTIGNvdW50IGF0IHRoZSBlbmQgb2YgYSBzaW5nbGUgYW5p bWF0aW9uLgorCisgICAgICAgIE5vIG5ldyB0ZXN0czogdGhpcyBpcyBhIHNpbXBsZSBkZWJ1Z2dp bmcgYWlkLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvblF0Ojp1cGRhdGVTdGF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpBbmltYXRpb25RdDo6dXBkYXRlQ3VycmVudFRpbWUpOgorICAgICAgICAo V2ViQ29yZTo6VHJhbnNmb3JtQW5pbWF0aW9uUXQ6OnVwZGF0ZVN0YXRlKToKKyAgICAgICAgKFdl YkNvcmU6Ok9wYWNpdHlBbmltYXRpb25RdDo6dXBkYXRlU3RhdGUpOgorCiAyMDEwLTA2LTIxICBT aGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJl dmlld2VkLCByb2xsaW5nIG91dCByNjE1ODUuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAKaW5kZXggOGVkMGQ4OS4uZjFlMTZjYyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcApAQCAt MjgsNiArMjgsNyBAQAogI2luY2x1ZGUgIlRyYW5zbGF0ZVRyYW5zZm9ybU9wZXJhdGlvbi5oIgog I2luY2x1ZGUgIlVuaXRCZXppZXIuaCIKICNpbmNsdWRlIDxRdENvcmUvcWFic3RyYWN0YW5pbWF0 aW9uLmg+CisjaW5jbHVkZSA8UXRDb3JlL3FkYXRldGltZS5oPgogI2luY2x1ZGUgPFF0Q29yZS9x ZGVidWcuaD4KICNpbmNsdWRlIDxRdENvcmUvcW1ldGFvYmplY3QuaD4KICNpbmNsdWRlIDxRdENv cmUvcXNldC5oPgpAQCAtNDEsNiArNDIsOCBAQAogI2luY2x1ZGUgPFF0R3VpL3FwaXhtYXBjYWNo ZS5oPgogI2luY2x1ZGUgPFF0R3VpL3FzdHlsZW9wdGlvbi5oPgogCisjZGVmaW5lIFFUX0RFQlVH X0ZQUyAwCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogI2lmbmRlZiBRVF9OT19HUkFQSElDU0VG RkVDVApAQCAtMTI0MSw2ICsxMjQ0LDIyIEBAIHByb3RlY3RlZDoKICAgICAvLyBUaGlzIGlzIHRo ZSBwYXJ0IHRoYXQgZGlmZmVycyBiZXR3ZWVuIGFuaW1hdGVkIHByb3BlcnRpZXMuCiAgICAgdmly dHVhbCB2b2lkIGFwcGx5RnJhbWUoY29uc3QgVCYgZnJvbVZhbHVlLCBjb25zdCBUJiB0b1ZhbHVl LCBxcmVhbCBwcm9ncmVzcykgPSAwOwogCisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVN0YXRlKFFB YnN0cmFjdEFuaW1hdGlvbjo6U3RhdGUgbmV3U3RhdGUsIFFBYnN0cmFjdEFuaW1hdGlvbjo6U3Rh dGUgb2xkU3RhdGUpCisgICAgeworI2lmIFFUX0RFQlVHX0ZQUworICAgICAgICBpZiAobmV3U3Rh dGUgPT0gUnVubmluZyAmJiBvbGRTdGF0ZSA9PSBTdG9wcGVkKSB7CisgICAgICAgICAgICBxRGVi dWcoIkFuaW1hdGlvbiBTdGFydGVkISIpOworICAgICAgICAgICAgbV9mcHMuZnJhbWVzID0gMDsK KyAgICAgICAgICAgIG1fZnBzLmR1cmF0aW9uLnN0YXJ0KCk7CisgICAgICAgIH0gZWxzZSBpZiAo bmV3U3RhdGUgPT0gU3RvcHBlZCAmJiBvbGRTdGF0ZSA9PSBSdW5uaW5nKSB7CisgICAgICAgICAg ICBjb25zdCBpbnQgZHVyYXRpb24gPSBtX2Zwcy5kdXJhdGlvbi5lbGFwc2VkKCk7CisgICAgICAg ICAgICBxRGVidWcoIkFuaW1hdGlvbiBFbmRlZCEgJWRtcyBbJWYgRlBTXSIsIGR1cmF0aW9uLAor ICAgICAgICAgICAgICAgICAgICAoMTAwMCAvICgoKGZsb2F0KWR1cmF0aW9uKSAvIG1fZnBzLmZy YW1lcykpKTsKKyAgICAgICAgfQorI2VuZGlmCisgICAgICAgIEFuaW1hdGlvblF0QmFzZTo6dXBk YXRlU3RhdGUobmV3U3RhdGUsIG9sZFN0YXRlKTsKKyAgICB9CisKICAgICB2aXJ0dWFsIHZvaWQg dXBkYXRlQ3VycmVudFRpbWUoaW50IGN1cnJlbnRUaW1lKQogICAgIHsKICAgICAgICAgaWYgKCFt X2xheWVyKQpAQCAtMTI4MCw5ICsxMjk5LDE4IEBAIHByb3RlY3RlZDoKICAgICAgICAgcHJvZ3Jl c3MgPSAoIXByb2dyZXNzIHx8IHByb2dyZXNzID09IDEgfHwgaXQua2V5KCkgPT0gaXQyLmtleSgp KSA/CiAgICAgICAgICAgICBwcm9ncmVzcyA6IGFwcGx5VGltaW5nRnVuY3Rpb24odGltaW5nRnVu YywgKHByb2dyZXNzIC0gaXQua2V5KCkpIC8gKGl0Mi5rZXkoKSAtIGl0LmtleSgpKSwgZHVyYXRp b24oKSk7CiAgICAgICAgIGFwcGx5RnJhbWUoZnJvbVZhbHVlLCB0b1ZhbHVlLCBwcm9ncmVzcyk7 CisjaWYgUVRfREVCVUdfRlBTCisgICAgICAgICsrbV9mcHMuZnJhbWVzOworI2VuZGlmCiAgICAg fQogCiAgICAgUU1hcDxxcmVhbCwgS2V5ZnJhbWVWYWx1ZVF0PFQ+ID4gbV9rZXlmcmFtZVZhbHVl czsKKyNpZiBRVF9ERUJVR19GUFMKKyAgICBzdHJ1Y3QgeworICAgICAgICBRVGltZSBkdXJhdGlv bjsKKyAgICAgICAgaW50IGZyYW1lczsKKyAgICB9IG1fZnBzOworI2VuZGlmCiB9OwogCiBjbGFz cyBUcmFuc2Zvcm1BbmltYXRpb25RdCA6IHB1YmxpYyBBbmltYXRpb25RdDxUcmFuc2Zvcm1PcGVy YXRpb25zPiB7CkBAIC0xMzM0LDcgKzEzNjIsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZv aWQgdXBkYXRlU3RhdGUoUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSBuZXdTdGF0ZSwgUUFic3Ry YWN0QW5pbWF0aW9uOjpTdGF0ZSBvbGRTdGF0ZSkKICAgICB7Ci0gICAgICAgIEFuaW1hdGlvblF0 QmFzZTo6dXBkYXRlU3RhdGUobmV3U3RhdGUsIG9sZFN0YXRlKTsKKyAgICAgICAgQW5pbWF0aW9u UXQ8VHJhbnNmb3JtT3BlcmF0aW9ucz46OnVwZGF0ZVN0YXRlKG5ld1N0YXRlLCBvbGRTdGF0ZSk7 CiAgICAgICAgIGlmICghbV9sYXllcikKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtMTM4NSw3 ICsxNDEzLDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVN0YXRlKFFBYnN0 cmFjdEFuaW1hdGlvbjo6U3RhdGUgbmV3U3RhdGUsIFFBYnN0cmFjdEFuaW1hdGlvbjo6U3RhdGUg b2xkU3RhdGUpCiAgICAgewotICAgICAgICBRQWJzdHJhY3RBbmltYXRpb246OnVwZGF0ZVN0YXRl KG5ld1N0YXRlLCBvbGRTdGF0ZSk7CisgICAgICAgIEFuaW1hdGlvblF0PHFyZWFsPjo6dXBkYXRl U3RhdGUobmV3U3RhdGUsIG9sZFN0YXRlKTsKIAogICAgICAgICBpZiAobV9sYXllcikKICAgICAg ICAgICAgIG1fbGF5ZXIuZGF0YSgpLT5tX29wYWNpdHlBbmltYXRpb25SdW5uaW5nID0gKG5ld1N0 YXRlID09IFFBYnN0cmFjdEFuaW1hdGlvbjo6UnVubmluZyk7Ci0tIAoxLjcuMQoK 59781 2010-06-25 11:24:34 -0700 2010-07-08 23:45:47 -0700 Patch bug-40381-20100625112432.patch text/plain 3930 smagnuso ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzMxOWI4YTlhNTdiMDA3NjVjNzZkYzBhYWM5MDlmNmJkZjFmNDY0MC4uYTEyYjQzMDFhZDlhYzg5 ZDYzMDgxYzJkNDU1NjVkZmQxMjFjMjc0ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wNi0wOSAgU2Ft IE1hZ251c29uICA8c21hZ251c29uQG5ldGZsaXguY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gZm9yIGRlYnVnZ2luZyBwdXJwb3NlcyBu aWNlIEknbSBjb250cmlidXRpbmcgYmFjayBteSBGUFMKKyAgICAgICAgY291bnRlciBpbiB0aGUg QW5pbWF0aW9uUXRCYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00MDM4MQorCisgICAgICAgIFNpbXBseSBzdGFydCBhIHRpbWVyIGFuZCBjb3VudCBm cmFtZXMgaW4gdGhlIEFuaW1hdGlvblF0QmFzZSBhbmQKKyAgICAgICAgc3BpdCBvdXQgdGhlIEZQ UyBjb3VudCBhdCB0aGUgZW5kIG9mIGEgc2luZ2xlIGFuaW1hdGlvbi4KKworICAgICAgICBObyBu ZXcgdGVzdHM6IHRoaXMgaXMgYSBzaW1wbGUgZGVidWdnaW5nIGFpZC4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpBbmltYXRpb25RdDo6dXBkYXRlU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9u UXQ6OnVwZGF0ZUN1cnJlbnRUaW1lKToKKyAgICAgICAgKFdlYkNvcmU6OlRyYW5zZm9ybUFuaW1h dGlvblF0Ojp1cGRhdGVTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpPcGFjaXR5QW5pbWF0aW9u UXQ6OnVwZGF0ZVN0YXRlKToKKwogMjAxMC0wNi0yNSAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBs ZS5jb20+CiAKICAgICAgICAgV2luZG93cyBidWlsZCBmaXgKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcCBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcAppbmRleCA4ZWQwZDg5NjQ1ODEzODc5 ZWMyMjcwMGNmMmEwMmEyYmE4NTQ1YjJjLi5mMWUxNmNjNzc2ZmUwZWRmNzk3Y2UwMDQ1N2EyMzg5 OWUxZjVmZGUxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBo aWNzTGF5ZXJRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGlj c0xheWVyUXQuY3BwCkBAIC0yOCw2ICsyOCw3IEBACiAjaW5jbHVkZSAiVHJhbnNsYXRlVHJhbnNm b3JtT3BlcmF0aW9uLmgiCiAjaW5jbHVkZSAiVW5pdEJlemllci5oIgogI2luY2x1ZGUgPFF0Q29y ZS9xYWJzdHJhY3RhbmltYXRpb24uaD4KKyNpbmNsdWRlIDxRdENvcmUvcWRhdGV0aW1lLmg+CiAj aW5jbHVkZSA8UXRDb3JlL3FkZWJ1Zy5oPgogI2luY2x1ZGUgPFF0Q29yZS9xbWV0YW9iamVjdC5o PgogI2luY2x1ZGUgPFF0Q29yZS9xc2V0Lmg+CkBAIC00MSw2ICs0Miw4IEBACiAjaW5jbHVkZSA8 UXRHdWkvcXBpeG1hcGNhY2hlLmg+CiAjaW5jbHVkZSA8UXRHdWkvcXN0eWxlb3B0aW9uLmg+CiAK KyNkZWZpbmUgUVRfREVCVUdfRlBTIDAKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiAjaWZuZGVm IFFUX05PX0dSQVBISUNTRUZGRUNUCkBAIC0xMjQxLDYgKzEyNDQsMjIgQEAgcHJvdGVjdGVkOgog ICAgIC8vIFRoaXMgaXMgdGhlIHBhcnQgdGhhdCBkaWZmZXJzIGJldHdlZW4gYW5pbWF0ZWQgcHJv cGVydGllcy4KICAgICB2aXJ0dWFsIHZvaWQgYXBwbHlGcmFtZShjb25zdCBUJiBmcm9tVmFsdWUs IGNvbnN0IFQmIHRvVmFsdWUsIHFyZWFsIHByb2dyZXNzKSA9IDA7CiAKKyAgICB2aXJ0dWFsIHZv aWQgdXBkYXRlU3RhdGUoUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSBuZXdTdGF0ZSwgUUFic3Ry YWN0QW5pbWF0aW9uOjpTdGF0ZSBvbGRTdGF0ZSkKKyAgICB7CisjaWYgUVRfREVCVUdfRlBTCisg ICAgICAgIGlmIChuZXdTdGF0ZSA9PSBSdW5uaW5nICYmIG9sZFN0YXRlID09IFN0b3BwZWQpIHsK KyAgICAgICAgICAgIHFEZWJ1ZygiQW5pbWF0aW9uIFN0YXJ0ZWQhIik7CisgICAgICAgICAgICBt X2Zwcy5mcmFtZXMgPSAwOworICAgICAgICAgICAgbV9mcHMuZHVyYXRpb24uc3RhcnQoKTsKKyAg ICAgICAgfSBlbHNlIGlmIChuZXdTdGF0ZSA9PSBTdG9wcGVkICYmIG9sZFN0YXRlID09IFJ1bm5p bmcpIHsKKyAgICAgICAgICAgIGNvbnN0IGludCBkdXJhdGlvbiA9IG1fZnBzLmR1cmF0aW9uLmVs YXBzZWQoKTsKKyAgICAgICAgICAgIHFEZWJ1ZygiQW5pbWF0aW9uIEVuZGVkISAlZG1zIFslZiBG UFNdIiwgZHVyYXRpb24sCisgICAgICAgICAgICAgICAgICAgICgxMDAwIC8gKCgoZmxvYXQpZHVy YXRpb24pIC8gbV9mcHMuZnJhbWVzKSkpOworICAgICAgICB9CisjZW5kaWYKKyAgICAgICAgQW5p bWF0aW9uUXRCYXNlOjp1cGRhdGVTdGF0ZShuZXdTdGF0ZSwgb2xkU3RhdGUpOworICAgIH0KKwog ICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVDdXJyZW50VGltZShpbnQgY3VycmVudFRpbWUpCiAgICAg ewogICAgICAgICBpZiAoIW1fbGF5ZXIpCkBAIC0xMjgwLDkgKzEyOTksMTggQEAgcHJvdGVjdGVk OgogICAgICAgICBwcm9ncmVzcyA9ICghcHJvZ3Jlc3MgfHwgcHJvZ3Jlc3MgPT0gMSB8fCBpdC5r ZXkoKSA9PSBpdDIua2V5KCkpID8KICAgICAgICAgICAgIHByb2dyZXNzIDogYXBwbHlUaW1pbmdG dW5jdGlvbih0aW1pbmdGdW5jLCAocHJvZ3Jlc3MgLSBpdC5rZXkoKSkgLyAoaXQyLmtleSgpIC0g aXQua2V5KCkpLCBkdXJhdGlvbigpKTsKICAgICAgICAgYXBwbHlGcmFtZShmcm9tVmFsdWUsIHRv VmFsdWUsIHByb2dyZXNzKTsKKyNpZiBRVF9ERUJVR19GUFMKKyAgICAgICAgKyttX2Zwcy5mcmFt ZXM7CisjZW5kaWYKICAgICB9CiAKICAgICBRTWFwPHFyZWFsLCBLZXlmcmFtZVZhbHVlUXQ8VD4g PiBtX2tleWZyYW1lVmFsdWVzOworI2lmIFFUX0RFQlVHX0ZQUworICAgIHN0cnVjdCB7CisgICAg ICAgIFFUaW1lIGR1cmF0aW9uOworICAgICAgICBpbnQgZnJhbWVzOworICAgIH0gbV9mcHM7Cisj ZW5kaWYKIH07CiAKIGNsYXNzIFRyYW5zZm9ybUFuaW1hdGlvblF0IDogcHVibGljIEFuaW1hdGlv blF0PFRyYW5zZm9ybU9wZXJhdGlvbnM+IHsKQEAgLTEzMzQsNyArMTM2Miw3IEBAIHB1YmxpYzoK IAogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVTdGF0ZShRQWJzdHJhY3RBbmltYXRpb246OlN0YXRl IG5ld1N0YXRlLCBRQWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG9sZFN0YXRlKQogICAgIHsKLSAg ICAgICAgQW5pbWF0aW9uUXRCYXNlOjp1cGRhdGVTdGF0ZShuZXdTdGF0ZSwgb2xkU3RhdGUpOwor ICAgICAgICBBbmltYXRpb25RdDxUcmFuc2Zvcm1PcGVyYXRpb25zPjo6dXBkYXRlU3RhdGUobmV3 U3RhdGUsIG9sZFN0YXRlKTsKICAgICAgICAgaWYgKCFtX2xheWVyKQogICAgICAgICAgICAgcmV0 dXJuOwogCkBAIC0xMzg1LDcgKzE0MTMsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQg dXBkYXRlU3RhdGUoUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSBuZXdTdGF0ZSwgUUFic3RyYWN0 QW5pbWF0aW9uOjpTdGF0ZSBvbGRTdGF0ZSkKICAgICB7Ci0gICAgICAgIFFBYnN0cmFjdEFuaW1h dGlvbjo6dXBkYXRlU3RhdGUobmV3U3RhdGUsIG9sZFN0YXRlKTsKKyAgICAgICAgQW5pbWF0aW9u UXQ8cXJlYWw+Ojp1cGRhdGVTdGF0ZShuZXdTdGF0ZSwgb2xkU3RhdGUpOwogCiAgICAgICAgIGlm IChtX2xheWVyKQogICAgICAgICAgICAgbV9sYXllci5kYXRhKCktPm1fb3BhY2l0eUFuaW1hdGlv blJ1bm5pbmcgPSAobmV3U3RhdGUgPT0gUUFic3RyYWN0QW5pbWF0aW9uOjpSdW5uaW5nKTsK