Remove core/platform/text/{mac, win}

Remove core/platform/text/{mac, win}

These directories only exist to contain LocaleMac and LocaleWin, respectively.
We can just move those files to be next to LocaleICU.

R=adamk@chromium.org

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=158838

[adamk, 2013-10-02 20:58:51]

lgtm

[commit-bot: I haz the power, 2013-10-02 20:58:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/abarth@chromium.org/25674007/1

[commit-bot: I haz the power, 2013-10-02 21:22:26]

Sorry for I got bad news for ya.
Compile failed with a clobber build on mac_layout.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_layout...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-10-02 22:46:35]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/abarth@chromium.org/25674007/16001

[commit-bot: I haz the power, 2013-10-02 23:54:53]

Retried try job too often on linux_blink_rel for step(s) webkit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_blin...

[commit-bot: I haz the power, 2013-10-03 01:30:41]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/abarth@chromium.org/25674007/16001

[commit-bot: I haz the power, 2013-10-03 05:42:58]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/abarth@chromium.org/25674007/16001

[commit-bot: I haz the power, 2013-10-03 09:31:59]

Retried try job too often on win_blink_rel for step(s) webkit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_blink_...

[commit-bot: I haz the power, 2013-10-03 15:37:29]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/abarth@chromium.org/25674007/16001

[commit-bot: I haz the power, 2013-10-03 15:37:37]

Failed to apply patch for Source/core/platform/text/LocaleWin.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  A         Source/core/platform/text/LocaleWin.cpp
  Copied Source/core/platform/text/win/LocaleWin.cpp ->
Source/core/platform/text/LocaleWin.cpp
  patching file Source/core/platform/text/LocaleWin.cpp
  Hunk #1 FAILED at 29.
  1 out of 5 hunks FAILED -- saving rejects to file
Source/core/platform/text/LocaleWin.cpp.rej

Patch:   NR 
Source/core/platform/text/win/LocaleWin.cpp->Source/core/platform/text/LocaleWin.cpp
Index: Source/core/platform/text/LocaleWin.cpp
diff --git a/Source/core/platform/text/win/LocaleWin.cpp
b/Source/core/platform/text/LocaleWin.cpp
similarity index 98%
rename from Source/core/platform/text/win/LocaleWin.cpp
rename to Source/core/platform/text/LocaleWin.cpp
index
b113675d0f758fd91b7157d6bc8f12239f9a82d6..85d4d5e01a086ac1b4beda5898babc818ed43a43
100644
--- a/Source/core/platform/text/win/LocaleWin.cpp
+++ b/Source/core/platform/text/LocaleWin.cpp
@@ -29,10 +29,8 @@
  */
 
 #include "config.h"
-#include "core/platform/text/win/LocaleWin.h"
+#include "core/platform/text/LocaleWin.h"
 
-#include <windows.h>
-#include <limits>
 #include "core/platform/text/DateTimeFormat.h"
 #include "platform/DateComponents.h"
 #include "platform/Language.h"
@@ -46,6 +44,8 @@
 #include "wtf/text/StringBuffer.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/text/StringHash.h"
+#include <limits>
+#include <windows.h>
 
 using namespace std;
 
@@ -280,10 +280,12 @@ static String convertWindowsDateTimeFormat(const String&
format)
                 if (lastQuoteCanBeLiteral && format[i - 1] == '\'') {
                     literalBuffer.append('\'');
                     lastQuoteCanBeLiteral = false;
-                } else
+                } else {
                     lastQuoteCanBeLiteral = true;
-            } else
+                }
+            } else {
                 literalBuffer.append(ch);
+            }
             continue;
         }
 
@@ -292,16 +294,17 @@ static String convertWindowsDateTimeFormat(const String&
format)
             if (lastQuoteCanBeLiteral && i > 0 && format[i - 1] == '\'') {
                 literalBuffer.append(ch);
                 lastQuoteCanBeLiteral = false;
-            } else
+            } else {
                 lastQuoteCanBeLiteral = true;
+            }
         } else if (isASCIIAlpha(ch)) {
             commitLiteralToken(literalBuffer, converted);
             unsigned symbolStart = i;
             unsigned count = countContinuousLetters(format, i);
             i += count - 1;
-            if (ch == 'h' || ch == 'H' || ch == 'm' || ch == 's' || ch == 'M'
|| ch == 'y')
+            if (ch == 'h' || ch == 'H' || ch == 'm' || ch == 's' || ch == 'M'
|| ch == 'y') {
                 converted.append(format, symbolStart, count);
-            else if (ch == 'd') {
+            } else if (ch == 'd') {
                 if (count <= 2)
                     converted.append(format, symbolStart, count);
                 else if (count == 3)
@@ -309,18 +312,20 @@ static String convertWindowsDateTimeFormat(const String&
format)
                 else
                     converted.append("EEEE");
             } else if (ch == 'g') {
-                if (count == 1)
+                if (count == 1) {
                     converted.append('G');
-                else {
+                } else {
                     // gg means imperial era in Windows.
                     // Just ignore it.
                 }
-            } else if (ch == 't')
+            } else if (ch == 't') {
                 converted.append('a');
-            else
+            } else {
                 literalBuffer.append(format, symbolStart, count);
-        } else
+            }
+        } else {
             literalBuffer.append(ch);
+        }
     }
     commitLiteralToken(literalBuffer, converted);
     return converted.toString();

[commit-bot: I haz the power, 2013-10-03 19:05:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/abarth@chromium.org/25674007/44001

[abarth-chromium, 2013-10-03 20:22:29]

Committed patchset #3 manually as r158838 (presubmit successful).