58188 2011-04-09 04:35:54 -0700 [Qt] MediaPlayerPrivateQt::supportsType does not parse codec parameter 2011-04-14 04:41:32 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC Linux RESOLVED FIXED Qt P3 Normal --- 1 nancy.piedra nancy.piedra commit-queue oldest_to_newest 382768 0 nancy.piedra 2011-04-09 04:35:54 -0700 The codec parameter in MediaPlayerPrivateQt::supportsType is not parsed before being passed to the QMediaPlayer::hasSupport function which takes a QStringList. See below: MediaPlayer::SupportsType MediaPlayerPrivateQt::supportsType(const String& mime, const String& codec) ... int QtMediaPlayerSupport = QMediaPlayer::hasSupport(mime, QStringList(codec)); I will be uploading a patch soon. 382776 1 88930 nancy.piedra 2011-04-09 09:24:02 -0700 Created attachment 88930 Patch to parse codec string The codec parameter in MediaPlayerPrivateQt::supportsType was not parsing the 'codec' QString into a QStringList which is required for the QMediaPlayer::hasSupport function. This patch parses and trims the codec parameter into a QStringList. 382951 2 88930 eric 2011-04-10 15:56:41 -0700 Comment on attachment 88930 Patch to parse codec string Do you need to unskip a test or update results? 383123 3 nancy.piedra 2011-04-11 05:48:21 -0700 (In reply to comment #2) > (From update of attachment 88930 [details]) > Do you need to unskip a test or update results? Eric, My goal is to get the video-can-play-type.html test to pass on Qt. See this bug: https://bugs.webkit.org/show_bug.cgi?id=42094 But during my investigations I noticed general issues in this area with parsing, etc. This bug is one of them. These are the others: Misuse of &quote: https://bugs.webkit.org/show_bug.cgi?id=57728 (misue of &quot) Improper parsing of codecs param: https://bugs.webkit.org/show_bug.cgi?id=53275 I'm trying to fix the issues incrementally. Right now, I can't pass video-can-play-type.html for Qt because there are some other issues in the return type (either in Qt Multimedia or QtWebkit - I'm still investigating) Maybe I should make this error a dependency on 42094? I'm open to other suggestions what is the proper thing to do. 383130 4 88930 benjamin 2011-04-11 06:13:41 -0700 Comment on attachment 88930 Patch to parse codec string View in context: https://bugs.webkit.org/attachment.cgi?id=88930&action=review Review express ... > Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp:87 > + // Parse and trim codecs Missing dot. > Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp:89 > + QString codecStr = codec; Why do you need to copy the string? > Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp:90 > + codecList = codecStr.split(QLatin1String(","), QString::SkipEmptyParts); That should be a QLatin1Char(','). Why do you create the empty QStringList just to assign it another value 2 lines later? > Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp:92 > + foreach (const QString &codecStrNotTrimmed, codecList) { Coding style. 383277 5 89030 nancy.piedra 2011-04-11 10:56:57 -0700 Created attachment 89030 Modified patch based on Benjamin's comments I modified the patch based on Benjamin's comments. I believe I addressed all comments except: 1. Why do you need to copy the string? I needed to created a QString from a String so that I could use the "split" function. 2. Coding style. I ran the "check-webkit-style" script and saw no style errors. If you could be more specific I will fix it. 383937 6 89030 benjamin 2011-04-12 04:56:46 -0700 Comment on attachment 89030 Modified patch based on Benjamin's comments View in context: https://bugs.webkit.org/attachment.cgi?id=89030&action=review I am ok with the change. It is not very solid but hey, that is the way QMediaPlayer is defined. Just clean the patch before it can land. > Source/WebCore/ChangeLog:9 > + a QStringList. This change parses and trims the list. Two spaces after the dot. > Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp:91 > + foreach (const QString &codecStrNotTrimmed, codecList) { coding style: const QString& codecStrNotTrimmed. > Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp:93 > + codecListTrimmed.append(codecStrTrimmed); Couldn't you have an empty string here. If codecs = "foo, , bar, ". The parts containing only spaces will be null string after trimmed() and will be inserted in the list. 383989 7 89200 nancy.piedra 2011-04-12 07:28:24 -0700 Created attachment 89200 Modified patch based on Benjamin's comments Modified patch based on Benjamin's comments. Added a test for a null string in the codecs paramter based on Benjamin's comments. 384161 8 89229 nancy.piedra 2011-04-12 10:59:41 -0700 Created attachment 89229 Add expected results 385621 9 89229 benjamin 2011-04-14 03:41:32 -0700 Comment on attachment 89229 Add expected results lgtm 385641 10 commit-queue 2011-04-14 04:38:47 -0700 The commit-queue encountered the following flaky tests while processing attachment 89229: http/tests/misc/favicon-loads-with-icon-loading-override.html bug 58412 (author: alice.liu@apple.com) The commit-queue is continuing to process your patch. 385643 11 89229 commit-queue 2011-04-14 04:41:28 -0700 Comment on attachment 89229 Add expected results Clearing flags on attachment: 89229 Committed r83836: <http://trac.webkit.org/changeset/83836> 385644 12 commit-queue 2011-04-14 04:41:32 -0700 All reviewed patches have been landed. Closing bug. 88930 2011-04-09 09:24:02 -0700 2011-04-11 10:56:57 -0700 Patch to parse codec string supportsType.diff text/plain 2033 nancy.piedra SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzMzc2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDQtMDkgIE5hbmN5IFBp ZWRyYSAgPG5hbmN5LnBpZWRyYUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBNZWRpYVBsYXllclByaXZhdGVRdDo6c3VwcG9y dHNUeXBlIGRvZXMgbm90IHBhcnNlIGNvZGVjIHBhcmFtZXRlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgxODgKKworICAgICAgICBUaGUgY29kZWMg cGFyYW1ldGVyIGluIE1lZGlhUGxheWVyUHJpdmF0ZVF0OjpzdXBwb3J0c1R5cGUgd2FzIG5vdCBw YXJzZWQgaW50bworICAgICAgICBhIFFTdHJpbmdMaXN0LiAgVGhpcyBjaGFuZ2UgcGFyc2VzIGFu ZCB0cmltcyB0aGUgbGlzdC4KKworICAgICAgICBUaGUgZXhpc3RpbmcgdmlkZW8tY2FuLXBsYXkt dHlwZS5odG1sIHRlc3Qgc2hvdWxkIGNvdmVyIHRoaXMgc28gbm8gbmV3IHRlc3RzCisgICAgICAg IHdlcmUgYWRkZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXll clByaXZhdGVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVRdDo6 c3VwcG9ydHNUeXBlKToKKwogMjAxMS0wNC0wOSAgSm9uIExlZSAgPGpvbmxlZUBhcHBsZS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQmV0aCBEYWtpbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZh dGVRdC5jcHAJKHJldmlzaW9uIDgzMTk0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NCw3 ICs4NCwxNyBAQCBNZWRpYVBsYXllcjo6U3VwcG9ydHNUeXBlIE1lZGlhUGxheWVyUHJpCiAgICAg aWYgKCFtaW1lLnN0YXJ0c1dpdGgoImF1ZGlvLyIpICYmICFtaW1lLnN0YXJ0c1dpdGgoInZpZGVv LyIpKQogICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6OklzTm90U3VwcG9ydGVkOwogCi0gICAg aWYgKFFNZWRpYVBsYXllcjo6aGFzU3VwcG9ydChtaW1lLCBRU3RyaW5nTGlzdChjb2RlYykpID49 IFF0TXVsdGltZWRpYUtpdDo6UHJvYmFibHlTdXBwb3J0ZWQpCisgICAgLy8gUGFyc2UgYW5kIHRy aW0gY29kZWNzCisgICAgUVN0cmluZ0xpc3QgY29kZWNMaXN0OworICAgIFFTdHJpbmcgY29kZWNT dHIgPSBjb2RlYzsKKyAgICBjb2RlY0xpc3QgPSBjb2RlY1N0ci5zcGxpdChRTGF0aW4xU3RyaW5n KCIsIiksIFFTdHJpbmc6OlNraXBFbXB0eVBhcnRzKTsKKyAgICBRU3RyaW5nTGlzdCBjb2RlY0xp c3RUcmltbWVkOworICAgIGZvcmVhY2ggKGNvbnN0IFFTdHJpbmcgJmNvZGVjU3RyTm90VHJpbW1l ZCwgY29kZWNMaXN0KSB7CisgICAgICAgIFFTdHJpbmcgY29kZWNTdHJUcmltbWVkID0gY29kZWNT dHJOb3RUcmltbWVkLnRyaW1tZWQoKTsKKyAgICAgICAgY29kZWNMaXN0VHJpbW1lZC5hcHBlbmQo Y29kZWNTdHJUcmltbWVkKTsKKyAgICB9CisKKyAgICBpZiAoUU1lZGlhUGxheWVyOjpoYXNTdXBw b3J0KG1pbWUsIGNvZGVjTGlzdFRyaW1tZWQpID49IFF0TXVsdGltZWRpYUtpdDo6UHJvYmFibHlT dXBwb3J0ZWQpCiAgICAgICAgIHJldHVybiBNZWRpYVBsYXllcjo6SXNTdXBwb3J0ZWQ7CiAKICAg ICByZXR1cm4gTWVkaWFQbGF5ZXI6Ok1heUJlU3VwcG9ydGVkOwo= 89030 2011-04-11 10:56:57 -0700 2011-04-12 10:59:41 -0700 Modified patch based on Benjamin's comments supportsType2.diff text/plain 2016 nancy.piedra SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzMzc2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDQtMDkgIE5hbmN5IFBp ZWRyYSAgPG5hbmN5LnBpZWRyYUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBNZWRpYVBsYXllclByaXZhdGVRdDo6c3VwcG9y dHNUeXBlIGRvZXMgbm90IHBhcnNlIGNvZGVjIHBhcmFtZXRlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgxODgKKworICAgICAgICBUaGUgY29kZWMg cGFyYW1ldGVyIGluIE1lZGlhUGxheWVyUHJpdmF0ZVF0OjpzdXBwb3J0c1R5cGUgd2FzIG5vdCBw YXJzZWQgaW50bworICAgICAgICBhIFFTdHJpbmdMaXN0LiAgVGhpcyBjaGFuZ2UgcGFyc2VzIGFu ZCB0cmltcyB0aGUgbGlzdC4KKworICAgICAgICBUaGUgZXhpc3RpbmcgdmlkZW8tY2FuLXBsYXkt dHlwZS5odG1sIHRlc3Qgc2hvdWxkIGNvdmVyIHRoaXMgc28gbm8gbmV3IHRlc3RzCisgICAgICAg IHdlcmUgYWRkZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXll clByaXZhdGVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVRdDo6 c3VwcG9ydHNUeXBlKToKKwogMjAxMS0wNC0wOSAgSm9uIExlZSAgPGpvbmxlZUBhcHBsZS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQmV0aCBEYWtpbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZh dGVRdC5jcHAJKHJldmlzaW9uIDgzMTk0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NCw3 ICs4NCwxNiBAQCBNZWRpYVBsYXllcjo6U3VwcG9ydHNUeXBlIE1lZGlhUGxheWVyUHJpCiAgICAg aWYgKCFtaW1lLnN0YXJ0c1dpdGgoImF1ZGlvLyIpICYmICFtaW1lLnN0YXJ0c1dpdGgoInZpZGVv LyIpKQogICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6OklzTm90U3VwcG9ydGVkOwogCi0gICAg aWYgKFFNZWRpYVBsYXllcjo6aGFzU3VwcG9ydChtaW1lLCBRU3RyaW5nTGlzdChjb2RlYykpID49 IFF0TXVsdGltZWRpYUtpdDo6UHJvYmFibHlTdXBwb3J0ZWQpCisgICAgLy8gUGFyc2UgYW5kIHRy aW0gY29kZWNzLgorICAgIFFTdHJpbmcgY29kZWNTdHIgPSBjb2RlYzsKKyAgICBRU3RyaW5nTGlz dCBjb2RlY0xpc3QgPSBjb2RlY1N0ci5zcGxpdChRTGF0aW4xQ2hhcignLCcpLCBRU3RyaW5nOjpT a2lwRW1wdHlQYXJ0cyk7CisgICAgUVN0cmluZ0xpc3QgY29kZWNMaXN0VHJpbW1lZDsKKyAgICBm b3JlYWNoIChjb25zdCBRU3RyaW5nICZjb2RlY1N0ck5vdFRyaW1tZWQsIGNvZGVjTGlzdCkgewor ICAgICAgICBRU3RyaW5nIGNvZGVjU3RyVHJpbW1lZCA9IGNvZGVjU3RyTm90VHJpbW1lZC50cmlt bWVkKCk7CisgICAgICAgIGNvZGVjTGlzdFRyaW1tZWQuYXBwZW5kKGNvZGVjU3RyVHJpbW1lZCk7 CisgICAgfQorCisgICAgaWYgKFFNZWRpYVBsYXllcjo6aGFzU3VwcG9ydChtaW1lLCBjb2RlY0xp c3RUcmltbWVkKSA+PSBRdE11bHRpbWVkaWFLaXQ6OlByb2JhYmx5U3VwcG9ydGVkKQogICAgICAg ICByZXR1cm4gTWVkaWFQbGF5ZXI6OklzU3VwcG9ydGVkOwogCiAgICAgcmV0dXJuIE1lZGlhUGxh eWVyOjpNYXlCZVN1cHBvcnRlZDsK 89200 2011-04-12 07:28:24 -0700 2011-04-12 10:59:41 -0700 Modified patch based on Benjamin's comments supportsType3.diff text/plain 3454 nancy.piedra SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNTg0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDQtMTIgIE5hbmN5IFBp ZWRyYSAgPG5hbmN5LnBpZWRyYUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBNZWRpYVBsYXllclByaXZhdGVRdDo6c3VwcG9y dHNUeXBlIGRvZXMgbm90IHBhcnNlIGNvZGVjIHBhcmFtZXRlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgxODgKKworICAgICAgICBUaGUgY29kZWMg cGFyYW1ldGVyIGluIE1lZGlhUGxheWVyUHJpdmF0ZVF0OjpzdXBwb3J0c1R5cGUgd2FzIG5vdCBw YXJzZWQgaW50bworICAgICAgICBhIFFTdHJpbmdMaXN0LiAgVGhpcyBjaGFuZ2UgcGFyc2VzIGFu ZCB0cmltcyB0aGUgbGlzdC4KKworICAgICAgICBBbiBhZGRpdGlvbmFsIHRlc3Qgd2FzIGFkZGVk IHRvIHZpZGVvLWNhbi1wbGF5LXR5cGUuaHRtbCB0byB0ZXN0IHBhcnNpbmcgb2YgY29kZWMgcGFy YW1ldGVyLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2 YXRlUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUXQ6OnN1cHBv cnRzVHlwZSk6CisKIDIwMTEtMDQtMTIgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVRdC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQ bGF5ZXJQcml2YXRlUXQuY3BwCShyZXZpc2lvbiA4MzE5NCkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtODQsNyArODQsMTYgQEAgTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSBNZWRpYVBsYXll clByaQogICAgIGlmICghbWltZS5zdGFydHNXaXRoKCJhdWRpby8iKSAmJiAhbWltZS5zdGFydHNX aXRoKCJ2aWRlby8iKSkKICAgICAgICAgcmV0dXJuIE1lZGlhUGxheWVyOjpJc05vdFN1cHBvcnRl ZDsKIAotICAgIGlmIChRTWVkaWFQbGF5ZXI6Omhhc1N1cHBvcnQobWltZSwgUVN0cmluZ0xpc3Qo Y29kZWMpKSA+PSBRdE11bHRpbWVkaWFLaXQ6OlByb2JhYmx5U3VwcG9ydGVkKQorICAgIC8vIFBh cnNlIGFuZCB0cmltIGNvZGVjcy4KKyAgICBRU3RyaW5nIGNvZGVjU3RyID0gY29kZWM7CisgICAg UVN0cmluZ0xpc3QgY29kZWNMaXN0ID0gY29kZWNTdHIuc3BsaXQoUUxhdGluMUNoYXIoJywnKSwg UVN0cmluZzo6U2tpcEVtcHR5UGFydHMpOworICAgIFFTdHJpbmdMaXN0IGNvZGVjTGlzdFRyaW1t ZWQ7CisgICAgZm9yZWFjaCAoY29uc3QgUVN0cmluZyYgY29kZWNTdHJOb3RUcmltbWVkLCBjb2Rl Y0xpc3QpIHsKKyAgICAgICAgUVN0cmluZyBjb2RlY1N0clRyaW1tZWQgPSBjb2RlY1N0ck5vdFRy aW1tZWQudHJpbW1lZCgpOworICAgICAgICBjb2RlY0xpc3RUcmltbWVkLmFwcGVuZChjb2RlY1N0 clRyaW1tZWQpOworICAgIH0KKworICAgIGlmIChRTWVkaWFQbGF5ZXI6Omhhc1N1cHBvcnQobWlt ZSwgY29kZWNMaXN0VHJpbW1lZCkgPj0gUXRNdWx0aW1lZGlhS2l0OjpQcm9iYWJseVN1cHBvcnRl ZCkKICAgICAgICAgcmV0dXJuIE1lZGlhUGxheWVyOjpJc1N1cHBvcnRlZDsKIAogICAgIHJldHVy biBNZWRpYVBsYXllcjo6TWF5QmVTdXBwb3J0ZWQ7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MzU4NSkK KysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBA CisyMDExLTA0LTEyICBOYW5jeSBQaWVkcmEgIDxuYW5jeS5waWVkcmFAbm9raWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIGFkZGl0 aW9uYWwgdGVzdCBmb3IgcGFyc2luZyBjb2RlY3MgcGFyYW1ldGVyLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgxODgKKworICAgICAgICAqIG1lZGlh L3ZpZGVvLWNhbi1wbGF5LXR5cGUuaHRtbDoKKwogMjAxMS0wNC0xMSAgUGF2ZWwgUG9kaXZpbG92 ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBG ZWxkbWFuLgpJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY2FuLXBsYXktdHlwZS5odG1s Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNhbi1wbGF5LXR5cGUuaHRt bAkocmV2aXNpb24gODMxOTQpCisrKyBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jYW4tcGxheS10 eXBlLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTI0LDYgKzI0LDcgQEAKICAgICAgICAgICAgIHRl c3RFeHBlY3RlZCgidmlkZW8uY2FuUGxheVR5cGUoJ2F1ZGlvL1dhdicpIiwgIm1heWJlIik7CiAg ICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLmNhblBsYXlUeXBlKCd2aWRlby9ibGFoYmxh aDsgY29kZWNzPWJsYWgnKSIsICIiKTsKICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8u Y2FuUGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFoOyBjb2RlY3M9XCJibGFoXCInKSIsICIiKTsKKyAg ICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFo OyBjb2RlY3M9XCJibGFoLCAgLCBibGFoXCInKSIsICIiKTsKICAgICAgICAgICAgIHRlc3RFeHBl Y3RlZCgidmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFoOyBjb2RlY3M9XCJiYWRjb250 ZW50JykiLCAiIik7CiAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLmNhblBsYXlUeXBl KCd2aWRlby9ibGFoYmxhaDsgY29kZWNzPWJhZGNvbnRlbnRcIicpIiwgIiIpOwogICAgICAgICAg ICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jYW5QbGF5VHlwZSgndmlkZW8vYmxhaGJsYWg7IGNvZGVj cz0mcXVvdDtiYWRjb250ZW50JnF1b3Q7JykiLCAiIik7Cg== 89229 2011-04-12 10:59:41 -0700 2011-04-14 04:41:28 -0700 Add expected results supportsType5.diff text/plain 4379 nancy.piedra SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNTg3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDQtMTIgIE5hbmN5IFBp ZWRyYSAgPG5hbmN5LnBpZWRyYUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBNZWRpYVBsYXllclByaXZhdGVRdDo6c3VwcG9y dHNUeXBlIGRvZXMgbm90IHBhcnNlIGNvZGVjIHBhcmFtZXRlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgxODgKKworICAgICAgICBUaGUgY29kZWMg cGFyYW1ldGVyIGluIE1lZGlhUGxheWVyUHJpdmF0ZVF0OjpzdXBwb3J0c1R5cGUgd2FzIG5vdCBw YXJzZWQgaW50bworICAgICAgICBhIFFTdHJpbmdMaXN0LiBUaGlzIGNoYW5nZSBwYXJzZXMgYW5k IHRyaW1zIHRoZSBsaXN0LgorCisgICAgICAgIEFuIGFkZGl0aW9uYWwgdGVzdCB3YXMgYWRkZWQg dG8gdmlkZW8tY2FuLXBsYXktdHlwZS5odG1sIHRvIHRlc3QgcGFyc2luZyBvZiBjb2RlYyBwYXJh bWV0ZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZh dGVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVRdDo6c3VwcG9y dHNUeXBlKToKKwogMjAxMS0wNC0xMiAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdh bGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYXJ0aW4gUm9iaW5zb24uCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVRdC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVk aWFQbGF5ZXJQcml2YXRlUXQuY3BwCShyZXZpc2lvbiA4MzE5NCkKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcAkod29ya2luZyBj b3B5KQpAQCAtODQsNyArODQsMTcgQEAgTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSBNZWRpYVBs YXllclByaQogICAgIGlmICghbWltZS5zdGFydHNXaXRoKCJhdWRpby8iKSAmJiAhbWltZS5zdGFy dHNXaXRoKCJ2aWRlby8iKSkKICAgICAgICAgcmV0dXJuIE1lZGlhUGxheWVyOjpJc05vdFN1cHBv cnRlZDsKIAotICAgIGlmIChRTWVkaWFQbGF5ZXI6Omhhc1N1cHBvcnQobWltZSwgUVN0cmluZ0xp c3QoY29kZWMpKSA+PSBRdE11bHRpbWVkaWFLaXQ6OlByb2JhYmx5U3VwcG9ydGVkKQorICAgIC8v IFBhcnNlIGFuZCB0cmltIGNvZGVjcy4KKyAgICBRU3RyaW5nIGNvZGVjU3RyID0gY29kZWM7Cisg ICAgUVN0cmluZ0xpc3QgY29kZWNMaXN0ID0gY29kZWNTdHIuc3BsaXQoUUxhdGluMUNoYXIoJywn KSwgUVN0cmluZzo6U2tpcEVtcHR5UGFydHMpOworICAgIFFTdHJpbmdMaXN0IGNvZGVjTGlzdFRy aW1tZWQ7CisgICAgZm9yZWFjaCAoY29uc3QgUVN0cmluZyYgY29kZWNTdHJOb3RUcmltbWVkLCBj b2RlY0xpc3QpIHsKKyAgICAgICAgUVN0cmluZyBjb2RlY1N0clRyaW1tZWQgPSBjb2RlY1N0ck5v dFRyaW1tZWQudHJpbW1lZCgpOworICAgICAgICBpZiAoIWNvZGVjU3RyVHJpbW1lZC5pc0VtcHR5 KCkpCisgICAgICAgICAgICBjb2RlY0xpc3RUcmltbWVkLmFwcGVuZChjb2RlY1N0clRyaW1tZWQp OworICAgIH0KKworICAgIGlmIChRTWVkaWFQbGF5ZXI6Omhhc1N1cHBvcnQobWltZSwgY29kZWNM aXN0VHJpbW1lZCkgPj0gUXRNdWx0aW1lZGlhS2l0OjpQcm9iYWJseVN1cHBvcnRlZCkKICAgICAg ICAgcmV0dXJuIE1lZGlhUGxheWVyOjpJc1N1cHBvcnRlZDsKIAogICAgIHJldHVybiBNZWRpYVBs YXllcjo6TWF5QmVTdXBwb3J0ZWQ7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MzU4NykKKysrIExheW91 dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDExLTA0 LTEyICBOYW5jeSBQaWVkcmEgIDxuYW5jeS5waWVkcmFAbm9raWEuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIGFkZGl0aW9uYWwgdGVz dCBmb3IgcGFyc2luZyBjb2RlY3MgcGFyYW1ldGVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgxODgKKworICAgICAgICAqIG1lZGlhL3ZpZGVvLWNh bi1wbGF5LXR5cGUtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIG1lZGlhL3ZpZGVvLWNhbi1wbGF5 LXR5cGUuaHRtbDoKKwogMjAxMS0wNC0xMSAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpJbmRleDog TGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY2FuLXBsYXktdHlwZS1leHBlY3RlZC50eHQKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY2FuLXBsYXktdHlwZS1leHBlY3RlZC50 eHQJKHJldmlzaW9uIDgzMTk0KQorKysgTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY2FuLXBsYXkt dHlwZS1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTcsNiArNyw3IEBAIEVYUEVDVEVE ICh2aWRlby5jYW5QbGF5VHlwZSgndmlkZW8vbXBlZzsKIEVYUEVDVEVEICh2aWRlby5jYW5QbGF5 VHlwZSgnIFZpZGVvL01QNCA7IENPREVDUz0ibXA0di4yMC44LCBtcDRhLjQwLjIiJykgPT0gJ3By b2JhYmx5JykgT0sKIEVYUEVDVEVEICh2aWRlby5jYW5QbGF5VHlwZSgnYXVkaW8vbXBlZycpID09 ICdtYXliZScpIE9LCiBFWFBFQ1RFRCAodmlkZW8uY2FuUGxheVR5cGUoJ2F1ZGlvL1dhdicpID09 ICdtYXliZScpIE9LCitFWFBFQ1RFRCAodmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFo OyBjb2RlY3M9ImJsYWgsICwgYmxhaCInKSA9PSAnJykgT0sKIEVYUEVDVEVEICh2aWRlby5jYW5Q bGF5VHlwZSgndmlkZW8vYmxhaGJsYWg7IGNvZGVjcz1ibGFoJykgPT0gJycpIE9LCiBFWFBFQ1RF RCAodmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFoOyBjb2RlY3M9ImJsYWgiJykgPT0g JycpIE9LCiBFWFBFQ1RFRCAodmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFoOyBjb2Rl Y3M9ImJhZGNvbnRlbnQnKSA9PSAnJykgT0sKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3ZpZGVv LWNhbi1wbGF5LXR5cGUuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS92aWRl by1jYW4tcGxheS10eXBlLmh0bWwJKHJldmlzaW9uIDgzMTk0KQorKysgTGF5b3V0VGVzdHMvbWVk aWEvdmlkZW8tY2FuLXBsYXktdHlwZS5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0yMiw2ICsyMiw3 IEBACiAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLmNhblBsYXlUeXBlKCcgICAgICAg IFZpZGVvL01QNCA7IENPREVDUz1cIm1wNHYuMjAuOCwgbXA0YS40MC4yXCInKSIsICJwcm9iYWJs eSIpOwogICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jYW5QbGF5VHlwZSgnYXVkaW8v bXBlZycpIiwgIm1heWJlIik7CiAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLmNhblBs YXlUeXBlKCdhdWRpby9XYXYnKSIsICJtYXliZSIpOworICAgICAgICAgICAgdGVzdEV4cGVjdGVk KCJ2aWRlby5jYW5QbGF5VHlwZSgndmlkZW8vYmxhaGJsYWg7IGNvZGVjcz1cImJsYWgsICAsIGJs YWhcIicpIiwgIiIpOwogICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jYW5QbGF5VHlw ZSgndmlkZW8vYmxhaGJsYWg7IGNvZGVjcz1ibGFoJykiLCAiIik7CiAgICAgICAgICAgICB0ZXN0 RXhwZWN0ZWQoInZpZGVvLmNhblBsYXlUeXBlKCd2aWRlby9ibGFoYmxhaDsgY29kZWNzPVwiYmxh aFwiJykiLCAiIik7CiAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLmNhblBsYXlUeXBl KCd2aWRlby9ibGFoYmxhaDsgY29kZWNzPVwiYmFkY29udGVudCcpIiwgIiIpOwo=