[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tkent at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 3042da9a5d4f84dd5181f86accd3ac43ba302260
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 7 05:23:09 2010 +0000

    2010-10-06  Kent Tamura  <tkent at chromium.org>
    
            Unreviewed, build fix.
    
            Windows build fix for r69272.
    
            * html/BaseDateAndTimeInputType.cpp:
            (WebCore::BaseDateAndTimeInputType::stepBase):
             Use defaultStepBase() instead of defaultStepBase.
            * html/InputType.h:
            (WebCore::InputType::defaultStepBase):
             Make defaultStepBase static function.
            * html/NumberInputType.cpp:
            (WebCore::NumberInputType::stepBase):
             Use defaultStepBase() instead of defaultStepBase.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69273 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6bffd52..e00f707 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,21 @@
 2010-10-06  Kent Tamura  <tkent at chromium.org>
 
+        Unreviewed, build fix.
+
+        Windows build fix for r69272.
+
+        * html/BaseDateAndTimeInputType.cpp:
+        (WebCore::BaseDateAndTimeInputType::stepBase):
+         Use defaultStepBase() instead of defaultStepBase.
+        * html/InputType.h:
+        (WebCore::InputType::defaultStepBase):
+         Make defaultStepBase static function.
+        * html/NumberInputType.cpp:
+        (WebCore::NumberInputType::stepBase):
+         Use defaultStepBase() instead of defaultStepBase.
+
+2010-10-06  Kent Tamura  <tkent at chromium.org>
+
         Reviewed by Dimitri Glazkov.
 
         Refactor HTMLInputElement: Move range/step related functions
diff --git a/WebCore/html/BaseDateAndTimeInputType.cpp b/WebCore/html/BaseDateAndTimeInputType.cpp
index 74ae1b9..28dbbf0 100644
--- a/WebCore/html/BaseDateAndTimeInputType.cpp
+++ b/WebCore/html/BaseDateAndTimeInputType.cpp
@@ -72,7 +72,7 @@ bool BaseDateAndTimeInputType::stepMismatch(const String& value, double step) co
 
 double BaseDateAndTimeInputType::stepBase() const
 {
-    return parseToDouble(element()->fastGetAttribute(minAttr), defaultStepBase);
+    return parseToDouble(element()->fastGetAttribute(minAttr), defaultStepBase());
 }
 
 double BaseDateAndTimeInputType::parseToDouble(const String& src, double defaultValue) const
diff --git a/WebCore/html/InputType.h b/WebCore/html/InputType.h
index c40ed85..22f3210 100644
--- a/WebCore/html/InputType.h
+++ b/WebCore/html/InputType.h
@@ -41,8 +41,6 @@ class HTMLInputElement;
 
 class InputType : public Noncopyable {
 public:
-    static const double defaultStepBase = 0.0;
-
     static PassOwnPtr<InputType> create(HTMLInputElement*, const AtomicString&);
     static PassOwnPtr<InputType> createText(HTMLInputElement*);
     virtual ~InputType();
@@ -79,6 +77,8 @@ public:
 protected:
     InputType(HTMLInputElement* element) : m_element(element) { }
     HTMLInputElement* element() const { return m_element; }
+    // We can't make this a static const data member because VC++ doesn't like it.
+    static double defaultStepBase() { return 0.0; }
 
 private:
     // Raw pointer because the HTMLInputElement object owns this InputType object.
diff --git a/WebCore/html/NumberInputType.cpp b/WebCore/html/NumberInputType.cpp
index e1cd869..2f43ce9 100644
--- a/WebCore/html/NumberInputType.cpp
+++ b/WebCore/html/NumberInputType.cpp
@@ -106,7 +106,7 @@ bool NumberInputType::stepMismatch(const String& value, double step) const
 
 double NumberInputType::stepBase() const
 {
-    return parseToDouble(element()->fastGetAttribute(minAttr), defaultStepBase);
+    return parseToDouble(element()->fastGetAttribute(minAttr), defaultStepBase());
 }
 
 double NumberInputType::defaultStep() const

-- 
WebKit Debian packaging