[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
philn at webkit.org
philn at webkit.org
Sun Feb 20 23:09:10 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit e4ac69dac25bc266899fb003cfaf604e4a72f2db
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 18 09:24:50 2011 +0000
2011-01-18 Philippe Normand <pnormand at igalia.com>
Unreviewed, rolling out r76002.
http://trac.webkit.org/changeset/76002
https://bugs.webkit.org/show_bug.cgi?id=49790
breaks a bunch of fast/forms tests on mac and GTK
* fast/forms/select-option-background-color-change.html: Removed.
* fast/forms/select-option-color-change.html: Removed.
* fast/forms/select-option-visibility-change.html: Removed.
* platform/mac/fast/forms/select-option-background-color-change-expected.checksum: Removed.
* platform/mac/fast/forms/select-option-background-color-change-expected.png: Removed.
* platform/mac/fast/forms/select-option-background-color-change-expected.txt: Removed.
* platform/mac/fast/forms/select-option-color-change-expected.checksum: Removed.
* platform/mac/fast/forms/select-option-color-change-expected.png: Removed.
* platform/mac/fast/forms/select-option-color-change-expected.txt: Removed.
* platform/mac/fast/forms/select-option-visibility-change-expected.checksum: Removed.
* platform/mac/fast/forms/select-option-visibility-change-expected.png: Removed.
* platform/mac/fast/forms/select-option-visibility-change-expected.txt: Removed.
2011-01-18 Philippe Normand <pnormand at igalia.com>
Unreviewed, rolling out r76002.
http://trac.webkit.org/changeset/76002
https://bugs.webkit.org/show_bug.cgi?id=49790
breaks a bunch of fast/forms tests on mac and GTK
* html/HTMLOptionElement.cpp:
(WebCore::HTMLOptionElement::setRenderStyle):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76006 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f14090d..5edafc4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,24 @@
+2011-01-18 Philippe Normand <pnormand at igalia.com>
+
+ Unreviewed, rolling out r76002.
+ http://trac.webkit.org/changeset/76002
+ https://bugs.webkit.org/show_bug.cgi?id=49790
+
+ breaks a bunch of fast/forms tests on mac and GTK
+
+ * fast/forms/select-option-background-color-change.html: Removed.
+ * fast/forms/select-option-color-change.html: Removed.
+ * fast/forms/select-option-visibility-change.html: Removed.
+ * platform/mac/fast/forms/select-option-background-color-change-expected.checksum: Removed.
+ * platform/mac/fast/forms/select-option-background-color-change-expected.png: Removed.
+ * platform/mac/fast/forms/select-option-background-color-change-expected.txt: Removed.
+ * platform/mac/fast/forms/select-option-color-change-expected.checksum: Removed.
+ * platform/mac/fast/forms/select-option-color-change-expected.png: Removed.
+ * platform/mac/fast/forms/select-option-color-change-expected.txt: Removed.
+ * platform/mac/fast/forms/select-option-visibility-change-expected.checksum: Removed.
+ * platform/mac/fast/forms/select-option-visibility-change-expected.png: Removed.
+ * platform/mac/fast/forms/select-option-visibility-change-expected.txt: Removed.
+
2011-01-18 Csaba Osztrogonác <ossy at webkit.org>
Unreviewed.
diff --git a/LayoutTests/fast/forms/select-option-background-color-change.html b/LayoutTests/fast/forms/select-option-background-color-change.html
deleted file mode 100644
index e673355..0000000
--- a/LayoutTests/fast/forms/select-option-background-color-change.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<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
deleted file mode 100644
index eb00d87..0000000
--- a/LayoutTests/fast/forms/select-option-color-change.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<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
deleted file mode 100644
index e337e5d..0000000
--- a/LayoutTests/fast/forms/select-option-visibility-change.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<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
deleted file mode 100644
index d562df7..0000000
--- a/LayoutTests/platform/mac/fast/forms/select-option-background-color-change-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 9970e2a..0000000
Binary files a/LayoutTests/platform/mac/fast/forms/select-option-background-color-change-expected.png and /dev/null 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
deleted file mode 100644
index d0994f4..0000000
--- a/LayoutTests/platform/mac/fast/forms/select-option-background-color-change-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 4e6d230..0000000
--- a/LayoutTests/platform/mac/fast/forms/select-option-color-change-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 204c475..0000000
Binary files a/LayoutTests/platform/mac/fast/forms/select-option-color-change-expected.png and /dev/null 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
deleted file mode 100644
index b6c8922..0000000
--- a/LayoutTests/platform/mac/fast/forms/select-option-color-change-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index b2175e6..0000000
--- a/LayoutTests/platform/mac/fast/forms/select-option-visibility-change-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 64c87fb..0000000
Binary files a/LayoutTests/platform/mac/fast/forms/select-option-visibility-change-expected.png and /dev/null 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
deleted file mode 100644
index d2fa408..0000000
--- a/LayoutTests/platform/mac/fast/forms/select-option-visibility-change-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-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 0668d21..304ed8e 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-18 Philippe Normand <pnormand at igalia.com>
+
+ Unreviewed, rolling out r76002.
+ http://trac.webkit.org/changeset/76002
+ https://bugs.webkit.org/show_bug.cgi?id=49790
+
+ breaks a bunch of fast/forms tests on mac and GTK
+
+ * html/HTMLOptionElement.cpp:
+ (WebCore::HTMLOptionElement::setRenderStyle):
+
2011-01-18 MORITA Hajime <morrita at google.com>
Unreviewed windows build fix.
diff --git a/Source/WebCore/html/HTMLOptionElement.cpp b/Source/WebCore/html/HTMLOptionElement.cpp
index bc5788d..e8f624c 100644
--- a/Source/WebCore/html/HTMLOptionElement.cpp
+++ b/Source/WebCore/html/HTMLOptionElement.cpp
@@ -221,9 +221,6 @@ 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