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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit c3e62ab91409a4cf06c4cf0a480b39f192c92336
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 14 20:13:45 2009 +0000

    2009-12-14  Nayan Kumar K  <nayankk at gmail.com>
    
            Reviewed by Darin Adler.
    
            Fix for compilation errors in WML enabled builds.
    
            https://bugs.webkit.org/show_bug.cgi?id=32481
    
            * wml/WMLInputElement.cpp:
            (WebCore::WMLInputElement::setValue):
            (WebCore::WMLInputElement::setValueForUser):
            * wml/WMLInputElement.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52107 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 44034ae..398315e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-14  Nayan Kumar K  <nayankk at gmail.com>
+
+        Reviewed by Darin Adler.
+
+        Fix for compilation errors in WML enabled builds.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32481
+
+        * wml/WMLInputElement.cpp:
+        (WebCore::WMLInputElement::setValue):
+        (WebCore::WMLInputElement::setValueForUser):
+        * wml/WMLInputElement.h:
+
 2009-12-14  Andrei Popescu  <andreip at google.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/wml/WMLInputElement.cpp b/WebCore/wml/WMLInputElement.cpp
index eb31502..ebe0172 100644
--- a/WebCore/wml/WMLInputElement.cpp
+++ b/WebCore/wml/WMLInputElement.cpp
@@ -132,7 +132,7 @@ String WMLInputElement::value() const
     return value;
 }
 
-void WMLInputElement::setValue(const String& value)
+void WMLInputElement::setValue(const String& value, bool sendChangeEvent)
 {
     setFormControlValueMatchesRenderer(false);
     m_data.setValue(constrainValue(value));
@@ -151,6 +151,13 @@ void WMLInputElement::setValue(const String& value)
     InputElement::notifyFormStateChanged(this);
 }
 
+void WMLInputElement::setValueForUser(const String& value)
+{
+    /* InputElement class defines pure virtual function 'setValueForUser', which 
+       will be useful only in HTMLInputElement. Do nothing in 'WMLInputElement'.
+     */
+}
+
 void WMLInputElement::setValueFromRenderer(const String& value)
 {
     InputElement::setValueFromRenderer(m_data, this, this, value);
diff --git a/WebCore/wml/WMLInputElement.h b/WebCore/wml/WMLInputElement.h
index 98ea13a..571a20b 100644
--- a/WebCore/wml/WMLInputElement.h
+++ b/WebCore/wml/WMLInputElement.h
@@ -57,7 +57,8 @@ public:
     virtual const AtomicString& formControlType() const;
     virtual const AtomicString& formControlName() const;
     virtual String value() const;
-    virtual void setValue(const String&);
+    virtual void setValue(const String&, bool sendChangeEvent = false);
+    virtual void setValueForUser(const String&);
     virtual void setValueFromRenderer(const String&);
 
     virtual bool saveFormControlState(String& value) const;

-- 
WebKit Debian packaging