[webkit-changes] [132579] trunk

Fri, 26 Oct 2012 00:42:19 -0700

Title: [132579] trunk
Revision
132579
Author
[email protected]
Date
2012-10-26 00:43:29 -0700 (Fri, 26 Oct 2012)

Log Message

[Chromium-Win] Support shortTimeFormat
https://bugs.webkit.org/show_bug.cgi?id=100471

Reviewed by Kentaro Hara.

Source/WebCore:

No new tests. Covered by fast/forms/time-multiple-fields/ and
WebKit/chromium/tests/LocaleWinTest.

* platform/text/LocaleWin.cpp:
(WebCore::LocaleWin::shortTimeFormat):
Gets a format by LOCALE_SSHORTTIME. If it fails, remove "<delimiter>ss"
from the format by LOCALE_STIMEFORMAT.
* platform/text/LocaleWin.h:
(LocaleWin): Declare m_timeFormatWithoutSeconds.

Source/WebKit/chromium:

* tests/LocaleWinTest.cpp:
(TEST_F): Update test expectations for the behavior change.

LayoutTests:

* platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-basic-expected.png:
* platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-disabled-readonly-expected.png:
* platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-pseudo-classes-expected.png:
* platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-pseudo-elements-expected.png:
* platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-style-expected.png:
* platform/chromium/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (132578 => 132579)


--- trunk/LayoutTests/ChangeLog	2012-10-26 07:35:06 UTC (rev 132578)
+++ trunk/LayoutTests/ChangeLog	2012-10-26 07:43:29 UTC (rev 132579)
@@ -1,3 +1,17 @@
+2012-10-26  Kent Tamura  <[email protected]>
+
+        [Chromium-Win] Support shortTimeFormat
+        https://bugs.webkit.org/show_bug.cgi?id=100471
+
+        Reviewed by Kentaro Hara.
+
+        * platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-basic-expected.png:
+        * platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-disabled-readonly-expected.png:
+        * platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-pseudo-classes-expected.png:
+        * platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-pseudo-elements-expected.png:
+        * platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-style-expected.png:
+        * platform/chromium/TestExpectations:
+
 2012-10-26  Nandor Huszka  <[email protected]>
 
         [Qt] Unreviewed gardening.

Modified: trunk/LayoutTests/platform/chromium/TestExpectations (132578 => 132579)


--- trunk/LayoutTests/platform/chromium/TestExpectations	2012-10-26 07:35:06 UTC (rev 132578)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2012-10-26 07:43:29 UTC (rev 132579)
@@ -2805,6 +2805,14 @@
 webkit.org/b/96720 fast/forms/date-multiple-fields/date-multiple-fields-preserve-value-after-history-back.html [ Pass Timeout ]
 webkit.org/b/98906 platform/chromium/fast/forms/suggestion-picker/date-suggestion-picker-mouse-operations.html [ Pass Failure ]
 
+# Need rebaseline 
+webkit.org/b/100471 fast/forms/time-multiple-fields/time-multiple-fields-appearance-basic.html [ Pass ImageOnlyFailure ]
+webkit.org/b/100471 fast/forms/time-multiple-fields/time-multiple-fields-appearance-disabled-readonly.html [ Pass ImageOnlyFailure ]
+webkit.org/b/100471 fast/forms/time-multiple-fields/time-multiple-fields-appearance-pseudo-classes.html [ Pass ImageOnlyFailure ]
+webkit.org/b/100471 fast/forms/time-multiple-fields/time-multiple-fields-appearance-pseudo-elements.html [ Pass ImageOnlyFailure ]
+webkit.org/b/100471 fast/forms/time-multiple-fields/time-multiple-fields-appearance-style.html [ Pass ImageOnlyFailure ]
+webkit.org/b/100471 fast/forms/time-multiple-fields/time-multiple-fields-appearance-style.html [ Pass ImageOnlyFailure ]
+
 # New test added in r87324
 crbug.com/83994 [ Win ] platform/win/plugins/call-_javascript_-that-destroys-plugin.html [ Failure ]

Modified: trunk/LayoutTests/platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-basic-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-disabled-readonly-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-pseudo-classes-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-pseudo-elements-expected.png (132578 => 132579)


--- trunk/LayoutTests/platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-pseudo-elements-expected.png	2012-10-26 07:35:06 UTC (rev 132578)
+++ trunk/LayoutTests/platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-pseudo-elements-expected.png	2012-10-26 07:43:29 UTC (rev 132579)
@@ -1,18 +1,15 @@
 \x89PNG
 
 
-IHDR X')tEXtchecksum6432b281c4dd7729245997f238f778ff\xBDv\xA4z\xA6IDATx\x9C\xED\xDDAN\xEA\xEC\xC7\xE1\xF6\xE6ne\x8E؁3\xE2\xD8\xC6gԑax\xA3\x89qn\xF3\x8D\xEF\xB8t\xDC9|\
-\xB5\xE0\xBFR\xF0yFRh\xFB\xEA9	\xBF\xBC})\xE5|>/\xC8\xF9סpj@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2\xFE}\xE8lV\x96塇@'\xF8\xA6\x8EQG\xAB\xF0Ί\xCE\xE0hu7\xB0hn\xA7Q\xAE\xD06\x81u"\xFE\xF3\xDFF\xD9t{iNZg\x91\xFBi\xBA\xBD,\xB5\x8A\xC0:A˴\xD2Xp.\xFE^˕[\xCDWe\xED\xB1\xCB\x87\xD2\xFA\xD6d2yyyy{{k\xFBD,\xAC\xCDZ\xD5Ob\xCD\xE7\xF3\x9D\xEAj\xFE\xC7\xEA\xC6=\xF9\x9Da@\xF7\xB5;\x83\xF5\xFA\xFAzww7\x9B\xCD\xFA\xFD\xFE\xD3\xD3\xD3h4\xFA\xE6\xEF\xF1k[?\xEC\xF4]\xBF\xD7\xE2\xD9\xE6\x8F\xC7˟\xBE\xDC\xDEd`k\xC3[p\xCD\xE07\xE6\xD4\xEDe\xD9p	\xFC\xDA\xAAg_;\xF5\xE2\xE1\xC6\xF1\xD4\xA7\xFEW\x80\xD0b`M&\x93\xFB\xFB\xFB\xD9lV\xC5\xC7\xC7\xC7\xCD\xCDM\xAF\xD7\x87\xFBm\xE3L\xC9joU۫\xE6P5{-\xB64\x9F\x98\x8F\xC7kQ\xB5x\xB8m{\xBDũ\xABë\xA9\x8D4Y\xFBk\xAC\x9E\xBD\xFAlu\xB4M\x8ES\x96e\xF3)8R-\xD6\xFB\xFB\xFB\xE7\xE7\xE7\xF2\xE1l6\x9BN\xA7{\xD6\xEA\x94\xC9\xDA\xC6\xE7\xA2j\xF6\xAA\xEF\xDFuf\xEB\xE75\x9F\xA9\xDAh\xA7\xB2\xACWs\x9C.\xFF \xA2\xC5\xC0\xBA\xB8\xB88;;[\xCC`E\xD1\xEF\xF7\x83AK\xE7\xDAcR\xA4\xFB\xB5T\xB5\x9C1\xAA\xE6K\xE4\x83ՙ\xA7\xBDu\X\xC8jq\x91\xFB\xF5\xF5\xF5\xE3\xE3c\xBF\xDF/\x8A\xE2\xFC\xFC\xFC\xF9\xF9\xF9\xEAꪍ\xD5\xD4U\xCD\xEA\xE9\xC5S\xAB
-\xB1\Q\xB4\xB6\xB4\xA8\xC9Ѳ\xCA?\x98){ԕo\xB6\x80\x85v\xB9\x8FF\xA3^\xAF7\x9DN\x83\xC1\xCF\xD7ծ6.:\x88\x9ASo{*r'\xF7\xB5\xE5\xE7\xCB\xC8۶Ƚ\xBAKu\xE3\xEAS5\x8B\xE2\xE0\x94\xB4~\xAC\xE1p\xB8\xF7\xBA\xAB/}\xB9\xC8}\xE3u\xC0\xBD\xE3\xA9\xFBW\xB7\xF5S\xF3\xB5Y\xAB\xBF\xDDj05\xDCe\x8F\x8Dpz:\xFAy\xAE\x9A\xDB1,4\\xF3\xBE-\x89\x9Aܦ\xA1\xFA춣\xB5q\x9B\x86\x9A\xBBQT_S\x96\xFF܈\xA1\xDAX\xABuu{\xF9I\xBA\xF1\?\xAF\xE6\xB7>\xF8\xD8`}\xF3κ\x93\xFD\xAB\xFB\xFC7\xE0H\xF9.\xC2S\xB3v5\xF0\x9B7n\xF6 \xB0N\xD02\xAA\xD4\x84/{>M\xD2
-\xC8@XG[ݼ\x93\x9D\xEE\xF0yDX\xFF
-8R.\x9E\x9D\xD2\xDD\xC0\xF2\xBD+\xC0\x91r	 \xCC"w\x800\x81&\xB0\xC2:\xBA\xC8\xDD
-w\xEAY;@\x97u4\xB0
-\xEF\xA0l\xA7\xBF\xE8\xB8\xEE\xBFǩ\xDE(\x80_K`\xD1	
-\xBF<\xF1\xF6\xD2\xDCG\xC0"w\xBA\xE8\xF6\xB2\xD4R\xAF\xD6k2\x99\xBC\xBC\xBC\xBC\xBD\xBD\xB5}"N\xC62\xAD4G\xAA\xDDK\x84\xAF\xAF\xAFwww\xB3٬\xDF\xEF?==\x8DF\xA3\xBD\xB5\\xA6\xB3X\x82\xB3x\xB8\xDFr\x9C\xB5C\xA5\xB4tX\xE0\xE8\xB48\x835\x99L\xEE\xEF\xEFg\xB3YQ777\xFF\xFD\xF7w8\x9Fϗ\xED\xB2wĔe9\xFF\xE3;\x83\xA9j㘿\xD0ڬ\x95I,\x8EQ\x8B3X\xEF\xEF\x9Fˇ\xB3\xD9l:\x9D\x87\xC3\xECY6\xCE\xAD~*m\xB9}\xB9\xB1\xBAK\xCD\xEB\xE7\xF3y\xC3\xD77\xED\xDA\xEB\xF7\x9B\xF7\xAA\xDFk\xD7\xE9\xBD\xF1x\xBC\xFC\xF9\xE1\xE1\xE1\xCB\xEDM\xB66\xBC\xD5\xD7~cN\xDD^\x96
-\x97\xC0@G\xB4Xggg\x8B\xAC\xA2(\xFA\xFD\xFE`0Ȟb\xB5W\x96?\xAFE\xCC\xF2\xE1\xC6g\xEB__\x96e\xF3\xD79Ԇ\xE3or\xA8\x9A\xBD[\x9A\xDF\xF8`<\xAFE\xD5\xE2\xE1\xB6\xED\xF5\xA7\xAE\xAF:$\xB3}\x9C\xB0\xEB\xFA\xFA\xFA\xF1\xF1\xF1\xAF\xBF\xFE\xFA\xF8\xF88??~~\xBE\xBA\xBAʞbۛt\xF0F\x945SD{g\xD7\xC8\xD88U\xB3W}\xA5}g\xE1\xDA\xCF0S\xC0ihw\x91\xFBh4\xEA\xF5z\xD3\xE9t0\xC4\xEB\xAAF\xDB
-?~\xF3\xE9\xAB\xD5]\xDAI\xAB\x96\xF3[\xD5B\xB5\xD6
-\x80S\xD2\xFA\x8DF\x87\xC3a|\xDD\xD5\xD2]\xD2A5\xBFE\xCDoW\xBD⹨\x96եfͧ\xBE\xB2|\xA0\x80_\xEEX\xEF\xE4^\xB3}\xDBr\x9Fm\x8B\xDC\xD7^\xBF\xADW\xBE<\xFE޿H\xAAB\xF6X֒/\xBB\xB0ʝ\xDC8%\xC7X\xF5\xF7kh\xBE1\xF8\xFA=|\xB9\xC8}\xE3u\xC0\xBD\xE3\xA9\xFBW\xB7\xF5\x93\xB5Y\x97\x8E^bK\xDD\xCE\xE0'5\xB9u\xC2R\xC35\xEFے\xA8\xE1\xB96\xFE
-\xAB\xBB\xB4q\x9B\x86\x9A\xBE\x8D\xB7\xBDX&T\xB5\xB1V\xEB\xEA\xF6\xB2\\xFB\xA0"tPGߨ\xBC\x83\xFE*\x80\xE3˞閵\xAB\x81.p\x8C\x9D\xB3\x8C*u\xC0\x91:\xD6E\xEE\x9C6i\xC0Q3\x83\xD6\xD1\xC5\xC2V1\xFF*;}\xF5\x90E\xEEt\x9FK\x84\x9EZ\xE0\xC4t7\xB0\x82_\xD8\xF0\x93\j\xB3\xC8 L`\x84	,\x80\xB0\x8E.r\xB7½m\xD6\xDE@{:X\x85h\x93~\x80Vu7\xB0hn\xD7u\xB67\xA0X'\xA3\xE1\x97\xF7\xDD^\x9A\xBB\x80\xD6Y\xE4~\x9An/K-\x87"\xB0N\xD02\xAD4\x84\xC0k=\xB0&\x93\xC9\xCB\xCB\xCB\xDB\xDB[\xDB'bam\xD6\xCA$\xFC\xBCv\xB9\xBF\xBE\xBE\xDE\xDD\xDD\xCDf\xB3~\xBF\xFF\xF4\xF44\x8D\xBEy\xC0\xB2\\xFF\xF2\xC4\xE5\xE8v\xFAp\\xFD^\x8Bg\x9Bp</~xx\xF8r{\x93\x81\xAD
-ou\xC05\x83ߘS\xB7\x97e\xC3%\xF0@D\x8B\x815\x99L\xEE\xEF\xEFg\xB3YQ777\xBD^o8\xEEw\xB4\x8Dw"X\xED\xADj{\xD5\xAAf\xAFŖ\xE67>\x8F\xC7kQ\xB5x\xB8m{\xBDũ\xABë\xC9\xDD\xA0\xB3Z\xAC\xF7\xF7\xF7\xCF\xCF\xCF\xE5\xC3\xD9l6\x9DN\xF7\xACEO\xEC\xE7\xA2j\x{1AABF4}]g\xB6~\x9E\x99*\xE8\x82\xEB\xE2\xE2\xE2\xEC\xECl1\x83UE\xBF\xDF-\x9D\xAB\xF9\xF4\xD5\xEA.E\xB7k\xA9j9\xBFU\x9D`\xB3\xD6
-\xBA\xA3\xC5E\xEE\xD7\xD7׏\x8F\x8F\xFD~\xBF(\x8A\xF3\xF3\xF3\xE7\xE7竫\xAB6NTSW\xF3\xF9\xBC\xFE\xA9\xD5RY\xFC\\x96\xE5\xF2\x87\xE6G\xCB*\xFF8\xAE\xFE\xDA]\xE4>\x8Dz\xBD\xDEt:?_W\xBBZ=\xCEa\xE3\xA6\xE6\xD4۞r'w\xE8\x8Eֿ*g8\xEE\xBD\xEE\xEAK_.r\xDFxp\xEFx\xEA\xFEU\xC5m\xFDdm\xFC\xA4\x8E^\x84\xAA\xB9\xC3B\xC35\xEFے\xA8\xC9m\xAA\xCFn;Z\xB7i\xA8\xB9E\xF55e\xF9ύ\xAA\x8D\xB5ZW\xB7\x97\xE5\xDA\x80\xB8\x8E\xBE\xD1*\x80\x9D,\xE8_\x95sj֮\xBA8?O`\x9D\xA0eT\xA9+8\x88\xD6\xB9s\xD2
-\xC8@XG;[\x85\xBD\x93\xE6ߜXT\xBE\xEE\x88s\x89\xF0\xA8%\xE8\x94\xEE\xD6N\xB32\xDD\xE1R@\x98E\xEEa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81&\xB0\xC2@\x98\xC0Xa L`\x84	,\x800\x81\xF6?F\xDD'y\x804h\xFEIEND\xAEB`\x82
\ No newline at end of file
+IHDR X')tEXtchecksum2e75c4b629414ad815baad8a0f9f9dc3N}L5IDATx\x9C\xED\xDDMn[\x80Q\xBB\xD5k\xD9\xA3\xEC\x80bo\x84\xD8\x83\x87xYB\x8B'!\xB6\x80\xC4\x822\xEE5d\xC0V\x91XXy\xFE\xA9\xD8\xCE\xE7N\xD99g\x80p\xB9\xEAV\xFEt\xEB\xBA2\xBD\xBB\xBB\x9B\xD0\xF9\xD7S_\xC0\xA9X1\x81X1\x81X1\x81X1\x81\xFB\xF7S_\xC0z\xD3\xE9\xF4\xA9/\x81=\xF9\xDD0\xD2\xC0\x9A\xF8\x9C>N\xCA&c\xACӶS\x88hM8.\xEB\xC9\xFC\xE7\xBF[eӧW\xE6\x84\xE0\xC8X\xE4>\x9F^M\xB5\x9C\x815
+\x8B\xB4\xD2Xp\xDC"<&\x8B\x95[ۯ\xCA\xDA\xE3\x90'N\xC3\xC1g\xB0\xAE\xAE\xAE\xBE~\xFD\xFA\xE3ǏC\x9F\xE8x-\xCDZ
+Ob\xDD\xDD\xDD\xEDTWw\xBF\xDD߸\xC7E>\xE62\xE0\xB99l`}\xFB\xF6\xED\xFD\xFB\xF7>|x\xF7\xEE\xDD\xF7\xEF\xDF?\xE0jL\xDBu\x9C\x81\xA3vp\xFAOkO1p\xBA\xB59\xB5Ӎ\xB3\xAF\x9Ez\xE0zvp\xC0\xC0\xBA\xBA\xBA\xBA\xBC\xBC\x9C\xCDf\x93\xC9\xE4\xF6\xF6\xF6\xE3Ǐ\xD7\xD7\xD7{\x8F\xB6\xF6\xD3\xFD\xFE\xCDNI4p\xD4\xFC\xDD\xED/l\xBE\xF3ꀫ\x83b\xCA\xE7\xFEϲt\xF6\xA5[{\xB5ی3\xD90lr\xC05X?\xFE\xFC\xF5\xEB\xD7\xE2\xE5l6\xBB\xB9\xB9y\xF3\xE6\xCD~\xA3->\xE9W7\x98￴\xDB\xC0Q\xBB\xD6\xD5\xE3m\xF9\xB0\x86Mv*\xCBa\xE3\xE8*\xD8\xC9\xEB\xE5˗ggg\xF3\xAC\xC9dr~~~qqq\xA0s\xEDFk\xDB+7\xA0\xB5\x94|ap\xE9Ll\xA9(\xA8\xF0\xE1۷o?\xFE|~~>\x99L^\xBCx\xF1\xE5˗ׯ_\xE2Du5pWk\xF5\xE1\xFD\xC5F\x93ce\xB1D\xE9	3e\x8F\xBA\xB2\xA6
+\xE1\xE0Ap}}}sssqq\xB1S]m*\x95\xD5\xED\x8Fl\x9A\xEDO\xF4\xC8AV\xA7\x9A\xB6\x92\xFB\xA6A\xE7Y\xF4\xE2\xDA	\xB3\xB5]\xB3_\xDBܓ\xCD\xFF;\xE04\x8C\xF4\xE3p\xCB\xEE(\x98\xC5\xC6\xC9`<y`m\xBAQ\xB8ȯ\xEB		,X\xEBh\x9E\xE4\xBE\x{13C025}\xED;\xDD\xEA\x9AO\xF0\xDC\xD1\xDB\xE9ᦝ\xEFop\xED<\xD6\xC0\xE4\xD6H\x9E\x950\x92\xCB\x80q:\x9A'\xB9\xAF-\xA1'K`\xEDq\xD4ާ\xA8&u\xC6394\x9E+\x80:\x9A\xAC\xB64_\xF5\xC87ON`\x8D\xC2"\xAA\xD4\x9C\x80\xA3\xB9Ex\xF2\xA4\x9C3X\xB1\x91~\xA9\xFE\xE4\xBF\xED\xBF\xEB\xD7w%\xAD\x93\xFF\x8F\x80m\xB8E\xF84T\x9C\xB0\xF1\x96\xC7,G\xCA
+\x80\x98E\xEE1\x81X\xB1\x91.r\xB7\xC2\xFD\xF4X\xED\xC0\xF31\xD2\xC0\x9A\xF8<>-\x8A\x80ge\xBC\x81Ř\x9D\xEA\x83R !\xB0\xD8Ӗ\xBF<\xF1\xD3+sW<;\xB9\xD3\xF8\xF4j\xAA\xA5`\xEE\xE0\x81uuu\xF5\xF5\xEB\xD7?~\xFAD<\xA1EZi,\x98\xFA\xE1\xB7o\xDF\xFE\xFA\xEB\xAF\xD9lv~~\xFE\xF7\xDF\xFF\xF1\xC7{\xB5X\xF43_\xD03\xB9\xDF➥\xA1*8:\x9C\xC1\xBA\xBA\xBA\xBA\xBC\xBC\x9C\xCDf\x93\xC9\xE4\xF6\xF6\xF6\xE3Ǐ\xD7\xD7׏\xF0\xEE\xEEn\xD1.{G\xCCt:\xBD\xFB\xED1\xB3\xEAc\x85\xA5Y+\x93Xp\xC0\xC0\xFA\xF9\xF3\xE7\xAF_\xBF/g\xB3\xD9\xCD\xCDM~\x96\xE9ok7\xDE߾x\xB9\xE9\xADG\xEE\xBF\xE5\xD5ns\xFDی3p\xD4NN\xFFi\xED)N\xB76\xA74\xCF\xDC\xEB\xE5˗ggg\x8B\x97\xE7\xE7\xE7\xED)\xEEOG->\xFE\xEFo\xBC\xBF}1ô4\x835\xB0\xFFd݌צ\xFD\xBCԵu\xB5\xEB85wˡ&\xBF\xCCM?\xFE\xEA\x9E\xC0\x83\xB8\xEB\xED۷\x9F?\xFE\xF3\xCF?ooo_\xBCx\xF1\xE5˗ׯ_\xB7\xA7\xD8\xF4\x91\xBF\xEB\x84Ю\xA7\xD8c\xFC\xFBKdž_=\xD1\xD2nG\xEDZW\x8F\xB7\xE5\xC3\xE0Y9\xF8\xE7\xF1\xF5\xF5\xF5\xCD\xCD\xCD\xC5\xC5\xC5Nu\xB5
+nY\xBC\x8E\x8C\xED\xC7\xD94Ԯ\xE3o\xF3\xEE\xC0\xF6\xC9`\xE4m\xFAYv*\xADM?\xF2\xFC\xEF\xF7\xFF\:\xFB\x96V\x80\xD36ҏ\xBD-kr\xAF0\x8E7\xB0KW\xBB\xF4\xEE\x96\xC3\xDE?p\xF5\x9FB`\xC0\xAE\x8E\xF5IZ]3\xB4\xBA2i\xE9\xF6\xDC\xD2!K\xFB/\xF5\xCA\xF6\xE3\xEF\xFD\x83T\xE5\xB1)w=v˷<\xC969\xD6\xC0\xBA\x9F;\xEF>\xB81\xDC\xDB̖\xAD\x9EnT\xB3A\x9B\xFA\xC9\xDA,\x9E\xB3c\xFAU9{<\xCE\xE0\xFFi\xF8\xF2\x96y\xB0\xB4}\x8F;ns˳\xB6\xFFz\xE3ڝ\xEFopmH\xA9+\x9E\xB9\xA3\x99\xC1Ϝ\xCD&\xC3W\xB8\xEB$\xD9\xF0{\x9C\xEB1\xA7\xFF?>\x8C\xCA1\xCD`1NK\xF3U\xA6\xAF@`XD\x95\xBA\x80\xC9\xDD"d\xE4\xA4,\x98\xC1\x88\x8D\xE8\xFF\xF7\x8D\xEAI\xAC\xF2\xA0Q\xE0!\xFBPK0`\xBC\x815\xE6G^p\xE3 f\x91;@L`\xC4@l\xA4\x8Bܭp_e\xB5\x8B\x91\xD6DO\xFC\x93\xE2\x80#2\xDE\xC0:m\xBB>\xA8\xF3pW\xE4֓\xD9\xF2\x97\xF7}ze\xEE
+\x8E\x8CE\xEEc\xF1\xE9\xD5TK\xC0iX\xA3\xB0H+\x8D'@`\xC4XWWW_\xBF~\xFD\xF1\xE3ǡOt\xBC\x96f\xADLb\xC0\xB1;l`}\xFB\xF6\xED\xFD\xFB\xF7>|x\xF7\xEE\xDD\xF7\xEF\xDF?\xE0\xEA\x97樂\xED:\xCE\xC0Q;
+8\xFD\xA7\xB5\xA78\xDDڜ\xD2Xp\xD4XWWW\x97\x97\x97\xB3\xD9l2\x99\xDC\xDE\xDE~\xFC\xF8\xF1\xFA\xFAz\xEF\xD1\xD6\xCAt:\xBD\xFBm\xA7$8j\xFE\xEE\xF66\xDFyu\xC0\xD5A<m\x9E\x89>\xA6\xE1\xE7ϟ\xBF~\xFDZ\xBC\x9C\xCDf777o޼\xD9o\xB4y\x9D,\xF5Ѓ\xC92\xDFi\xB7\x81\xA3v\xAD\xAB\xC7\xDB\xF2a
+\xC09``\xBD|\xF9\xF2\xEC\xECl>\x835\x99L\xCE\xCF\xCF/..t\xAE=\xC2hm{\xE5\xE6sZk\xA7\xCA\xDC\x80Su\xC0[\x84o߾\xFD\xFC\xF9\xF3\xF9\xF9\xF9d2y\xF1\xE2ŗ/_^\xBF~}\x88
+\xD4\xD5\xFC\xB6\xDD\xC0[K\xAB\xA6&\xF7\xEEEk\xB1\xCA\xCA}@\xE0\xE0Ap}}}sssqq\xB1S]m*\x95\xD5\xED\x8Fl\x9A\xEDO\xF4\xC8A\x96\xF6\x99N\xA7\xDB?\xC9}1
+\xB6\xE5\xF5Ok\xA4\xDB[v\xCF@\xC1,6NV\xEE>x\xD4\xC0\xF6\xBD\xAFvS`m\xBAQ\xB8\xC8/\x81G\xE7h4\xBA\xF4ȃ\xA5\xED\xBB\xFE\xEE\xE4\xE1;z;\xDD"ܴ\xF3\xFD\xED\xAE\x9DDz\xF2\x8E\xDA\xD1\xFC\xB2\xE7\xB5%\xF4\xE0\xA4\xCE\xC0\xAC=\x8E\xDA\xFB&\x9F\xE0Y9\x9A\xAC\xB64_e\xFA
+\x8E\x9D\xC0\x85ET\xA9+8Gs\x8B\xF0\xE4I+8f\xB0b#\xFD\xF2\xFF\xC9?\x95`\x8F\xAF=\x9E\xF6?\x9C\xB7\x9F\x86Z\x806\xDE\xC0\xDAi\x8E`<\xDCx\x88Y\xE4X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81\xFBT\xCEu\xF6BkIEND\xAEB`\x82
\ No newline at end of file

Modified: trunk/LayoutTests/platform/chromium-win/fast/forms/time-multiple-fields/time-multiple-fields-appearance-style-expected.png


(Binary files differ)

Modified: trunk/Source/WebCore/ChangeLog (132578 => 132579)


--- trunk/Source/WebCore/ChangeLog	2012-10-26 07:35:06 UTC (rev 132578)
+++ trunk/Source/WebCore/ChangeLog	2012-10-26 07:43:29 UTC (rev 132579)
@@ -1,3 +1,20 @@
+2012-10-26  Kent Tamura  <[email protected]>
+
+        [Chromium-Win] Support shortTimeFormat
+        https://bugs.webkit.org/show_bug.cgi?id=100471
+
+        Reviewed by Kentaro Hara.
+
+        No new tests. Covered by fast/forms/time-multiple-fields/ and
+        WebKit/chromium/tests/LocaleWinTest.
+
+        * platform/text/LocaleWin.cpp:
+        (WebCore::LocaleWin::shortTimeFormat):
+        Gets a format by LOCALE_SSHORTTIME. If it fails, remove "<delimiter>ss"
+        from the format by LOCALE_STIMEFORMAT.
+        * platform/text/LocaleWin.h:
+        (LocaleWin): Declare m_timeFormatWithoutSeconds.
+
 2012-10-26  Adam Barth  <[email protected]>
 
         Unreviewed. Update run-bindings-tests results after recent active DOM

Modified: trunk/Source/WebCore/platform/text/LocaleWin.cpp (132578 => 132579)


--- trunk/Source/WebCore/platform/text/LocaleWin.cpp	2012-10-26 07:35:06 UTC (rev 132578)
+++ trunk/Source/WebCore/platform/text/LocaleWin.cpp	2012-10-26 07:43:29 UTC (rev 132579)
@@ -704,11 +704,23 @@
     return m_localizedTimeFormatText;
 }
 
-// Note: To make XP/Vista and Windows 7/later same behavior, we don't use
-// LOCALE_SSHORTTIME.
 String LocaleWin::shortTimeFormat()
 {
-    return timeFormat();
+    if (!m_timeFormatWithoutSeconds.isNull())
+        return m_timeFormatWithoutSeconds;
+    String format = getLocaleInfoString(LOCALE_SSHORTTIME);
+    // Vista or older Windows doesn't support LOCALE_SSHORTTIME.
+    if (format.isEmpty()) {
+        format = timeFormat();
+        StringBuilder builder;
+        builder.append(getLocaleInfoString(LOCALE_STIME));
+        builder.append("ss");
+        size_t pos = format.reverseFind(builder.toString());
+        if (pos != notFound)
+            format.remove(pos, builder.length());
+    }
+    m_timeFormatWithoutSeconds = convertWindowsTimeFormatToLDML(format);
+    return m_timeFormatWithoutSeconds;
 }
 
 const Vector<String>& LocaleWin::shortMonthLabels()

Modified: trunk/Source/WebCore/platform/text/LocaleWin.h (132578 => 132579)


--- trunk/Source/WebCore/platform/text/LocaleWin.h	2012-10-26 07:35:06 UTC (rev 132578)
+++ trunk/Source/WebCore/platform/text/LocaleWin.h	2012-10-26 07:43:29 UTC (rev 132579)
@@ -104,6 +104,7 @@
 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     String m_dateFormat;
     String m_monthFormat;
+    String m_timeFormatWithoutSeconds;
 #endif
 #if ENABLE(CALENDAR_PICKER)
     Vector<String> m_weekDayShortLabels;

Modified: trunk/Source/WebKit/chromium/ChangeLog (132578 => 132579)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-10-26 07:35:06 UTC (rev 132578)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-10-26 07:43:29 UTC (rev 132579)
@@ -1,3 +1,13 @@
+2012-10-26  Kent Tamura  <[email protected]>
+
+        [Chromium-Win] Support shortTimeFormat
+        https://bugs.webkit.org/show_bug.cgi?id=100471
+
+        Reviewed by Kentaro Hara.
+
+        * tests/LocaleWinTest.cpp:
+        (TEST_F): Update test expectations for the behavior change.
+
 2012-10-25  Sheriff Bot  <[email protected]>
 
         Unreviewed, rolling out r132514.

Modified: trunk/Source/WebKit/chromium/tests/LocaleWinTest.cpp (132578 => 132579)


--- trunk/Source/WebKit/chromium/tests/LocaleWinTest.cpp	2012-10-26 07:35:06 UTC (rev 132578)
+++ trunk/Source/WebKit/chromium/tests/LocaleWinTest.cpp	2012-10-26 07:43:29 UTC (rev 132579)
@@ -312,9 +312,9 @@
 
 TEST_F(LocaleWinTest, shortTimeFormat)
 {
-    EXPECT_STREQ("h:mm:ss a", shortTimeFormat(EnglishUS).utf8().data());
-    EXPECT_STREQ("HH:mm:ss", shortTimeFormat(FrenchFR).utf8().data());
-    EXPECT_STREQ("H:mm:ss", shortTimeFormat(JapaneseJP).utf8().data());
+    EXPECT_STREQ("h:mm a", shortTimeFormat(EnglishUS).utf8().data());
+    EXPECT_STREQ("HH:mm", shortTimeFormat(FrenchFR).utf8().data());
+    EXPECT_STREQ("H:mm", shortTimeFormat(JapaneseJP).utf8().data());
 }
 
 TEST_F(LocaleWinTest, shortMonthLabels)

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to