[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

Thu Apr 8 01:58:45 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit 2f851f1ae81ccb44a94413d3bfa0ba3d83bc3da1
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 25 05:24:09 2010 +0000

    2010-02-24  Jay Campan  <jcampan at google.com>
    
            Reviewed by David Levin.
    
            Don't show the autofill popup when the input text is disabled or read only.
    
            Test: manual-tests/chromium/no-autofill-on-readonly.html
    
            https://bugs.webkit.org/show_bug.cgi?id=35129
    
            * src/EditorClientImpl.cpp:
            (WebKit::EditorClientImpl::autofill):
            *  manual-tests/chromium/no-autofill-on-readonly.html: Added.
    2010-02-24  Jay Campan  <jcampan at google.com>
    
            Reviewed by David Levin.
    
            Don't show the autofill popup when the input text is disabled or read only.
    
            https://bugs.webkit.org/show_bug.cgi?id=35129
    
            * src/EditorClientImpl.cpp:
            (WebKit::EditorClientImpl::autofill):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55219 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f6350b0..73b33b2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-24  Jay Campan  <jcampan at google.com>
+
+        Reviewed by David Levin.
+
+        Don't show the autofill popup when the input text is disabled or read only.
+
+        Test: manual-tests/chromium/no-autofill-on-readonly.html
+
+        https://bugs.webkit.org/show_bug.cgi?id=35129
+
+        * src/EditorClientImpl.cpp:
+        (WebKit::EditorClientImpl::autofill):
+        *  manual-tests/chromium/no-autofill-on-readonly.html: Added.
+
 2010-02-24  Dominic Mazzoni  <dmazzoni at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebCore/manual-tests/chromium/no-autofill-on-readonly.html b/WebCore/manual-tests/chromium/no-autofill-on-readonly.html
new file mode 100644
index 0000000..9724aaa
--- /dev/null
+++ b/WebCore/manual-tests/chromium/no-autofill-on-readonly.html
@@ -0,0 +1,33 @@
+<html>
+<head>
+</head>
+<body>
+    <p>This page tests that the autofill popup is not shown for read-only and disabled text inputs.</p>
+    <p>Do the following:</p>
+    <ul>
+      <li>Enter a name in the input text in Form 1 and press submit. This is so the autofill has a value for that field.</li>
+      <li>Reload the page so the input text is empty. Click twice on the Form 1 text input. An autofill popup with the name you entered previously should be shown.</li>
+      <li>Click twice on the Form 2 text input. No autofill popup should be shown.</li>
+      <li>Click twice on the Form 3 text input. No autofill popup should be shown.</li>
+    </ul>
+
+    <h1>Form 1 (text input non read-only)</h1>
+    <form action="no-autofill-on-readonly.html">
+      Name:<input type="text" name="name"></input><br>
+      <input type="submit"></input>
+    </form>
+
+    <h1>Form 2 (text input read-only)</h1>
+    <form action="no-autofill-on-readonly.html">
+      Name:<input type="text" name="name" READONLY></input><br>
+      <input type="submit"></input>
+    </form>
+
+    <h1>Form 3 (text input disabled)</h1>
+    <form action="no-autofill-on-readonly.html">
+      Name:<input type="text" name="name" DISABLED></input><br>
+      <input type="submit"></input>
+    </form>
+
+</body>
+</html>
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 4c90de0..b92372a 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-24  Jay Campan  <jcampan at google.com>
+
+        Reviewed by David Levin.
+
+        Don't show the autofill popup when the input text is disabled or read only.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35129
+
+        * src/EditorClientImpl.cpp:
+        (WebKit::EditorClientImpl::autofill):
+
 2010-02-24  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/EditorClientImpl.cpp b/WebKit/chromium/src/EditorClientImpl.cpp
index cfd8ec4..dff1edc 100644
--- a/WebKit/chromium/src/EditorClientImpl.cpp
+++ b/WebKit/chromium/src/EditorClientImpl.cpp
@@ -703,8 +703,9 @@ bool EditorClientImpl::autofill(HTMLInputElement* inputElement,
 
     // Let's try to trigger autofill for that field, if applicable.
     if (!inputElement->isEnabledFormControl() || !inputElement->isTextField()
-        || inputElement->isPasswordField()
-        || !inputElement->autoComplete())
+        || inputElement->isPasswordField() || !inputElement->autoComplete()
+        || !inputElement->isEnabledFormControl()
+        || inputElement->isReadOnlyFormControl())
         return false;
 
     WebString name = WebInputElement(inputElement).nameForAutofill();

-- 
WebKit Debian packaging

