95986 2012-09-06 08:24:26 -0700 Seek to end after duration change in HTMLMediaElement 2012-09-07 18:28:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 vrk vrk eric.carlson feature-media-reviews webkit.review.bot oldest_to_newest 713311 0 vrk 2012-09-06 08:24:26 -0700 Seek to end after duration change in HTMLMediaElement 713317 1 162513 vrk 2012-09-06 08:30:08 -0700 Created attachment 162513 Patch 713465 2 162513 eric.carlson 2012-09-06 11:01:45 -0700 Comment on attachment 162513 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=162513&action=review > LayoutTests/http/tests/media/media-source/seek-to-end-after-duration-change.html:13 > + waitForEventOnce('loadeddata', onLoadedData, false, false, video); waitForEventOnce only takes three parameters, what are the last two intended to do? > LayoutTests/http/tests/media/media-source/seek-to-end-after-duration-change.html:20 > + waitForEventOnce('seeked', onExplicitSeek, false, false, video); Ditto. > LayoutTests/http/tests/media/media-source/seek-to-end-after-duration-change.html:32 > + waitForEventOnce('durationchange', onDurationChange, false, false, video); Ditto. > LayoutTests/http/tests/media/media-source/seek-to-end-after-duration-change.html:42 > + waitForEventOnce('seeking', function() { > + waitForEventOnce('seeked', onSeekToEnd, false, false, video); > + mediaSource.endOfStream(); > + }, false, false, video); Ditto. > LayoutTests/http/tests/media/media-source/seek-to-end-after-duration-change.html:50 > + failTest("Seeked to " + currentTime.toFixed(3) + " instead of " + duration.toFixed(3)); You compare currenTime and duration with full precision so the error message should do the same. 714306 3 162713 vrk 2012-09-07 02:10:39 -0700 Created attachment 162713 Patch 714308 4 162513 vrk 2012-09-07 02:12:27 -0700 Comment on attachment 162513 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=162513&action=review >> LayoutTests/http/tests/media/media-source/seek-to-end-after-duration-change.html:13 >> + waitForEventOnce('loadeddata', onLoadedData, false, false, video); > > waitForEventOnce only takes three parameters, what are the last two intended to do? Whoops; originally I had used waitForEvent() (which has 5 parameters -- the 4th is for "run one time", and the 5th is the element on which the event listener is attached), then realized I wanted waitForEventOnce() and didn't remove the last two parameters. Since I always attach the event listener to "video," the waitForEventOnce() 3-parameter method works. Changed all callsites. >> LayoutTests/http/tests/media/media-source/seek-to-end-after-duration-change.html:20 >> + waitForEventOnce('seeked', onExplicitSeek, false, false, video); > > Ditto. Fixed. >> LayoutTests/http/tests/media/media-source/seek-to-end-after-duration-change.html:32 >> + waitForEventOnce('durationchange', onDurationChange, false, false, video); > > Ditto. Fixed. >> LayoutTests/http/tests/media/media-source/seek-to-end-after-duration-change.html:42 >> + }, false, false, video); > > Ditto. Fixed, here and a few lines above. >> LayoutTests/http/tests/media/media-source/seek-to-end-after-duration-change.html:50 >> + failTest("Seeked to " + currentTime.toFixed(3) + " instead of " + duration.toFixed(3)); > > You compare currenTime and duration with full precision so the error message should do the same. Done. 715201 5 162713 webkit.review.bot 2012-09-07 18:28:22 -0700 Comment on attachment 162713 Patch Clearing flags on attachment: 162713 Committed r127949: <http://trac.webkit.org/changeset/127949> 715202 6 webkit.review.bot 2012-09-07 18:28:24 -0700 All reviewed patches have been landed. Closing bug. 162513 2012-09-06 08:30:08 -0700 2012-09-07 02:12:27 -0700 Patch bug-95986-20120906082949.patch text/plain 6923 vrk U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3Njk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWY2NGExNWYwODM4NWFk YjM5OGE5OGZmMDBjNTJjYTFjZmZkN2EzNS4uZTRlZTJjNDQ5NTM5MjkwNWU0ZGIwZmEyYWJkYTE2 MTUzN2U0NjY3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA5LTA2ICBWaWN0 b3JpYSBLaXJzdCAgPHZya0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgU2VlayB0byBlbmQgYWZ0 ZXIgZHVyYXRpb24gY2hhbmdlIGluIEhUTUxNZWRpYUVsZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1OTg2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBzZWVrcyB0aGUgbWVkaWEgZWxlbWVu dCB0byB0aGUgZW5kIG9mIHRoZSBtZWRpYSByZXNvdXJjZSBpZiB0aGUgY3VycmVudCBwbGF5YmFj aworICAgICAgICBwb3NpdGlvbiBoYXMgYmVjb21lIGdyZWF0ZXIgdGhhbiB0aGUgZHVyYXRpb24g YWZ0ZXIgYSBkdXJhdGlvbiBjaGFuZ2UuCisgICAgICAgIGh0dHA6Ly9kZXYudzMub3JnL2h0bWw1 L3NwZWMvbWVkaWEtZWxlbWVudHMuaHRtbCNkdXJhdGlvbkNoYW5nZQorCisgICAgICAgIFRlc3Q6 IGh0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL3NlZWstdG8tZW5kLWFmdGVyLWR1cmF0aW9u LWNoYW5nZS5odG1sCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJEdXJhdGlvbkNoYW5n ZWQpOiBBZnRlciBmaXJpbmcgdGhlIGR1cmF0aW9uIGNoYW5nZSBldmVudCwgY2hlY2tzIHRvIHNl ZSBpZiBjdXJyZW50IHRpbWUgZXhjZWVkcyBkdXJhdGlvbiBhbmQgaWYgc28sIHNlZWtzIHRvIGR1 cmF0aW9uLgorCiAyMDEyLTA5LTA1ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQ7IHJldmVydCBhIGNoYW5nZSB0byBTY3JvbGxpbmdU cmVlTm9kZU1hYyB3aGljaCBhY2NpZGVudGFsbHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuY3BwCmluZGV4IDdjODczZjVhMDQzM2IyYjEyMTE2YmFmMGZhMzAwZmI2MDhjYTM5 ZjEuLjZhY2I1MDFhNDkyMDZhMmIzNTZiOGNiNTgyNGU3YjkxZjcwZGMzZmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtMzI1Niw4ICszMjU2LDE2IEBAIHZv aWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJEdXJhdGlvbkNoYW5nZWQoTWVkaWFQbGF5 ZXIqIHBsYXllcikKICAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXll ckR1cmF0aW9uQ2hhbmdlZCIpOwogCiAgICAgYmVnaW5Qcm9jZXNzaW5nTWVkaWFQbGF5ZXJDYWxs YmFjaygpOworCiAgICAgc2NoZWR1bGVFdmVudChldmVudE5hbWVzKCkuZHVyYXRpb25jaGFuZ2VF dmVudCk7CiAgICAgbWVkaWFQbGF5ZXJDaGFyYWN0ZXJpc3RpY0NoYW5nZWQocGxheWVyKTsKKwor ICAgIGZsb2F0IG5vdyA9IGN1cnJlbnRUaW1lKCk7CisgICAgZmxvYXQgZHVyID0gZHVyYXRpb24o KTsKKyAgICBFeGNlcHRpb25Db2RlIGlnbm9yZWRFeGNlcHRpb247CisgICAgaWYgKG5vdyA+IGR1 cikKKyAgICAgICAgc2VlayhkdXIsIGlnbm9yZWRFeGNlcHRpb24pOworCiAgICAgZW5kUHJvY2Vz c2luZ01lZGlhUGxheWVyQ2FsbGJhY2soKTsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGEyMTBmOTFlYjhlYzJhODQz MTNmN2FiYjBiNzg5OWU4N2E2YTg4MTUuLjNmOTZmNDJmZmM5ZGJmOWVmN2IyMmE0YWQzYmMyMDky ZjM3MWY3MTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wOS0wNiAgVmljdG9yaWEgS2ly c3QgIDx2cmtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFNlZWsgdG8gZW5kIGFmdGVyIGR1cmF0 aW9uIGNoYW5nZSBpbiBIVE1MTWVkaWFFbGVtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTk4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgc2Vla3MgdGhlIG1lZGlhIGVsZW1lbnQgdG8gdGhl IGVuZCBvZiB0aGUgbWVkaWEgcmVzb3VyY2UgaWYgdGhlIGN1cnJlbnQgcGxheWJhY2sKKyAgICAg ICAgcG9zaXRpb24gaGFzIGJlY29tZSBncmVhdGVyIHRoYW4gdGhlIGR1cmF0aW9uIGFmdGVyIGEg ZHVyYXRpb24gY2hhbmdlLgorICAgICAgICBodHRwOi8vZGV2LnczLm9yZy9odG1sNS9zcGVjL21l ZGlhLWVsZW1lbnRzLmh0bWwjZHVyYXRpb25DaGFuZ2UKKworICAgICAgICAqIGh0dHAvdGVzdHMv bWVkaWEvbWVkaWEtc291cmNlL3NlZWstdG8tZW5kLWFmdGVyLWR1cmF0aW9uLWNoYW5nZS1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc291cmNl L3NlZWstdG8tZW5kLWFmdGVyLWR1cmF0aW9uLWNoYW5nZS5odG1sOiBBZGRlZC4KKwogMjAxMi0w OS0wNSAgTGF1cm8gTmV0byAgPGxhdXJvLm5ldG9Ab3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBb UXRdIHBsYXRmb3JtL3F0L3BsdWdpbnMvcXQtcXdpZGdldC1wbHVnaW4uaHRtbCBmYWlscwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2Uvc2Vlay10 by1lbmQtYWZ0ZXItZHVyYXRpb24tY2hhbmdlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL3NlZWstdG8tZW5kLWFmdGVyLWR1cmF0aW9uLWNo YW5nZS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2RlM2MzNzA2MTI4ZmFhMTBhNGYyNjE5OTRm YzQ3NGUwZTc0NWY5ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv bWVkaWEvbWVkaWEtc291cmNlL3NlZWstdG8tZW5kLWFmdGVyLWR1cmF0aW9uLWNoYW5nZS1leHBl Y3RlZC50eHQKQEAgLTAsMCArMSwxMCBAQAorVGVzdCB0aGF0IHRoZSB2aWRlbyB0YWcgc2Vla3Mg dG8gdGhlIGVuZCBvZiB0aGUgZmlsZSBpZiBkdXJhdGlvbiBpcyB0cnVuY2F0ZWQgYmVmb3JlIHRo ZSBjdXJyZW50IHBsYXliYWNrIHBvc2l0aW9uLgorCitFVkVOVCh3ZWJraXRzb3VyY2VvcGVuKQor RVZFTlQobG9hZGVkZGF0YSkKK0VWRU5UKHNlZWtlZCkKK0VWRU5UKGR1cmF0aW9uY2hhbmdlKQor RVZFTlQoc2Vla2luZykKK0VWRU5UKHNlZWtlZCkKK0VORCBPRiBURVNUCisKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL3NlZWstdG8tZW5kLWFm dGVyLWR1cmF0aW9uLWNoYW5nZS5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9t ZWRpYS1zb3VyY2Uvc2Vlay10by1lbmQtYWZ0ZXItZHVyYXRpb24tY2hhbmdlLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uNTkxZDE5MTExZGI1MjI2OTgwZDE0MjNmNWFiNWZhYzBkNTZmOTNmMQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL3NlZWst dG8tZW5kLWFmdGVyLWR1cmF0aW9uLWNoYW5nZS5odG1sCkBAIC0wLDAgKzEsNzcgQEAKKzwhRE9D VFlQRSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSIvbWVk aWEtcmVzb3VyY2VzL3ZpZGVvLXRlc3QuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNy Yz0iL21lZGlhL3Jlc291cmNlcy9tZWRpYS1zb3VyY2Uvd2VibS9zZWdtZW50LWluZm8uanMiPjwv c2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0ibWVkaWEtc291cmNlLmpzIj48L3NjcmlwdD4K KyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgICAgIHZhciBzZWdtZW50SGVscGVyID0gbmV3IE1l ZGlhU291cmNlVGVzdC5TZWdtZW50SGVscGVyKFdlYk1TZWdtZW50SW5mby50ZXN0V2ViTSwgdHJ1 ZSk7CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIG9uU291cmNlT3BlbigpCisgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgc2VnbWVudEhlbHBlci5hZGRTb3VyY2VCdWZmZXIoKTsKKyAgICAg ICAgICAgICAgICB3YWl0Rm9yRXZlbnRPbmNlKCdsb2FkZWRkYXRhJywgb25Mb2FkZWREYXRhLCBm YWxzZSwgZmFsc2UsIHZpZGVvKTsKKyAgICAgICAgICAgICAgICBzZWdtZW50SGVscGVyLmFwcGVu ZEluaXRTZWdtZW50KCk7CisgICAgICAgICAgICAgICAgc2VnbWVudEhlbHBlci5hcHBlbmRBbGxN ZWRpYVNlZ21lbnRzKCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIG9u TG9hZGVkRGF0YSgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50 T25jZSgnc2Vla2VkJywgb25FeHBsaWNpdFNlZWssIGZhbHNlLCBmYWxzZSwgdmlkZW8pOworICAg ICAgICAgICAgICAgIHZpZGVvLmN1cnJlbnRUaW1lID0gMzsKKyAgICAgICAgICAgIH0KKworICAg ICAgICAgICAgZnVuY3Rpb24gb25FeHBsaWNpdFNlZWsoKQorICAgICAgICAgICAgeworICAgICAg ICAgICAgICAgIHZhciBjdXJyZW50VGltZSA9IHZpZGVvLmN1cnJlbnRUaW1lOworICAgICAgICAg ICAgICAgIGlmIChjdXJyZW50VGltZSAhPSAzKSB7CisgICAgICAgICAgICAgICAgICAgIGZhaWxU ZXN0KCJTZWVrZWQgdG8gIiArIGN1cnJlbnRUaW1lLnRvRml4ZWQoMykgKyAiIGluc3RlYWQgb2Yg MyIpOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgfQorCisg ICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50T25jZSgnZHVyYXRpb25jaGFuZ2UnLCBvbkR1cmF0 aW9uQ2hhbmdlLCBmYWxzZSwgZmFsc2UsIHZpZGVvKTsKKyAgICAgICAgICAgICAgICBtZWRpYVNv dXJjZS5kdXJhdGlvbiA9IDI7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9u IG9uRHVyYXRpb25DaGFuZ2UoKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIE1lZGlh U291cmNlVGVzdC5leHBlY3REdXJhdGlvbih2aWRlbywgbWVkaWFTb3VyY2UsIDIpOworICAgICAg ICAgICAgICAgIHdhaXRGb3JFdmVudE9uY2UoJ3NlZWtpbmcnLCBmdW5jdGlvbigpIHsKKyAgICAg ICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50T25jZSgnc2Vla2VkJywgb25TZWVrVG9FbmQsIGZh bHNlLCBmYWxzZSwgdmlkZW8pOworICAgICAgICAgICAgICAgICAgICBtZWRpYVNvdXJjZS5lbmRP ZlN0cmVhbSgpOworICAgICAgICAgICAgICAgIH0sIGZhbHNlLCBmYWxzZSwgdmlkZW8pOworICAg ICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBvblNlZWtUb0VuZCgpCisgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgdmFyIGN1cnJlbnRUaW1lID0gdmlkZW8uY3VycmVudFRp bWU7CisgICAgICAgICAgICAgICAgdmFyIGR1cmF0aW9uID0gdmlkZW8uZHVyYXRpb247CisgICAg ICAgICAgICAgICAgaWYgKGN1cnJlbnRUaW1lICE9IGR1cmF0aW9uKSB7CisgICAgICAgICAgICAg ICAgICAgIGZhaWxUZXN0KCJTZWVrZWQgdG8gIiArIGN1cnJlbnRUaW1lLnRvRml4ZWQoMykgKyAi IGluc3RlYWQgb2YgIiArIGR1cmF0aW9uLnRvRml4ZWQoMykpOworICAgICAgICAgICAgICAgICAg ICByZXR1cm47CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGVuZFRlc3QoKTsK KyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24gb25Mb2FkKCkKKyAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7CisKKyAgICAgICAgICAg ICAgICBtZWRpYVNvdXJjZSA9IG5ldyBXZWJLaXRNZWRpYVNvdXJjZSgpOworICAgICAgICAgICAg ICAgIHdhaXRGb3JFdmVudCgnd2Via2l0c291cmNlb3BlbicsIG9uU291cmNlT3BlbiwgZmFsc2Us IGZhbHNlLCBtZWRpYVNvdXJjZSk7CisKKyAgICAgICAgICAgICAgICBzZWdtZW50SGVscGVyLmlu aXQodmlkZW8sIGZ1bmN0aW9uKHN1Y2Nlc3MpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFz dWNjZXNzKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBmYWlsVGVzdCgiRmFpbGVkIHRvIGxv YWQgc2VnbWVudCBkYXRhIik7CisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAg ICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgTWVkaWFTb3VyY2VUZXN0LnNl dFNyY1RvTWVkaWFTb3VyY2VUZXN0VVJMKHZpZGVvKTsKKyAgICAgICAgICAgICAgICB9KTsKKyAg ICAgICAgICAgIH0KKyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5IG9u bG9hZD0ib25Mb2FkKCkiPgorICAgICAgICA8dmlkZW8+IDwvdmlkZW8+CisgICAgICAgIDxwPlRl c3QgdGhhdCB0aGUgdmlkZW8gdGFnIHNlZWtzIHRvIHRoZSBlbmQgb2YgdGhlIGZpbGUgaWYgZHVy YXRpb24gaXMgdHJ1bmNhdGVkIGJlZm9yZSB0aGUgY3VycmVudCBwbGF5YmFjayBwb3NpdGlvbi48 L3A+CisgICAgPC9ib2R5PgorPC9odG1sPgo= 162713 2012-09-07 02:10:39 -0700 2012-09-07 18:28:21 -0700 Patch bug-95986-20120907021019.patch text/plain 6820 vrk U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3Njk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWY2NGExNWYwODM4NWFk YjM5OGE5OGZmMDBjNTJjYTFjZmZkN2EzNS4uZTRlZTJjNDQ5NTM5MjkwNWU0ZGIwZmEyYWJkYTE2 MTUzN2U0NjY3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA5LTA2ICBWaWN0 b3JpYSBLaXJzdCAgPHZya0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgU2VlayB0byBlbmQgYWZ0 ZXIgZHVyYXRpb24gY2hhbmdlIGluIEhUTUxNZWRpYUVsZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1OTg2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBzZWVrcyB0aGUgbWVkaWEgZWxlbWVu dCB0byB0aGUgZW5kIG9mIHRoZSBtZWRpYSByZXNvdXJjZSBpZiB0aGUgY3VycmVudCBwbGF5YmFj aworICAgICAgICBwb3NpdGlvbiBoYXMgYmVjb21lIGdyZWF0ZXIgdGhhbiB0aGUgZHVyYXRpb24g YWZ0ZXIgYSBkdXJhdGlvbiBjaGFuZ2UuCisgICAgICAgIGh0dHA6Ly9kZXYudzMub3JnL2h0bWw1 L3NwZWMvbWVkaWEtZWxlbWVudHMuaHRtbCNkdXJhdGlvbkNoYW5nZQorCisgICAgICAgIFRlc3Q6 IGh0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL3NlZWstdG8tZW5kLWFmdGVyLWR1cmF0aW9u LWNoYW5nZS5odG1sCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJEdXJhdGlvbkNoYW5n ZWQpOiBBZnRlciBmaXJpbmcgdGhlIGR1cmF0aW9uIGNoYW5nZSBldmVudCwgY2hlY2tzIHRvIHNl ZSBpZiBjdXJyZW50IHRpbWUgZXhjZWVkcyBkdXJhdGlvbiBhbmQgaWYgc28sIHNlZWtzIHRvIGR1 cmF0aW9uLgorCiAyMDEyLTA5LTA1ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQ7IHJldmVydCBhIGNoYW5nZSB0byBTY3JvbGxpbmdU cmVlTm9kZU1hYyB3aGljaCBhY2NpZGVudGFsbHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuY3BwCmluZGV4IDdjODczZjVhMDQzM2IyYjEyMTE2YmFmMGZhMzAwZmI2MDhjYTM5 ZjEuLjZhY2I1MDFhNDkyMDZhMmIzNTZiOGNiNTgyNGU3YjkxZjcwZGMzZmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtMzI1Niw4ICszMjU2LDE2IEBAIHZv aWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJEdXJhdGlvbkNoYW5nZWQoTWVkaWFQbGF5 ZXIqIHBsYXllcikKICAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXll ckR1cmF0aW9uQ2hhbmdlZCIpOwogCiAgICAgYmVnaW5Qcm9jZXNzaW5nTWVkaWFQbGF5ZXJDYWxs YmFjaygpOworCiAgICAgc2NoZWR1bGVFdmVudChldmVudE5hbWVzKCkuZHVyYXRpb25jaGFuZ2VF dmVudCk7CiAgICAgbWVkaWFQbGF5ZXJDaGFyYWN0ZXJpc3RpY0NoYW5nZWQocGxheWVyKTsKKwor ICAgIGZsb2F0IG5vdyA9IGN1cnJlbnRUaW1lKCk7CisgICAgZmxvYXQgZHVyID0gZHVyYXRpb24o KTsKKyAgICBFeGNlcHRpb25Db2RlIGlnbm9yZWRFeGNlcHRpb247CisgICAgaWYgKG5vdyA+IGR1 cikKKyAgICAgICAgc2VlayhkdXIsIGlnbm9yZWRFeGNlcHRpb24pOworCiAgICAgZW5kUHJvY2Vz c2luZ01lZGlhUGxheWVyQ2FsbGJhY2soKTsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGEyMTBmOTFlYjhlYzJhODQz MTNmN2FiYjBiNzg5OWU4N2E2YTg4MTUuLjNmOTZmNDJmZmM5ZGJmOWVmN2IyMmE0YWQzYmMyMDky ZjM3MWY3MTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wOS0wNiAgVmljdG9yaWEgS2ly c3QgIDx2cmtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFNlZWsgdG8gZW5kIGFmdGVyIGR1cmF0 aW9uIGNoYW5nZSBpbiBIVE1MTWVkaWFFbGVtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTk4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgc2Vla3MgdGhlIG1lZGlhIGVsZW1lbnQgdG8gdGhl IGVuZCBvZiB0aGUgbWVkaWEgcmVzb3VyY2UgaWYgdGhlIGN1cnJlbnQgcGxheWJhY2sKKyAgICAg ICAgcG9zaXRpb24gaGFzIGJlY29tZSBncmVhdGVyIHRoYW4gdGhlIGR1cmF0aW9uIGFmdGVyIGEg ZHVyYXRpb24gY2hhbmdlLgorICAgICAgICBodHRwOi8vZGV2LnczLm9yZy9odG1sNS9zcGVjL21l ZGlhLWVsZW1lbnRzLmh0bWwjZHVyYXRpb25DaGFuZ2UKKworICAgICAgICAqIGh0dHAvdGVzdHMv bWVkaWEvbWVkaWEtc291cmNlL3NlZWstdG8tZW5kLWFmdGVyLWR1cmF0aW9uLWNoYW5nZS1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc291cmNl L3NlZWstdG8tZW5kLWFmdGVyLWR1cmF0aW9uLWNoYW5nZS5odG1sOiBBZGRlZC4KKwogMjAxMi0w OS0wNSAgTGF1cm8gTmV0byAgPGxhdXJvLm5ldG9Ab3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBb UXRdIHBsYXRmb3JtL3F0L3BsdWdpbnMvcXQtcXdpZGdldC1wbHVnaW4uaHRtbCBmYWlscwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2Uvc2Vlay10 by1lbmQtYWZ0ZXItZHVyYXRpb24tY2hhbmdlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL3NlZWstdG8tZW5kLWFmdGVyLWR1cmF0aW9uLWNo YW5nZS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2RlM2MzNzA2MTI4ZmFhMTBhNGYyNjE5OTRm YzQ3NGUwZTc0NWY5ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv bWVkaWEvbWVkaWEtc291cmNlL3NlZWstdG8tZW5kLWFmdGVyLWR1cmF0aW9uLWNoYW5nZS1leHBl Y3RlZC50eHQKQEAgLTAsMCArMSwxMCBAQAorVGVzdCB0aGF0IHRoZSB2aWRlbyB0YWcgc2Vla3Mg dG8gdGhlIGVuZCBvZiB0aGUgZmlsZSBpZiBkdXJhdGlvbiBpcyB0cnVuY2F0ZWQgYmVmb3JlIHRo ZSBjdXJyZW50IHBsYXliYWNrIHBvc2l0aW9uLgorCitFVkVOVCh3ZWJraXRzb3VyY2VvcGVuKQor RVZFTlQobG9hZGVkZGF0YSkKK0VWRU5UKHNlZWtlZCkKK0VWRU5UKGR1cmF0aW9uY2hhbmdlKQor RVZFTlQoc2Vla2luZykKK0VWRU5UKHNlZWtlZCkKK0VORCBPRiBURVNUCisKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL3NlZWstdG8tZW5kLWFm dGVyLWR1cmF0aW9uLWNoYW5nZS5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9t ZWRpYS1zb3VyY2Uvc2Vlay10by1lbmQtYWZ0ZXItZHVyYXRpb24tY2hhbmdlLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uNjU1MDFlOWVlNDI2ODY3NDQwOGVlYzE3NTNiODU0YmFmOTk2ZDM4ZgotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL3NlZWst dG8tZW5kLWFmdGVyLWR1cmF0aW9uLWNoYW5nZS5odG1sCkBAIC0wLDAgKzEsNzcgQEAKKzwhRE9D VFlQRSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSIvbWVk aWEtcmVzb3VyY2VzL3ZpZGVvLXRlc3QuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNy Yz0iL21lZGlhL3Jlc291cmNlcy9tZWRpYS1zb3VyY2Uvd2VibS9zZWdtZW50LWluZm8uanMiPjwv c2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0ibWVkaWEtc291cmNlLmpzIj48L3NjcmlwdD4K KyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgICAgIHZhciBzZWdtZW50SGVscGVyID0gbmV3IE1l ZGlhU291cmNlVGVzdC5TZWdtZW50SGVscGVyKFdlYk1TZWdtZW50SW5mby50ZXN0V2ViTSwgdHJ1 ZSk7CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIG9uU291cmNlT3BlbigpCisgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgc2VnbWVudEhlbHBlci5hZGRTb3VyY2VCdWZmZXIoKTsKKyAgICAg ICAgICAgICAgICB3YWl0Rm9yRXZlbnRPbmNlKCdsb2FkZWRkYXRhJywgb25Mb2FkZWREYXRhLCBm YWxzZSk7CisgICAgICAgICAgICAgICAgc2VnbWVudEhlbHBlci5hcHBlbmRJbml0U2VnbWVudCgp OworICAgICAgICAgICAgICAgIHNlZ21lbnRIZWxwZXIuYXBwZW5kQWxsTWVkaWFTZWdtZW50cygp OworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBvbkxvYWRlZERhdGEoKQor ICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHdhaXRGb3JFdmVudE9uY2UoJ3NlZWtlZCcs IG9uRXhwbGljaXRTZWVrLCBmYWxzZSk7CisgICAgICAgICAgICAgICAgdmlkZW8uY3VycmVudFRp bWUgPSAzOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBvbkV4cGxpY2l0 U2VlaygpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgdmFyIGN1cnJlbnRUaW1lID0g dmlkZW8uY3VycmVudFRpbWU7CisgICAgICAgICAgICAgICAgaWYgKGN1cnJlbnRUaW1lICE9IDMp IHsKKyAgICAgICAgICAgICAgICAgICAgZmFpbFRlc3QoIlNlZWtlZCB0byAiICsgY3VycmVudFRp bWUgKyAiIGluc3RlYWQgb2YgMyIpOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAg ICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50T25jZSgnZHVyYXRp b25jaGFuZ2UnLCBvbkR1cmF0aW9uQ2hhbmdlLCBmYWxzZSk7CisgICAgICAgICAgICAgICAgbWVk aWFTb3VyY2UuZHVyYXRpb24gPSAyOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5j dGlvbiBvbkR1cmF0aW9uQ2hhbmdlKCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBN ZWRpYVNvdXJjZVRlc3QuZXhwZWN0RHVyYXRpb24odmlkZW8sIG1lZGlhU291cmNlLCAyKTsKKyAg ICAgICAgICAgICAgICB3YWl0Rm9yRXZlbnRPbmNlKCdzZWVraW5nJywgZnVuY3Rpb24oKSB7Cisg ICAgICAgICAgICAgICAgICAgIHdhaXRGb3JFdmVudE9uY2UoJ3NlZWtlZCcsIG9uU2Vla1RvRW5k LCBmYWxzZSk7CisgICAgICAgICAgICAgICAgICAgIG1lZGlhU291cmNlLmVuZE9mU3RyZWFtKCk7 CisgICAgICAgICAgICAgICAgfSwgZmFsc2UpOworICAgICAgICAgICAgfQorCisgICAgICAgICAg ICBmdW5jdGlvbiBvblNlZWtUb0VuZCgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg dmFyIGN1cnJlbnRUaW1lID0gdmlkZW8uY3VycmVudFRpbWU7CisgICAgICAgICAgICAgICAgdmFy IGR1cmF0aW9uID0gdmlkZW8uZHVyYXRpb247CisgICAgICAgICAgICAgICAgaWYgKGN1cnJlbnRU aW1lICE9IGR1cmF0aW9uKSB7CisgICAgICAgICAgICAgICAgICAgIGZhaWxUZXN0KCJTZWVrZWQg dG8gIiArIGN1cnJlbnRUaW1lICsgIiBpbnN0ZWFkIG9mICIgKyBkdXJhdGlvbik7CisgICAgICAg ICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAg ZW5kVGVzdCgpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBvbkxvYWQo KQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsKKwor ICAgICAgICAgICAgICAgIG1lZGlhU291cmNlID0gbmV3IFdlYktpdE1lZGlhU291cmNlKCk7Cisg ICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50KCd3ZWJraXRzb3VyY2VvcGVuJywgb25Tb3VyY2VP cGVuLCBmYWxzZSwgZmFsc2UsIG1lZGlhU291cmNlKTsKKworICAgICAgICAgICAgICAgIHNlZ21l bnRIZWxwZXIuaW5pdCh2aWRlbywgZnVuY3Rpb24oc3VjY2VzcykgeworICAgICAgICAgICAgICAg ICAgICBpZiAoIXN1Y2Nlc3MpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGZhaWxUZXN0KCJG YWlsZWQgdG8gbG9hZCBzZWdtZW50IGRhdGEiKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBNZWRpYVNv dXJjZVRlc3Quc2V0U3JjVG9NZWRpYVNvdXJjZVRlc3RVUkwodmlkZW8pOworICAgICAgICAgICAg ICAgIH0pOworICAgICAgICAgICAgfQorICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+Cisg ICAgPGJvZHkgb25sb2FkPSJvbkxvYWQoKSI+CisgICAgICAgIDx2aWRlbz4gPC92aWRlbz4KKyAg ICAgICAgPHA+VGVzdCB0aGF0IHRoZSB2aWRlbyB0YWcgc2Vla3MgdG8gdGhlIGVuZCBvZiB0aGUg ZmlsZSBpZiBkdXJhdGlvbiBpcyB0cnVuY2F0ZWQgYmVmb3JlIHRoZSBjdXJyZW50IHBsYXliYWNr IHBvc2l0aW9uLjwvcD4KKyAgICA8L2JvZHk+Cis8L2h0bWw+Cg==