From cad810f21b803229eb11403f9209855525a25d57 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Fri, 6 May 2011 11:45:16 +0100
Subject: Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
---
 Source/WebCore/manual-tests/plugin-in-iframe-scroll.html | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 Source/WebCore/manual-tests/plugin-in-iframe-scroll.html

(limited to 'Source/WebCore/manual-tests/plugin-in-iframe-scroll.html')

diff --git a/Source/WebCore/manual-tests/plugin-in-iframe-scroll.html b/Source/WebCore/manual-tests/plugin-in-iframe-scroll.html
new file mode 100644
index 0000000..182c43c
--- /dev/null
+++ b/Source/WebCore/manual-tests/plugin-in-iframe-scroll.html
@@ -0,0 +1,7 @@
+<p>This test requires that accelerated compositing be disabled. Please scroll down to the bottom.</p>
+<p>Both squares should be orange, with no red visible at any time.</p>
+<iframe src="resources/plugin-in-iframe-scroll-iframe.html" width="300" height="300" marginwidth="0" marginheight="0" frameborder="0" scrolling="no" style="border:1px"></iframe>
+
+<div style="height:1000px">&nbsp;</div>
+<iframe src="resources/plugin-in-iframe-scroll-iframe.html" width="300" height="300" marginwidth="0" marginheight="0" frameborder="0" scrolling="no" style="border:1px"></iframe>
+<div style="height:1000px">&nbsp;</div>
-- 
cgit v1.1