[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 12:33:35 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit f0a8347694567be2789d42278b2265a41552ba89
Author: jcivelli at chromium.org <jcivelli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 10:41:29 2010 +0000

    2010-08-25  Jay Civelli  <jcivelli at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Adding missing test files and reenabling the WebFrame unit-test.
            https://bugs.webkit.org/show_bug.cgi?id=44492
    
            * tests/WebFrameTest.cpp:
            (WebKit::TEST_F):
            * tests/data/iframes_test.html: Added.
            * tests/data/invisible_iframe.html: Added.
            * tests/data/visible_iframe.html: Added.
            * tests/data/zero_sized_iframe.html: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66003 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d2067d1..708522a 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-25  Jay Civelli  <jcivelli at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Adding missing test files and reenabling the WebFrame unit-test.
+        https://bugs.webkit.org/show_bug.cgi?id=44492
+
+        * tests/WebFrameTest.cpp:
+        (WebKit::TEST_F):
+        * tests/data/iframes_test.html: Added.
+        * tests/data/invisible_iframe.html: Added.
+        * tests/data/visible_iframe.html: Added.
+        * tests/data/zero_sized_iframe.html: Added.
+
 2010-08-25  Kent Tamura  <tkent at chromium.org>
 
         Unreviewed, build fix.
diff --git a/WebKit/chromium/tests/WebFrameTest.cpp b/WebKit/chromium/tests/WebFrameTest.cpp
index aa893cf..cf91cb4 100644
--- a/WebKit/chromium/tests/WebFrameTest.cpp
+++ b/WebKit/chromium/tests/WebFrameTest.cpp
@@ -69,7 +69,7 @@ public:
 class TestWebFrameClient : public WebFrameClient {
 };
 
-TEST_F(WebFrameTest, DISABLED_ContentText)
+TEST_F(WebFrameTest, ContentText)
 {
     // Register our resources.
     WebURLResponse response;
diff --git a/WebKit/chromium/tests/data/iframes_test.html b/WebKit/chromium/tests/data/iframes_test.html
new file mode 100644
index 0000000..425709b
--- /dev/null
+++ b/WebKit/chromium/tests/data/iframes_test.html
@@ -0,0 +1,9 @@
+<html>
+  <body>
+    <iframe src="visible_iframe.html"></iframe>
+    <iframe width=0 height=0 src="zero_sized_iframe.html"></iframe>
+    <iframe style="visibility:hidden;" src="invisible_iframe.html"></iframe>
+    <p>This is a visible paragraph.</p>
+    <p style="visibility:hidden;">This is an invisible paragraph.</p>
+  </body>
+</html>
diff --git a/WebKit/chromium/tests/data/invisible_iframe.html b/WebKit/chromium/tests/data/invisible_iframe.html
new file mode 100644
index 0000000..e5686c7
--- /dev/null
+++ b/WebKit/chromium/tests/data/invisible_iframe.html
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    This is an invisible frame.
+  </body>
+</html>
diff --git a/WebKit/chromium/tests/data/visible_iframe.html b/WebKit/chromium/tests/data/visible_iframe.html
new file mode 100644
index 0000000..291af3d
--- /dev/null
+++ b/WebKit/chromium/tests/data/visible_iframe.html
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    This is a visible iframe.
+  </body>
+</html>
diff --git a/WebKit/chromium/tests/data/zero_sized_iframe.html b/WebKit/chromium/tests/data/zero_sized_iframe.html
new file mode 100644
index 0000000..6728cab
--- /dev/null
+++ b/WebKit/chromium/tests/data/zero_sized_iframe.html
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    This is an iframe with zero size.
+  </body>
+</html>

-- 
WebKit Debian packaging

