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

[tkent at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 1284a733aec552df3bbc420ba4d05e9b2da6cd98
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 29 23:48:30 2010 +0000

    [Chromium] Add substitution parameters to WebKitClient::queryLocalizedString()
    https://bugs.webkit.org/show_bug.cgi?id=50053
    
    Reviewed by Darin Fisher.
    
    * public/WebKitClient.h:
    (WebKit::WebKitClient::queryLocalizedString): Add overload functions with
      substitution string parameters, and remove the integer parameter overload.
    * src/LocalizedStrings.cpp:
    (WebCore::query): Add string parameter overloads, and remove the integer parameter overload.
    (WebCore::multipleFileUploadText): Call the string parameter query().
    (WebCore::validationMessageTooLongText): Pass the parameters to query().
    (WebCore::validationMessageRangeUnderflowText): ditto.
    (WebCore::validationMessageRangeOverflowText): ditto.
    (WebCore::validationMessageStepMismatchText): ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72844 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 8236333..3f9efc9 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,21 @@
+2010-11-29  Kent Tamura  <tkent at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Add substitution parameters to WebKitClient::queryLocalizedString()
+        https://bugs.webkit.org/show_bug.cgi?id=50053
+
+        * public/WebKitClient.h:
+        (WebKit::WebKitClient::queryLocalizedString): Add overload functions with
+          substitution string parameters, and remove the integer parameter overload.
+        * src/LocalizedStrings.cpp:
+        (WebCore::query): Add string parameter overloads, and remove the integer parameter overload.
+        (WebCore::multipleFileUploadText): Call the string parameter query().
+        (WebCore::validationMessageTooLongText): Pass the parameters to query().
+        (WebCore::validationMessageRangeUnderflowText): ditto.
+        (WebCore::validationMessageRangeOverflowText): ditto.
+        (WebCore::validationMessageStepMismatchText): ditto.
+
 2010-11-29  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Remove Build directory that was erroneously added in r72103.
diff --git a/WebKit/chromium/public/WebKitClient.h b/WebKit/chromium/public/WebKitClient.h
index 8832add..0c4020f 100644
--- a/WebKit/chromium/public/WebKitClient.h
+++ b/WebKit/chromium/public/WebKitClient.h
@@ -226,10 +226,10 @@ public:
     // Returns true on success.
     virtual bool decodeAudioFileData(WebAudioBus* destinationBus, const char* audioFileData, size_t dataSize, double sampleRate) { return false; }
 
-    // Returns a localized string resource (with an optional numeric
-    // parameter value).
+    // Returns a localized string resource (with substitution parameters).
     virtual WebString queryLocalizedString(WebLocalizedString::Name) { return WebString(); }
-    virtual WebString queryLocalizedString(WebLocalizedString::Name, int numericValue) { return WebString(); }
+    virtual WebString queryLocalizedString(WebLocalizedString::Name, const WebString& parameter) { return WebString(); }
+    virtual WebString queryLocalizedString(WebLocalizedString::Name, const WebString& parameter1, const WebString& parameter2) { return WebString(); }
 
 
     // Sandbox ------------------------------------------------------------
diff --git a/WebKit/chromium/src/LocalizedStrings.cpp b/WebKit/chromium/src/LocalizedStrings.cpp
index e7b39d5..ab14009 100644
--- a/WebKit/chromium/src/LocalizedStrings.cpp
+++ b/WebKit/chromium/src/LocalizedStrings.cpp
@@ -43,6 +43,7 @@
 #include <wtf/text/WTFString.h>
 
 using WebKit::WebLocalizedString;
+using WebKit::WebString;
 
 namespace WebCore {
 
@@ -51,9 +52,14 @@ static String query(WebLocalizedString::Name name)
     return WebKit::webKitClient()->queryLocalizedString(name);
 }
 
-static String query(WebLocalizedString::Name name, int numericValue)
+static String query(WebLocalizedString::Name name, const WebString& parameter)
 {
-    return WebKit::webKitClient()->queryLocalizedString(name, numericValue);
+    return WebKit::webKitClient()->queryLocalizedString(name, parameter);
+}
+
+static String query(WebLocalizedString::Name name, const WebString& parameter1, const WebString& parameter2)
+{
+    return WebKit::webKitClient()->queryLocalizedString(name, parameter1, parameter2);
 }
 
 String searchableIndexIntroduction()
@@ -191,7 +197,7 @@ String crashedPluginText()
 
 String multipleFileUploadText(unsigned numberOfFiles)
 {
-    return query(WebLocalizedString::MultipleFileUploadText, numberOfFiles);
+    return query(WebLocalizedString::MultipleFileUploadText, String::number(numberOfFiles));
 }
 
 // Used in FTPDirectoryDocument.cpp
@@ -350,28 +356,24 @@ String validationMessagePatternMismatchText()
     return query(WebLocalizedString::ValidationPatternMismatch);
 }
 
-String validationMessageTooLongText(int, int)
+String validationMessageTooLongText(int valueLength, int maxLength)
 {
-    // FIXME: pass the arguments.
-    return query(WebLocalizedString::ValidationTooLong);
+    return query(WebLocalizedString::ValidationTooLong, String::number(valueLength), String::number(maxLength));
 }
 
-String validationMessageRangeUnderflowText(const String&)
+String validationMessageRangeUnderflowText(const String& minimum)
 {
-    // FIXME: pass the arguments.
-    return query(WebLocalizedString::ValidationRangeUnderflow);
+    return query(WebLocalizedString::ValidationRangeUnderflow, minimum);
 }
 
-String validationMessageRangeOverflowText(const String&)
+String validationMessageRangeOverflowText(const String& maximum)
 {
-    // FIXME: pass the arguments.
-    return query(WebLocalizedString::ValidationRangeOverflow);
+    return query(WebLocalizedString::ValidationRangeOverflow, maximum);
 }
 
-String validationMessageStepMismatchText(const String&, const String&)
+String validationMessageStepMismatchText(const String& base, const String& step)
 {
-    // FIXME: pass the arguments.
-    return query(WebLocalizedString::ValidationStepMismatch);
+    return query(WebLocalizedString::ValidationStepMismatch, base, step);
 }
 
 } // namespace WebCore

-- 
WebKit Debian packaging