[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

hyatt hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:51:47 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit f986a47164a5cfeaf32e1a1f3db52946d99b9868
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 20:39:14 2004 +0000

    Add overflow test and fix rss test to not be rss.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7066 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/fast/overflow/003.xml b/LayoutTests/fast/overflow/003.xml
index 452cb11..c12dfc7 100644
--- a/LayoutTests/fast/overflow/003.xml
+++ b/LayoutTests/fast/overflow/003.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="resources/rss.css" type="text/css"?>
-<rss version="0.91" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<rssfake version="0.91" xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <channel>
     <title>scottandrew.com</title>
     <link>http://www.scottandrew.com</link>
@@ -86,4 +86,4 @@
     </item>
     <xhtml:script src="rss.js" type="text/javascript"/>
   </channel>
-</rss>
+</rssfake>
diff --git a/LayoutTests/fast/overflow/007-expected.txt b/LayoutTests/fast/overflow/007-expected.txt
new file mode 100644
index 0000000..f92d05f
--- /dev/null
+++ b/LayoutTests/fast/overflow/007-expected.txt
@@ -0,0 +1,88 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x388
+  RenderBlock {HTML} at (0,0) size 800x388
+    RenderBody {BODY} at (32,32) size 736x324 [bgcolor=#CCCCCC]
+layer at (143,32) size 514x146 clip at (144,33) size 497x144
+  RenderBlock {DIV} at (111,0) size 514x146 [bgcolor=#FFFFFF] [border: (1px solid #999999)]
+    RenderBlock (anonymous) at (17,17) size 465x0
+      RenderText {TEXT} at (0,0) size 0x0
+    RenderBlock {P} at (17,17) size 465x72
+      RenderText {TEXT} at (0,0) size 220x18
+        text run at (0,0) width 220: "This page is to test the behavior of "
+      RenderInline {CODE} at (0,0) size 136x15
+        RenderText {TEXT} at (220,2) size 136x15
+          text run at (220,2) width 136: "position:absolute"
+      RenderText {TEXT} at (356,0) size 463x36
+        text run at (356,0) width 107: " content which is"
+        text run at (0,18) width 275: "a child of an overflowed parent object with "
+      RenderInline {CODE} at (0,0) size 104x15
+        RenderText {TEXT} at (275,20) size 104x15
+          text run at (275,20) width 104: "overflow:auto"
+      RenderText {TEXT} at (379,18) size 454x36
+        text run at (379,18) width 75: ", both when"
+        text run at (0,36) width 133: "the parent element is "
+      RenderInline {CODE} at (0,0) size 120x15
+        RenderText {TEXT} at (133,38) size 120x15
+          text run at (133,38) width 120: "position:static"
+      RenderText {TEXT} at (253,36) size 92x18
+        text run at (253,36) width 92: " (top case) and"
+      RenderInline {CODE} at (0,0) size 136x15
+        RenderText {TEXT} at (0,56) size 136x15
+          text run at (0,56) width 136: "position:relative"
+      RenderText {TEXT} at (136,54) size 93x18
+        text run at (136,54) width 93: " (bottom case)."
+    RenderBlock {P} at (17,105) size 465x180 [color=#999999]
+      RenderText {TEXT} at (0,0) size 465x180
+        text run at (0,0) width 457: "Following extra content exists to ensure that the parent box overflows properly. Sed"
+        text run at (0,15) width 449: "ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque"
+        text run at (0,30) width 454: "laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi"
+        text run at (0,45) width 433: "architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia"
+        text run at (0,60) width 454: "voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos"
+        text run at (0,75) width 462: "qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum"
+        text run at (0,90) width 436: "quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi"
+        text run at (0,105) width 454: "tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim"
+        text run at (0,120) width 455: "ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam,"
+        text run at (0,135) width 449: "nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit"
+        text run at (0,150) width 465: "qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem"
+        text run at (0,165) width 220: "eum fugiat quo voluptas nulla pariatur?"
+layer at (0,0) size 40x34
+  RenderBlock (positioned) {P} at (0,0) size 40x34 [bgcolor=#FF0000]
+    RenderText {TEXT} at (8,8) size 24x18
+      text run at (8,8) width 24: "hi 1"
+layer at (143,210) size 514x146 clip at (144,211) size 497x144
+  RenderBlock (relative positioned) {DIV} at (111,178) size 514x146 [bgcolor=#FFFFFF] [border: (1px solid #999999)]
+    RenderBlock (anonymous) at (17,17) size 465x0
+      RenderText {TEXT} at (0,0) size 0x0
+    RenderBlock {P} at (17,17) size 465x36
+      RenderText {TEXT} at (0,0) size 462x36
+        text run at (0,0) width 462: "Safari v1.2.2 incorrectly scrolls the 'hi 1' div when its parent is scrolled. If"
+        text run at (0,18) width 327: "you resize the page even a little, this bug fixes itself."
+    RenderBlock {P} at (17,69) size 465x72
+      RenderText {TEXT} at (0,0) size 401x18
+        text run at (0,0) width 401: "Safari v1.2.2 also (really odd) causes the entire second div to be"
+      RenderInline {CODE} at (0,0) size 88x15
+        RenderText {TEXT} at (0,20) size 88x15
+          text run at (0,20) width 88: "opacity:0.5"
+      RenderText {TEXT} at (88,18) size 440x54
+        text run at (88,18) width 347: ", despite the fact that this property is only applied to the"
+        text run at (0,36) width 440: "child item. This problem fixes itself if you resize the window and then"
+        text run at (0,54) width 85: "scroll the div."
+    RenderBlock {P} at (17,157) size 465x180 [color=#999999]
+      RenderText {TEXT} at (0,0) size 465x180
+        text run at (0,0) width 457: "Following extra content exists to ensure that the parent box overflows properly. Sed"
+        text run at (0,15) width 449: "ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque"
+        text run at (0,30) width 454: "laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi"
+        text run at (0,45) width 433: "architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia"
+        text run at (0,60) width 454: "voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos"
+        text run at (0,75) width 462: "qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum"
+        text run at (0,90) width 436: "quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi"
+        text run at (0,105) width 454: "tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim"
+        text run at (0,120) width 455: "ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam,"
+        text run at (0,135) width 449: "nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit"
+        text run at (0,150) width 465: "qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem"
+        text run at (0,165) width 220: "eum fugiat quo voluptas nulla pariatur?"
+layer at (144,211) size 40x34
+  RenderBlock (positioned) {P} at (1,1) size 40x34 [bgcolor=#FF0000]
+    RenderText {TEXT} at (8,8) size 24x18
+      text run at (8,8) width 24: "hi 2"
diff --git a/LayoutTests/fast/overflow/007.html b/LayoutTests/fast/overflow/007.html
new file mode 100644
index 0000000..bb7c7a8
--- /dev/null
+++ b/LayoutTests/fast/overflow/007.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+	<title>Positioned Content inside Overflow</title>
+	<style type='text/css'>
+		body	{ background:#ccc; margin:2em }
+		p	{ margin-top:0 }
+		.content	{ width:30em; margin:2em auto; background:white; border:1px solid #999; padding:1em; height:7em; overflow:auto }
+		.child	{ background:red; opacity:0.5; position:absolute; padding:0.5em; top:0; left:0 }
+
+		#content2	{ position:relative }
+		p.ancillary	{ color:#999; font-style:italic; font-size:80% }
+	</style>
+</head>
+<body>
+	<div id="content1" class="content">
+		<p class="child">hi 1</p>
+		<p>This page is to test the behavior of <code>position:absolute</code> content which is a child of an overflowed parent object with <code>overflow:auto</code>, both when the parent element is <code>position:static</code> (top case) and <code>position:relative</code> (bottom case).</p>
+		<p class="ancillary">Following extra content exists to ensure that the parent box overflows properly. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?</p>
+	</div>
+
+	<div id="content2" class="content">
+		<p class="child">hi 2</p>
+		<p>Safari v1.2.2 incorrectly scrolls the 'hi 1' div when its parent is scrolled. If you resize the page even a little, this bug fixes itself.</p>
+		<p>Safari v1.2.2 also (really odd) causes the entire second div to be <code>opacity:0.5</code>, despite the fact that this property is only applied to the child item. This problem fixes itself if you resize the window and then scroll the div.</p>
+		<p class="ancillary">Following extra content exists to ensure that the parent box overflows properly. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?</p>
+	</div>
+</body>
+</html>
diff --git a/LayoutTests/fast/overflow/resources/rss.css b/LayoutTests/fast/overflow/resources/rss.css
index 7408e7e..ec9cd40 100644
--- a/LayoutTests/fast/overflow/resources/rss.css
+++ b/LayoutTests/fast/overflow/resources/rss.css
@@ -1,4 +1,4 @@
-rss
+rssfake
 {
     display:inline;
     margin:10px;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list