56145 2011-03-10 14:18:57 -0800 [Qt] Seeking videos using the timeline bar does not work properly and stop the video playback. 2011-05-04 12:59:48 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC Linux RESOLVED FIXED Qt, QtTriaged P1 Blocker --- 1 menard menard commit-queue hausmann kling vestbo oldest_to_newest 365529 0 menard 2011-03-10 14:18:57 -0800 - Go to tiny.cc/wkmedia and start playback of one of the video. - Try to seek somewhere. On Linux the seeking is really strange sometimes going back to the value we were before the seek. On Mac for instance the playback stops. 365538 1 85390 menard 2011-03-10 14:29:04 -0800 Created attachment 85390 Patch to fix the issue We do not need seekTimeout and queuedSeekTimeout anymore. setPosition on QMediaPlayer is good enough. positionChanged() will be emitted when the data is buffered. On Linux the signal was not emitted because of a bug in QtMultimedia. Also we need to resume the playback after receiving positionChanged() because beginScrubbing() actually paused the mediaplayer previously. A patch has been send to the Qt Multimedia team for review. 366955 2 85390 vestbo 2011-03-14 06:26:42 -0700 Comment on attachment 85390 Patch to fix the issue as discussed on irc we need to exit early on state-change when seeking so that play/pause changes are not reflected as DOM events 366977 3 85673 menard 2011-03-14 07:47:00 -0700 Created attachment 85673 V2 with comments taken into account. 366979 4 85673 vestbo 2011-03-14 07:52:43 -0700 Comment on attachment 85673 V2 with comments taken into account. View in context: https://bugs.webkit.org/attachment.cgi?id=85673&action=review r=me with comment > Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp:448 > + if (m_mediaPlayer->state() != QMediaPlayer::PlayingState) { This needs to check the webcorePlayer state 366986 5 85673 vestbo 2011-03-14 08:05:46 -0700 Comment on attachment 85673 V2 with comments taken into account. r-, there's logic in HTMLMEdiaElement that should take care of the play() for us 367125 6 85700 menard 2011-03-14 12:22:45 -0700 Created attachment 85700 V3 without the play. Resuming the playback should be handled a layer up so I removed the play() call. It's a separate patch that I will upload after on a separate bug report. This commit then still fix the seeking but the video keep being paused after a successful seek. 367133 7 85702 menard 2011-03-14 12:34:13 -0700 Created attachment 85702 V4 with up-to-date changelog 367522 8 85702 commit-queue 2011-03-14 22:59:34 -0700 Comment on attachment 85702 V4 with up-to-date changelog Clearing flags on attachment: 85702 Committed r81114: <http://trac.webkit.org/changeset/81114> 367523 9 commit-queue 2011-03-14 22:59:40 -0700 All reviewed patches have been landed. Closing bug. 85390 2011-03-10 14:29:04 -0800 2011-03-14 07:47:00 -0700 Patch to fix the issue patch.diff text/plain 5731 menard ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxYTQ5YWJkLi5kNjdkNWM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDMtMTAgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0 XSBTZWVraW5nIHZpZGVvcyB1c2luZyB0aGUgdGltZWxpbmUgYmFyIGRvZXMgbm90IHdvcmsgcHJv cGVybHkgYW5kIHN0b3AgdGhlIHZpZGVvIHBsYXliYWNrLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTYxNDUKKworICAgICAgICBXZSBkbyBub3QgbmVl ZCBzZWVrVGltZW91dCBhbmQgcXVldWVkU2Vla1RpbWVvdXQgYW55bW9yZS4gc2V0UG9zaXRpb24g b24gUU1lZGlhUGxheWVyIGlzIGdvb2QgZW5vdWdoLgorICAgICAgICBwb3NpdGlvbkNoYW5nZWQo KSB3aWxsIGJlIGVtaXR0ZWQgd2hlbiB0aGUgZGF0YSBpcyBidWZmZXJlZC4gT24gTGludXggdGhl IHNpZ25hbCB3YXMgbm90IGVtaXR0ZWQgYmVjYXVzZQorICAgICAgICBvZiBhIGJ1ZyBpbiBRdE11 bHRpbWVkaWEuIEFsc28gd2UgbmVlZCB0byByZXN1bWUgdGhlIHBsYXliYWNrIGFmdGVyIHJlY2Vp dmluZyBwb3NpdGlvbkNoYW5nZWQoKSBiZWNhdXNlCisgICAgICAgIGJlZ2luU2NydWJiaW5nKCkg YWN0dWFsbHkgcGF1c2VkIHRoZSBtZWRpYXBsYXllciBwcmV2aW91c2x5LgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUXQ6Ok1lZGlhUGxheWVyUHJpdmF0ZVF0KToKKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZVF0OjpzZWVrKToKKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZVF0OjpzdGF0ZUNoYW5nZWQpOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUXQ6OnBvc2l0aW9uQ2hhbmdlZCk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuaDoKKwogMjAxMS0wMy0w OSAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVRdC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVRdC5jcHAKaW5kZXggMDAx ZDQ1Yi4uNGVkZTczYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcApAQCAtMTAzLDcgKzEwMyw2 IEBAIE1lZGlhUGxheWVyUHJpdmF0ZVF0OjpNZWRpYVBsYXllclByaXZhdGVRdChNZWRpYVBsYXll ciogcGxheWVyKQogICAgICwgbV9pc1Zpc2libGUoZmFsc2UpCiAgICAgLCBtX2lzU2Vla2luZyhm YWxzZSkKICAgICAsIG1fY29tcG9zaXRlZChmYWxzZSkKLSAgICAsIG1fcXVldWVkU2VlaygtMSkK ICAgICAsIG1fcHJlbG9hZChNZWRpYVBsYXllcjo6QXV0bykKICAgICAsIG1fc3VwcHJlc3NOZXh0 UGxheWJhY2tDaGFuZ2VkKGZhbHNlKQogewpAQCAtMjk2LDMyICsyOTUsOCBAQCB2b2lkIE1lZGlh UGxheWVyUHJpdmF0ZVF0OjpzZWVrKGZsb2F0IHBvc2l0aW9uKQogICAgIGlmIChtX21lZGlhUGxh eWVyQ29udHJvbCAmJiAhbV9tZWRpYVBsYXllckNvbnRyb2wtPmF2YWlsYWJsZVBsYXliYWNrUmFu Z2VzKCkuY29udGFpbnMocG9zaXRpb24gKiAxMDAwKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAg aWYgKG1faXNTZWVraW5nKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAocG9zaXRpb24gPiBk dXJhdGlvbigpKQotICAgICAgICBwb3NpdGlvbiA9IGR1cmF0aW9uKCk7Ci0KLSAgICAvLyBTZWVr aW5nIGlzIG1vc3QgcmVsaWFibGUgd2hlbiB3ZSdyZSBwYXVzZWQuCi0gICAgLy8gV2Via2l0IHdp bGwgdHJ5IHRvIHBhdXNlIGJlZm9yZSBzZWVraW5nLCBidXQgZHVlIHRvIHRoZSBhc3luY2hyb25v dXMgbmF0dXJlCi0gICAgLy8gb2YgdGhlIGJhY2tlbmQsIHRoZSBwbGF5ZXIgbWF5IG5vdCBhY3R1 YWxseSBiZSBwYXVzZWQgeWV0LgotICAgIC8vIEluIHRoaXMgY2FzZSwgd2Ugc2hvdWxkIHF1ZXVl IHRoZSBzZWVrIGFuZCB3YWl0IHVudGlsIHBhdXNpbmcgaGFzIGNvbXBsZXRlZAotICAgIC8vIGJl Zm9yZSBhdHRlbXB0aW5nIHRvIHNlZWsuCi0gICAgaWYgKG1fbWVkaWFQbGF5ZXItPnN0YXRlKCkg PT0gUU1lZGlhUGxheWVyOjpQbGF5aW5nU3RhdGUpIHsKLSAgICAgICAgbV9tZWRpYVBsYXllci0+ cGF1c2UoKTsKLSAgICAgICAgbV9pc1NlZWtpbmcgPSB0cnVlOwotICAgICAgICBtX3F1ZXVlZFNl ZWsgPSBzdGF0aWNfY2FzdDxxaW50NjQ+KHBvc2l0aW9uICogMTAwMCk7Ci0KLSAgICAgICAgLy8g U2V0IGEgdGltZW91dCwgc28gdGhhdCBpbiB0aGUgZXZlbnQgdGhhdCB3ZSBkb24ndCBnZXQgYSBz dGF0ZSBjaGFuZ2VkCi0gICAgICAgIC8vIHNpZ25hbCwgd2Ugc3RpbGwgYXR0ZW1wdCB0aGUgc2Vl ay4KLSAgICAgICAgUVRpbWVyOjpzaW5nbGVTaG90KDEwMDAsIHRoaXMsIFNMT1QocXVldWVkU2Vl a1RpbWVvdXQoKSkpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIG1faXNTZWVraW5nID0gdHJ1ZTsK LSAgICAgICAgbV9tZWRpYVBsYXllci0+c2V0UG9zaXRpb24oc3RhdGljX2Nhc3Q8cWludDY0Pihw b3NpdGlvbiAqIDEwMDApKTsKLQotICAgICAgICAvLyBTZXQgYSB0aW1lb3V0LCBpbiBjYXNlIHdl IGRvbid0IGdldCBhIHBvc2l0aW9uIGNoYW5nZWQgc2lnbmFsCi0gICAgICAgIFFUaW1lcjo6c2lu Z2xlU2hvdCgxMDAwMCwgdGhpcywgU0xPVChzZWVrVGltZW91dCgpKSk7Ci0gICAgfQorICAgIG1f aXNTZWVraW5nID0gdHJ1ZTsKKyAgICBtX21lZGlhUGxheWVyLT5zZXRQb3NpdGlvbihzdGF0aWNf Y2FzdDxxaW50NjQ+KHBvc2l0aW9uICogMTAwMCkpOwogfQogCiBib29sIE1lZGlhUGxheWVyUHJp dmF0ZVF0OjpzZWVraW5nKCkgY29uc3QKQEAgLTQ0MywxMyArNDE4LDggQEAgdm9pZCBNZWRpYVBs YXllclByaXZhdGVRdDo6aGFuZGxlRXJyb3IoUU1lZGlhUGxheWVyOjpFcnJvcikKICAgICB1cGRh dGVTdGF0ZXMoKTsKIH0KIAotdm9pZCBNZWRpYVBsYXllclByaXZhdGVRdDo6c3RhdGVDaGFuZ2Vk KFFNZWRpYVBsYXllcjo6U3RhdGUgc3RhdGUpCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF0Ojpz dGF0ZUNoYW5nZWQoUU1lZGlhUGxheWVyOjpTdGF0ZSkKIHsKLSAgICBpZiAoc3RhdGUgIT0gUU1l ZGlhUGxheWVyOjpQbGF5aW5nU3RhdGUgJiYgbV9pc1NlZWtpbmcgJiYgbV9xdWV1ZWRTZWVrID49 IDApIHsKLSAgICAgICAgbV9tZWRpYVBsYXllci0+c2V0UG9zaXRpb24obV9xdWV1ZWRTZWVrKTsK LSAgICAgICAgbV9xdWV1ZWRTZWVrID0gLTE7Ci0gICAgfQotCiAgICAgaWYgKCFtX3N1cHByZXNz TmV4dFBsYXliYWNrQ2hhbmdlZCkKICAgICAgICAgbV93ZWJDb3JlUGxheWVyLT5wbGF5YmFja1N0 YXRlQ2hhbmdlZCgpOwogICAgIGVsc2UKQEAgLTQ2OCwzNCArNDM4LDEzIEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlUXQ6Om5hdGl2ZVNpemVDaGFuZ2VkKGNvbnN0IFFTaXplRiYgc2l6ZSkKICAg ICBtX3dlYkNvcmVQbGF5ZXItPnNpemVDaGFuZ2VkKCk7CiB9CiAKLXZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlUXQ6OnF1ZXVlZFNlZWtUaW1lb3V0KCkKLXsKLSAgICAvLyBJZiB3ZSBoYXZlbid0IGhl YXJkIGFueXRoaW5nLCBhc3N1bWUgdGhlIHBsYXllciBpcyBub3cgcGF1c2VkCi0gICAgLy8gYW5k IHdlIGNhbiBhdHRlbXB0IHRoZSBzZWVrCi0gICAgaWYgKG1faXNTZWVraW5nICYmIG1fcXVldWVk U2VlayA+PSAwKSB7Ci0gICAgICAgIG1fbWVkaWFQbGF5ZXItPnNldFBvc2l0aW9uKG1fcXVldWVk U2Vlayk7Ci0gICAgICAgIG1fcXVldWVkU2VlayA9IC0xOwotCi0gICAgICAgIC8vIFNldCBhIHRp bWVvdXQsIGluIGNhc2Ugd2UgZG9uJ3QgZ2V0IGEgcG9zaXRpb24gY2hhbmdlZCBzaWduYWwKLSAg ICAgICAgUVRpbWVyOjpzaW5nbGVTaG90KDEwMDAwLCB0aGlzLCBTTE9UKHNlZWtUaW1lb3V0KCkp KTsKLSAgICB9Ci19Ci0KLXZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUXQ6OnNlZWtUaW1lb3V0KCkK LXsKLSAgICAvLyBJZiB3ZSBoYXZlbid0IGhlYXJkIGFueXRoaW5nLCBhc3N1bWUgdGhlIHNlZWsg c3VjY2VlZGVkCi0gICAgaWYgKG1faXNTZWVraW5nKSB7Ci0gICAgICAgIG1fd2ViQ29yZVBsYXll ci0+dGltZUNoYW5nZWQoKTsKLSAgICAgICAgbV9pc1NlZWtpbmcgPSBmYWxzZTsKLSAgICB9Ci19 Ci0KIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUXQ6OnBvc2l0aW9uQ2hhbmdlZChxaW50NjQpCiB7 CiAgICAgLy8gT25seSBwcm9wYWdhdGUgdGhpcyBldmVudCBpZiB3ZSBhcmUgc2Vla2luZwotICAg IGlmIChtX2lzU2Vla2luZyAmJiBtX3F1ZXVlZFNlZWsgPT0gLTEpIHsKLSAgICAgICAgbV93ZWJD b3JlUGxheWVyLT50aW1lQ2hhbmdlZCgpOworICAgIGlmIChtX2lzU2Vla2luZykgewogICAgICAg ICBtX2lzU2Vla2luZyA9IGZhbHNlOworICAgICAgICBtX21lZGlhUGxheWVyLT5wbGF5KCk7Cisg ICAgICAgIG1fd2ViQ29yZVBsYXllci0+dGltZUNoYW5nZWQoKTsKICAgICB9CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJp dmF0ZVF0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXll clByaXZhdGVRdC5oCmluZGV4IDgxY2RkNzkuLjdhOGUxZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQu aApAQCAtMTIwLDggKzEyMCw2IEBAIHByaXZhdGUgc2xvdHM6CiAgICAgdm9pZCBoYW5kbGVFcnJv cihRTWVkaWFQbGF5ZXI6OkVycm9yKTsKICAgICB2b2lkIHN0YXRlQ2hhbmdlZChRTWVkaWFQbGF5 ZXI6OlN0YXRlKTsKICAgICB2b2lkIG5hdGl2ZVNpemVDaGFuZ2VkKGNvbnN0IFFTaXplRiYpOwot ICAgIHZvaWQgcXVldWVkU2Vla1RpbWVvdXQoKTsKLSAgICB2b2lkIHNlZWtUaW1lb3V0KCk7CiAg ICAgdm9pZCBwb3NpdGlvbkNoYW5nZWQocWludDY0KTsKICAgICB2b2lkIGR1cmF0aW9uQ2hhbmdl ZChxaW50NjQpOwogICAgIHZvaWQgYnVmZmVyU3RhdHVzQ2hhbmdlZChpbnQpOwpAQCAtMTUzLDcg KzE1MSw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lzVmlzaWJsZTsKICAgICBib29sIG1faXNT ZWVraW5nOwogICAgIGJvb2wgbV9jb21wb3NpdGVkOwotICAgIHFpbnQ2NCBtX3F1ZXVlZFNlZWs7 CiAgICAgTWVkaWFQbGF5ZXI6OlByZWxvYWQgbV9wcmVsb2FkOwogICAgIGJvb2wgbV9kZWxheWlu Z0xvYWQ7CiAgICAgU3RyaW5nIG1fbWVkaWFVcmw7Cg== 85673 2011-03-14 07:47:00 -0700 2011-03-14 12:22:45 -0700 V2 with comments taken into account. patch.diff text/plain 5950 menard ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiNzBhNjkwLi41NTYyYWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDMtMTEgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0 XSBTZWVraW5nIHZpZGVvcyB1c2luZyB0aGUgdGltZWxpbmUgYmFyIGRvZXMgbm90IHdvcmsgcHJv cGVybHkgYW5kIHN0b3AgdGhlIHZpZGVvIHBsYXliYWNrLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTYxNDUKKworICAgICAgICBXZSBkbyBub3QgbmVl ZCBzZWVrVGltZW91dCBhbmQgcXVldWVkU2Vla1RpbWVvdXQgYW55bW9yZS4gc2V0UG9zaXRpb24g b24gUU1lZGlhUGxheWVyIGlzIGdvb2QgZW5vdWdoLgorICAgICAgICBwb3NpdGlvbkNoYW5nZWQo KSB3aWxsIGJlIGVtaXR0ZWQgd2hlbiB0aGUgZGF0YSBpcyBidWZmZXJlZC4gT24gTGludXggdGhl IHNpZ25hbCB3YXMgbm90IGVtaXR0ZWQgYmVjYXVzZQorICAgICAgICBvZiBhIGJ1ZyBpbiBRdE11 bHRpbWVkaWEuIEFsc28gd2UgbmVlZCB0byByZXN1bWUgdGhlIHBsYXliYWNrIGFmdGVyIHJlY2Vp dmluZyBwb3NpdGlvbkNoYW5nZWQoKSBiZWNhdXNlCisgICAgICAgIGJlZ2luU2NydWJiaW5nKCkg YWN0dWFsbHkgcGF1c2VkIHRoZSBtZWRpYXBsYXllciBwcmV2aW91c2x5LgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUXQ6Ok1lZGlhUGxheWVyUHJpdmF0ZVF0KToKKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZVF0OjpzZWVrKToKKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZVF0OjpzdGF0ZUNoYW5nZWQpOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUXQ6OnBvc2l0aW9uQ2hhbmdlZCk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuaDoKKwogMjAxMS0wMy0x MSAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcAppbmRleCAwMDFkNDViLi5kMjIy NDAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRp YVBsYXllclByaXZhdGVRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCkBAIC0xMDMsNyArMTAzLDYgQEAgTWVkaWFQ bGF5ZXJQcml2YXRlUXQ6Ok1lZGlhUGxheWVyUHJpdmF0ZVF0KE1lZGlhUGxheWVyKiBwbGF5ZXIp CiAgICAgLCBtX2lzVmlzaWJsZShmYWxzZSkKICAgICAsIG1faXNTZWVraW5nKGZhbHNlKQogICAg ICwgbV9jb21wb3NpdGVkKGZhbHNlKQotICAgICwgbV9xdWV1ZWRTZWVrKC0xKQogICAgICwgbV9w cmVsb2FkKE1lZGlhUGxheWVyOjpBdXRvKQogICAgICwgbV9zdXBwcmVzc05leHRQbGF5YmFja0No YW5nZWQoZmFsc2UpCiB7CkBAIC0yOTYsMzIgKzI5NSw4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlUXQ6OnNlZWsoZmxvYXQgcG9zaXRpb24pCiAgICAgaWYgKG1fbWVkaWFQbGF5ZXJDb250cm9s ICYmICFtX21lZGlhUGxheWVyQ29udHJvbC0+YXZhaWxhYmxlUGxheWJhY2tSYW5nZXMoKS5jb250 YWlucyhwb3NpdGlvbiAqIDEwMDApKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAobV9pc1Nl ZWtpbmcpCi0gICAgICAgIHJldHVybjsKLQotICAgIGlmIChwb3NpdGlvbiA+IGR1cmF0aW9uKCkp Ci0gICAgICAgIHBvc2l0aW9uID0gZHVyYXRpb24oKTsKLQotICAgIC8vIFNlZWtpbmcgaXMgbW9z dCByZWxpYWJsZSB3aGVuIHdlJ3JlIHBhdXNlZC4KLSAgICAvLyBXZWJraXQgd2lsbCB0cnkgdG8g cGF1c2UgYmVmb3JlIHNlZWtpbmcsIGJ1dCBkdWUgdG8gdGhlIGFzeW5jaHJvbm91cyBuYXR1cmUK LSAgICAvLyBvZiB0aGUgYmFja2VuZCwgdGhlIHBsYXllciBtYXkgbm90IGFjdHVhbGx5IGJlIHBh dXNlZCB5ZXQuCi0gICAgLy8gSW4gdGhpcyBjYXNlLCB3ZSBzaG91bGQgcXVldWUgdGhlIHNlZWsg YW5kIHdhaXQgdW50aWwgcGF1c2luZyBoYXMgY29tcGxldGVkCi0gICAgLy8gYmVmb3JlIGF0dGVt cHRpbmcgdG8gc2Vlay4KLSAgICBpZiAobV9tZWRpYVBsYXllci0+c3RhdGUoKSA9PSBRTWVkaWFQ bGF5ZXI6OlBsYXlpbmdTdGF0ZSkgewotICAgICAgICBtX21lZGlhUGxheWVyLT5wYXVzZSgpOwot ICAgICAgICBtX2lzU2Vla2luZyA9IHRydWU7Ci0gICAgICAgIG1fcXVldWVkU2VlayA9IHN0YXRp Y19jYXN0PHFpbnQ2ND4ocG9zaXRpb24gKiAxMDAwKTsKLQotICAgICAgICAvLyBTZXQgYSB0aW1l b3V0LCBzbyB0aGF0IGluIHRoZSBldmVudCB0aGF0IHdlIGRvbid0IGdldCBhIHN0YXRlIGNoYW5n ZWQKLSAgICAgICAgLy8gc2lnbmFsLCB3ZSBzdGlsbCBhdHRlbXB0IHRoZSBzZWVrLgotICAgICAg ICBRVGltZXI6OnNpbmdsZVNob3QoMTAwMCwgdGhpcywgU0xPVChxdWV1ZWRTZWVrVGltZW91dCgp KSk7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgbV9pc1NlZWtpbmcgPSB0cnVlOwotICAgICAgICBt X21lZGlhUGxheWVyLT5zZXRQb3NpdGlvbihzdGF0aWNfY2FzdDxxaW50NjQ+KHBvc2l0aW9uICog MTAwMCkpOwotCi0gICAgICAgIC8vIFNldCBhIHRpbWVvdXQsIGluIGNhc2Ugd2UgZG9uJ3QgZ2V0 IGEgcG9zaXRpb24gY2hhbmdlZCBzaWduYWwKLSAgICAgICAgUVRpbWVyOjpzaW5nbGVTaG90KDEw MDAwLCB0aGlzLCBTTE9UKHNlZWtUaW1lb3V0KCkpKTsKLSAgICB9CisgICAgbV9pc1NlZWtpbmcg PSB0cnVlOworICAgIG1fbWVkaWFQbGF5ZXItPnNldFBvc2l0aW9uKHN0YXRpY19jYXN0PHFpbnQ2 ND4ocG9zaXRpb24gKiAxMDAwKSk7CiB9CiAKIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlUXQ6OnNl ZWtpbmcoKSBjb25zdApAQCAtNDQzLDEzICs0MTgsOCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZVF0OjpoYW5kbGVFcnJvcihRTWVkaWFQbGF5ZXI6OkVycm9yKQogICAgIHVwZGF0ZVN0YXRlcygp OwogfQogCi12b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF0OjpzdGF0ZUNoYW5nZWQoUU1lZGlhUGxh eWVyOjpTdGF0ZSBzdGF0ZSkKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUXQ6OnN0YXRlQ2hhbmdl ZChRTWVkaWFQbGF5ZXI6OlN0YXRlKQogewotICAgIGlmIChzdGF0ZSAhPSBRTWVkaWFQbGF5ZXI6 OlBsYXlpbmdTdGF0ZSAmJiBtX2lzU2Vla2luZyAmJiBtX3F1ZXVlZFNlZWsgPj0gMCkgewotICAg ICAgICBtX21lZGlhUGxheWVyLT5zZXRQb3NpdGlvbihtX3F1ZXVlZFNlZWspOwotICAgICAgICBt X3F1ZXVlZFNlZWsgPSAtMTsKLSAgICB9Ci0KICAgICBpZiAoIW1fc3VwcHJlc3NOZXh0UGxheWJh Y2tDaGFuZ2VkKQogICAgICAgICBtX3dlYkNvcmVQbGF5ZXItPnBsYXliYWNrU3RhdGVDaGFuZ2Vk KCk7CiAgICAgZWxzZQpAQCAtNDY4LDM0ICs0MzgsMTggQEAgdm9pZCBNZWRpYVBsYXllclByaXZh dGVRdDo6bmF0aXZlU2l6ZUNoYW5nZWQoY29uc3QgUVNpemVGJiBzaXplKQogICAgIG1fd2ViQ29y ZVBsYXllci0+c2l6ZUNoYW5nZWQoKTsKIH0KIAotdm9pZCBNZWRpYVBsYXllclByaXZhdGVRdDo6 cXVldWVkU2Vla1RpbWVvdXQoKQotewotICAgIC8vIElmIHdlIGhhdmVuJ3QgaGVhcmQgYW55dGhp bmcsIGFzc3VtZSB0aGUgcGxheWVyIGlzIG5vdyBwYXVzZWQKLSAgICAvLyBhbmQgd2UgY2FuIGF0 dGVtcHQgdGhlIHNlZWsKLSAgICBpZiAobV9pc1NlZWtpbmcgJiYgbV9xdWV1ZWRTZWVrID49IDAp IHsKLSAgICAgICAgbV9tZWRpYVBsYXllci0+c2V0UG9zaXRpb24obV9xdWV1ZWRTZWVrKTsKLSAg ICAgICAgbV9xdWV1ZWRTZWVrID0gLTE7Ci0KLSAgICAgICAgLy8gU2V0IGEgdGltZW91dCwgaW4g Y2FzZSB3ZSBkb24ndCBnZXQgYSBwb3NpdGlvbiBjaGFuZ2VkIHNpZ25hbAotICAgICAgICBRVGlt ZXI6OnNpbmdsZVNob3QoMTAwMDAsIHRoaXMsIFNMT1Qoc2Vla1RpbWVvdXQoKSkpOwotICAgIH0K LX0KLQotdm9pZCBNZWRpYVBsYXllclByaXZhdGVRdDo6c2Vla1RpbWVvdXQoKQotewotICAgIC8v IElmIHdlIGhhdmVuJ3QgaGVhcmQgYW55dGhpbmcsIGFzc3VtZSB0aGUgc2VlayBzdWNjZWVkZWQK LSAgICBpZiAobV9pc1NlZWtpbmcpIHsKLSAgICAgICAgbV93ZWJDb3JlUGxheWVyLT50aW1lQ2hh bmdlZCgpOwotICAgICAgICBtX2lzU2Vla2luZyA9IGZhbHNlOwotICAgIH0KLX0KLQogdm9pZCBN ZWRpYVBsYXllclByaXZhdGVRdDo6cG9zaXRpb25DaGFuZ2VkKHFpbnQ2NCkKIHsKICAgICAvLyBP bmx5IHByb3BhZ2F0ZSB0aGlzIGV2ZW50IGlmIHdlIGFyZSBzZWVraW5nCi0gICAgaWYgKG1faXNT ZWVraW5nICYmIG1fcXVldWVkU2VlayA9PSAtMSkgewotICAgICAgICBtX3dlYkNvcmVQbGF5ZXIt PnRpbWVDaGFuZ2VkKCk7CisgICAgaWYgKG1faXNTZWVraW5nKSB7CiAgICAgICAgIG1faXNTZWVr aW5nID0gZmFsc2U7CisgICAgICAgIG1fd2ViQ29yZVBsYXllci0+dGltZUNoYW5nZWQoKTsKKwor ICAgICAgICBpZiAobV9tZWRpYVBsYXllci0+c3RhdGUoKSAhPSBRTWVkaWFQbGF5ZXI6OlBsYXlp bmdTdGF0ZSkgeworICAgICAgICAgICAgLy8gSWYgd2UgYXJlIHNlZWtpbmcgd2UgZG9uJ3Qgd2Fu dCB0byBwcm9wYWdhdGUgdGhlIHN0YXRlcyBjaGFuZ2VzIHRvIHRoZSBET00uCisgICAgICAgICAg ICBtX3N1cHByZXNzTmV4dFBsYXliYWNrQ2hhbmdlZCA9IHRydWU7CisgICAgICAgICAgICBtX21l ZGlhUGxheWVyLT5wbGF5KCk7CisgICAgICAgIH0KICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVR dC5oCmluZGV4IDgxY2RkNzkuLjdhOGUxZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuaApAQCAtMTIw LDggKzEyMCw2IEBAIHByaXZhdGUgc2xvdHM6CiAgICAgdm9pZCBoYW5kbGVFcnJvcihRTWVkaWFQ bGF5ZXI6OkVycm9yKTsKICAgICB2b2lkIHN0YXRlQ2hhbmdlZChRTWVkaWFQbGF5ZXI6OlN0YXRl KTsKICAgICB2b2lkIG5hdGl2ZVNpemVDaGFuZ2VkKGNvbnN0IFFTaXplRiYpOwotICAgIHZvaWQg cXVldWVkU2Vla1RpbWVvdXQoKTsKLSAgICB2b2lkIHNlZWtUaW1lb3V0KCk7CiAgICAgdm9pZCBw b3NpdGlvbkNoYW5nZWQocWludDY0KTsKICAgICB2b2lkIGR1cmF0aW9uQ2hhbmdlZChxaW50NjQp OwogICAgIHZvaWQgYnVmZmVyU3RhdHVzQ2hhbmdlZChpbnQpOwpAQCAtMTUzLDcgKzE1MSw2IEBA IHByaXZhdGU6CiAgICAgYm9vbCBtX2lzVmlzaWJsZTsKICAgICBib29sIG1faXNTZWVraW5nOwog ICAgIGJvb2wgbV9jb21wb3NpdGVkOwotICAgIHFpbnQ2NCBtX3F1ZXVlZFNlZWs7CiAgICAgTWVk aWFQbGF5ZXI6OlByZWxvYWQgbV9wcmVsb2FkOwogICAgIGJvb2wgbV9kZWxheWluZ0xvYWQ7CiAg ICAgU3RyaW5nIG1fbWVkaWFVcmw7Cg== 85700 2011-03-14 12:22:45 -0700 2011-03-14 12:34:13 -0700 V3 without the play. patch.diff text/plain 5689 menard ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiNzBhNjkwLi41NTYyYWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDMtMTEgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0 XSBTZWVraW5nIHZpZGVvcyB1c2luZyB0aGUgdGltZWxpbmUgYmFyIGRvZXMgbm90IHdvcmsgcHJv cGVybHkgYW5kIHN0b3AgdGhlIHZpZGVvIHBsYXliYWNrLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTYxNDUKKworICAgICAgICBXZSBkbyBub3QgbmVl ZCBzZWVrVGltZW91dCBhbmQgcXVldWVkU2Vla1RpbWVvdXQgYW55bW9yZS4gc2V0UG9zaXRpb24g b24gUU1lZGlhUGxheWVyIGlzIGdvb2QgZW5vdWdoLgorICAgICAgICBwb3NpdGlvbkNoYW5nZWQo KSB3aWxsIGJlIGVtaXR0ZWQgd2hlbiB0aGUgZGF0YSBpcyBidWZmZXJlZC4gT24gTGludXggdGhl IHNpZ25hbCB3YXMgbm90IGVtaXR0ZWQgYmVjYXVzZQorICAgICAgICBvZiBhIGJ1ZyBpbiBRdE11 bHRpbWVkaWEuIEFsc28gd2UgbmVlZCB0byByZXN1bWUgdGhlIHBsYXliYWNrIGFmdGVyIHJlY2Vp dmluZyBwb3NpdGlvbkNoYW5nZWQoKSBiZWNhdXNlCisgICAgICAgIGJlZ2luU2NydWJiaW5nKCkg YWN0dWFsbHkgcGF1c2VkIHRoZSBtZWRpYXBsYXllciBwcmV2aW91c2x5LgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUXQ6Ok1lZGlhUGxheWVyUHJpdmF0ZVF0KToKKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZVF0OjpzZWVrKToKKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZVF0OjpzdGF0ZUNoYW5nZWQpOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUXQ6OnBvc2l0aW9uQ2hhbmdlZCk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuaDoKKwogMjAxMS0wMy0x MSAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcAppbmRleCAwMDFkNDViLi4wMWUy NjFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRp YVBsYXllclByaXZhdGVRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCkBAIC0xMDMsNyArMTAzLDYgQEAgTWVkaWFQ bGF5ZXJQcml2YXRlUXQ6Ok1lZGlhUGxheWVyUHJpdmF0ZVF0KE1lZGlhUGxheWVyKiBwbGF5ZXIp CiAgICAgLCBtX2lzVmlzaWJsZShmYWxzZSkKICAgICAsIG1faXNTZWVraW5nKGZhbHNlKQogICAg ICwgbV9jb21wb3NpdGVkKGZhbHNlKQotICAgICwgbV9xdWV1ZWRTZWVrKC0xKQogICAgICwgbV9w cmVsb2FkKE1lZGlhUGxheWVyOjpBdXRvKQogICAgICwgbV9zdXBwcmVzc05leHRQbGF5YmFja0No YW5nZWQoZmFsc2UpCiB7CkBAIC0yOTYsMzIgKzI5NSw4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlUXQ6OnNlZWsoZmxvYXQgcG9zaXRpb24pCiAgICAgaWYgKG1fbWVkaWFQbGF5ZXJDb250cm9s ICYmICFtX21lZGlhUGxheWVyQ29udHJvbC0+YXZhaWxhYmxlUGxheWJhY2tSYW5nZXMoKS5jb250 YWlucyhwb3NpdGlvbiAqIDEwMDApKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAobV9pc1Nl ZWtpbmcpCi0gICAgICAgIHJldHVybjsKLQotICAgIGlmIChwb3NpdGlvbiA+IGR1cmF0aW9uKCkp Ci0gICAgICAgIHBvc2l0aW9uID0gZHVyYXRpb24oKTsKLQotICAgIC8vIFNlZWtpbmcgaXMgbW9z dCByZWxpYWJsZSB3aGVuIHdlJ3JlIHBhdXNlZC4KLSAgICAvLyBXZWJraXQgd2lsbCB0cnkgdG8g cGF1c2UgYmVmb3JlIHNlZWtpbmcsIGJ1dCBkdWUgdG8gdGhlIGFzeW5jaHJvbm91cyBuYXR1cmUK LSAgICAvLyBvZiB0aGUgYmFja2VuZCwgdGhlIHBsYXllciBtYXkgbm90IGFjdHVhbGx5IGJlIHBh dXNlZCB5ZXQuCi0gICAgLy8gSW4gdGhpcyBjYXNlLCB3ZSBzaG91bGQgcXVldWUgdGhlIHNlZWsg YW5kIHdhaXQgdW50aWwgcGF1c2luZyBoYXMgY29tcGxldGVkCi0gICAgLy8gYmVmb3JlIGF0dGVt cHRpbmcgdG8gc2Vlay4KLSAgICBpZiAobV9tZWRpYVBsYXllci0+c3RhdGUoKSA9PSBRTWVkaWFQ bGF5ZXI6OlBsYXlpbmdTdGF0ZSkgewotICAgICAgICBtX21lZGlhUGxheWVyLT5wYXVzZSgpOwot ICAgICAgICBtX2lzU2Vla2luZyA9IHRydWU7Ci0gICAgICAgIG1fcXVldWVkU2VlayA9IHN0YXRp Y19jYXN0PHFpbnQ2ND4ocG9zaXRpb24gKiAxMDAwKTsKLQotICAgICAgICAvLyBTZXQgYSB0aW1l b3V0LCBzbyB0aGF0IGluIHRoZSBldmVudCB0aGF0IHdlIGRvbid0IGdldCBhIHN0YXRlIGNoYW5n ZWQKLSAgICAgICAgLy8gc2lnbmFsLCB3ZSBzdGlsbCBhdHRlbXB0IHRoZSBzZWVrLgotICAgICAg ICBRVGltZXI6OnNpbmdsZVNob3QoMTAwMCwgdGhpcywgU0xPVChxdWV1ZWRTZWVrVGltZW91dCgp KSk7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgbV9pc1NlZWtpbmcgPSB0cnVlOwotICAgICAgICBt X21lZGlhUGxheWVyLT5zZXRQb3NpdGlvbihzdGF0aWNfY2FzdDxxaW50NjQ+KHBvc2l0aW9uICog MTAwMCkpOwotCi0gICAgICAgIC8vIFNldCBhIHRpbWVvdXQsIGluIGNhc2Ugd2UgZG9uJ3QgZ2V0 IGEgcG9zaXRpb24gY2hhbmdlZCBzaWduYWwKLSAgICAgICAgUVRpbWVyOjpzaW5nbGVTaG90KDEw MDAwLCB0aGlzLCBTTE9UKHNlZWtUaW1lb3V0KCkpKTsKLSAgICB9CisgICAgbV9pc1NlZWtpbmcg PSB0cnVlOworICAgIG1fbWVkaWFQbGF5ZXItPnNldFBvc2l0aW9uKHN0YXRpY19jYXN0PHFpbnQ2 ND4ocG9zaXRpb24gKiAxMDAwKSk7CiB9CiAKIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlUXQ6OnNl ZWtpbmcoKSBjb25zdApAQCAtNDQzLDEzICs0MTgsOCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZVF0OjpoYW5kbGVFcnJvcihRTWVkaWFQbGF5ZXI6OkVycm9yKQogICAgIHVwZGF0ZVN0YXRlcygp OwogfQogCi12b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF0OjpzdGF0ZUNoYW5nZWQoUU1lZGlhUGxh eWVyOjpTdGF0ZSBzdGF0ZSkKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUXQ6OnN0YXRlQ2hhbmdl ZChRTWVkaWFQbGF5ZXI6OlN0YXRlKQogewotICAgIGlmIChzdGF0ZSAhPSBRTWVkaWFQbGF5ZXI6 OlBsYXlpbmdTdGF0ZSAmJiBtX2lzU2Vla2luZyAmJiBtX3F1ZXVlZFNlZWsgPj0gMCkgewotICAg ICAgICBtX21lZGlhUGxheWVyLT5zZXRQb3NpdGlvbihtX3F1ZXVlZFNlZWspOwotICAgICAgICBt X3F1ZXVlZFNlZWsgPSAtMTsKLSAgICB9Ci0KICAgICBpZiAoIW1fc3VwcHJlc3NOZXh0UGxheWJh Y2tDaGFuZ2VkKQogICAgICAgICBtX3dlYkNvcmVQbGF5ZXItPnBsYXliYWNrU3RhdGVDaGFuZ2Vk KCk7CiAgICAgZWxzZQpAQCAtNDY4LDM0ICs0MzgsMTIgQEAgdm9pZCBNZWRpYVBsYXllclByaXZh dGVRdDo6bmF0aXZlU2l6ZUNoYW5nZWQoY29uc3QgUVNpemVGJiBzaXplKQogICAgIG1fd2ViQ29y ZVBsYXllci0+c2l6ZUNoYW5nZWQoKTsKIH0KIAotdm9pZCBNZWRpYVBsYXllclByaXZhdGVRdDo6 cXVldWVkU2Vla1RpbWVvdXQoKQotewotICAgIC8vIElmIHdlIGhhdmVuJ3QgaGVhcmQgYW55dGhp bmcsIGFzc3VtZSB0aGUgcGxheWVyIGlzIG5vdyBwYXVzZWQKLSAgICAvLyBhbmQgd2UgY2FuIGF0 dGVtcHQgdGhlIHNlZWsKLSAgICBpZiAobV9pc1NlZWtpbmcgJiYgbV9xdWV1ZWRTZWVrID49IDAp IHsKLSAgICAgICAgbV9tZWRpYVBsYXllci0+c2V0UG9zaXRpb24obV9xdWV1ZWRTZWVrKTsKLSAg ICAgICAgbV9xdWV1ZWRTZWVrID0gLTE7Ci0KLSAgICAgICAgLy8gU2V0IGEgdGltZW91dCwgaW4g Y2FzZSB3ZSBkb24ndCBnZXQgYSBwb3NpdGlvbiBjaGFuZ2VkIHNpZ25hbAotICAgICAgICBRVGlt ZXI6OnNpbmdsZVNob3QoMTAwMDAsIHRoaXMsIFNMT1Qoc2Vla1RpbWVvdXQoKSkpOwotICAgIH0K LX0KLQotdm9pZCBNZWRpYVBsYXllclByaXZhdGVRdDo6c2Vla1RpbWVvdXQoKQotewotICAgIC8v IElmIHdlIGhhdmVuJ3QgaGVhcmQgYW55dGhpbmcsIGFzc3VtZSB0aGUgc2VlayBzdWNjZWVkZWQK LSAgICBpZiAobV9pc1NlZWtpbmcpIHsKLSAgICAgICAgbV93ZWJDb3JlUGxheWVyLT50aW1lQ2hh bmdlZCgpOwotICAgICAgICBtX2lzU2Vla2luZyA9IGZhbHNlOwotICAgIH0KLX0KLQogdm9pZCBN ZWRpYVBsYXllclByaXZhdGVRdDo6cG9zaXRpb25DaGFuZ2VkKHFpbnQ2NCkKIHsKICAgICAvLyBP bmx5IHByb3BhZ2F0ZSB0aGlzIGV2ZW50IGlmIHdlIGFyZSBzZWVraW5nCi0gICAgaWYgKG1faXNT ZWVraW5nICYmIG1fcXVldWVkU2VlayA9PSAtMSkgewotICAgICAgICBtX3dlYkNvcmVQbGF5ZXIt PnRpbWVDaGFuZ2VkKCk7CisgICAgaWYgKG1faXNTZWVraW5nKSB7CiAgICAgICAgIG1faXNTZWVr aW5nID0gZmFsc2U7CisgICAgICAgIG1fd2ViQ29yZVBsYXllci0+dGltZUNoYW5nZWQoKTsKICAg ICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L01lZGlhUGxheWVyUHJpdmF0ZVF0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9xdC9NZWRpYVBsYXllclByaXZhdGVRdC5oCmluZGV4IDgxY2RkNzkuLjdhOGUxZGEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJp dmF0ZVF0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQ bGF5ZXJQcml2YXRlUXQuaApAQCAtMTIwLDggKzEyMCw2IEBAIHByaXZhdGUgc2xvdHM6CiAgICAg dm9pZCBoYW5kbGVFcnJvcihRTWVkaWFQbGF5ZXI6OkVycm9yKTsKICAgICB2b2lkIHN0YXRlQ2hh bmdlZChRTWVkaWFQbGF5ZXI6OlN0YXRlKTsKICAgICB2b2lkIG5hdGl2ZVNpemVDaGFuZ2VkKGNv bnN0IFFTaXplRiYpOwotICAgIHZvaWQgcXVldWVkU2Vla1RpbWVvdXQoKTsKLSAgICB2b2lkIHNl ZWtUaW1lb3V0KCk7CiAgICAgdm9pZCBwb3NpdGlvbkNoYW5nZWQocWludDY0KTsKICAgICB2b2lk IGR1cmF0aW9uQ2hhbmdlZChxaW50NjQpOwogICAgIHZvaWQgYnVmZmVyU3RhdHVzQ2hhbmdlZChp bnQpOwpAQCAtMTUzLDcgKzE1MSw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lzVmlzaWJsZTsK ICAgICBib29sIG1faXNTZWVraW5nOwogICAgIGJvb2wgbV9jb21wb3NpdGVkOwotICAgIHFpbnQ2 NCBtX3F1ZXVlZFNlZWs7CiAgICAgTWVkaWFQbGF5ZXI6OlByZWxvYWQgbV9wcmVsb2FkOwogICAg IGJvb2wgbV9kZWxheWluZ0xvYWQ7CiAgICAgU3RyaW5nIG1fbWVkaWFVcmw7Cg== 85702 2011-03-14 12:34:13 -0700 2011-03-14 22:59:34 -0700 V4 with up-to-date changelog patch.diff text/plain 5541 menard ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiNzBhNjkwLi5mMTllY2RkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDMtMTEgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0 XSBTZWVraW5nIHZpZGVvcyB1c2luZyB0aGUgdGltZWxpbmUgYmFyIGRvZXMgbm90IHdvcmsgcHJv cGVybHkgYW5kIHN0b3AgdGhlIHZpZGVvIHBsYXliYWNrLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTYxNDUKKworICAgICAgICBXZSBkbyBub3QgbmVl ZCBzZWVrVGltZW91dCBhbmQgcXVldWVkU2Vla1RpbWVvdXQgYW55bW9yZS4gc2V0UG9zaXRpb24g b24gUU1lZGlhUGxheWVyIGlzIGdvb2QgZW5vdWdoLgorICAgICAgICBwb3NpdGlvbkNoYW5nZWQo KSB3aWxsIGJlIGVtaXR0ZWQgd2hlbiB0aGUgZGF0YSBpcyBidWZmZXJlZC4gT24gTGludXggdGhl IHNpZ25hbCB3YXMgbm90IGVtaXR0ZWQgYmVjYXVzZQorICAgICAgICBvZiBhIGJ1ZyBpbiBRdE11 bHRpbWVkaWEuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclBy aXZhdGVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVRdDo6TWVk aWFQbGF5ZXJQcml2YXRlUXQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRl UXQ6OnNlZWspOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUXQ6OnN0YXRl Q2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVRdDo6cG9zaXRp b25DaGFuZ2VkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclBy aXZhdGVRdC5oOgorCiAyMDExLTAzLTExICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQu Y3BwCmluZGV4IDAwMWQ0NWIuLjAxZTI2MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVRdC5jcHAKQEAg LTEwMyw3ICsxMDMsNiBAQCBNZWRpYVBsYXllclByaXZhdGVRdDo6TWVkaWFQbGF5ZXJQcml2YXRl UXQoTWVkaWFQbGF5ZXIqIHBsYXllcikKICAgICAsIG1faXNWaXNpYmxlKGZhbHNlKQogICAgICwg bV9pc1NlZWtpbmcoZmFsc2UpCiAgICAgLCBtX2NvbXBvc2l0ZWQoZmFsc2UpCi0gICAgLCBtX3F1 ZXVlZFNlZWsoLTEpCiAgICAgLCBtX3ByZWxvYWQoTWVkaWFQbGF5ZXI6OkF1dG8pCiAgICAgLCBt X3N1cHByZXNzTmV4dFBsYXliYWNrQ2hhbmdlZChmYWxzZSkKIHsKQEAgLTI5NiwzMiArMjk1LDgg QEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVRdDo6c2VlayhmbG9hdCBwb3NpdGlvbikKICAgICBp ZiAobV9tZWRpYVBsYXllckNvbnRyb2wgJiYgIW1fbWVkaWFQbGF5ZXJDb250cm9sLT5hdmFpbGFi bGVQbGF5YmFja1JhbmdlcygpLmNvbnRhaW5zKHBvc2l0aW9uICogMTAwMCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIGlmIChtX2lzU2Vla2luZykKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYg KHBvc2l0aW9uID4gZHVyYXRpb24oKSkKLSAgICAgICAgcG9zaXRpb24gPSBkdXJhdGlvbigpOwot Ci0gICAgLy8gU2Vla2luZyBpcyBtb3N0IHJlbGlhYmxlIHdoZW4gd2UncmUgcGF1c2VkLgotICAg IC8vIFdlYmtpdCB3aWxsIHRyeSB0byBwYXVzZSBiZWZvcmUgc2Vla2luZywgYnV0IGR1ZSB0byB0 aGUgYXN5bmNocm9ub3VzIG5hdHVyZQotICAgIC8vIG9mIHRoZSBiYWNrZW5kLCB0aGUgcGxheWVy IG1heSBub3QgYWN0dWFsbHkgYmUgcGF1c2VkIHlldC4KLSAgICAvLyBJbiB0aGlzIGNhc2UsIHdl IHNob3VsZCBxdWV1ZSB0aGUgc2VlayBhbmQgd2FpdCB1bnRpbCBwYXVzaW5nIGhhcyBjb21wbGV0 ZWQKLSAgICAvLyBiZWZvcmUgYXR0ZW1wdGluZyB0byBzZWVrLgotICAgIGlmIChtX21lZGlhUGxh eWVyLT5zdGF0ZSgpID09IFFNZWRpYVBsYXllcjo6UGxheWluZ1N0YXRlKSB7Ci0gICAgICAgIG1f bWVkaWFQbGF5ZXItPnBhdXNlKCk7Ci0gICAgICAgIG1faXNTZWVraW5nID0gdHJ1ZTsKLSAgICAg ICAgbV9xdWV1ZWRTZWVrID0gc3RhdGljX2Nhc3Q8cWludDY0Pihwb3NpdGlvbiAqIDEwMDApOwot Ci0gICAgICAgIC8vIFNldCBhIHRpbWVvdXQsIHNvIHRoYXQgaW4gdGhlIGV2ZW50IHRoYXQgd2Ug ZG9uJ3QgZ2V0IGEgc3RhdGUgY2hhbmdlZAotICAgICAgICAvLyBzaWduYWwsIHdlIHN0aWxsIGF0 dGVtcHQgdGhlIHNlZWsuCi0gICAgICAgIFFUaW1lcjo6c2luZ2xlU2hvdCgxMDAwLCB0aGlzLCBT TE9UKHF1ZXVlZFNlZWtUaW1lb3V0KCkpKTsKLSAgICB9IGVsc2UgewotICAgICAgICBtX2lzU2Vl a2luZyA9IHRydWU7Ci0gICAgICAgIG1fbWVkaWFQbGF5ZXItPnNldFBvc2l0aW9uKHN0YXRpY19j YXN0PHFpbnQ2ND4ocG9zaXRpb24gKiAxMDAwKSk7Ci0KLSAgICAgICAgLy8gU2V0IGEgdGltZW91 dCwgaW4gY2FzZSB3ZSBkb24ndCBnZXQgYSBwb3NpdGlvbiBjaGFuZ2VkIHNpZ25hbAotICAgICAg ICBRVGltZXI6OnNpbmdsZVNob3QoMTAwMDAsIHRoaXMsIFNMT1Qoc2Vla1RpbWVvdXQoKSkpOwot ICAgIH0KKyAgICBtX2lzU2Vla2luZyA9IHRydWU7CisgICAgbV9tZWRpYVBsYXllci0+c2V0UG9z aXRpb24oc3RhdGljX2Nhc3Q8cWludDY0Pihwb3NpdGlvbiAqIDEwMDApKTsKIH0KIAogYm9vbCBN ZWRpYVBsYXllclByaXZhdGVRdDo6c2Vla2luZygpIGNvbnN0CkBAIC00NDMsMTMgKzQxOCw4IEBA IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUXQ6OmhhbmRsZUVycm9yKFFNZWRpYVBsYXllcjo6RXJy b3IpCiAgICAgdXBkYXRlU3RhdGVzKCk7CiB9CiAKLXZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUXQ6 OnN0YXRlQ2hhbmdlZChRTWVkaWFQbGF5ZXI6OlN0YXRlIHN0YXRlKQordm9pZCBNZWRpYVBsYXll clByaXZhdGVRdDo6c3RhdGVDaGFuZ2VkKFFNZWRpYVBsYXllcjo6U3RhdGUpCiB7Ci0gICAgaWYg KHN0YXRlICE9IFFNZWRpYVBsYXllcjo6UGxheWluZ1N0YXRlICYmIG1faXNTZWVraW5nICYmIG1f cXVldWVkU2VlayA+PSAwKSB7Ci0gICAgICAgIG1fbWVkaWFQbGF5ZXItPnNldFBvc2l0aW9uKG1f cXVldWVkU2Vlayk7Ci0gICAgICAgIG1fcXVldWVkU2VlayA9IC0xOwotICAgIH0KLQogICAgIGlm ICghbV9zdXBwcmVzc05leHRQbGF5YmFja0NoYW5nZWQpCiAgICAgICAgIG1fd2ViQ29yZVBsYXll ci0+cGxheWJhY2tTdGF0ZUNoYW5nZWQoKTsKICAgICBlbHNlCkBAIC00NjgsMzQgKzQzOCwxMiBA QCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF0OjpuYXRpdmVTaXplQ2hhbmdlZChjb25zdCBRU2l6 ZUYmIHNpemUpCiAgICAgbV93ZWJDb3JlUGxheWVyLT5zaXplQ2hhbmdlZCgpOwogfQogCi12b2lk IE1lZGlhUGxheWVyUHJpdmF0ZVF0OjpxdWV1ZWRTZWVrVGltZW91dCgpCi17Ci0gICAgLy8gSWYg d2UgaGF2ZW4ndCBoZWFyZCBhbnl0aGluZywgYXNzdW1lIHRoZSBwbGF5ZXIgaXMgbm93IHBhdXNl ZAotICAgIC8vIGFuZCB3ZSBjYW4gYXR0ZW1wdCB0aGUgc2VlawotICAgIGlmIChtX2lzU2Vla2lu ZyAmJiBtX3F1ZXVlZFNlZWsgPj0gMCkgewotICAgICAgICBtX21lZGlhUGxheWVyLT5zZXRQb3Np dGlvbihtX3F1ZXVlZFNlZWspOwotICAgICAgICBtX3F1ZXVlZFNlZWsgPSAtMTsKLQotICAgICAg ICAvLyBTZXQgYSB0aW1lb3V0LCBpbiBjYXNlIHdlIGRvbid0IGdldCBhIHBvc2l0aW9uIGNoYW5n ZWQgc2lnbmFsCi0gICAgICAgIFFUaW1lcjo6c2luZ2xlU2hvdCgxMDAwMCwgdGhpcywgU0xPVChz ZWVrVGltZW91dCgpKSk7Ci0gICAgfQotfQotCi12b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF0Ojpz ZWVrVGltZW91dCgpCi17Ci0gICAgLy8gSWYgd2UgaGF2ZW4ndCBoZWFyZCBhbnl0aGluZywgYXNz dW1lIHRoZSBzZWVrIHN1Y2NlZWRlZAotICAgIGlmIChtX2lzU2Vla2luZykgewotICAgICAgICBt X3dlYkNvcmVQbGF5ZXItPnRpbWVDaGFuZ2VkKCk7Ci0gICAgICAgIG1faXNTZWVraW5nID0gZmFs c2U7Ci0gICAgfQotfQotCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF0Ojpwb3NpdGlvbkNoYW5n ZWQocWludDY0KQogewogICAgIC8vIE9ubHkgcHJvcGFnYXRlIHRoaXMgZXZlbnQgaWYgd2UgYXJl IHNlZWtpbmcKLSAgICBpZiAobV9pc1NlZWtpbmcgJiYgbV9xdWV1ZWRTZWVrID09IC0xKSB7Ci0g ICAgICAgIG1fd2ViQ29yZVBsYXllci0+dGltZUNoYW5nZWQoKTsKKyAgICBpZiAobV9pc1NlZWtp bmcpIHsKICAgICAgICAgbV9pc1NlZWtpbmcgPSBmYWxzZTsKKyAgICAgICAgbV93ZWJDb3JlUGxh eWVyLT50aW1lQ2hhbmdlZCgpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmgKaW5kZXgg ODFjZGQ3OS4uN2E4ZTFkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVRdC5oCkBAIC0xMjAsOCArMTIwLDYg QEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIGhhbmRsZUVycm9yKFFNZWRpYVBsYXllcjo6RXJy b3IpOwogICAgIHZvaWQgc3RhdGVDaGFuZ2VkKFFNZWRpYVBsYXllcjo6U3RhdGUpOwogICAgIHZv aWQgbmF0aXZlU2l6ZUNoYW5nZWQoY29uc3QgUVNpemVGJik7Ci0gICAgdm9pZCBxdWV1ZWRTZWVr VGltZW91dCgpOwotICAgIHZvaWQgc2Vla1RpbWVvdXQoKTsKICAgICB2b2lkIHBvc2l0aW9uQ2hh bmdlZChxaW50NjQpOwogICAgIHZvaWQgZHVyYXRpb25DaGFuZ2VkKHFpbnQ2NCk7CiAgICAgdm9p ZCBidWZmZXJTdGF0dXNDaGFuZ2VkKGludCk7CkBAIC0xNTMsNyArMTUxLDYgQEAgcHJpdmF0ZToK ICAgICBib29sIG1faXNWaXNpYmxlOwogICAgIGJvb2wgbV9pc1NlZWtpbmc7CiAgICAgYm9vbCBt X2NvbXBvc2l0ZWQ7Ci0gICAgcWludDY0IG1fcXVldWVkU2VlazsKICAgICBNZWRpYVBsYXllcjo6 UHJlbG9hZCBtX3ByZWxvYWQ7CiAgICAgYm9vbCBtX2RlbGF5aW5nTG9hZDsKICAgICBTdHJpbmcg bV9tZWRpYVVybDsK