<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214036] trunk/Source/WTF</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214036">214036</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-16 04:55:13 -0700 (Thu, 16 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[UNIX] Implement currentSearchLocaleID() and currentTextBreakLocaleID()
https://bugs.webkit.org/show_bug.cgi?id=169745
Reviewed by Yusuke Suzuki.
Add a common implementation for Unix based ports using setlocale.
* wtf/PlatformGTK.cmake:
* wtf/PlatformJSCOnly.cmake:
* wtf/text/gtk/TextBreakIteratorInternalICUGtk.cpp: Removed.
* wtf/text/unix/TextBreakIteratorInternalICUUnix.cpp: Renamed from Source/WTF/wtf/text/jsconly/TextBreakIteratorInternalICUJSCOnly.cpp.
(WTF::currentSearchLocaleID):
(WTF::currentTextBreakLocaleID):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformGTKcmake">trunk/Source/WTF/wtf/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWTFwtfPlatformJSCOnlycmake">trunk/Source/WTF/wtf/PlatformJSCOnly.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WTF/wtf/text/unix/</li>
<li><a href="#trunkSourceWTFwtftextunixTextBreakIteratorInternalICUUnixcpp">trunk/Source/WTF/wtf/text/unix/TextBreakIteratorInternalICUUnix.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/Source/WTF/wtf/text/gtk/</li>
<li>trunk/Source/WTF/wtf/text/jsconly/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (214035 => 214036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-03-16 09:57:18 UTC (rev 214035)
+++ trunk/Source/WTF/ChangeLog 2017-03-16 11:55:13 UTC (rev 214036)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2017-03-16 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [UNIX] Implement currentSearchLocaleID() and currentTextBreakLocaleID()
+ https://bugs.webkit.org/show_bug.cgi?id=169745
+
+ Reviewed by Yusuke Suzuki.
+
+ Add a common implementation for Unix based ports using setlocale.
+
+ * wtf/PlatformGTK.cmake:
+ * wtf/PlatformJSCOnly.cmake:
+ * wtf/text/gtk/TextBreakIteratorInternalICUGtk.cpp: Removed.
+ * wtf/text/unix/TextBreakIteratorInternalICUUnix.cpp: Renamed from Source/WTF/wtf/text/jsconly/TextBreakIteratorInternalICUJSCOnly.cpp.
+ (WTF::currentSearchLocaleID):
+ (WTF::currentTextBreakLocaleID):
+
+2017-03-16 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GLIB] MainThread implementation is not GTK+ specific
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=169736
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformGTK.cmake (214035 => 214036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformGTK.cmake 2017-03-16 09:57:18 UTC (rev 214035)
+++ trunk/Source/WTF/wtf/PlatformGTK.cmake 2017-03-16 11:55:13 UTC (rev 214036)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> PlatformUserPreferredLanguagesUnix.cpp
</span><span class="cx"> UniStdExtras.cpp
</span><span class="cx">
</span><del>- text/gtk/TextBreakIteratorInternalICUGtk.cpp
</del><ins>+ text/unix/TextBreakIteratorInternalICUUnix.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WTF_LIBRARIES
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformJSCOnlycmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformJSCOnly.cmake (214035 => 214036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformJSCOnly.cmake 2017-03-16 09:57:18 UTC (rev 214035)
+++ trunk/Source/WTF/wtf/PlatformJSCOnly.cmake 2017-03-16 11:55:13 UTC (rev 214036)
</span><span class="lines">@@ -2,10 +2,18 @@
</span><span class="cx"> PlatformUserPreferredLanguagesUnix.cpp
</span><span class="cx">
</span><span class="cx"> generic/WorkQueueGeneric.cpp
</span><del>-
- text/jsconly/TextBreakIteratorInternalICUJSCOnly.cpp
</del><span class="cx"> )
</span><span class="cx">
</span><ins>+if (WIN32)
+ list(APPEND WTF_SOURCES
+ text/win/TextBreakIteratorInternalICUWin.cpp
+ )
+else ()
+ list(APPEND WTF_SOURCES
+ text/unix/TextBreakIteratorInternalICUUnix.cpp
+ )
+endif ()
+
</ins><span class="cx"> if (LOWERCASE_EVENT_LOOP_TYPE STREQUAL "glib")
</span><span class="cx"> list(APPEND WTF_SOURCES
</span><span class="cx"> glib/GRefPtr.cpp
</span></span></pre></div>
<a id="trunkSourceWTFwtftextunixTextBreakIteratorInternalICUUnixcppfromrev214035trunkSourceWTFwtftextjsconlyTextBreakIteratorInternalICUJSCOnlycpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WTF/wtf/text/unix/TextBreakIteratorInternalICUUnix.cpp (from rev 214035, trunk/Source/WTF/wtf/text/jsconly/TextBreakIteratorInternalICUJSCOnly.cpp) (0 => 214036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/unix/TextBreakIteratorInternalICUUnix.cpp (rev 0)
+++ trunk/Source/WTF/wtf/text/unix/TextBreakIteratorInternalICUUnix.cpp 2017-03-16 11:55:13 UTC (rev 214036)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2017 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+#include "TextBreakIteratorInternalICU.h"
+
+#include <locale.h>
+
+namespace WTF {
+
+const char* currentSearchLocaleID()
+{
+ if (auto* localeDefault = setlocale(LC_MESSAGES, nullptr))
+ return localeDefault;
+ return "";
+}
+
+const char* currentTextBreakLocaleID()
+{
+ if (auto* localeDefault = setlocale(LC_MESSAGES, nullptr))
+ return localeDefault;
+ return "en_us";
+}
+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>