Title: [102086] trunk/Source/WebCore
- Revision
- 102086
- Author
- [email protected]
- Date
- 2011-12-05 19:48:35 -0800 (Mon, 05 Dec 2011)
Log Message
Upstream htmlSelectMultipleItems needed for <select multiple> by iOS
https://bugs.webkit.org/show_bug.cgi?id=73734
Patch by Benjamin Poulain <[email protected]> on 2011-12-05
Reviewed by David Kilzer.
* platform/DefaultLocalizationStrategy.cpp:
(WebCore::DefaultLocalizationStrategy::htmlSelectMultipleItems):
* platform/DefaultLocalizationStrategy.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (102085 => 102086)
--- trunk/Source/WebCore/ChangeLog 2011-12-06 02:55:47 UTC (rev 102085)
+++ trunk/Source/WebCore/ChangeLog 2011-12-06 03:48:35 UTC (rev 102086)
@@ -1,3 +1,14 @@
+2011-12-05 Benjamin Poulain <[email protected]>
+
+ Upstream htmlSelectMultipleItems needed for <select multiple> by iOS
+ https://bugs.webkit.org/show_bug.cgi?id=73734
+
+ Reviewed by David Kilzer.
+
+ * platform/DefaultLocalizationStrategy.cpp:
+ (WebCore::DefaultLocalizationStrategy::htmlSelectMultipleItems):
+ * platform/DefaultLocalizationStrategy.h:
+
2011-12-05 Darin Adler <[email protected]>
Use HashMap<OwnPtr> in CrossOriginPreflightResultCache
Modified: trunk/Source/WebCore/platform/DefaultLocalizationStrategy.cpp (102085 => 102086)
--- trunk/Source/WebCore/platform/DefaultLocalizationStrategy.cpp 2011-12-06 02:55:47 UTC (rev 102085)
+++ trunk/Source/WebCore/platform/DefaultLocalizationStrategy.cpp 2011-12-06 03:48:35 UTC (rev 102086)
@@ -767,7 +767,13 @@
return formatLocalizedString(WEB_UI_STRING("Key from %@", "Name of keychain key generated by the KEYGEN tag"), hostCFString.get());
}
-#endif
+#if PLATFORM(IOS)
+String DefaultLocalizationStrategy::htmlSelectMultipleItems(int count)
+{
+ return formatLocalizedString(WEB_UI_STRING("%d Items", "Present the number of selected <option> items in a <select multiple> element (iOS only)"), count);
+}
+#endif // PLATFORM(IOS)
+#endif // PLATFORM(MAC)
String DefaultLocalizationStrategy::imageTitle(const String& filename, const IntSize& size)
{
Modified: trunk/Source/WebCore/platform/DefaultLocalizationStrategy.h (102085 => 102086)
--- trunk/Source/WebCore/platform/DefaultLocalizationStrategy.h 2011-12-06 02:55:47 UTC (rev 102085)
+++ trunk/Source/WebCore/platform/DefaultLocalizationStrategy.h 2011-12-06 03:48:35 UTC (rev 102086)
@@ -169,7 +169,10 @@
virtual String keygenMenuItem1024();
virtual String keygenMenuItem2048();
virtual String keygenKeychainItemName(const String& host);
-#endif
+#if PLATFORM(IOS)
+ virtual String htmlSelectMultipleItems(int);
+#endif // PLATFORM(IOS)
+#endif // PLATFORM(MAC)
virtual String imageTitle(const String& filename, const IntSize&);
virtual String mediaElementLoadingStateText();
virtual String mediaElementLiveBroadcastStateText();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
