WebCore:
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: http://svn.webkit.org/repository/webkit/trunk@28133 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e6a4f91..234239d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -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
index 0000000..a9136f0
--- /dev/null
+++ b/LayoutTests/media/fallback-expected.txt
@@ -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
index 0000000..509e03e
--- /dev/null
+++ b/LayoutTests/media/fallback.html
@@ -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>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6403b2c..2e64486 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -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.
diff --git a/WebCore/rendering/RenderMedia.h b/WebCore/rendering/RenderMedia.h
index 319b73c..2ed3cad 100644
--- a/WebCore/rendering/RenderMedia.h
+++ b/WebCore/rendering/RenderMedia.h
@@ -45,6 +45,8 @@
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; }
