[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
rwlbuis at webkit.org
rwlbuis at webkit.org
Sun Feb 20 23:08:57 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit f546108042fa82a9e2ed0374f966123f49f95036
Author: rwlbuis at webkit.org <rwlbuis at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 18 08:00:50 2011 +0000
2011-01-17 Rob Buis <rwlbuis at gmail.com>
Reviewed by Kent Tamura.
Color changes to option elements in a select multiple aren't drawn immediately
https://bugs.webkit.org/show_bug.cgi?id=49790
Redirect style changes on <option> element to the owner <select> element.
Tests: fast/forms/select-option-background-color-change.html
fast/forms/select-option-color-change.html
fast/forms/select-option-visibility-change.html
* html/HTMLOptionElement.cpp:
(WebCore::HTMLOptionElement::setRenderStyle):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76002 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9d1958f..4855622 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,24 @@
+2011-01-17 Rob Buis <rwlbuis at gmail.com>
+
+ Reviewed by Kent Tamura.
+
+ Add tests for:
+ Color changes to option elements in a select multiple aren't drawn immediately
+ https://bugs.webkit.org/show_bug.cgi?id=49790
+
+ * fast/forms/select-option-background-color-change.html: Added.
+ * fast/forms/select-option-color-change.html: Added.
+ * fast/forms/select-option-visibility-change.html: Added.
+ * platform/mac/fast/forms/select-option-background-color-change-expected.checksum: Added.
+ * platform/mac/fast/forms/select-option-background-color-change-expected.png: Added.
+ * platform/mac/fast/forms/select-option-background-color-change-expected.txt: Added.
+ * platform/mac/fast/forms/select-option-color-change-expected.checksum: Added.
+ * platform/mac/fast/forms/select-option-color-change-expected.png: Added.
+ * platform/mac/fast/forms/select-option-color-change-expected.txt: Added.
+ * platform/mac/fast/forms/select-option-visibility-change-expected.checksum: Added.
+ * platform/mac/fast/forms/select-option-visibility-change-expected.png: Added.
+ * platform/mac/fast/forms/select-option-visibility-change-expected.txt: Added.
+
2011-01-17 Steve Lacey <sjl at chromium.org>
Reviewed by David Levin.
diff --git a/LayoutTests/fast/forms/select-option-background-color-change.html b/LayoutTests/fast/forms/select-option-background-color-change.html
new file mode 100644
index 0000000..e673355
--- /dev/null
+++ b/LayoutTests/fast/forms/select-option-background-color-change.html
@@ -0,0 +1,21 @@
+<html>
+<head>
+<script>
+function test()
+{
+ if (window.layoutTestController)
+ layoutTestController.waitUntilDone();
+ document.getElementById('option').style.backgroundColor = 'green';
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+}
+</script>
+</head>
+</html>
+<body onload="setTimeout(test, 0)">
+<p>This tests changing the background color of an option element updates the listbox</p>
+<select multiple="multiple">
+ <option id="option" value="A">A</option>
+</select>
+</body>
+</html>
diff --git a/LayoutTests/fast/forms/select-option-color-change.html b/LayoutTests/fast/forms/select-option-color-change.html
new file mode 100644
index 0000000..eb00d87
--- /dev/null
+++ b/LayoutTests/fast/forms/select-option-color-change.html
@@ -0,0 +1,21 @@
+<html>
+<head>
+<script>
+function test()
+{
+ if (window.layoutTestController)
+ layoutTestController.waitUntilDone();
+ document.getElementById('option').style.color = 'green';
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+}
+</script>
+</head>
+</html>
+<body onload="setTimeout(test, 0)">
+<p>This tests changing the color of an option element updates the listbox</p>
+<select multiple="multiple">
+ <option id="option" value="A">A</option>
+</select>
+</body>
+</html>
diff --git a/LayoutTests/fast/forms/select-option-visibility-change.html b/LayoutTests/fast/forms/select-option-visibility-change.html
new file mode 100644
index 0000000..e337e5d
--- /dev/null
+++ b/LayoutTests/fast/forms/select-option-visibility-change.html
@@ -0,0 +1,21 @@
+<html>
+<head>
+<script>
+function test()
+{
+ if (window.layoutTestController)
+ layoutTestController.waitUntilDone();
+ document.getElementById('option').style.visibility = 'hidden';
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+}
+</script>
+</head>
+</html>
+<body onload="setTimeout(test, 0)">
+<p>This tests changing the visibility of an option element updates the listbox</p>
+<select multiple="multiple">
+ <option id="option" value="A">A</option>
+</select>
+</body>
+</html>
diff --git a/LayoutTests/platform/mac/fast/forms/select-option-background-color-change-expected.checksum b/LayoutTests/platform/mac/fast/forms/select-option-background-color-change-expected.checksum
new file mode 100644
index 0000000..d562df7
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/forms/select-option-background-color-change-expected.checksum
@@ -0,0 +1 @@
+b14b3a4a147999e5cc2051e18074018a
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/forms/select-option-background-color-change-expected.png b/LayoutTests/platform/mac/fast/forms/select-option-background-color-change-expected.png
new file mode 100644
index 0000000..9970e2a
Binary files /dev/null and b/LayoutTests/platform/mac/fast/forms/select-option-background-color-change-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/forms/select-option-background-color-change-expected.txt b/LayoutTests/platform/mac/fast/forms/select-option-background-color-change-expected.txt
new file mode 100644
index 0000000..d0994f4
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/forms/select-option-background-color-change-expected.txt
@@ -0,0 +1,11 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 513x18
+ text run at (0,0) width 513: "This tests changing the background color of an option element updates the listbox"
+ RenderBlock (anonymous) at (0,34) size 784x61
+ RenderListBox {SELECT} at (2,2) size 25x57 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/forms/select-option-color-change-expected.checksum b/LayoutTests/platform/mac/fast/forms/select-option-color-change-expected.checksum
new file mode 100644
index 0000000..4e6d230
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/forms/select-option-color-change-expected.checksum
@@ -0,0 +1 @@
+b49a6a3ceaaa2b191e5ae3ddaad26d45
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/forms/select-option-color-change-expected.png b/LayoutTests/platform/mac/fast/forms/select-option-color-change-expected.png
new file mode 100644
index 0000000..204c475
Binary files /dev/null and b/LayoutTests/platform/mac/fast/forms/select-option-color-change-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/forms/select-option-color-change-expected.txt b/LayoutTests/platform/mac/fast/forms/select-option-color-change-expected.txt
new file mode 100644
index 0000000..b6c8922
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/forms/select-option-color-change-expected.txt
@@ -0,0 +1,11 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 434x18
+ text run at (0,0) width 434: "This tests changing the color of an option element updates the listbox"
+ RenderBlock (anonymous) at (0,34) size 784x61
+ RenderListBox {SELECT} at (2,2) size 25x57 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/forms/select-option-visibility-change-expected.checksum b/LayoutTests/platform/mac/fast/forms/select-option-visibility-change-expected.checksum
new file mode 100644
index 0000000..b2175e6
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/forms/select-option-visibility-change-expected.checksum
@@ -0,0 +1 @@
+17abce5648df50a5ddc718119e15ab7e
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/forms/select-option-visibility-change-expected.png b/LayoutTests/platform/mac/fast/forms/select-option-visibility-change-expected.png
new file mode 100644
index 0000000..64c87fb
Binary files /dev/null and b/LayoutTests/platform/mac/fast/forms/select-option-visibility-change-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/forms/select-option-visibility-change-expected.txt b/LayoutTests/platform/mac/fast/forms/select-option-visibility-change-expected.txt
new file mode 100644
index 0000000..d2fa408
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/forms/select-option-visibility-change-expected.txt
@@ -0,0 +1,11 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 456x18
+ text run at (0,0) width 456: "This tests changing the visibility of an option element updates the listbox"
+ RenderBlock (anonymous) at (0,34) size 784x61
+ RenderListBox {SELECT} at (2,2) size 25x57 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
+ RenderText {#text} at (0,0) size 0x0
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 94ffb73..404a4a3 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-17 Rob Buis <rwlbuis at gmail.com>
+
+ Reviewed by Kent Tamura.
+
+ Color changes to option elements in a select multiple aren't drawn immediately
+ https://bugs.webkit.org/show_bug.cgi?id=49790
+
+ Redirect style changes on <option> element to the owner <select> element.
+
+ Tests: fast/forms/select-option-background-color-change.html
+ fast/forms/select-option-color-change.html
+ fast/forms/select-option-visibility-change.html
+
+ * html/HTMLOptionElement.cpp:
+ (WebCore::HTMLOptionElement::setRenderStyle):
+
2011-01-17 MORITA Hajime <morrita at google.com>
Unreviewed, rolling out r75995.
diff --git a/Source/WebCore/html/HTMLOptionElement.cpp b/Source/WebCore/html/HTMLOptionElement.cpp
index e8f624c..bc5788d 100644
--- a/Source/WebCore/html/HTMLOptionElement.cpp
+++ b/Source/WebCore/html/HTMLOptionElement.cpp
@@ -221,6 +221,9 @@ String HTMLOptionElement::label() const
void HTMLOptionElement::setRenderStyle(PassRefPtr<RenderStyle> newStyle)
{
m_style = newStyle;
+ if (HTMLSelectElement* select = ownerSelectElement())
+ if (RenderObject* renderer = select->renderer())
+ renderer->repaint();
}
RenderStyle* HTMLOptionElement::nonRendererRenderStyle() const
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list