WebCore:
authorantti@apple.com <antti@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 29 Nov 2007 06:07:20 +0000 (06:07 +0000)
committerantti@apple.com <antti@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 29 Nov 2007 06:07:20 +0000 (06:07 +0000)
        Reviewed by Geoff.

        Fallback content inside media elements should not be rendered.

        Test: media/fallback.html

        * rendering/RenderMedia.h:
        (WebCore::RenderMedia::canHaveChildren):

LayoutTests:

        Reviewed by Geoff.

        Test that fallback content inside media elements is not be rendered.

        * media/fallback-expected.txt: Added.
        * media/fallback.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28133 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/media/fallback-expected.txt [new file with mode: 0644]
LayoutTests/media/fallback.html [new file with mode: 0644]
WebCore/ChangeLog
WebCore/rendering/RenderMedia.h

index e6a4f9158e9dd9e37ee19c920ffddd5718274832..234239d332a36618d3b5ab4161b48fa7cac42502 100644 (file)
@@ -1,3 +1,12 @@
+2007-11-28  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Geoff.
+        
+        Test that fallback content inside media elements is not be rendered.
+
+        * media/fallback-expected.txt: Added.
+        * media/fallback.html: Added.
+
 2007-11-28  Alice Liu  <alice.liu@apple.com>
 
         just some more typo fixes
diff --git a/LayoutTests/media/fallback-expected.txt b/LayoutTests/media/fallback-expected.txt
new file mode 100644 (file)
index 0000000..a9136f0
--- /dev/null
@@ -0,0 +1,3 @@
+Test that fallback content is not rendered
+
+
diff --git a/LayoutTests/media/fallback.html b/LayoutTests/media/fallback.html
new file mode 100644 (file)
index 0000000..509e03e
--- /dev/null
@@ -0,0 +1,7 @@
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+</script>
+<p>Test that fallback content is not rendered</p>
+<video>FAIL<b>FAIL</b></video>
+<audio>FAIL<b>FAIL</b></audio>
index 6403b2cc002bbb7f903f48e87ddd1bba9a1fa28d..2e6448601abd7c94bf8bda755673180e1176dd29 100644 (file)
@@ -1,3 +1,14 @@
+2007-11-28  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Geoff.
+        
+        Fallback content inside media elements should not be rendered.
+
+        Test: media/fallback.html
+
+        * rendering/RenderMedia.h:
+        (WebCore::RenderMedia::canHaveChildren):
+
 2007-11-28  Mark Rowe  <mrowe@apple.com>
 
         Windows build fix.
index 319b73ca36e3c16ff7a4b0a6a50f081ed57c9f40..2ed3cad9bc02841e9b3c35b3738a8e7ebe404c41 100644 (file)
@@ -45,6 +45,8 @@ public:
     virtual ~RenderMedia();
     
     virtual void setStyle(RenderStyle* newStyle);
+    
+    virtual bool canHaveChildren() const { return false; }
 
     virtual const char* renderName() const { return "RenderMedia"; }
     virtual bool isMedia() const { return true; }