[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
dbates at webkit.org
dbates at webkit.org
Thu Feb 4 21:22:46 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 84368195539077a607a0c66ac6e1220deae030d1
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 21 05:05:55 2010 +0000
2010-01-20 Daniel Bates <dbates at webkit.org>
No review, rolling out 53591.
http://trac.webkit.org/changeset/53591
https://bugs.webkit.org/show_bug.cgi?id=29564
Rolling out the change committed in change set 53591
<http://trac.webkit.org/changeset/53591> because it caused
a regression of test /fast/replaced/table-percent-height.html
on the Qt bot.
* platform/qt/RenderThemeQt.cpp:
(WebCore::RenderThemeQt::adjustButtonStyle):
2010-01-20 Daniel Bates <dbates at webkit.org>
No review, rolling out 53591.
http://trac.webkit.org/changeset/53591
https://bugs.webkit.org/show_bug.cgi?id=29564
Rolling out the change committed in change set 53591
<http://trac.webkit.org/changeset/53591> because it caused
a regression of test /fast/replaced/table-percent-height.html
on the Qt bot.
* fast/css/button-height-expected.txt: Removed.
* fast/css/button-height.html: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53601 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f1fbeaf..906efa4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,19 @@
2010-01-20 Daniel Bates <dbates at webkit.org>
+ No review, rolling out 53591.
+ http://trac.webkit.org/changeset/53591
+ https://bugs.webkit.org/show_bug.cgi?id=29564
+
+ Rolling out the change committed in change set 53591
+ <http://trac.webkit.org/changeset/53591> because it caused
+ a regression of test /fast/replaced/table-percent-height.html
+ on the Qt bot.
+
+ * fast/css/button-height-expected.txt: Removed.
+ * fast/css/button-height.html: Removed.
+
+2010-01-20 Daniel Bates <dbates at webkit.org>
+
No review, rolling out 53594.
http://trac.webkit.org/changeset/53594
https://bugs.webkit.org/show_bug.cgi?id=33936
diff --git a/LayoutTests/fast/css/button-height-expected.txt b/LayoutTests/fast/css/button-height-expected.txt
deleted file mode 100644
index 3f3b68e..0000000
--- a/LayoutTests/fast/css/button-height-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-This tests that the specified height is honored (*) for <input> and <button> elements.
-(*) The Mac ports ignore the specified height for <input type="button"> elements unless a border and/or background CSS property is also specified (see the fifth button below). Disregarding padding, they render the button with a height equal to the height of the font used for the button label.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS document.getElementById('button1').offsetHeight is document.getElementById('button2').offsetHeight
-PASS document.getElementById('button3').offsetHeight is 40
-PASS document.getElementById('button4').offsetHeight is 40
-PASS document.getElementById('button5').offsetHeight is correct for this platform.
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/css/button-height.html b/LayoutTests/fast/css/button-height.html
deleted file mode 100644
index b08d2e0..0000000
--- a/LayoutTests/fast/css/button-height.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" href="../js/resources/js-test-style.css">
-<script src="../js/resources/js-test-pre.js"></script>
-<style>
-#button3, #button5 { height: 40px; }
-#button4 { height: 40px; background-color: yellow; }
-</style>
-<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
-
-window.onload = function()
-{
- shouldBe("document.getElementById('button1').offsetHeight", "document.getElementById('button2').offsetHeight");
- shouldEvaluateTo("document.getElementById('button3').offsetHeight", 40);
- shouldEvaluateTo("document.getElementById('button4').offsetHeight", 40);
-
- // Note, the expected height is the height of button 1 for the Mac ports, and 40 otherwise.
- var expectedButton5Height = (navigator.platform.indexOf("Mac") !== -1) ? document.getElementById("button1").offsetHeight : 40;
- if (document.getElementById('button5').offsetHeight == expectedButton5Height)
- testPassed("document.getElementById('button5').offsetHeight is correct for this platform.");
- else
- testFailed("document.getElementById('button5').offsetHeight is incorrect for this platform. Should be the same height as button 1 for the Mac ports and 40 otherwise.");
-
- if (window.layoutTestController) {
- var testContainer = document.getElementById("test-container");
- if (testContainer)
- document.body.removeChild(testContainer);
- }
- debug('<br /><span class="pass">TEST COMPLETE</span>');
-}
-</script>
-</head>
-<body>
-<p id="description"></p>
-<div id="test-container">
- <ol>
- <li><input id="button1" type="button" value="unspecified height"/><p><strong>Expected height:</strong> height of button label font.</p></li>
- <li><button id="button2">unspecified height</button><p><strong>Expected height:</strong> height of button label font.</p></li>
- <li><button id="button3">height 40 pixels</button><p><strong>Expected height:</strong> 40 pixels.</p></li>
- <li><input id="button4" type="button" value="height 40 pixels, background yellow"/><p><strong>Expected height:</strong> 40 pixels.</p></li>
- <li><input id="button5" type="button" value="height 40 pixels (*)"/><p><strong>(*) Expected height:</strong><br/>Mac: height of button label font.<br/>Other: 40 pixels.</p></li>
- </ol>
-</div>
-<hr/>
-<div id="console"></div>
-<script>
- description("This tests that the specified height is honored (*) for <input> and <button> elements.<br/>" +
- "(*) The Mac ports ignore the specified height for <input type="button"> elements unless a " +
- "border and/or background CSS property is also specified (see the fifth button below). Disregarding " +
- "padding, they render the button with a height equal to the height of the font used for the button label.");
- var successfullyParsed = true;
-</script>
-</body>
-</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9094969..30adf19 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-20 Daniel Bates <dbates at webkit.org>
+
+ No review, rolling out 53591.
+ http://trac.webkit.org/changeset/53591
+ https://bugs.webkit.org/show_bug.cgi?id=29564
+
+ Rolling out the change committed in change set 53591
+ <http://trac.webkit.org/changeset/53591> because it caused
+ a regression of test /fast/replaced/table-percent-height.html
+ on the Qt bot.
+
+ * platform/qt/RenderThemeQt.cpp:
+ (WebCore::RenderThemeQt::adjustButtonStyle):
+
2010-01-20 Stephen White <senorblanco at chromium.org>
Reviewed by David Levin.
diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp
index c8df328..428dbbc 100644
--- a/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/WebCore/platform/qt/RenderThemeQt.cpp
@@ -397,13 +397,8 @@ void RenderThemeQt::adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* s
// Ditch the border.
style->resetBorder();
-#ifdef Q_WS_MAC
- if (style->appearance() == PushButtonPart) {
- // The Mac ports ignore the specified height for <input type="button"> elements
- // unless a border and/or background CSS property is also specified.
- style->setHeight(Length(Auto));
- }
-#endif
+ // Height is locked to auto.
+ style->setHeight(Length(Auto));
// White-space is locked to pre
style->setWhiteSpace(PRE);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list