55901 2011-03-07 13:40:01 -0800 [Qt] Fix the error code for media resource failures when using QtMobility 2011-06-08 08:48:08 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 50925 1 max.hong.shen max.hong.shen ademar cmarcelo hui_huang inferno joel.parks menard nancy.piedra vestbo webkit.review.bot oldest_to_newest 363549 0 max.hong.shen 2011-03-07 13:40:01 -0800 According to Html 5 video spec, when the media resource failed to load or that the given URL could not be resolved, the media element should adjust its status as following, 1. Set the error attribute to a new MediaError object whose code attribute is set to MEDIA_ERR_SRC_NOT_SUPPORTED. 2. Set the element's networkState attribute to the NETWORK_NO_SOURCE value. Currently, qMediaPlayer returns QMediaPlayer::InvalidMedia for media resource failures, instead of setting m_networkState to NetworkError, we should use MediaPlayer::FormatError to indicate the resource error. 363555 1 84977 max.hong.shen 2011-03-07 13:49:08 -0800 Created attachment 84977 proposed fix 365974 2 84977 menard 2011-03-11 06:43:42 -0800 Comment on attachment 84977 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=84977&action=review > Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp:535 > + else if (m_networkState != MediaPlayer::FormatError) Not sure to get that change...Could you explain me? 365982 3 max.hong.shen 2011-03-11 06:59:04 -0800 (In reply to comment #2) > (From update of attachment 84977 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=84977&action=review > > > Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp:535 > > + else if (m_networkState != MediaPlayer::FormatError) > > Not sure to get that change...Could you explain me? That's because Qt Mobility sends out a NetworkError after InvalidMedia (Note, InvalidMedia is not a kind of error for Qt Mobility). I think it makes sense for Qt Mobility, but for MediaPlayerPrivateQt, it should treat this special NetworkError (the one follow the InvalidMedia) as a FormatError. Maybe following code is more clear about this idea, although it causes an unnecessary assignment. - if (currentError == QMediaPlayer::FormatError) + if (currentError == QMediaPlayer::FormatError || (m_networkState == QMediaPlayer::FormatError && currentError == QMediaPlayer::NetworkError)) m_networkState = MediaPlayer::FormatError; else m_networkState = MediaPlayer::NetworkError; What do you think? Alexis :) 370821 4 menard 2011-03-21 12:12:54 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 84977 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=84977&action=review > > > > > Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp:535 > > > + else if (m_networkState != MediaPlayer::FormatError) > > > > Not sure to get that change...Could you explain me? > > That's because Qt Mobility sends out a NetworkError after InvalidMedia (Note, InvalidMedia is not a kind of error for Qt Mobility). I think it makes sense for Qt Mobility, but for MediaPlayerPrivateQt, it should treat this special NetworkError (the one follow the InvalidMedia) as a FormatError. > > Maybe following code is more clear about this idea, although it causes an unnecessary assignment. > > - if (currentError == QMediaPlayer::FormatError) > + if (currentError == QMediaPlayer::FormatError || (m_networkState == QMediaPlayer::FormatError && currentError == QMediaPlayer::NetworkError)) > m_networkState = MediaPlayer::FormatError; > else > m_networkState = MediaPlayer::NetworkError; > > What do you think? Alexis :) Well the assignment is no big deal as soon as it does not send an extra notification. But at least the code is clearer to read 375773 5 menard 2011-03-29 14:34:03 -0700 Could you please update the patch with your second suggestion and a little comment on the condition on why we need this extra check, basically what you wrote to me :). 377756 6 max.hong.shen 2011-04-01 06:36:58 -0700 (In reply to comment #5) > Could you please update the patch with your second suggestion and a little comment on the condition on why we need this extra check, basically what you wrote to me :). Thanks for reminding me, Alexis :) It has been a while, so I may need to check/test the patch carefully with the latest qt-mobility. I will provide a new patch once I finish the task on my hand. Thanks! 388173 7 laszlo.gombos 2011-04-18 16:53:05 -0700 *** Bug 40155 has been marked as a duplicate of this bug. *** 392592 8 joel.parks 2011-04-26 11:32:10 -0700 needed for BR-7521 392846 9 84977 hausmann 2011-04-26 15:38:57 -0700 Comment on attachment 84977 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=84977&action=review > Source/WebCore/ChangeLog:8 > + To indicate the media resource failures, set the netwrok state to netwrok -> network 392858 10 84977 hausmann 2011-04-26 15:42:41 -0700 Comment on attachment 84977 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=84977&action=review Please fix these issues before landing. >>>> Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp:535 >>> >>> Not sure to get that change...Could you explain me? >> >> That's because Qt Mobility sends out a NetworkError after InvalidMedia (Note, InvalidMedia is not a kind of error for Qt Mobility). I think it makes sense for Qt Mobility, but for MediaPlayerPrivateQt, it should treat this special NetworkError (the one follow the InvalidMedia) as a FormatError. >> >> Maybe following code is more clear about this idea, although it causes an unnecessary assignment. >> >> - if (currentError == QMediaPlayer::FormatError) >> + if (currentError == QMediaPlayer::FormatError || (m_networkState == QMediaPlayer::FormatError && currentError == QMediaPlayer::NetworkError)) >> m_networkState = MediaPlayer::FormatError; >> else >> m_networkState = MediaPlayer::NetworkError; >> >> What do you think? Alexis :) > > Well the assignment is no big deal as soon as it does not send an extra notification. But at least the code is clearer to read I also prefer the more readable code. Let's go for that. The rest looks okay to me :) 393060 11 max.hong.shen 2011-04-26 16:47:35 -0700 Thanks for the review, Simon. I think I need to double check the patch with the QtMobility 1.2 before landing the patch. Will do it tomorrow and put comments here. (In reply to comment #10) > (From update of attachment 84977 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=84977&action=review > > Please fix these issues before landing. > > >>>> Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp:535 > > >>> > >>> Not sure to get that change...Could you explain me? > >> > >> That's because Qt Mobility sends out a NetworkError after InvalidMedia (Note, InvalidMedia is not a kind of error for Qt Mobility). I think it makes sense for Qt Mobility, but for MediaPlayerPrivateQt, it should treat this special NetworkError (the one follow the InvalidMedia) as a FormatError. > >> > >> Maybe following code is more clear about this idea, although it causes an unnecessary assignment. > >> > >> - if (currentError == QMediaPlayer::FormatError) > >> + if (currentError == QMediaPlayer::FormatError || (m_networkState == QMediaPlayer::FormatError && currentError == QMediaPlayer::NetworkError)) > >> m_networkState = MediaPlayer::FormatError; > >> else > >> m_networkState = MediaPlayer::NetworkError; > >> > >> What do you think? Alexis :) > > > > Well the assignment is no big deal as soon as it does not send an extra notification. But at least the code is clearer to read > > I also prefer the more readable code. Let's go for that. The rest looks okay to me :) 393599 12 91298 max.hong.shen 2011-04-27 09:21:38 -0700 Created attachment 91298 fix the patch according to the qtmobility change With the QtMobility 1.2.0, it can send out QMediaPlayer::ResourceError after QMediaPlayer::InvalidMedia for resource issue. So I made a little bit change for it in this new patch. Also, I noticed that all the media tests are disabled in https://bugs.webkit.org/show_bug.cgi?id=57983, so I just tested the related layouttest(including tests under LayoutTest/media and LayoutTest/fast/media) on my environment. 408310 13 91298 menard 2011-05-23 14:35:07 -0700 Comment on attachment 91298 fix the patch according to the qtmobility change I'm fine with the change. The only hic is that we will enforce the usage of QtMM 1.2, but I'm also fine with that. 410566 14 91298 hausmann 2011-05-26 10:14:59 -0700 Comment on attachment 91298 fix the patch according to the qtmobility change View in context: https://bugs.webkit.org/attachment.cgi?id=91298&action=review r=me > Source/WebCore/ChangeLog:8 > + To indicate the media resource failures, set the netwrok state to Please fix the netwrok -> network typo before landing :) 412851 15 max.hong.shen 2011-05-31 14:10:26 -0700 (In reply to comment #14) > (From update of attachment 91298 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=91298&action=review > > r=me > > > Source/WebCore/ChangeLog:8 > > + To indicate the media resource failures, set the netwrok state to > > Please fix the netwrok -> network typo before landing :) Thanks for your review, Simon :) I will update/test it ASAP. 416945 16 96331 max.hong.shen 2011-06-07 17:15:32 -0700 Created attachment 96331 fix typo 417037 17 96331 webkit.review.bot 2011-06-07 19:44:47 -0700 Comment on attachment 96331 fix typo Clearing flags on attachment: 96331 Committed r88318: <http://trac.webkit.org/changeset/88318> 417038 18 webkit.review.bot 2011-06-07 19:44:52 -0700 All reviewed patches have been landed. Closing bug. 417258 19 ademar 2011-06-08 08:48:08 -0700 Revision r88318 cherry-picked into qtwebkit-2.2 with commit f1e20a4 <http://gitorious.org/webkit/qtwebkit/commit/f1e20a4> 84977 2011-03-07 13:49:08 -0800 2011-04-27 09:21:38 -0700 proposed fix 55901.patch text/plain 4429 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNDkxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDMtMDcgIFlpIFNoZW4g IDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtRdF0gRml4IHRoZSBlcnJvciBjb2RlIGZvciBtZWRpYSByZXNvdXJj ZSBmYWlsdXJlcyB3aGVuIHVzaW5nIFF0TW9iaWxpdHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1OTAxCisKKyAgICAgICAgVG8gaW5kaWNhdGUgdGhl IG1lZGlhIHJlc291cmNlIGZhaWx1cmVzLCBzZXQgdGhlIG5ldHdyb2sgc3RhdGUgdG8KKyAgICAg ICAgTWVkaWFQbGF5ZXI6OkZvcm1hdEVycm9yIHdoZW4gcmVjZWl2ZXMgUU1lZGlhUGxheWVyOjpJ bnZhbGlkTWVkaWEuCisKKyAgICAgICAgVGVzdHM6IG1lZGlhL2ludmFsaWQtbWVkaWEtdXJsLWNy YXNoLmh0bWwKKyAgICAgICAgICAgICAgIG1lZGlhL21lZGlhLWNvbnN0YW50cy5odG1sCisgICAg ICAgICAgICAgICBtZWRpYS92aWRlby1lcnJvci1kb2VzLW5vdC1leGlzdC5odG1sCisgICAgICAg ICAgICAgICBtZWRpYS92aWRlby1zcmMtY2hhbmdlLmh0bWwKKyAgICAgICAgICAgICAgIG1lZGlh L3ZpZGVvLXNyYy1pbnZhbGlkLXJlbW92ZS5odG1sCisgICAgICAgICAgICAgICBtZWRpYS92aWRl by1zcmMtbm9uZS5odG1sCisgICAgICAgICAgICAgICBtZWRpYS92aWRlby1zcmMtcGx1cy1zb3Vy Y2UuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2 YXRlUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUXQ6OnVwZGF0 ZVN0YXRlcyk6CisKIDIwMTEtMDMtMDcgIFRha2F5b3NoaSBLb2NoaSAgPGtvY2hpQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVy UHJpdmF0ZVF0LmNwcAkocmV2aXNpb24gODA0ODcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTUzMiw3ICs1MzIsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF0Ojp1cGRhdGVTdGF0ZXMo CiAgICAgICAgIG1fcmVhZHlTdGF0ZSA9IE1lZGlhUGxheWVyOjpIYXZlTm90aGluZzsKICAgICAg ICAgaWYgKGN1cnJlbnRFcnJvciA9PSBRTWVkaWFQbGF5ZXI6OkZvcm1hdEVycm9yKQogICAgICAg ICAgICAgbV9uZXR3b3JrU3RhdGUgPSBNZWRpYVBsYXllcjo6Rm9ybWF0RXJyb3I7Ci0gICAgICAg IGVsc2UKKyAgICAgICAgZWxzZSBpZiAobV9uZXR3b3JrU3RhdGUgIT0gTWVkaWFQbGF5ZXI6OkZv cm1hdEVycm9yKQogICAgICAgICAgICAgbV9uZXR3b3JrU3RhdGUgPSBNZWRpYVBsYXllcjo6TmV0 d29ya0Vycm9yOwogICAgIH0gZWxzZSBpZiAoY3VycmVudFN0YXR1cyA9PSBRTWVkaWFQbGF5ZXI6 OlVua25vd25NZWRpYVN0YXR1cwogICAgICAgICAgICAgICAgfHwgY3VycmVudFN0YXR1cyA9PSBR TWVkaWFQbGF5ZXI6Ok5vTWVkaWEpIHsKQEAgLTU1NSw3ICs1NTUsNyBAQCB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZVF0Ojp1cGRhdGVTdGF0ZXMoCiAgICAgICAgIG1fbmV0d29ya1N0YXRlID0gTWVk aWFQbGF5ZXI6OkxvYWRlZDsKICAgICAgICAgbV9yZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6Okhh dmVFbm91Z2hEYXRhOwogICAgIH0gZWxzZSBpZiAoY3VycmVudFN0YXR1cyA9PSBRTWVkaWFQbGF5 ZXI6OkludmFsaWRNZWRpYSkgewotICAgICAgICBtX25ldHdvcmtTdGF0ZSA9IE1lZGlhUGxheWVy OjpOZXR3b3JrRXJyb3I7CisgICAgICAgIG1fbmV0d29ya1N0YXRlID0gTWVkaWFQbGF5ZXI6OkZv cm1hdEVycm9yOwogICAgICAgICBtX3JlYWR5U3RhdGUgPSBNZWRpYVBsYXllcjo6SGF2ZU5vdGhp bmc7CiAgICAgfQogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MDQ5MSkKKysrIExheW91dFRlc3RzL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDExLTAzLTA3ICBZaSBT aGVuICA8eWkuNC5zaGVuQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbUXRdIEZpeCB0aGUgZXJyb3IgY29kZSBmb3IgbWVkaWEgcmVz b3VyY2UgZmFpbHVyZXMgd2hlbiB1c2luZyBRdE1vYmlsaXR5CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTkwMQorCisgICAgICAgIFVuc2tpcCB0aGUg dGVzdHMgd2hpY2ggYXJlIG5vdyBwYXNzaW5nLgorCisgICAgICAgICogcGxhdGZvcm0vcXQvU2tp cHBlZDoKKwogMjAxMS0wMy0wNyAgTWloYWkgUGFycGFyaXRhICA8bWloYWlwQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBVbnJldmlld2VkIENocm9taXVtIGV4cGVjdGF0aW9ucyB1cGRhdGUuCklu ZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQJKHJldmlzaW9uIDgwNDg3KQorKysgTGF5b3V0VGVz dHMvcGxhdGZvcm0vcXQvU2tpcHBlZAkod29ya2luZyBjb3B5KQpAQCAtNTYyLDggKzU2Miw2IEBA IGh0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlLXBhcmFtZXRlcnMKICMgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4Mzc2CiBtZWRpYS9tZWRpYS1kb2N1bWVudC1h dWRpby1zaXplLmh0bWwKIAotbWVkaWEvaW52YWxpZC1tZWRpYS11cmwtY3Jhc2guaHRtbAotCiAj IFtRdF0gbWVkaWEvbWVkaWEtY2FuLXBsYXktb2dnLmh0bWwgY3Jhc2hlcyBpbnRlcm1pdHRlbnRs eSBvbiB0aGUgYm90CiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z OTQ4MQogbWVkaWEvYXVkaW8tb25seS12aWRlby1pbnRyaW5zaWMtc2l6ZS5odG1sCkBAIC01OTcs NyArNTk1LDYgQEAgbWVkaWEvY29udHJvbHMtc3R5bGluZy5odG1sCiBtZWRpYS9ldmVudC1hdHRy aWJ1dGVzLmh0bWwKIG1lZGlhL2ZhbGxiYWNrLmh0bWwKIG1lZGlhL21lZGlhLWNhcHRpb25zLmh0 bWwKLW1lZGlhL21lZGlhLWNvbnN0YW50cy5odG1sCiBtZWRpYS9tZWRpYS1mdWxsc2NyZWVuLWlu bGluZS5odG1sCiBtZWRpYS9tZWRpYS1mdWxsc2NyZWVuLW5vdC1pbi1kb2N1bWVudC5odG1sCiBt ZWRpYS9tZWRpYS1sb2FkLWV2ZW50Lmh0bWwKQEAgLTYzMyw3ICs2MzAsNiBAQCBtZWRpYS92aWRl by1kb20tc3JjLmh0bWwKIG1lZGlhL3ZpZGVvLWR1cmF0aW9uLWtub3duLWFmdGVyLWVvcy5odG1s CiBtZWRpYS92aWRlby1lbGVtZW50LW90aGVyLW5hbWVzcGFjZS1jcmFzaC5odG1sCiBtZWRpYS92 aWRlby1lbXB0eS1zb3VyY2UuaHRtbAotbWVkaWEvdmlkZW8tZXJyb3ItZG9lcy1ub3QtZXhpc3Qu aHRtbAogbWVkaWEvdmlkZW8tbGF5ZXItY3Jhc2guaHRtbAogbWVkaWEvdmlkZW8tbG9hZC1uZXR3 b3JrU3RhdGUuaHRtbAogbWVkaWEvdmlkZW8tbG9hZC1yZWFkeVN0YXRlLmh0bWwKQEAgLTY2OCwx MSArNjY0LDcgQEAgbWVkaWEvdmlkZW8tc291cmNlLW1lZGlhLmh0bWwKIG1lZGlhL3ZpZGVvLXNv dXJjZS1ub25lLXN1cHBvcnRlZC5odG1sCiBtZWRpYS92aWRlby1zb3VyY2UtdHlwZS5odG1sCiBt ZWRpYS92aWRlby1zb3VyY2UtdHlwZS1wYXJhbXMuaHRtbAotbWVkaWEvdmlkZW8tc3JjLWNoYW5n ZS5odG1sCiBtZWRpYS92aWRlby1zcmMuaHRtbAotbWVkaWEvdmlkZW8tc3JjLWludmFsaWQtcmVt b3ZlLmh0bWwKLW1lZGlhL3ZpZGVvLXNyYy1ub25lLmh0bWwKLW1lZGlhL3ZpZGVvLXNyYy1wbHVz LXNvdXJjZS5odG1sCiBtZWRpYS92aWRlby1zcmMtcmVtb3ZlLmh0bWwKIG1lZGlhL3ZpZGVvLXNy Yy1zZXQuaHRtbAogbWVkaWEvdmlkZW8tc3JjLXNvdXJjZS5odG1sCg== 91298 2011-04-27 09:21:38 -0700 2011-06-07 17:15:32 -0700 fix the patch according to the qtmobility change 55901.patch text/plain 3483 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1MDU0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMjcgIFlpIFNoZW4g IDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtRdF0gRml4IHRoZSBlcnJvciBjb2RlIGZvciBtZWRpYSByZXNvdXJj ZSBmYWlsdXJlcyB3aGVuIHVzaW5nIFF0TW9iaWxpdHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1OTAxCisKKyAgICAgICAgVG8gaW5kaWNhdGUgdGhl IG1lZGlhIHJlc291cmNlIGZhaWx1cmVzLCBzZXQgdGhlIG5ldHdyb2sgc3RhdGUgdG8KKyAgICAg ICAgTWVkaWFQbGF5ZXI6OkZvcm1hdEVycm9yIHdoZW4gcmVjZWl2ZXMgUU1lZGlhUGxheWVyOjpJ bnZhbGlkTWVkaWEgb3IKKyAgICAgICAgUU1lZGlhUGxheWVyOjpSZXNvdXJjZUVycm9yLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUXQ6OnVwZGF0ZVN0YXRlcyk6CisK IDIwMTEtMDQtMjcgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVR dC5jcHAJKHJldmlzaW9uIDg1MDUzKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00ODgsNyAr NDg4LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVRdDo6dXBkYXRlU3RhdGVzKAogCiAgICAg aWYgKGN1cnJlbnRFcnJvciAhPSBRTWVkaWFQbGF5ZXI6Ok5vRXJyb3IpIHsKICAgICAgICAgbV9y ZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6OkhhdmVOb3RoaW5nOwotICAgICAgICBpZiAoY3VycmVu dEVycm9yID09IFFNZWRpYVBsYXllcjo6Rm9ybWF0RXJyb3IpCisgICAgICAgIGlmIChjdXJyZW50 RXJyb3IgPT0gUU1lZGlhUGxheWVyOjpGb3JtYXRFcnJvciB8fCBjdXJyZW50RXJyb3IgPT0gUU1l ZGlhUGxheWVyOjpSZXNvdXJjZUVycm9yKQogICAgICAgICAgICAgbV9uZXR3b3JrU3RhdGUgPSBN ZWRpYVBsYXllcjo6Rm9ybWF0RXJyb3I7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIG1fbmV0 d29ya1N0YXRlID0gTWVkaWFQbGF5ZXI6Ok5ldHdvcmtFcnJvcjsKQEAgLTUxMyw3ICs1MTMsNyBA QCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF0Ojp1cGRhdGVTdGF0ZXMoCiAgICAgICAgIG1fbmV0 d29ya1N0YXRlID0gTWVkaWFQbGF5ZXI6OkxvYWRlZDsKICAgICAgICAgbV9yZWFkeVN0YXRlID0g TWVkaWFQbGF5ZXI6OkhhdmVFbm91Z2hEYXRhOwogICAgIH0gZWxzZSBpZiAoY3VycmVudFN0YXR1 cyA9PSBRTWVkaWFQbGF5ZXI6OkludmFsaWRNZWRpYSkgewotICAgICAgICBtX25ldHdvcmtTdGF0 ZSA9IE1lZGlhUGxheWVyOjpOZXR3b3JrRXJyb3I7CisgICAgICAgIG1fbmV0d29ya1N0YXRlID0g TWVkaWFQbGF5ZXI6OkZvcm1hdEVycm9yOwogICAgICAgICBtX3JlYWR5U3RhdGUgPSBNZWRpYVBs YXllcjo6SGF2ZU5vdGhpbmc7CiAgICAgfQogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA4NTA1NCkKKysr IExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisy MDExLTA0LTI3ICBZaSBTaGVuICA8eWkuNC5zaGVuQG5va2lhLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEZpeCB0aGUgZXJyb3IgY29k ZSBmb3IgbWVkaWEgcmVzb3VyY2UgZmFpbHVyZXMgd2hlbiB1c2luZyBRdE1vYmlsaXR5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTkwMQorCisgICAg ICAgIFVuc2tpcCB0aGUgdGVzdHMgd2hpY2ggYXJlIG5vdyBwYXNzaW5nLgorCisgICAgICAgICog cGxhdGZvcm0vcXQvU2tpcHBlZDoKKwogMjAxMS0wNC0yNyAgWXVyeSBTZW1pa2hhdHNreSAgPHl1 cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpJ bmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCShyZXZpc2lvbiA4NTA1MykKKysrIExheW91dFRl c3RzL3BsYXRmb3JtL3F0L1NraXBwZWQJKHdvcmtpbmcgY29weSkKQEAgLTYzNSw3ICs2MzUsNiBA QCBtZWRpYS92aWRlby1kb2N1bWVudC10eXBlcy5odG1sCiBtZWRpYS92aWRlby1kdXJhdGlvbi1r bm93bi1hZnRlci1lb3MuaHRtbAogbWVkaWEvdmlkZW8tZWxlbWVudC1vdGhlci1uYW1lc3BhY2Ut Y3Jhc2guaHRtbAogbWVkaWEvdmlkZW8tZW1wdHktc291cmNlLmh0bWwKLW1lZGlhL3ZpZGVvLWVy cm9yLWRvZXMtbm90LWV4aXN0Lmh0bWwKIG1lZGlhL3ZpZGVvLWxheWVyLWNyYXNoLmh0bWwKIG1l ZGlhL3ZpZGVvLWxvYWQtbmV0d29ya1N0YXRlLmh0bWwKIG1lZGlhL3ZpZGVvLWxvb3AuaHRtbApA QCAtNjU3LDEwICs2NTYsNiBAQCBtZWRpYS92aWRlby1zb3VyY2UtZXJyb3IuaHRtbAogbWVkaWEv dmlkZW8tc291cmNlLWVycm9yLW5vLWNhbmRpZGF0ZS5odG1sCiBtZWRpYS92aWRlby1zb3VyY2Ut dHlwZS5odG1sCiBtZWRpYS92aWRlby1zb3VyY2UtdHlwZS1wYXJhbXMuaHRtbAotbWVkaWEvdmlk ZW8tc3JjLWNoYW5nZS5odG1sCi1tZWRpYS92aWRlby1zcmMtaW52YWxpZC1yZW1vdmUuaHRtbAot bWVkaWEvdmlkZW8tc3JjLW5vbmUuaHRtbAotbWVkaWEvdmlkZW8tc3JjLXBsdXMtc291cmNlLmh0 bWwKIG1lZGlhL3ZpZGVvLXRpbWV1cGRhdGUtZHVyaW5nLXBsYXliYWNrLmh0bWwKIG1lZGlhL3Zp ZGVvLXRpbWV1cGRhdGUtcmV2ZXJzZS1wbGF5Lmh0bWwKIG1lZGlhL3ZpZGVvLXRyYW5zZm9ybWVk Lmh0bWwK 96331 2011-06-07 17:15:32 -0700 2011-06-07 19:44:47 -0700 fix typo 55901.patch text/plain 3488 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4Mjg5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDYtMDcgIFlpIFNoZW4g IDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNt YW5uLgorCisgICAgICAgIFtRdF0gRml4IHRoZSBlcnJvciBjb2RlIGZvciBtZWRpYSByZXNvdXJj ZSBmYWlsdXJlcyB3aGVuIHVzaW5nIFF0TW9iaWxpdHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1OTAxCisKKyAgICAgICAgVG8gaW5kaWNhdGUgdGhl IG1lZGlhIHJlc291cmNlIGZhaWx1cmVzLCBzZXQgdGhlIG5ldHdvcmsgc3RhdGUgdG8KKyAgICAg ICAgTWVkaWFQbGF5ZXI6OkZvcm1hdEVycm9yIHdoZW4gcmVjZWl2ZXMgUU1lZGlhUGxheWVyOjpJ bnZhbGlkTWVkaWEgb3IKKyAgICAgICAgUU1lZGlhUGxheWVyOjpSZXNvdXJjZUVycm9yLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUXQ6OnVwZGF0ZVN0YXRlcyk6CisK IDIwMTEtMDYtMDcgIFNhaWxlc2ggQWdyYXdhbCAgPHNhaWxAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IE1paGFpIFBhcnBhcml0YS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVR dC5jcHAJKHJldmlzaW9uIDg4Mjc4KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00OTAsNyAr NDkwLDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVRdDo6dXBkYXRlU3RhdGVzKAogCiAgICAg aWYgKGN1cnJlbnRFcnJvciAhPSBRTWVkaWFQbGF5ZXI6Ok5vRXJyb3IpIHsKICAgICAgICAgbV9y ZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6OkhhdmVOb3RoaW5nOwotICAgICAgICBpZiAoY3VycmVu dEVycm9yID09IFFNZWRpYVBsYXllcjo6Rm9ybWF0RXJyb3IpCisgICAgICAgIGlmIChjdXJyZW50 RXJyb3IgPT0gUU1lZGlhUGxheWVyOjpGb3JtYXRFcnJvciB8fCBjdXJyZW50RXJyb3IgPT0gUU1l ZGlhUGxheWVyOjpSZXNvdXJjZUVycm9yKQogICAgICAgICAgICAgbV9uZXR3b3JrU3RhdGUgPSBN ZWRpYVBsYXllcjo6Rm9ybWF0RXJyb3I7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIG1fbmV0 d29ya1N0YXRlID0gTWVkaWFQbGF5ZXI6Ok5ldHdvcmtFcnJvcjsKQEAgLTUxNSw3ICs1MTUsNyBA QCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF0Ojp1cGRhdGVTdGF0ZXMoCiAgICAgICAgIG1fbmV0 d29ya1N0YXRlID0gTWVkaWFQbGF5ZXI6OkxvYWRlZDsKICAgICAgICAgbV9yZWFkeVN0YXRlID0g TWVkaWFQbGF5ZXI6OkhhdmVFbm91Z2hEYXRhOwogICAgIH0gZWxzZSBpZiAoY3VycmVudFN0YXR1 cyA9PSBRTWVkaWFQbGF5ZXI6OkludmFsaWRNZWRpYSkgewotICAgICAgICBtX25ldHdvcmtTdGF0 ZSA9IE1lZGlhUGxheWVyOjpOZXR3b3JrRXJyb3I7CisgICAgICAgIG1fbmV0d29ya1N0YXRlID0g TWVkaWFQbGF5ZXI6OkZvcm1hdEVycm9yOwogICAgICAgICBtX3JlYWR5U3RhdGUgPSBNZWRpYVBs YXllcjo6SGF2ZU5vdGhpbmc7CiAgICAgfQogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA4ODI4OSkKKysr IExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisy MDExLTA2LTA3ICBZaSBTaGVuICA8eWkuNC5zaGVuQG5va2lhLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KKworICAgICAgICBbUXRdIEZpeCB0aGUgZXJyb3IgY29k ZSBmb3IgbWVkaWEgcmVzb3VyY2UgZmFpbHVyZXMgd2hlbiB1c2luZyBRdE1vYmlsaXR5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTkwMQorCisgICAg ICAgIFVuc2tpcCB0aGUgdGVzdHMgd2hpY2ggYXJlIG5vdyBwYXNzaW5nLgorCisgICAgICAgICog cGxhdGZvcm0vcXQvU2tpcHBlZDoKKwogMjAxMS0wNi0wNyAgVmFuZ2VsaXMgS29ra2V2aXMgIDx2 YW5nZWxpc0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmFtZXMgUm9iaW5z b24uCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQJKHJldmlzaW9uIDg4Mjc4KQorKysgTGF5 b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAkod29ya2luZyBjb3B5KQpAQCAtNTg1LDcgKzU4 NSw2IEBAIG1lZGlhL3ZpZGVvLWRvY3VtZW50LXR5cGVzLmh0bWwKIG1lZGlhL3ZpZGVvLWR1cmF0 aW9uLWtub3duLWFmdGVyLWVvcy5odG1sCiBtZWRpYS92aWRlby1lbGVtZW50LW90aGVyLW5hbWVz cGFjZS1jcmFzaC5odG1sCiBtZWRpYS92aWRlby1lbXB0eS1zb3VyY2UuaHRtbAotbWVkaWEvdmlk ZW8tZXJyb3ItZG9lcy1ub3QtZXhpc3QuaHRtbAogbWVkaWEvdmlkZW8tbGF5ZXItY3Jhc2guaHRt bAogbWVkaWEvdmlkZW8tbG9hZC1uZXR3b3JrU3RhdGUuaHRtbAogbWVkaWEvdmlkZW8tbG9vcC5o dG1sCkBAIC02MDcsMTAgKzYwNiw2IEBAIG1lZGlhL3ZpZGVvLXNvdXJjZS1lcnJvci5odG1sCiBt ZWRpYS92aWRlby1zb3VyY2UtZXJyb3Itbm8tY2FuZGlkYXRlLmh0bWwKIG1lZGlhL3ZpZGVvLXNv dXJjZS10eXBlLmh0bWwKIG1lZGlhL3ZpZGVvLXNvdXJjZS10eXBlLXBhcmFtcy5odG1sCi1tZWRp YS92aWRlby1zcmMtY2hhbmdlLmh0bWwKLW1lZGlhL3ZpZGVvLXNyYy1pbnZhbGlkLXJlbW92ZS5o dG1sCi1tZWRpYS92aWRlby1zcmMtbm9uZS5odG1sCi1tZWRpYS92aWRlby1zcmMtcGx1cy1zb3Vy Y2UuaHRtbAogbWVkaWEvdmlkZW8tdGltZXVwZGF0ZS1kdXJpbmctcGxheWJhY2suaHRtbAogbWVk aWEvdmlkZW8tdGltZXVwZGF0ZS1yZXZlcnNlLXBsYXkuaHRtbAogbWVkaWEvdmlkZW8tdHJhbnNm b3JtZWQuaHRtbAo=