summaryrefslogtreecommitdiffstats
path: root/WebCore/manual-tests/resources
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-04-27 16:31:00 +0100
committerSteve Block <steveblock@google.com>2010-05-11 14:42:12 +0100
commitdcc8cf2e65d1aa555cce12431a16547e66b469ee (patch)
tree92a8d65cd5383bca9749f5327fb5e440563926e6 /WebCore/manual-tests/resources
parentccac38a6b48843126402088a309597e682f40fe6 (diff)
downloadexternal_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip
external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz
external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebCore/manual-tests/resources')
-rw-r--r--WebCore/manual-tests/resources/focused-iframe.html12
-rw-r--r--WebCore/manual-tests/resources/plugin-in-iframe-scroll-iframe.html6
-rw-r--r--WebCore/manual-tests/resources/video-tab.html1
3 files changed, 7 insertions, 12 deletions
diff --git a/WebCore/manual-tests/resources/focused-iframe.html b/WebCore/manual-tests/resources/focused-iframe.html
deleted file mode 100644
index 50b49a5..0000000
--- a/WebCore/manual-tests/resources/focused-iframe.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<body onload="load()">
- This frame should get the focus.
- <input id="box"></input>
- <script>
- function load()
- {
- document.getElementById("box").focus();
- }
- </script>
-</body>
-</html>
diff --git a/WebCore/manual-tests/resources/plugin-in-iframe-scroll-iframe.html b/WebCore/manual-tests/resources/plugin-in-iframe-scroll-iframe.html
new file mode 100644
index 0000000..b2593b0
--- /dev/null
+++ b/WebCore/manual-tests/resources/plugin-in-iframe-scroll-iframe.html
@@ -0,0 +1,6 @@
+<object type="video/quicktime" style="background-color: red; width: 298px; height: 298px; border:solid 1px">
+ <param name="src" value="orange.mov">
+ <param name="controller" value="false">
+ <param name="autoplay" value="false">
+ <param name="scale" value="tofit">
+</object>
diff --git a/WebCore/manual-tests/resources/video-tab.html b/WebCore/manual-tests/resources/video-tab.html
new file mode 100644
index 0000000..fec915f
--- /dev/null
+++ b/WebCore/manual-tests/resources/video-tab.html
@@ -0,0 +1 @@
+<video src="http://movies.apple.com/movies/us/apple/ipoditunes/2007/touch/ads/apple_ipodtouch_touch_r640-9cie.mov" controls autoplay>