64314 2011-07-11 13:32:20 -0700 REGRESSION(r89004): Video pauses and never resumes playing if scrubbed during playback 2011-10-11 01:44:41 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED http://media.w3.org/2010/05/bunny/movie.mp4 InRadar, Regression P2 Normal --- 1 mrowe tkent dglazkov hyatt jer.noble sam sjl tkent tonikitoo oldest_to_newest 435175 0 mrowe 2011-07-11 13:32:20 -0700 Steps to reproduce: 1) Load <http://media.w3.org/2010/05/bunny/movie.mp4> and let the video begin to play. 2) Click in the playback timeline to move ahead. 3) Wait for a few moments to see whether the video continues to play from that point. Results: Video stops playing after 2 and never resumes. Pressing pause then play again does not unstick it. 435177 1 mrowe 2011-07-11 13:33:51 -0700 This broke in r89004. 435178 2 mrowe 2011-07-11 13:35:32 -0700 The video gets stuck because after r89004 MediaControlTimelineElement::defaultEventHandler no longer sees the mouse up event. This means that endScrubbing is no longer called on the MediaElement. 435180 3 mrowe 2011-07-11 13:37:35 -0700 For ease of clickability: This broke in <http://trac.webkit.org/changeset/89004>. 435323 4 mrowe 2011-07-11 17:10:29 -0700 <rdar://problem/9757476> 435453 5 100432 tkent 2011-07-11 20:10:22 -0700 Created attachment 100432 Patch 435456 6 100432 mrowe 2011-07-11 20:27:37 -0700 Comment on attachment 100432 Patch Why is mousedown different? 435458 7 tkent 2011-07-11 20:33:00 -0700 (In reply to comment #6) > (From update of attachment 100432 [details]) > Why is mousedown different? setDefaultHandled() for mousedown is required to fix Bug 62683, and mousedown is unrelated to this media control issue. 435461 8 mrowe 2011-07-11 20:35:28 -0700 I understand that changing it is not required to fix the bug. What I’m asking is why does calling setDefaultHandled cause a problem for mousemove / mouseup but not for mousedown? Why is there an inconsistency in behavior? 435468 9 tkent 2011-07-11 21:13:13 -0700 (In reply to comment #8) I think it's because SliderThumbElement starts mouse capturing since a mousedown event. 437217 10 jer.noble 2011-07-14 11:21:24 -0700 (In reply to comment #9) > (In reply to comment #8) > > I think it's because SliderThumbElement starts mouse capturing since a mousedown event. MediaControlTimelineElement::defaultEventHandler() needs to receive a mouseDown event to initiate scrubbing. Calling setDefaultHandled() in SliderThumbElement means that event will never be handled by MediaControlTimelineElement. The setDefaultHandled() call for mouseDown must be removed as well to fix media scrubbing, so this patch is not complete. Is there another way to fix the Qt layout test that doesn't involve calling setDefaultHandled() on mouseDown events? 438798 11 sjl 2011-07-18 16:07:59 -0700 FYI: This problem has broken Chromium too. Any ETA? Thx :-) 438892 12 tkent 2011-07-18 18:24:40 -0700 Jer, Steve, Would you try my patch and tell me what's wrong please? I thought my patch fixed the bug. 438903 13 mrowe 2011-07-18 18:31:07 -0700 A code change can fix a bug yet not be correct. 438911 14 sjl 2011-07-18 18:46:03 -0700 The patch does fix the symptom (i.e. media timeline now works, for chromium), but I don't understand why the mouseDown case should be different? 438972 15 jer.noble 2011-07-18 22:52:39 -0700 (In reply to comment #12) > Jer, Steve, > Would you try my patch and tell me what's wrong please? I thought my patch fixed the bug. Your patch sets defaultHandled for mouseDown events. This means that MediaControlTimelineElement will never see the mouseDown event, and HTMLMediaElement::beginScrubbing() will never be called. HTMLMediaElement::beginScrubbing() sets some internal flags and pauses the movie if necessary. HTMLMediaElement::endScrubbing() checks those flags, and begins to play the movie if it was paused in beginScrubbing(). With your patch, beginScrubbing() will never get called, and endScrubbing() will. While your patch fixes the obvious bug, it creates another less obvious one. 438977 16 sjl 2011-07-18 23:06:27 -0700 And testing more closely, pausing/resuming after scrubbing is now buggy (with the patch). 438980 17 tkent 2011-07-18 23:22:04 -0700 Thank you for the comments. It seems I tested with a wrong way. I thought I clicked on the thumb of the timeline slider but probably I clicked on the slider track near the thumb. My patch doesn't pause the media by mouse clicking. 438981 18 101272 tkent 2011-07-18 23:26:50 -0700 Created attachment 101272 Patch 2 438986 19 101272 jer.noble 2011-07-18 23:42:10 -0700 Comment on attachment 101272 Patch 2 View in context: https://bugs.webkit.org/attachment.cgi?id=101272&action=review This patch looks much better. Just one comment: > Source/WebCore/html/RangeInputType.cpp:164 > + // Mouse click on the thumb was already handled in SliderThumbElement::defaultEventHandler(). > + if (targetNode == thumb) > + return; > thumb->dragFrom(event->absoluteLocation()); > event->setDefaultHandled(); Now that you return early here, is the "event->setDefaultHandled()" line still necessary to fix bug #64314? 438987 20 jer.noble 2011-07-18 23:44:32 -0700 (In reply to comment #19) > Now that you return early here, is the "event->setDefaultHandled()" line still necessary to fix bug #64314? Whoops, wrong bug number. Is that line still needed to fix bug #62683? 438988 21 101272 mrowe 2011-07-18 23:44:44 -0700 Comment on attachment 101272 Patch 2 View in context: https://bugs.webkit.org/attachment.cgi?id=101272&action=review > Source/WebCore/html/shadow/SliderThumbElement.cpp:283 > + // We don't call event->setDefaultHandled() here intentionally. > + // http://webkit.org/b/64314 We typically don’t put a comment at every location that we don’t call a given function. Is the lack of call to setDefaultHandled here so surprising that the comment is necessary? 439003 22 101282 tkent 2011-07-19 00:13:28 -0700 Created attachment 101282 Patch 3 439004 23 101272 tkent 2011-07-19 00:17:56 -0700 Comment on attachment 101272 Patch 2 View in context: https://bugs.webkit.org/attachment.cgi?id=101272&action=review >> Source/WebCore/html/RangeInputType.cpp:164 >> event->setDefaultHandled(); > > Now that you return early here, is the "event->setDefaultHandled()" line still necessary to fix bug #64314? It is unnecessary. Removed. >> Source/WebCore/html/shadow/SliderThumbElement.cpp:283 >> + // http://webkit.org/b/64314 > > We typically don’t put a comment at every location that we don’t call a given function. Is the lack of call to setDefaultHandled here so surprising that the comment is necessary? The lack surprised me and I added setDefaultHandled() blindly in r89004. Almost all of event handling code of HTMLInputElement and InputTypes call setDefaultHandled() if they do something for events. 439601 24 101282 sam 2011-07-19 19:14:23 -0700 Comment on attachment 101282 Patch 3 View in context: https://bugs.webkit.org/attachment.cgi?id=101282&action=review > Source/WebCore/html/shadow/SliderThumbElement.cpp:283 > + // We don't call event->setDefaultHandled() here intentionally. > + // http://webkit.org/b/64314 A better way to phrase this would be "We intentionally do not call event->setDefaultHandled() here. It would probably be of more use to explain why we don't call it rather than pointing to a bug. 439617 25 tkent 2011-07-19 21:43:30 -0700 (In reply to comment #24) > (From update of attachment 101282 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=101282&action=review > > > Source/WebCore/html/shadow/SliderThumbElement.cpp:283 > > + // We don't call event->setDefaultHandled() here intentionally. > > + // http://webkit.org/b/64314 > > A better way to phrase this would be "We intentionally do not call event->setDefaultHandled() here. It would probably be of more use to explain why we don't call it rather than pointing to a bug. Thanks! I'll change the comment as follows and will land the patch. // We intentionally do not call event->setDefaultHandled() here because // MediaControlTimelineElement::defaultEventHandler() wants to handle these // mouse events. 439618 26 tkent 2011-07-19 21:46:49 -0700 Committed r91333: <http://trac.webkit.org/changeset/91333> 479148 27 tonikitoo 2011-10-06 07:30:55 -0700 (In reply to comment #26) > Committed r91333: <http://trac.webkit.org/changeset/91333> Kent, is this really the right thing to do for "input type=range" case. Now no events get handled at all on this case for range input. More specially, getting the mouse-move set as 'defaultHandled' when draggin the slider is specially usefull for touch-based input devices, if they want to make this slider draggable. 481510 28 tkent 2011-10-11 01:44:41 -0700 (In reply to comment #27) > (In reply to comment #26) > > Committed r91333: <http://trac.webkit.org/changeset/91333> > > Kent, is this really the right thing to do for "input type=range" case. Now no events get handled at all on this case for range input. > > More specially, getting the mouse-move set as 'defaultHandled' when draggin the slider is specially usefull for touch-based input devices, if they want to make this slider draggable. I think the current behavior is same as the behavior before r89004. Would you explain the detail of the use-case in another bug please? 100432 2011-07-11 20:10:22 -0700 2011-07-18 23:26:42 -0700 Patch bug-64314-20110712121021.patch text/plain 1985 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogOTA4MDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkODVhY2NiMzA1MWVmMWIx YTVhODA1NTVlYjFmZmYwMmEwM2VlNWQwLi44ZjZkZDVkZjA3MDk2MDFlOGQxMmJjN2ZmMmIzOGIy MTVhNThiZGEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDctMTEgIEtlbnQg VGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJFR1JFU1NJT04ocjg5MDA0 KTogVmlkZW8gcGF1c2VzIGFuZCBuZXZlciByZXN1bWVzIHBsYXlpbmcgaWYgc2NydWJiZWQgZHVy aW5nIHBsYXliYWNrLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQzMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBpdCdzIGhhcmQgdG8gbWFrZSBhIG5vbi1mbGFreSB0 ZXN0IGZvciB0aGlzIGJlaGF2aW9yLgorCisgICAgICAgICogaHRtbC9zaGFkb3cvU2xpZGVyVGh1 bWJFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNsaWRlclRodW1iRWxlbWVudDo6ZGVm YXVsdEV2ZW50SGFuZGxlcik6CisgICAgICAgICBEbyBub3QgY2FsbCBzZXREZWZhdWx0SGFuZGxl ZCgpIGZvciBtb3VzZW1vdmUgYW5kIG1vdXNldXAgaW4KKyAgICAgICAgIG9yZGVyIHRvIHByb3Bh Z2F0ZSB0aGVtIHRvIGFuY2VzdG9yIGVsZW1lbnRzLgorCiAyMDExLTA3LTExICBSeW9zdWtlIE5p d2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIHBvc2l0aW9uRm9yUG9pbnQgaXMgYnJv a2VuIHdoZW4gYSBibG9jayBpcyBwb3NpdGlvbmVkIHJlbGF0aXZlbHkgaW5zaWRlIHRoZSBwYXJl bnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxl bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVsZW1lbnQu Y3BwCmluZGV4IDJjNmI0ODgxNGNiODFkYWI0MGMwNjRiMmM0YTljYzcwZjU0MDhhNmMuLjMyZmM2 YzA1MDUxOWU4NjQ2YzllZWNmMTBmOTBmMjUyOGRiNGMyZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50LmNwcApAQCAtMjg1LDEyICsyODUs MTQgQEAgdm9pZCBTbGlkZXJUaHVtYkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQq IGV2ZW50KQogICAgICAgICByZXR1cm47CiAgICAgfSBlbHNlIGlmIChldmVudFR5cGUgPT0gZXZl bnROYW1lcygpLm1vdXNldXBFdmVudCAmJiBpc0xlZnRCdXR0b24pIHsKICAgICAgICAgc3RvcERy YWdnaW5nKCk7Ci0gICAgICAgIGV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgpOworICAgICAgICAv LyBXZSBkb24ndCBjYWxsIGV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgpIGhlcmUgaW50ZW50aW9u YWxseS4KKyAgICAgICAgLy8gaHR0cDovL3dlYmtpdC5vcmcvYi82NDMxNAogICAgICAgICByZXR1 cm47CiAgICAgfSBlbHNlIGlmIChldmVudFR5cGUgPT0gZXZlbnROYW1lcygpLm1vdXNlbW92ZUV2 ZW50KSB7CiAgICAgICAgIGlmIChtX2luRHJhZ01vZGUpCiAgICAgICAgICAgICBzZXRQb3NpdGlv bkZyb21Qb2ludChtb3VzZUV2ZW50LT5hYnNvbHV0ZUxvY2F0aW9uKCkpOwotICAgICAgICBldmVu dC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKKyAgICAgICAgLy8gV2UgZG9uJ3QgY2FsbCBldmVudC0+ c2V0RGVmYXVsdEhhbmRsZWQoKSBoZXJlIGludGVudGlvbmFsbHkuCisgICAgICAgIC8vIGh0dHA6 Ly93ZWJraXQub3JnL2IvNjQzMTQKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAo= 101272 2011-07-18 23:26:50 -0700 2011-07-19 00:18:08 -0700 Patch 2 bug-64314-20110719152648.patch text/plain 3133 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogOTEyMzgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3ZmE3MzgwYTFlZjMzZTgw NzRkZTA2NDVlOGE0Yzk0ODVmODM4ZjAyLi45MmUxNDY3ZDFmM2Q5ODI0M2NkY2VmMGZkYzQ4NjUx NmNlNzBiY2RjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDctMTggIEtlbnQg VGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJFR1JFU1NJT04ocjg5MDA0 KTogVmlkZW8gcGF1c2VzIGFuZCBuZXZlciByZXN1bWVzIHBsYXlpbmcgaWYgc2NydWJiZWQgZHVy aW5nIHBsYXliYWNrLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQzMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBpdCdzIGhhcmQgdG8gbWFrZSBhIG5vbi1mbGFreSB0 ZXN0IGZvciB0aGlzIGJlaGF2aW9yLgorCisgICAgICAgICogaHRtbC9SYW5nZUlucHV0VHlwZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSYW5nZUlucHV0VHlwZTo6aGFuZGxlTW91c2VEb3duRXZl bnQpOgorICAgICAgICBEb24ndCBjYWxsIFNsaWRlclRodW1iRWxlbWVudDo6ZHJhZ0Zyb20oKSBm b3IgZXZlbnRzIG9uIHRoZSB0aHVtYi4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9TbGlkZXJUaHVt YkVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2xpZGVyVGh1bWJFbGVtZW50OjpkZWZh dWx0RXZlbnRIYW5kbGVyKToKKyAgICAgICAgRG8gbm90IGNhbGwgc2V0RGVmYXVsdEhhbmRsZWQo KSBmb3IgbW91c2UgZXZlbnRzIGluIG9yZGVyIHRvCisgICAgICAgIHByb3BhZ2F0ZSB0aGVtIHRv IGFuY2VzdG9yIGVsZW1lbnRzLgorCiAyMDExLTA3LTE4ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04oOTEyMDk/KTogZmFzdC9jc3MvY3VzdG9t LWZvbnQteGhlaWdodC5odG1sIGlzIGZhaWxpbmcgb24gTGVvcGFyZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9SYW5nZUlucHV0VHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L1JhbmdlSW5wdXRUeXBlLmNwcAppbmRleCBmYjllZTVkZWJmNGMwMmQyMDVlM2I4MjYxNjIzODE1 ZTJkMGQ4Nzk0Li5jNDg3MzZiYmNjMTZiOTEyMzI5MTM1ZjE3NGNiY2RkZjZiZWYwMDEwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1JhbmdlSW5wdXRUeXBlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL1JhbmdlSW5wdXRUeXBlLmNwcApAQCAtMTU2LDggKzE1NiwxMCBAQCB2 b2lkIFJhbmdlSW5wdXRUeXBlOjpoYW5kbGVNb3VzZURvd25FdmVudChNb3VzZUV2ZW50KiBldmVu dCkKICAgICBOb2RlKiB0YXJnZXROb2RlID0gZXZlbnQtPnRhcmdldCgpLT50b05vZGUoKTsKICAg ICBpZiAoZXZlbnQtPmJ1dHRvbigpICE9IExlZnRCdXR0b24gfHwgIXRhcmdldE5vZGUgfHwgKHRh cmdldE5vZGUgIT0gZWxlbWVudCgpICYmICF0YXJnZXROb2RlLT5pc0Rlc2NlbmRhbnRPZihlbGVt ZW50KCktPnNoYWRvd1Jvb3QoKSkpKQogICAgICAgICByZXR1cm47Ci0KICAgICBTbGlkZXJUaHVt YkVsZW1lbnQqIHRodW1iID0gc2xpZGVyVGh1bWJFbGVtZW50T2YoZWxlbWVudCgpKTsKKyAgICAv LyBNb3VzZSBjbGljayBvbiB0aGUgdGh1bWIgd2FzIGFscmVhZHkgaGFuZGxlZCBpbiBTbGlkZXJU aHVtYkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoKS4KKyAgICBpZiAodGFyZ2V0Tm9kZSA9 PSB0aHVtYikKKyAgICAgICAgcmV0dXJuOwogICAgIHRodW1iLT5kcmFnRnJvbShldmVudC0+YWJz b2x1dGVMb2NhdGlvbigpKTsKICAgICBldmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVsZW1lbnQuY3BwCmlu ZGV4IDJjNmI0ODgxNGNiODFkYWI0MGMwNjRiMmM0YTljYzcwZjU0MDhhNmMuLjU2ZWFjY2YyNTVj Y2I5NmM3Yzg0NzI1NTBmZTRhZmM2MDA4YWUyZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50LmNwcApAQCAtMjc5LDE4ICsyNzksMTcgQEAg dm9pZCBTbGlkZXJUaHVtYkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50 KQogICAgIGJvb2wgaXNMZWZ0QnV0dG9uID0gbW91c2VFdmVudC0+YnV0dG9uKCkgPT0gTGVmdEJ1 dHRvbjsKICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSA9IGV2ZW50LT50eXBlKCk7 CiAKKyAgICAvLyBXZSBkb24ndCBjYWxsIGV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgpIGhlcmUg aW50ZW50aW9uYWxseS4KKyAgICAvLyBodHRwOi8vd2Via2l0Lm9yZy9iLzY0MzE0CiAgICAgaWYg KGV2ZW50VHlwZSA9PSBldmVudE5hbWVzKCkubW91c2Vkb3duRXZlbnQgJiYgaXNMZWZ0QnV0dG9u KSB7CiAgICAgICAgIHN0YXJ0RHJhZ2dpbmcoKTsKLSAgICAgICAgZXZlbnQtPnNldERlZmF1bHRI YW5kbGVkKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9IGVsc2UgaWYgKGV2ZW50VHlwZSA9PSBl dmVudE5hbWVzKCkubW91c2V1cEV2ZW50ICYmIGlzTGVmdEJ1dHRvbikgewogICAgICAgICBzdG9w RHJhZ2dpbmcoKTsKLSAgICAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVkKCk7CiAgICAgICAg IHJldHVybjsKICAgICB9IGVsc2UgaWYgKGV2ZW50VHlwZSA9PSBldmVudE5hbWVzKCkubW91c2Vt b3ZlRXZlbnQpIHsKICAgICAgICAgaWYgKG1faW5EcmFnTW9kZSkKICAgICAgICAgICAgIHNldFBv c2l0aW9uRnJvbVBvaW50KG1vdXNlRXZlbnQtPmFic29sdXRlTG9jYXRpb24oKSk7Ci0gICAgICAg IGV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCg== 101282 2011-07-19 00:13:28 -0700 2011-07-19 19:14:23 -0700 Patch 3 bug-64314-20110719161326.patch text/plain 3100 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogOTEyMzgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3ZmE3MzgwYTFlZjMzZTgw NzRkZTA2NDVlOGE0Yzk0ODVmODM4ZjAyLi45MmUxNDY3ZDFmM2Q5ODI0M2NkY2VmMGZkYzQ4NjUx NmNlNzBiY2RjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDctMTggIEtlbnQg VGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJFR1JFU1NJT04ocjg5MDA0 KTogVmlkZW8gcGF1c2VzIGFuZCBuZXZlciByZXN1bWVzIHBsYXlpbmcgaWYgc2NydWJiZWQgZHVy aW5nIHBsYXliYWNrLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQzMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBpdCdzIGhhcmQgdG8gbWFrZSBhIG5vbi1mbGFreSB0 ZXN0IGZvciB0aGlzIGJlaGF2aW9yLgorCisgICAgICAgICogaHRtbC9SYW5nZUlucHV0VHlwZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSYW5nZUlucHV0VHlwZTo6aGFuZGxlTW91c2VEb3duRXZl bnQpOgorICAgICAgICBEb24ndCBjYWxsIFNsaWRlclRodW1iRWxlbWVudDo6ZHJhZ0Zyb20oKSBm b3IgZXZlbnRzIG9uIHRoZSB0aHVtYi4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9TbGlkZXJUaHVt YkVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2xpZGVyVGh1bWJFbGVtZW50OjpkZWZh dWx0RXZlbnRIYW5kbGVyKToKKyAgICAgICAgRG8gbm90IGNhbGwgc2V0RGVmYXVsdEhhbmRsZWQo KSBmb3IgbW91c2UgZXZlbnRzIGluIG9yZGVyIHRvCisgICAgICAgIHByb3BhZ2F0ZSB0aGVtIHRv IGFuY2VzdG9yIGVsZW1lbnRzLgorCiAyMDExLTA3LTE4ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04oOTEyMDk/KTogZmFzdC9jc3MvY3VzdG9t LWZvbnQteGhlaWdodC5odG1sIGlzIGZhaWxpbmcgb24gTGVvcGFyZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9SYW5nZUlucHV0VHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L1JhbmdlSW5wdXRUeXBlLmNwcAppbmRleCBmYjllZTVkZWJmNGMwMmQyMDVlM2I4MjYxNjIzODE1 ZTJkMGQ4Nzk0Li4yNmQyOTliMTNkODQ4NmI3MzkyNzA0YTc2OWZmOWFmOWIwY2Y5ZjgzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1JhbmdlSW5wdXRUeXBlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL1JhbmdlSW5wdXRUeXBlLmNwcApAQCAtMTU2LDEwICsxNTYsMTAgQEAg dm9pZCBSYW5nZUlucHV0VHlwZTo6aGFuZGxlTW91c2VEb3duRXZlbnQoTW91c2VFdmVudCogZXZl bnQpCiAgICAgTm9kZSogdGFyZ2V0Tm9kZSA9IGV2ZW50LT50YXJnZXQoKS0+dG9Ob2RlKCk7CiAg ICAgaWYgKGV2ZW50LT5idXR0b24oKSAhPSBMZWZ0QnV0dG9uIHx8ICF0YXJnZXROb2RlIHx8ICh0 YXJnZXROb2RlICE9IGVsZW1lbnQoKSAmJiAhdGFyZ2V0Tm9kZS0+aXNEZXNjZW5kYW50T2YoZWxl bWVudCgpLT5zaGFkb3dSb290KCkpKSkKICAgICAgICAgcmV0dXJuOwotCiAgICAgU2xpZGVyVGh1 bWJFbGVtZW50KiB0aHVtYiA9IHNsaWRlclRodW1iRWxlbWVudE9mKGVsZW1lbnQoKSk7CisgICAg aWYgKHRhcmdldE5vZGUgPT0gdGh1bWIpCisgICAgICAgIHJldHVybjsKICAgICB0aHVtYi0+ZHJh Z0Zyb20oZXZlbnQtPmFic29sdXRlTG9jYXRpb24oKSk7Ci0gICAgZXZlbnQtPnNldERlZmF1bHRI YW5kbGVkKCk7CiB9CiAKIHZvaWQgUmFuZ2VJbnB1dFR5cGU6OmhhbmRsZUtleWRvd25FdmVudChL ZXlib2FyZEV2ZW50KiBldmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hh ZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9T bGlkZXJUaHVtYkVsZW1lbnQuY3BwCmluZGV4IDJjNmI0ODgxNGNiODFkYWI0MGMwNjRiMmM0YTlj YzcwZjU0MDhhNmMuLjU2ZWFjY2YyNTVjY2I5NmM3Yzg0NzI1NTBmZTRhZmM2MDA4YWUyZmQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50LmNw cApAQCAtMjc5LDE4ICsyNzksMTcgQEAgdm9pZCBTbGlkZXJUaHVtYkVsZW1lbnQ6OmRlZmF1bHRF dmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQogICAgIGJvb2wgaXNMZWZ0QnV0dG9uID0gbW91c2VF dmVudC0+YnV0dG9uKCkgPT0gTGVmdEJ1dHRvbjsKICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGV2 ZW50VHlwZSA9IGV2ZW50LT50eXBlKCk7CiAKKyAgICAvLyBXZSBkb24ndCBjYWxsIGV2ZW50LT5z ZXREZWZhdWx0SGFuZGxlZCgpIGhlcmUgaW50ZW50aW9uYWxseS4KKyAgICAvLyBodHRwOi8vd2Vi a2l0Lm9yZy9iLzY0MzE0CiAgICAgaWYgKGV2ZW50VHlwZSA9PSBldmVudE5hbWVzKCkubW91c2Vk b3duRXZlbnQgJiYgaXNMZWZ0QnV0dG9uKSB7CiAgICAgICAgIHN0YXJ0RHJhZ2dpbmcoKTsKLSAg ICAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVkKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9 IGVsc2UgaWYgKGV2ZW50VHlwZSA9PSBldmVudE5hbWVzKCkubW91c2V1cEV2ZW50ICYmIGlzTGVm dEJ1dHRvbikgewogICAgICAgICBzdG9wRHJhZ2dpbmcoKTsKLSAgICAgICAgZXZlbnQtPnNldERl ZmF1bHRIYW5kbGVkKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9IGVsc2UgaWYgKGV2ZW50VHlw ZSA9PSBldmVudE5hbWVzKCkubW91c2Vtb3ZlRXZlbnQpIHsKICAgICAgICAgaWYgKG1faW5EcmFn TW9kZSkKICAgICAgICAgICAgIHNldFBvc2l0aW9uRnJvbVBvaW50KG1vdXNlRXZlbnQtPmFic29s dXRlTG9jYXRpb24oKSk7Ci0gICAgICAgIGV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgpOwogICAg ICAgICByZXR1cm47CiAgICAgfQogCg==