[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 760d446c525b44704873d0dabe6bd745bcea27be
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 12 10:13:50 2010 +0000

    .: Removed WMLInputElement.* from .gitattributes as the file is
    now CRLF clean.
    
    Reviewed by Holger Freyther.
    
    * .gitattributes:
    
    WebCore: Replaced stray CRLF with LF.
    
    Reviewed by Holger Freyther.
    
    * wml/WMLInputElement.cpp:
    (WebCore::WMLInputElement::suggestedValue):
    * wml/WMLInputElement.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54716 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitattributes b/.gitattributes
index a3ea8b1..46ca454 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -212,8 +212,6 @@ WebCore/platform/chromium/SuddenTerminationChromium.cpp -crlf
 WebCore/platform/network/win/NetworkStateNotifierWin.cpp -crlf
 WebCore/platform/wx/wxcode/non-kerned-drawing.h -crlf
 WebCore/rendering/RenderThemeChromiumWin.h -crlf
-WebCore/wml/WMLInputElement.cpp -crlf
-WebCore/wml/WMLInputElement.h -crlf
 WebKit/chromium/src/EventListenerWrapper.cpp -crlf
 WebKit/chromium/src/EventListenerWrapper.h -crlf
 WebKit/chromium/src/WebEventListener.cpp -crlf
diff --git a/ChangeLog b/ChangeLog
index 9ff2307..046188c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-12  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Holger Freyther.
+
+        Removed WMLInputElement.* from .gitattributes as the file is
+        now CRLF clean.
+
+        * .gitattributes:
+
 2010-02-10  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 59c0d4c..1f6ffd7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-12  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Holger Freyther.
+
+        Replaced stray CRLF with LF.
+
+        * wml/WMLInputElement.cpp:
+        (WebCore::WMLInputElement::suggestedValue):
+        * wml/WMLInputElement.h:
+
 2010-02-10  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebCore/wml/WMLInputElement.cpp b/WebCore/wml/WMLInputElement.cpp
index 560fd09..979a294 100644
--- a/WebCore/wml/WMLInputElement.cpp
+++ b/WebCore/wml/WMLInputElement.cpp
@@ -123,10 +123,10 @@ const AtomicString& WMLInputElement::formControlName() const
     return m_data.name();
 }
 
-const String& WMLInputElement::suggestedValue() const
-{
-    return m_data.suggestedValue();
-}
+const String& WMLInputElement::suggestedValue() const
+{
+    return m_data.suggestedValue();
+}
 
 String WMLInputElement::value() const
 {
diff --git a/WebCore/wml/WMLInputElement.h b/WebCore/wml/WMLInputElement.h
index 217d9c7..eea633b 100644
--- a/WebCore/wml/WMLInputElement.h
+++ b/WebCore/wml/WMLInputElement.h
@@ -56,7 +56,7 @@ public:
     virtual int size() const;
     virtual const AtomicString& formControlType() const;
     virtual const AtomicString& formControlName() const;
-    virtual const String& suggestedValue() const;
+    virtual const String& suggestedValue() const;
     virtual String value() const;
     virtual void setValue(const String&, bool sendChangeEvent = false);
     virtual void setValueForUser(const String&);

-- 
WebKit Debian packaging