[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:27:23 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 82b956de33094ca907bbde619369dce2d04479e9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Feb 23 21:39:44 2004 +0000
Adding test for 3560033 fix.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/block/margin-collapse/103-expected.txt b/LayoutTests/fast/block/margin-collapse/103-expected.txt
new file mode 100644
index 0000000..8ebd9a7
--- /dev/null
+++ b/LayoutTests/fast/block/margin-collapse/103-expected.txt
@@ -0,0 +1,147 @@
+layer at (0,0) size 800x1691
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x1691
+ RenderBlock {HTML} at (0,0) size 800x1691
+ RenderBody {BODY} at (8,20) size 784x1651 [bgcolor=#A6A972]
+ RenderBlock {DIV} at (91,0) size 602x1651 [bgcolor=#FDFDE9] [border: (1px solid #000000)]
+ RenderBlock {DIV} at (1,31) size 600x70
+ RenderBlock {DIV} at (1,114) size 600x1465
+ RenderBlock {P} at (20,0) size 560x80 [color=#333333]
+ RenderText {TEXT} at (0,2) size 520x40
+ text run at (0,2) width 520: "We are trying to understand how UVic students perform Shakespeare related research for"
+ text run at (0,22) width 265: "classes as well as for their own interest. The "
+ RenderInline {A} at (0,0) size 173x16 [border: (1px dashed #333333) none]
+ RenderText {TEXT} at (265,22) size 173x20
+ text run at (265,22) width 173: "Internet Shakespeare Editions"
+ RenderText {TEXT} at (438,22) size 560x60
+ text run at (438,22) width 122: " are being developed"
+ text run at (0,42) width 210: "for students as well as Shakespeare "
+ text run at (210,42) width 349: "scholars world wide to better understand the man, his plays"
+ text run at (0,62) width 155: "and our interpretations of "
+ text run at (155,62) width 35: "them."
+ RenderBlock {P} at (20,93) size 560x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 463x20
+ text run at (0,2) width 463: "Please take the time to carefully review and complete the following questions."
+ RenderBlock {FORM} at (20,138) size 560x1291
+ RenderBlock {H2} at (0,0) size 560x16 [color=#333333]
+ RenderText {TEXT} at (0,0) size 201x16
+ text run at (0,0) width 201: "PERSONAL INFORMATION"
+ RenderBlock (floating) {SPAN} at (0,26) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 68x20
+ text run at (0,2) width 68: "Your Name*"
+ RenderLineEdit {INPUT} at (325,26) size 180x19
+ RenderBlock (floating) {SPAN} at (0,47) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 120x20
+ text run at (0,2) width 120: "Your e-mail address*"
+ RenderLineEdit {INPUT} at (325,47) size 180x19
+ RenderBlock (floating) {SPAN} at (0,68) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 128x20
+ text run at (0,2) width 128: "Your degree program*"
+ RenderSelect {SELECT} at (325,68) size 180x18
+ RenderBlock (floating) {SPAN} at (0,88) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 110x20
+ text run at (0,2) width 110: "Your year of study*"
+ RenderSelect {SELECT} at (325,88) size 180x18
+ RenderBlock (floating) {SPAN} at (0,108) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 152x20
+ text run at (0,2) width 152: "Shakespeare classes taken"
+ RenderSelect {SELECT} at (325,108) size 180x18
+ RenderBlock {P} at (0,139) size 560x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 156x20
+ text run at (0,2) width 156: "* indicates a required field"
+ RenderBlock {H2} at (0,184) size 560x16 [color=#333333]
+ RenderText {TEXT} at (0,0) size 298x16
+ text run at (0,0) width 298: "SHAKESPEARE RESEARCH QUESTIONS"
+ RenderBlock (floating) {SPAN} at (0,210) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 321x20
+ text run at (0,2) width 321: "What percentage of your research time is spent online?"
+ RenderSelect {SELECT} at (325,210) size 180x18
+ RenderBlock (floating) {SPAN} at (0,230) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 300x40
+ text run at (0,2) width 300: "What is holding you back from doing more research"
+ text run at (0,22) width 41: "online?"
+ RenderSelect {SELECT} at (325,230) size 180x18
+ RenderBlock (floating) {SPAN} at (0,250) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 220x20
+ text run at (0,2) width 220: "Your research is primarily focused on:"
+ RenderBlock {SPAN} at (325,250) size 180x20 [color=#333333]
+ RenderRadioButton {INPUT} at (3,3) size 12x13
+ RenderText {TEXT} at (18,2) size 32x20
+ text run at (18,2) width 32: "Texts"
+ RenderBlock {SPAN} at (325,270) size 180x20 [color=#333333]
+ RenderRadioButton {INPUT} at (3,3) size 12x13
+ RenderText {TEXT} at (18,2) size 133x20
+ text run at (18,2) width 133: "Performance materials"
+ RenderBlock {SPAN} at (325,290) size 180x20 [color=#333333]
+ RenderRadioButton {INPUT} at (3,3) size 12x13
+ RenderText {TEXT} at (18,2) size 21x20
+ text run at (18,2) width 21: "n/a"
+ RenderBlock {H2} at (0,335) size 560x16 [color=#333333]
+ RenderText {TEXT} at (0,0) size 374x16
+ text run at (0,0) width 374: "INTERNET SHAKESPEARE EDITIONS QUESTIONS"
+ RenderBlock (floating) {SPAN} at (0,361) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 302x20
+ text run at (0,2) width 302: "Have you used UVic's Internet Shakespeare Editions?"
+ RenderBlock {SPAN} at (325,361) size 180x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 19x20
+ text run at (0,2) width 19: "Yes"
+ RenderRadioButton {INPUT} at (22,3) size 12x13
+ RenderText {TEXT} at (37,2) size 19x20
+ text run at (37,2) width 4: " "
+ text run at (41,2) width 15: "No"
+ RenderRadioButton {INPUT} at (59,3) size 12x13
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {P} at (0,394) size 560x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 378x20
+ text run at (0,2) width 378: "-- If you answered no to this question, skip to the next section --"
+ RenderBlock (floating) {SPAN} at (0,427) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 274x20
+ text run at (0,2) width 274: "Which area of the ISE did you find most useful?"
+ RenderSelect {SELECT} at (325,427) size 180x18
+ RenderBlock (floating) {SPAN} at (0,447) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 252x20
+ text run at (0,2) width 252: "How did you find the navigation of the ISE?"
+ RenderSelect {SELECT} at (325,447) size 180x18
+ RenderBlock (floating) {SPAN} at (0,467) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 206x20
+ text run at (0,2) width 206: "Please describe your use of the ISE."
+ RenderTextArea {TEXTAREA} at (0,490) size 500x100
+ RenderBlock {H2} at (0,615) size 560x16 [color=#333333]
+ RenderText {TEXT} at (0,0) size 291x16
+ text run at (0,0) width 291: "TOOLS IN DEVELOPMENT QUESTIONS"
+ RenderBlock {P} at (0,644) size 560x60 [color=#333333]
+ RenderText {TEXT} at (0,2) size 556x60
+ text run at (0,2) width 453: "We are in the process of both making new material available and developing "
+ text run at (453,2) width 103: "new tools to view"
+ text run at (0,22) width 354: "and extrapolate information from Shakespeare's works. The "
+ text run at (354,22) width 160: "following images are visual"
+ text run at (0,42) width 343: "representations of some of the ideas being thrown around."
+ RenderBlock {P} at (0,717) size 560x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 337x20
+ text run at (0,2) width 337: "Please review them carefully and provide feedback below"
+ RenderBlock (floating) {SPAN} at (0,750) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 145x20
+ text run at (0,2) width 145: "Your comments on Fig. 1"
+ RenderTextArea {TEXTAREA} at (0,770) size 500x100
+ RenderBlock (floating) {SPAN} at (0,875) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 145x20
+ text run at (0,2) width 145: "Your comments on Fig. 2"
+ RenderTextArea {TEXTAREA} at (0,895) size 500x100
+ RenderBlock (floating) {SPAN} at (0,1000) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 145x20
+ text run at (0,2) width 145: "Your comments on Fig. 3"
+ RenderTextArea {TEXTAREA} at (0,1020) size 500x100
+ RenderBlock {H2} at (0,1145) size 560x16 [color=#333333]
+ RenderText {TEXT} at (0,0) size 143x16
+ text run at (0,0) width 143: "OTHER FEEDBACK"
+ RenderBlock (floating) {SPAN} at (0,1171) size 325x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 220x20
+ text run at (0,2) width 220: "Please enter any other thoughts here."
+ RenderTextArea {TEXTAREA} at (0,1191) size 500x100
+ RenderBlock {P} at (20,1445) size 560x20 [color=#333333]
+ RenderText {TEXT} at (0,2) size 233x20
+ text run at (0,2) width 233: "Thank you for your time filling this out."
+ RenderBlock {DIV} at (1,1599) size 600x51 [border: (1px dashed #A6A972) none]
+ RenderBlock {SPAN} at (0,16) size 600x20 [color=#333333]
+ RenderText {TEXT} at (247,2) size 106x20
+ text run at (247,2) width 106: "\x{A9}2003 Kevin Davis"
diff --git a/LayoutTests/fast/block/margin-collapse/103.html b/LayoutTests/fast/block/margin-collapse/103.html
new file mode 100644
index 0000000..d53c9eb
--- /dev/null
+++ b/LayoutTests/fast/block/margin-collapse/103.html
@@ -0,0 +1,324 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+
+<head>
+ <title>Shakespeare Survey</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <link rel="stylesheet" type="text/css" media="screen" href="shakes.css" />
+
+<style>
+body
+{
+text-align: center;
+background-color: #A6A972;
+}
+
+p,ul,ol,a,span
+{
+font: 10pt/20px "trebuchet ms", verdana, helvetica, arial, sans-serif;
+color: #333;
+}
+h1,h2,h3
+{
+margin:0; padding: 0;
+margin-bottom: 10px;
+text-transform: uppercase;
+font-family: Georgia, Times New Roman;
+color: #333;
+}
+
+h1 {font-size: 18px; }
+
+h2
+{
+font-size: 14px;
+margin-top: 25px;
+}
+
+h3 {font-size: 12px; }
+
+a
+{
+text-decoration: none;
+border-bottom: 1px dashed 3 33 333 #333;
+}
+
+a:visited{}
+a:hover{}
+
+a:active
+{
+border-bottom: 1px solid #333;
+}
+
+input, textarea
+{
+font-weight: bold;
+}
+
+
+/* Specific Sections */
+
+#container
+{
+width: 600px;
+margin: 20px auto;
+background-color: #FDFDE9;
+border: 1px solid black;
+text-align: left;
+}
+
+#top
+{
+height: 70px;
+background-position: center top;
+background-repeat: no-repeat;
+background-image: url(images/title.jpg);
+margin-top: 30px;
+}
+#content
+{
+padding-left: 20px;
+padding-right: 20px;
+}
+
+#intro {}
+#bottom
+{
+clear: both;
+height: 50px;
+border-top: 1px dashed #A6A972;
+text-align: center;
+margin-top: 20px;
+}
+
+#copyright
+{
+display: block;
+height: 20px;
+margin-top: 15px;
+margin-bottom: 15px;
+}
+
+.question
+{
+display: block;
+float: left;
+width: 325px;
+height: 20px;
+}
+
+.answer
+{
+display: block;
+width: 180px;
+margin-left: 325px;
+}
+
+
+textarea.answer
+{
+height: 100px;
+width: 500px;
+margin-top: 25px;
+margin-left: 0px;
+clear: both;
+margin-bottom: 5px;
+}
+
+.figure
+{
+display: block;
+height: 100px;
+border-color: #000;
+border-width: 1px;
+float: left;
+margin-right: 10px;
+width: 120px;
+}
+
+.figure img
+{
+border: 1px solid #333;
+}
+
+.caption
+{
+
+}
+
+.error
+{
+color: #C92B45;
+}
+</style>
+
+</head>
+
+<body>
+
+<div id="container">
+ <div id="top"></div>
+
+ <div id="content">
+ <p>
+ We are trying to understand how UVic students perform Shakespeare related research for
+ classes as well as for their own interest. The <a href="http://uvic.ca/shakespeare/">
+ Internet Shakespeare Editions</a> are being developed for students as well as Shakespeare
+ scholars world wide to better understand the man, his plays and our interpretations of
+ them.
+ </p>
+
+ <p>Please take the time to carefully review and complete the following questions.</p>
+
+
+ <form action="process.php" method="post">
+
+ <h2>Personal Information</h2>
+
+ <span class="question" >
+ Your Name*
+ </span>
+ <input class="answer" type="text" name="name"/>
+
+ <span class="question" >
+ Your e-mail address*
+ </span>
+ <input class="answer" type="text" name="email"/>
+
+ <span class="question" >
+ Your degree program*
+ </span>
+ <select class="answer" name="program">
+ <option value="">Program options</option>
+ <option value="ugradENG">Undergraduate English</option>
+ <option value="gradENG">Graduate English</option>
+ <option value="humanities">Other Humanities</option>
+ <option value="other">Other Altogether</option>
+ </select>
+
+ <span class="question" >
+ Your year of study*
+ </span>
+ <select class="answer" name="year">
+ <option value="">Years you've been here</option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="more">More</option>
+ <option value="na">Not telling</option>
+ </select>
+
+ <span class="question">Shakespeare classes taken</span>
+ <select class="answer" name="classes">
+ <option value="">Number taken</option>
+ <option value="0">0</option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="more">More</option>
+ <option value="na">Not telling</option>
+ </select>
+
+ <p>* indicates a required field</p>
+
+ <h2>Shakespeare Research Questions</h2>
+
+ <span class="question">What percentage of your research time is spent online?</span>
+ <select class="answer" name="research-pct">
+ <option value="">Percentages of time</option>
+ <option value="0">0-10%</option>
+ <option value="10">10-20%</option>
+ <option value="20">20-30%</option>
+ <option value="30">30-40%</option>
+ <option value="50">50% or more</option>
+ <option value="na">n/a</option>
+ </select>
+
+ <span class="question">What is holding you back from doing more research online?</span>
+ <select class="answer" name="research-hold">
+ <option value="">Reasons</option>
+ <option value="tools">Lack of good online resources</option>
+ <option value="refuse">Online sources not accepted</option>
+ <option value="prefer">I prefer the library</option>
+ <option value="nothing">I do everything I can online</option>
+ <option value="na">n/a</option>
+ </select>
+
+ <span class="question">Your research is primarily focused on:</span>
+ <span class="answer"><input type="radio" name="research-tp" value="text" checked="checked" />Texts</span>
+ <span class="answer"><input type="radio" name="research-tp" value="perf" />Performance materials</span>
+ <span class="answer"><input type="radio" name="research-tp" value="na" />n/a</span>
+
+ <h2>Internet Shakespeare Editions Questions</h2>
+
+ <span class="question">Have you used UVic's Internet Shakespeare Editions?</span>
+ <span class="answer">
+ Yes<input type="radio" name="ise" value="yes" checked="checked" />
+ No<input type="radio" name="ise" value="no"/>
+ </span>
+
+ <p>-- If you answered no to this question, skip to the next section --</p>
+
+ <span class="question">Which area of the ISE did you find most useful?</span>
+ <select class="answer" name="ise-area">
+ <option value="">Sections of the ISE</option>
+ <option value="life">Life and Times</option>
+ <option value="text">Old versions of texts</option>
+ <option value="links">Links to other sites</option>
+ </select>
+
+ <span class="question">How did you find the navigation of the ISE?</span>
+ <select class="answer" name="ise-nav">
+ <option value="">Level of difficulty</option>
+ <option value="1">No problems at all</option>
+ <option value="2">A bit cumbersome</option>
+ <option value="3">Very difficult to use</option>
+ </select>
+
+ <span class="question">Please describe your use of the ISE.</span>
+ <textarea class="answer" name="ise-describe"></textarea>
+
+
+ <h2>Tools in Development Questions</h2>
+
+ <p>
+ We are in the process of both making new material available and developing
+ new tools to view and extrapolate information from Shakespeare's works. The
+ following images are visual representations of some of the ideas being thrown around.
+ </p>
+
+ <p>Please review them carefully and provide feedback below</p>
+
+ <span class="question">Your comments on Fig. 1</span>
+ <textarea class="answer" name="fig1"></textarea>
+
+ <span class="question">Your comments on Fig. 2</span>
+ <textarea class="answer" name="fig2"></textarea>
+
+ <span class="question">Your comments on Fig. 3</span>
+ <textarea class="answer" name="fig3"></textarea>
+
+
+ <h2>Other Feedback</h2>
+
+ <span class="question">Please enter any other thoughts here.</span>
+ <textarea class="answer" name="other"></textarea>
+
+
+ </form>
+
+ <p>Thank you for your time filling this out.</p>
+
+ </div>
+
+ <div id="bottom"><span id="copyright">©2003 Kevin Davis</span></div>
+</div>
+
+</body>
+
+</html>
\ No newline at end of file
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list