[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

commit-queue at webkit.org commit-queue at webkit.org
Mon Dec 27 16:29:47 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 35fc1be49e55da1de5b57c5a2467999bb88806ea
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 22 08:37:48 2010 +0000

    2010-12-22  Dai Mikurube  <dmikurube at google.com>
    
            Reviewed by Kent Tamura.
    
            Assertion failure with <select multiple required>
            https://bugs.webkit.org/show_bug.cgi?id=51260
    
            * fast/forms/resources/select-live-pseudo-selectors.js:
            * fast/forms/select-live-pseudo-selectors-expected.txt:
    2010-12-22  Dai Mikurube  <dmikurube at google.com>
    
            Reviewed by Kent Tamura.
    
            Assertion failure with <select multiple required>
            https://bugs.webkit.org/show_bug.cgi?id=51260
    
            Test: fast/css/pseudo-valid-select-click.html
    
            * dom/SelectElement.cpp: updateValidity() after selecting some options of ListBox-typed <select> elements to update valid() cache.
            (WebCore::SelectElement::updateListBoxSelection):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74466 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 33d1812..21c48c3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-22  Dai Mikurube  <dmikurube at google.com>
+
+        Reviewed by Kent Tamura.
+
+        Assertion failure with <select multiple required>
+        https://bugs.webkit.org/show_bug.cgi?id=51260
+
+        * fast/forms/resources/select-live-pseudo-selectors.js:
+        * fast/forms/select-live-pseudo-selectors-expected.txt:
+
 2010-12-21  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/LayoutTests/fast/forms/resources/select-live-pseudo-selectors.js b/LayoutTests/fast/forms/resources/select-live-pseudo-selectors.js
index c22133c..d722081 100644
--- a/LayoutTests/fast/forms/resources/select-live-pseudo-selectors.js
+++ b/LayoutTests/fast/forms/resources/select-live-pseudo-selectors.js
@@ -6,6 +6,19 @@ document.body.appendChild(form);
 var nonForm = document.createElement('div');
 document.body.appendChild(nonForm);
 
+function simulateClick(element) {
+    var rect = element.getBoundingClientRect();
+    var x = rect.left + rect.width / 2;
+    var y = rect.top + rect.height / 2;
+
+    if (!window.eventSender) {
+        return;
+    }
+    eventSender.mouseMoveTo(x, y);
+    eventSender.mouseDown();
+    eventSender.mouseUp();
+}
+
 function makeInvalid() {
     var select = document.createElement('select');
     select.name = 'foo';
@@ -87,6 +100,25 @@ shouldBe(elBackground, 'invalidColor');
 // --------------------------------
 //     value change
 // --------------------------------
+
+debug('Change the values of select elements without explicit initializing values by clicking:');
+form.innerHTML = '<select id="select-multiple" multiple required>' +
+'  <option id="multiple-empty">empty</option>' +
+'  <option id="multiple-another">another</option>' +
+'</select>' +
+'<select id="select-size4" size="4" required>' +
+'  <option id="size4-empty">empty</option>' +
+'  <option id="size4-another">another</option>' +
+'</select>';
+var selectMultiple = document.getElementById("multiple-empty");
+selectMultiple.focus();
+simulateClick(selectMultiple);
+var selectSize4 = document.getElementById("size4-empty");
+selectSize4.focus();
+simulateClick(selectSize4);
+shouldBe('backgroundOf(selectMultiple)', 'validColor');
+shouldBe('backgroundOf(selectSize4)', 'validColor');
+
 debug('Change the value with a placeholder label option:');
 el = makeInvalid();
 o1 = appendOption('', el);
diff --git a/LayoutTests/fast/forms/select-live-pseudo-selectors-expected.txt b/LayoutTests/fast/forms/select-live-pseudo-selectors-expected.txt
index 4d7cb73..8197ac4 100644
--- a/LayoutTests/fast/forms/select-live-pseudo-selectors-expected.txt
+++ b/LayoutTests/fast/forms/select-live-pseudo-selectors-expected.txt
@@ -14,6 +14,9 @@ PASS backgroundOf(el) is invalidColor
 Inside/outside of a form:
 PASS backgroundOf(el) is invalidColor
 PASS backgroundOf(el) is invalidColor
+Change the values of select elements without explicit initializing values by clicking:
+PASS backgroundOf(selectMultiple) is validColor
+PASS backgroundOf(selectSize4) is validColor
 Change the value with a placeholder label option:
 PASS backgroundOf(el) is validColor
 PASS backgroundOf(el) is invalidColor
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dbd3bbf..4240c5f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-22  Dai Mikurube  <dmikurube at google.com>
+
+        Reviewed by Kent Tamura.
+
+        Assertion failure with <select multiple required>
+        https://bugs.webkit.org/show_bug.cgi?id=51260
+
+        Test: fast/css/pseudo-valid-select-click.html
+
+        * dom/SelectElement.cpp: updateValidity() after selecting some options of ListBox-typed <select> elements to update valid() cache.
+        (WebCore::SelectElement::updateListBoxSelection):
+
 2010-12-21  Darin Adler  <darin at apple.com>
 
         Unreviewed correction to unreviewed build fix for r74447.
diff --git a/WebCore/dom/SelectElement.cpp b/WebCore/dom/SelectElement.cpp
index bfa1b93..661ba88 100644
--- a/WebCore/dom/SelectElement.cpp
+++ b/WebCore/dom/SelectElement.cpp
@@ -172,6 +172,7 @@ void SelectElement::updateListBoxSelection(SelectElementData& data, Element* ele
             optionElement->setSelectedState(cachedStateForActiveSelection[i]);
     }
 
+    toSelectElement(element)->updateValidity();
     scrollToSelection(data, element);
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list