Changeset 83191 in webkit

Timestamp:

Apr 7, 2011 11:46:23 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-07 Nancy Piedra <​nancy.piedra@nokia.com>

Reviewed by Eric Carlson.

Add tests for parsing codecs parameter in video-can-play-type.html
​https://bugs.webkit.org/show_bug.cgi?id=53275

• media/video-can-play-type-expected.txt:
• media/video-can-play-type.html:

2011-04-07 Nancy Piedra <​nancy.piedra@nokia.com>

Reviewed by Eric Carlson.

Parse quotes from content type parameters
​https://bugs.webkit.org/show_bug.cgi?id=53275

This functionality is tested in video-can-play-type.html layout test
where I've added codecs parameter with good and bad formatting.

• platform/ContentType.cpp: (WebCore::ContentType::parameter):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-can-play-type-expected.txt (modified) (1 diff)
• LayoutTests/media/video-can-play-type.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/ContentType.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-07  Nancy Piedra  <nancy.piedra@nokia.com>
+
+        Reviewed by Eric Carlson.
+
+        Add tests for parsing codecs parameter in video-can-play-type.html
+        https://bugs.webkit.org/show_bug.cgi?id=53275
+
+        * media/video-can-play-type-expected.txt:
+        * media/video-can-play-type.html:
+
 2011-04-07  Jessie Berlin  <jberlin@apple.com>
 

trunk/LayoutTests/media/video-can-play-type-expected.txt

@@ -8 +8 @@
 EXPECTED (video.canPlayType('audio/mpeg') == 'maybe') OK
 EXPECTED (video.canPlayType('audio/Wav') == 'maybe') OK
+EXPECTED (video.canPlayType('video/blahblah; codecs=blah') == '') OK
+EXPECTED (video.canPlayType('video/blahblah; codecs="blah"') == '') OK
+EXPECTED (video.canPlayType('video/blahblah; codecs="badcontent') == '') OK
+EXPECTED (video.canPlayType('video/blahblah; codecs=badcontent"') == '') OK
+EXPECTED (video.canPlayType('video/blahblah; codecs="badcontent"') == '') OK
 END OF TEST
 

trunk/LayoutTests/media/video-can-play-type.html

@@ -23 +23 @@
             testExpected("video.canPlayType('audio/mpeg')", "maybe");
             testExpected("video.canPlayType('audio/Wav')", "maybe");
+            testExpected("video.canPlayType('video/blahblah; codecs=blah')", "");
+            testExpected("video.canPlayType('video/blahblah; codecs=\"blah\"')", "");
+            testExpected("video.canPlayType('video/blahblah; codecs=\"badcontent')", "");
+            testExpected("video.canPlayType('video/blahblah; codecs=badcontent\"')", "");
+            testExpected("video.canPlayType('video/blahblah; codecs="badcontent"')", "");
 
             endTest();

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-07  Nancy Piedra  <nancy.piedra@nokia.com>
+
+        Reviewed by Eric Carlson.
+
+        Parse quotes from content type parameters
+        https://bugs.webkit.org/show_bug.cgi?id=53275
+
+        This functionality is tested in video-can-play-type.html layout test
+        where I've added codecs parameter with good and bad formatting.
+
+        * platform/ContentType.cpp:
+        (WebCore::ContentType::parameter):
+
 2011-04-07  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebCore/platform/ContentType.cpp

@@ -46 +46 @@
         size_t start = strippedType.find(parameterName, semi + 1, false);
         if (start != notFound) {
-            start = strippedType.find('=', start + 6);
+            start = strippedType.find('=', start + parameterName.length());
             if (start != notFound) {
-                size_t end = strippedType.find(';', start + 6);
-                if (end == notFound)
-                    end = strippedType.length();
+                size_t quote = strippedType.find('\"', start + 1);
+                size_t end = strippedType.find('\"', start + 2);
+                if (quote != notFound && end != notFound)
+                    start = quote;
+                else {
+                    end = strippedType.find(';', start + 1);
+                    if (end == notFound)
+                        end = strippedType.length();
+                }
                 parameterValue = strippedType.substring(start + 1, end - (start + 1)).stripWhiteSpace();
             }