[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tkent at chromium.org
tkent at chromium.org
Wed Dec 22 16:09:39 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 379a5d613d2529e3b16190191004abd230adee44
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 19 04:48:45 2010 +0000
2010-11-18 Kent Tamura <tkent at chromium.org>
Reviewed by Tony Chang.
Add more validation message functions
https://bugs.webkit.org/show_bug.cgi?id=49716
Add the following message functions:
- validationMessageValueMissingForCheckbox()
- validationMessageValueMissingForFile()
- validationMessageValueMissingForMultipleFile()
- validationMessageValueMissingForRadio()
- validationMessageValueMissingForSelect()
and update ValidityState, HTMLInputElement, and InputTypes to use them.
No new tests because this doesn't change visible behavior.
* html/CheckboxInputType.cpp:
(WebCore::CheckboxInputType::valueMissingText):
* html/CheckboxInputType.h:
* html/FileInputType.cpp:
(WebCore::FileInputType::valueMissingText):
* html/FileInputType.h:
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::valueMissingText):
* html/HTMLInputElement.h:
* html/InputType.cpp:
(WebCore::InputType::valueMissingText):
* html/InputType.h:
* html/RadioInputType.cpp:
(WebCore::RadioInputType::valueMissingText):
* html/RadioInputType.h:
* html/ValidityState.cpp:
(WebCore::ValidityState::validationMessage):
* platform/LocalizedStrings.cpp:
(WebCore::validationMessageValueMissingForCheckboxText):
(WebCore::validationMessageValueMissingForFileText):
(WebCore::validationMessageValueMissingForMultipleFileText):
(WebCore::validationMessageValueMissingForRadioText):
(WebCore::validationMessageValueMissingForSelectText):
* platform/LocalizedStrings.h:
* platform/android/LocalizedStringsAndroid.cpp:
(WebCore::validationMessageValueMissingForCheckboxText):
(WebCore::validationMessageValueMissingForFileText):
(WebCore::validationMessageValueMissingForMultipleFileText):
(WebCore::validationMessageValueMissingForRadioText):
(WebCore::validationMessageValueMissingForSelectText):
* platform/brew/LocalizedStringsBrew.cpp:
(WebCore::validationMessageValueMissingForCheckboxText):
(WebCore::validationMessageValueMissingForFileText):
(WebCore::validationMessageValueMissingForMultipleFileText):
(WebCore::validationMessageValueMissingForRadioText):
(WebCore::validationMessageValueMissingForSelectText):
* platform/efl/LocalizedStringsEfl.cpp:
(WebCore::validationMessageValueMissingForCheckboxText):
(WebCore::validationMessageValueMissingForFileText):
(WebCore::validationMessageValueMissingForMultipleFileText):
(WebCore::validationMessageValueMissingForRadioText):
(WebCore::validationMessageValueMissingForSelectText):
* platform/gtk/LocalizedStringsGtk.cpp:
(WebCore::validationMessageValueMissingForCheckboxText):
(WebCore::validationMessageValueMissingForFileText):
(WebCore::validationMessageValueMissingForMultipleFileText):
(WebCore::validationMessageValueMissingForRadioText):
(WebCore::validationMessageValueMissingForSelectText):
* platform/haiku/LocalizedStringsHaiku.cpp:
(WebCore::validationMessageValueMissingText):
(WebCore::validationMessageValueMissingForCheckboxText):
(WebCore::validationMessageValueMissingForFileText):
(WebCore::validationMessageValueMissingForMultipleFileText):
(WebCore::validationMessageValueMissingForRadioText):
(WebCore::validationMessageValueMissingForSelectText):
* platform/wx/LocalizedStringsWx.cpp:
(WebCore::validationMessageValueMissingForCheckboxText):
(WebCore::validationMessageValueMissingForFileText):
(WebCore::validationMessageValueMissingForMultipleFileText):
(WebCore::validationMessageValueMissingForRadioText):
(WebCore::validationMessageValueMissingForSelectText):
2010-11-18 Kent Tamura <tkent at chromium.org>
Reviewed by Tony Chang.
Add more validation message functions
https://bugs.webkit.org/show_bug.cgi?id=49716
Add implementations of new functions and symbols for new messages.
* public/WebLocalizedString.h:
* src/LocalizedStrings.cpp:
(WebCore::validationMessageValueMissingForCheckboxText):
(WebCore::validationMessageValueMissingForFileText):
(WebCore::validationMessageValueMissingForMultipleFileText):
(WebCore::validationMessageValueMissingForRadioText):
(WebCore::validationMessageValueMissingForSelectText):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72363 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5d1c3c3..125e756 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,83 @@
+2010-11-18 Kent Tamura <tkent at chromium.org>
+
+ Reviewed by Tony Chang.
+
+ Add more validation message functions
+ https://bugs.webkit.org/show_bug.cgi?id=49716
+
+ Add the following message functions:
+ - validationMessageValueMissingForCheckbox()
+ - validationMessageValueMissingForFile()
+ - validationMessageValueMissingForMultipleFile()
+ - validationMessageValueMissingForRadio()
+ - validationMessageValueMissingForSelect()
+
+ and update ValidityState, HTMLInputElement, and InputTypes to use them.
+
+ No new tests because this doesn't change visible behavior.
+
+ * html/CheckboxInputType.cpp:
+ (WebCore::CheckboxInputType::valueMissingText):
+ * html/CheckboxInputType.h:
+ * html/FileInputType.cpp:
+ (WebCore::FileInputType::valueMissingText):
+ * html/FileInputType.h:
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::valueMissingText):
+ * html/HTMLInputElement.h:
+ * html/InputType.cpp:
+ (WebCore::InputType::valueMissingText):
+ * html/InputType.h:
+ * html/RadioInputType.cpp:
+ (WebCore::RadioInputType::valueMissingText):
+ * html/RadioInputType.h:
+ * html/ValidityState.cpp:
+ (WebCore::ValidityState::validationMessage):
+ * platform/LocalizedStrings.cpp:
+ (WebCore::validationMessageValueMissingForCheckboxText):
+ (WebCore::validationMessageValueMissingForFileText):
+ (WebCore::validationMessageValueMissingForMultipleFileText):
+ (WebCore::validationMessageValueMissingForRadioText):
+ (WebCore::validationMessageValueMissingForSelectText):
+ * platform/LocalizedStrings.h:
+ * platform/android/LocalizedStringsAndroid.cpp:
+ (WebCore::validationMessageValueMissingForCheckboxText):
+ (WebCore::validationMessageValueMissingForFileText):
+ (WebCore::validationMessageValueMissingForMultipleFileText):
+ (WebCore::validationMessageValueMissingForRadioText):
+ (WebCore::validationMessageValueMissingForSelectText):
+ * platform/brew/LocalizedStringsBrew.cpp:
+ (WebCore::validationMessageValueMissingForCheckboxText):
+ (WebCore::validationMessageValueMissingForFileText):
+ (WebCore::validationMessageValueMissingForMultipleFileText):
+ (WebCore::validationMessageValueMissingForRadioText):
+ (WebCore::validationMessageValueMissingForSelectText):
+ * platform/efl/LocalizedStringsEfl.cpp:
+ (WebCore::validationMessageValueMissingForCheckboxText):
+ (WebCore::validationMessageValueMissingForFileText):
+ (WebCore::validationMessageValueMissingForMultipleFileText):
+ (WebCore::validationMessageValueMissingForRadioText):
+ (WebCore::validationMessageValueMissingForSelectText):
+ * platform/gtk/LocalizedStringsGtk.cpp:
+ (WebCore::validationMessageValueMissingForCheckboxText):
+ (WebCore::validationMessageValueMissingForFileText):
+ (WebCore::validationMessageValueMissingForMultipleFileText):
+ (WebCore::validationMessageValueMissingForRadioText):
+ (WebCore::validationMessageValueMissingForSelectText):
+ * platform/haiku/LocalizedStringsHaiku.cpp:
+ (WebCore::validationMessageValueMissingText):
+ (WebCore::validationMessageValueMissingForCheckboxText):
+ (WebCore::validationMessageValueMissingForFileText):
+ (WebCore::validationMessageValueMissingForMultipleFileText):
+ (WebCore::validationMessageValueMissingForRadioText):
+ (WebCore::validationMessageValueMissingForSelectText):
+ * platform/wx/LocalizedStringsWx.cpp:
+ (WebCore::validationMessageValueMissingForCheckboxText):
+ (WebCore::validationMessageValueMissingForFileText):
+ (WebCore::validationMessageValueMissingForMultipleFileText):
+ (WebCore::validationMessageValueMissingForRadioText):
+ (WebCore::validationMessageValueMissingForSelectText):
+
2010-11-18 Gavin Barraclough <barraclough at apple.com>
Reviewed by Oliver Hunt.
diff --git a/WebCore/html/CheckboxInputType.cpp b/WebCore/html/CheckboxInputType.cpp
index 572dde0..5e015e4 100644
--- a/WebCore/html/CheckboxInputType.cpp
+++ b/WebCore/html/CheckboxInputType.cpp
@@ -32,6 +32,7 @@
#include "CheckboxInputType.h"
#include "HTMLInputElement.h"
+#include "LocalizedStrings.h"
#include <wtf/PassOwnPtr.h>
namespace WebCore {
@@ -51,4 +52,9 @@ bool CheckboxInputType::valueMissing(const String&) const
return !element()->checked();
}
+String CheckboxInputType::valueMissingText() const
+{
+ return validationMessageValueMissingForCheckboxText();
+}
+
} // namespace WebCore
diff --git a/WebCore/html/CheckboxInputType.h b/WebCore/html/CheckboxInputType.h
index b68e14d..a4c419d 100644
--- a/WebCore/html/CheckboxInputType.h
+++ b/WebCore/html/CheckboxInputType.h
@@ -43,6 +43,7 @@ private:
CheckboxInputType(HTMLInputElement* element) : BaseCheckableInputType(element) { }
virtual const AtomicString& formControlType() const;
virtual bool valueMissing(const String&) const;
+ virtual String valueMissingText() const;
};
} // namespace WebCore
diff --git a/WebCore/html/FileInputType.cpp b/WebCore/html/FileInputType.cpp
index e9d0b5e..b5fc2fb 100644
--- a/WebCore/html/FileInputType.cpp
+++ b/WebCore/html/FileInputType.cpp
@@ -27,6 +27,7 @@
#include "FileList.h"
#include "FormDataList.h"
#include "HTMLInputElement.h"
+#include "LocalizedStrings.h"
#include "RenderFileUploadControl.h"
#include <wtf/PassOwnPtr.h>
#include <wtf/text/WTFString.h>
@@ -77,6 +78,11 @@ bool FileInputType::valueMissing(const String& value) const
return value.isEmpty();
}
+String FileInputType::valueMissingText() const
+{
+ return element()->multiple() ? validationMessageValueMissingForMultipleFileText() : validationMessageValueMissingForFileText();
+}
+
bool FileInputType::handleDOMActivateEvent(Event* event)
{
if (element()->disabled() || !element()->renderer())
diff --git a/WebCore/html/FileInputType.h b/WebCore/html/FileInputType.h
index 142afaf..df95ffc 100644
--- a/WebCore/html/FileInputType.h
+++ b/WebCore/html/FileInputType.h
@@ -44,6 +44,7 @@ private:
virtual const AtomicString& formControlType() const;
virtual bool appendFormData(FormDataList&, bool) const;
virtual bool valueMissing(const String&) const;
+ virtual String valueMissingText() const;
virtual bool handleDOMActivateEvent(Event*);
virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) const;
};
diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp
index af4e7d0..4939f8c 100644
--- a/WebCore/html/HTMLInputElement.cpp
+++ b/WebCore/html/HTMLInputElement.cpp
@@ -280,6 +280,11 @@ String HTMLInputElement::typeMismatchText() const
return m_inputType->typeMismatchText();
}
+String HTMLInputElement::valueMissingText() const
+{
+ return m_inputType->valueMissingText();
+}
+
bool HTMLInputElement::getAllowedValueStep(double* step) const
{
return getAllowedValueStepWithDecimalPlaces(step, 0);
diff --git a/WebCore/html/HTMLInputElement.h b/WebCore/html/HTMLInputElement.h
index 9884117..8f6a471 100644
--- a/WebCore/html/HTMLInputElement.h
+++ b/WebCore/html/HTMLInputElement.h
@@ -73,6 +73,7 @@ public:
String stepBaseString() const;
String stepString() const;
String typeMismatchText() const;
+ String valueMissingText() const;
// Implementations of HTMLInputElement::stepUp() and stepDown().
void stepUp(int, ExceptionCode&);
diff --git a/WebCore/html/InputType.cpp b/WebCore/html/InputType.cpp
index 6dd002c..294f75e 100644
--- a/WebCore/html/InputType.cpp
+++ b/WebCore/html/InputType.cpp
@@ -275,6 +275,11 @@ String InputType::typeMismatchText() const
return validationMessageTypeMismatchText();
}
+String InputType::valueMissingText() const
+{
+ return validationMessageValueMissingText();
+}
+
bool InputType::handleClickEvent(MouseEvent*)
{
return false;
@@ -472,4 +477,3 @@ const AtomicString& week()
} // namespace WebCore::InpuTypeNames
} // namespace WebCore
-
diff --git a/WebCore/html/InputType.h b/WebCore/html/InputType.h
index f1a5b6d..c1417fa 100644
--- a/WebCore/html/InputType.h
+++ b/WebCore/html/InputType.h
@@ -100,6 +100,7 @@ public:
virtual bool scaledStepValeuShouldBeInteger() const;
virtual double acceptableError(double) const;
virtual String typeMismatchText() const;
+ virtual String valueMissingText() const;
// Event handlers
// If the return value is true, do no further default event handling in the
diff --git a/WebCore/html/RadioInputType.cpp b/WebCore/html/RadioInputType.cpp
index a6c4707..f59cf78 100644
--- a/WebCore/html/RadioInputType.cpp
+++ b/WebCore/html/RadioInputType.cpp
@@ -32,6 +32,7 @@
#include "RadioInputType.h"
#include "HTMLInputElement.h"
+#include "LocalizedStrings.h"
#include "MouseEvent.h"
#include <wtf/PassOwnPtr.h>
@@ -52,6 +53,11 @@ bool RadioInputType::valueMissing(const String&) const
return !element()->checkedRadioButtons().checkedButtonForGroup(element()->name());
}
+String RadioInputType::valueMissingText() const
+{
+ return validationMessageValueMissingForRadioText();
+}
+
bool RadioInputType::handleClickEvent(MouseEvent* event)
{
event->setDefaultHandled();
diff --git a/WebCore/html/RadioInputType.h b/WebCore/html/RadioInputType.h
index 2798010..27ae75e 100644
--- a/WebCore/html/RadioInputType.h
+++ b/WebCore/html/RadioInputType.h
@@ -43,6 +43,7 @@ private:
RadioInputType(HTMLInputElement* element) : BaseCheckableInputType(element) { }
virtual const AtomicString& formControlType() const;
virtual bool valueMissing(const String&) const;
+ virtual String valueMissingText() const;
virtual bool handleClickEvent(MouseEvent*);
};
diff --git a/WebCore/html/ValidityState.cpp b/WebCore/html/ValidityState.cpp
index 84fc664..ef3de66 100644
--- a/WebCore/html/ValidityState.cpp
+++ b/WebCore/html/ValidityState.cpp
@@ -42,17 +42,24 @@ String ValidityState::validationMessage() const
if (customError())
return m_customErrorMessage;
- if (valueMissing())
- return validationMessageValueMissingText();
- if (patternMismatch())
- return validationMessagePatternMismatchText();
bool isInputElement = m_control->hasTagName(inputTag);
bool isTextAreaElement = m_control->hasTagName(textareaTag);
+ // The order of the following checks is meaningful. e.g. We'd like to show the
+ // valueMissing message even if the control has other validation errors.
+ if (valueMissing()) {
+ if (m_control->hasTagName(selectTag))
+ return validationMessageValueMissingForSelectText();
+ if (isInputElement)
+ return static_cast<HTMLInputElement*>(m_control)->valueMissingText();
+ return validationMessageValueMissingText();
+ }
if (typeMismatch()) {
if (isInputElement)
return static_cast<HTMLInputElement*>(m_control)->typeMismatchText();
return validationMessageTypeMismatchText();
}
+ if (patternMismatch())
+ return validationMessagePatternMismatchText();
if (tooLong()) {
if (!isInputElement && !isTextAreaElement) {
ASSERT_NOT_REACHED();
diff --git a/WebCore/platform/LocalizedStrings.cpp b/WebCore/platform/LocalizedStrings.cpp
index 021205a..8739c74 100644
--- a/WebCore/platform/LocalizedStrings.cpp
+++ b/WebCore/platform/LocalizedStrings.cpp
@@ -585,6 +585,31 @@ String validationMessageValueMissingText()
return platformStrategies()->localizationStrategy()->validationMessageValueMissingText();
}
+String validationMessageValueMissingForCheckboxText()
+{
+ return platformStrategies()->localizationStrategy()->validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForFileText()
+{
+ return platformStrategies()->localizationStrategy()->validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForMultipleFileText()
+{
+ return platformStrategies()->localizationStrategy()->validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForRadioText()
+{
+ return platformStrategies()->localizationStrategy()->validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForSelectText()
+{
+ return platformStrategies()->localizationStrategy()->validationMessageValueMissingText();
+}
+
String validationMessageTypeMismatchText()
{
return platformStrategies()->localizationStrategy()->validationMessageTypeMismatchText();
diff --git a/WebCore/platform/LocalizedStrings.h b/WebCore/platform/LocalizedStrings.h
index d332e45..b168651 100644
--- a/WebCore/platform/LocalizedStrings.h
+++ b/WebCore/platform/LocalizedStrings.h
@@ -166,6 +166,11 @@ namespace WebCore {
String localizedMediaTimeDescription(float);
String validationMessageValueMissingText();
+ String validationMessageValueMissingForCheckboxText();
+ String validationMessageValueMissingForFileText();
+ String validationMessageValueMissingForMultipleFileText();
+ String validationMessageValueMissingForRadioText();
+ String validationMessageValueMissingForSelectText();
String validationMessageTypeMismatchText();
String validationMessageTypeMismatchForEmailText();
String validationMessageTypeMismatchForMultipleEmailText();
diff --git a/WebCore/platform/android/LocalizedStringsAndroid.cpp b/WebCore/platform/android/LocalizedStringsAndroid.cpp
index 9278ad8..afcec5c 100644
--- a/WebCore/platform/android/LocalizedStringsAndroid.cpp
+++ b/WebCore/platform/android/LocalizedStringsAndroid.cpp
@@ -385,6 +385,36 @@ String validationMessageValueMissingText()
return String();
}
+String validationMessageValueMissingForCheckboxText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForFileText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForMultipleFileText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForRadioText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForSelectText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
String validationMessageTypeMismatchText()
{
notImplemented();
diff --git a/WebCore/platform/brew/LocalizedStringsBrew.cpp b/WebCore/platform/brew/LocalizedStringsBrew.cpp
index b044623..08e2002 100644
--- a/WebCore/platform/brew/LocalizedStringsBrew.cpp
+++ b/WebCore/platform/brew/LocalizedStringsBrew.cpp
@@ -402,6 +402,36 @@ String validationMessageValueMissingText()
return String();
}
+String validationMessageValueMissingForCheckboxText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForFileText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForMultipleFileText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForRadioText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForSelectText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
String validationMessageTypeMismatchText()
{
notImplemented();
diff --git a/WebCore/platform/efl/LocalizedStringsEfl.cpp b/WebCore/platform/efl/LocalizedStringsEfl.cpp
index 2935983..85dcdcb 100644
--- a/WebCore/platform/efl/LocalizedStringsEfl.cpp
+++ b/WebCore/platform/efl/LocalizedStringsEfl.cpp
@@ -480,6 +480,36 @@ String validationMessageValueMissingText()
return String::fromUTF8("value missing");
}
+String validationMessageValueMissingForCheckboxText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForFileText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForMultipleFileText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForRadioText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForSelectText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
String missingPluginText()
{
return String::fromUTF8("missing plugin");
diff --git a/WebCore/platform/gtk/LocalizedStringsGtk.cpp b/WebCore/platform/gtk/LocalizedStringsGtk.cpp
index 68c1598..65e8852 100644
--- a/WebCore/platform/gtk/LocalizedStringsGtk.cpp
+++ b/WebCore/platform/gtk/LocalizedStringsGtk.cpp
@@ -553,6 +553,36 @@ String validationMessageValueMissingText()
return String::fromUTF8(_("value missing"));
}
+String validationMessageValueMissingForCheckboxText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForFileText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForMultipleFileText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForRadioText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForSelectText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
String validationMessageTypeMismatchText()
{
notImplemented();
diff --git a/WebCore/platform/haiku/LocalizedStringsHaiku.cpp b/WebCore/platform/haiku/LocalizedStringsHaiku.cpp
index e5ca001..5587fa2 100644
--- a/WebCore/platform/haiku/LocalizedStringsHaiku.cpp
+++ b/WebCore/platform/haiku/LocalizedStringsHaiku.cpp
@@ -409,6 +409,36 @@ String validationMessageValueMissingText()
return String();
}
+String validationMessageValueMissingForCheckboxText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForFileText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForMultipleFileText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForRadioText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForSelectText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
String validationMessageTypeMismatchText()
{
notImplemented();
diff --git a/WebCore/platform/wx/LocalizedStringsWx.cpp b/WebCore/platform/wx/LocalizedStringsWx.cpp
index 1b46643..3c90f6b 100644
--- a/WebCore/platform/wx/LocalizedStringsWx.cpp
+++ b/WebCore/platform/wx/LocalizedStringsWx.cpp
@@ -390,6 +390,36 @@ String validationMessageValueMissingText()
return String();
}
+String validationMessageValueMissingForCheckboxText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForFileText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForMultipleFileText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForRadioText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
+String validationMessageValueMissingForSelectText()
+{
+ notImplemented();
+ return validationMessageValueMissingText();
+}
+
String validationMessageTypeMismatchText()
{
notImplemented();
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d7a6623..6967bbb 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,20 @@
+2010-11-18 Kent Tamura <tkent at chromium.org>
+
+ Reviewed by Tony Chang.
+
+ Add more validation message functions
+ https://bugs.webkit.org/show_bug.cgi?id=49716
+
+ Add implementations of new functions and symbols for new messages.
+
+ * public/WebLocalizedString.h:
+ * src/LocalizedStrings.cpp:
+ (WebCore::validationMessageValueMissingForCheckboxText):
+ (WebCore::validationMessageValueMissingForFileText):
+ (WebCore::validationMessageValueMissingForMultipleFileText):
+ (WebCore::validationMessageValueMissingForRadioText):
+ (WebCore::validationMessageValueMissingForSelectText):
+
2010-11-18 Tony Chang <tony at chromium.org>
Unreviewed, fix chromium compile. We need ipc and openssl now.
diff --git a/WebKit/chromium/public/WebLocalizedString.h b/WebKit/chromium/public/WebLocalizedString.h
index 8ab5f8d..598e972 100644
--- a/WebKit/chromium/public/WebLocalizedString.h
+++ b/WebKit/chromium/public/WebLocalizedString.h
@@ -59,6 +59,11 @@ struct WebLocalizedString {
KeygenMenuHighGradeKeySize,
KeygenMenuMediumGradeKeySize,
ValidationValueMissing,
+ ValidationValueMissingForCheckbox,
+ ValidationValueMissingForFile,
+ ValidationValueMissingForMultipleFile,
+ ValidationValueMissingForRadio,
+ ValidationValueMissingForSelect,
ValidationTypeMismatch,
ValidationTypeMismatchForEmail,
ValidationTypeMismatchForMultipleEmail,
diff --git a/WebKit/chromium/src/LocalizedStrings.cpp b/WebKit/chromium/src/LocalizedStrings.cpp
index 947e732..e7b39d5 100644
--- a/WebKit/chromium/src/LocalizedStrings.cpp
+++ b/WebKit/chromium/src/LocalizedStrings.cpp
@@ -94,6 +94,7 @@ String searchMenuRecentSearchesText()
{
return query(WebLocalizedString::SearchMenuRecentSearchesText);
}
+
String searchMenuClearRecentSearchesText()
{
return query(WebLocalizedString::SearchMenuClearRecentSearchesText);
@@ -299,6 +300,31 @@ String validationMessageValueMissingText()
return query(WebLocalizedString::ValidationValueMissing);
}
+String validationMessageValueMissingForCheckboxText()
+{
+ return query(WebLocalizedString::ValidationValueMissingForCheckbox);
+}
+
+String validationMessageValueMissingForFileText()
+{
+ return query(WebLocalizedString::ValidationValueMissingForFile);
+}
+
+String validationMessageValueMissingForMultipleFileText()
+{
+ return query(WebLocalizedString::ValidationValueMissingForMultipleFile);
+}
+
+String validationMessageValueMissingForRadioText()
+{
+ return query(WebLocalizedString::ValidationValueMissingForRadio);
+}
+
+String validationMessageValueMissingForSelectText()
+{
+ return query(WebLocalizedString::ValidationValueMissingForSelect);
+}
+
String validationMessageTypeMismatchText()
{
return query(WebLocalizedString::ValidationTypeMismatch);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list