Changeset 107244 in webkit
- Timestamp:
- Feb 9, 2012 7:49:13 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r107242 r107244 1 2012-02-09 Arun Patole <arun.patole@motorola.com> 2 3 Setting media element 'src' attribute to "" should trigger load 4 https://bugs.webkit.org/show_bug.cgi?id=47907 5 6 Reviewed by Eric Carlson. 7 8 * media/video-src-empty-expected.txt: Added, test for <video> with empty src. 9 * media/video-src-empty.html: Added. 10 * media/video-src-none-expected.txt: 11 * media/video-src-none.html: removed "empty src" test as it is handled in separate test: video-src-empty.html. 12 * platform/chromium/test_expectations.txt: media/video-empty-source.html needs a rebaseline. 13 1 14 2012-02-09 Pavel Feldman <pfeldman@google.com> 2 15 -
trunk/LayoutTests/media/video-src-none-expected.txt
r64085 r107244 1 2 1 3 Network state should remain in NETWORK_EMPTY with empty ormissing 'src' attribute.2 Network state should remain in NETWORK_EMPTY with missing 'src' attribute. 4 3 ** <video> with no src attribute** 5 4 EXPECTED (videos[0].error == 'null') OK 6 5 EXPECTED (videos[0].networkState == '0') OK 7 6 EXPECTED (videos[0].src == '') OK 8 ** <video> with empty src attribute **9 EXPECTED (videos[1].error == 'null') OK10 EXPECTED (videos[1].networkState == '0') OK11 EXPECTED (relativeURL(videos[1].src) == 'video-src-none.html') OK12 13 Calling load() with empty 'src' should fire 'error' event, set network state to NETWORK_NO_SOURCE, and set error to MEDIA_ERR_SRC_NOT_SUPPORTED.14 'error' event:15 EXPECTED (state == 'load() with empty 'src'') OK16 EXPECTED ([object HTMLVideoElement] == '[object HTMLVideoElement]') OK17 EXPECTED (videos[1].error.code == '4') OK18 EXPECTED (videos[1].networkState == '3') OK19 7 20 8 Calling load() with no 'src' should NOT fire 'error' event, set network state to NETWORK_EMPTY. -
trunk/LayoutTests/media/video-src-none.html
r79630 r107244 17 17 function errorEvent() 18 18 { 19 consoleWrite("'error' event:"); 20 testExpected("state", "load() with empty 'src'"); 21 testExpected(event.target, videos[1]); 22 testExpected("videos[1].error.code", MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED); 23 testExpected("videos[1].networkState", HTMLMediaElement.NETWORK_NO_SOURCE); 19 failTest("<br><i>***'error' event fired***<" + "/i>"); 20 } 21 22 function test() 23 { 24 videos = document.querySelectorAll('video'); 25 26 consoleWrite("<br><i>Network state should remain in NETWORK_EMPTY with missing 'src' attribute.<" + "/i>"); 27 consoleWrite("** <video> with no src attribute**"); 28 testExpected("videos[0].error", null); 29 testExpected("videos[0].networkState", HTMLMediaElement.NETWORK_EMPTY); 30 testExpected("videos[0].src", ""); 24 31 25 32 consoleWrite("<br><i>Calling load() with no 'src' should NOT fire 'error' event, set network state to NETWORK_EMPTY.<" + "/i>"); … … 29 36 setTimeout(someTimeLater, 100) ; 30 37 } 31 32 function test()33 {34 videos = document.querySelectorAll('video');35 36 consoleWrite("<br><i>Network state should remain in NETWORK_EMPTY with empty or missing 'src' attribute.<" + "/i>");37 consoleWrite("** <video> with no src attribute**");38 testExpected("videos[0].error", null);39 testExpected("videos[0].networkState", HTMLMediaElement.NETWORK_EMPTY);40 testExpected("videos[0].src", "");41 42 consoleWrite("** <video> with empty src attribute **");43 testExpected("videos[1].error", null);44 testExpected("videos[1].networkState", HTMLMediaElement.NETWORK_EMPTY);45 testExpected("relativeURL(videos[1].src)", "video-src-none.html");46 47 consoleWrite("<br><" + "i>Calling load() with empty 'src' should fire 'error' event, set network state to NETWORK_NO_SOURCE, and set error to MEDIA_ERR_SRC_NOT_SUPPORTED.<" + "/i>");48 state = "load() with empty 'src'";49 videos[1].load();50 }51 38 </script> 52 39 </head> … … 54 41 <body onload="setTimeout(test, 100)"> 55 42 <video width=320 height=60 controls onerror="errorEvent()"></video> 56 <br>57 <video width=320 height=60 controls src="" onerror="errorEvent()"></video>58 43 </body> 59 44 </html> -
trunk/LayoutTests/platform/chromium/test_expectations.txt
r107241 r107244 4013 4013 // Some of the new baselines don't make any sense. 4014 4014 BUGWK78175 DEBUG SNOWLEOPARD : compositing/overflow/overflow-scaled-descendant-overlapping.html = IMAGE 4015 4016 // Just needs a rebaseline. 4017 BUGWK47907 : media/video-empty-source.html = IMAGE+TEXT -
trunk/Source/WebCore/ChangeLog
r107243 r107244 1 2012-02-09 Arun Patole <arun.patole@motorola.com> 2 3 Setting media element 'src' attribute to "" should trigger load 4 https://bugs.webkit.org/show_bug.cgi?id=47907 5 6 Reviewed by Eric Carlson. 7 8 Test: media/video-src-empty.html 9 10 * html/HTMLMediaElement.cpp: 11 (WebCore::HTMLMediaElement::attributeChanged):Trigger a load, as long as the 'src' attribute is present. 12 1 13 2012-02-09 Jonathan Backer <backer@chromium.org> 2 14 -
trunk/Source/WebCore/html/HTMLMediaElement.cpp
r106876 r107244 328 328 if (attrName == srcAttr) { 329 329 // Trigger a reload, as long as the 'src' attribute is present. 330 if ( !getAttribute(srcAttr).isEmpty())330 if (fastHasAttribute(srcAttr)) 331 331 scheduleLoad(MediaResource); 332 332 } else if (attrName == controlsAttr)
Note: See TracChangeset
for help on using the changeset viewer.