<!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>[162782] trunk</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/162782">162782</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-01-25 13:36:37 -0800 (Sat, 25 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of ICU_UNICODE and WCHAR_UNICODE remnants
https://bugs.webkit.org/show_bug.cgi?id=127623
Reviewed by Anders Carlsson.
.:
* Source/cmake/OptionsEfl.cmake: Removed ICU_UNICODE and WCHAR_UNICODE flags.
* Source/cmake/OptionsGTK.cmake: Ditto.
* Source/cmake/OptionsWinCE.cmake: Ditto.
Source/JavaScriptCore:
* runtime/DatePrototype.cpp: Removed USE(ICU_UNICODE) checks, since that's always true now.
Source/WebCore:
* CMakeLists.txt: Removed SmartReplaceICU.cpp.
* GNUmakefile.list.am: Ditto.
* PlatformEfl.cmake: Ditto.
* PlatformGTK.cmake: Ditto.
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::modifyMovingRight): Ditto.
(WebCore::FrameSelection::modifyMovingLeft): Ditto.
* editing/SmartReplace.cpp: Moved code here from SmartReplaceICU,
since we always support ICU now. Added some FIXME comments about
bugs and mistakes I spotted in the code as I was moving it.
* editing/SmartReplaceICU.cpp: Removed.
* editing/TextIterator.cpp: Removed unneeded checks.
* platform/ThreadGlobalData.cpp:
(WebCore::ThreadGlobalData::ThreadGlobalData): Ditto.
(WebCore::ThreadGlobalData::destroy): Ditto.
* platform/ThreadGlobalData.h: Ditto.
* platform/URL.cpp:
(WebCore::appendEncodedHostname): Ditto.
* platform/graphics/SurrogatePairAwareTextIterator.cpp: Ditto.
Also removed unneeded "using namespace".
* platform/text/TextCodecICU.cpp: Ditto.
* platform/text/TextEncoding.cpp:
(WebCore::TextEncoding::encode): Ditto.
* platform/text/TextEncodingRegistry.cpp:
(WebCore::extendTextCodecMaps): Ditto.
Source/WTF:
* wtf/CMakeLists.txt: Removed WTF_USE_ICU_UNICODE and
WTF_USE_WCHAR_UNICODE since they are true and false respectively.
* wtf/Platform.h: Removed code to set WTF_USE_ICU_UNICODE.
* wtf/unicode/Collator.h: Removed ifdefs.
* wtf/unicode/CollatorDefault.cpp: Ditto.
* wtf/unicode/Unicode.h: Ditto.
* wtf/unicode/icu/CollatorICU.cpp: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeDatePrototypecpp">trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfCMakeListstxt">trunk/Source/WTF/wtf/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWTFwtfunicodeCollatorh">trunk/Source/WTF/wtf/unicode/Collator.h</a></li>
<li><a href="#trunkSourceWTFwtfunicodeCollatorDefaultcpp">trunk/Source/WTF/wtf/unicode/CollatorDefault.cpp</a></li>
<li><a href="#trunkSourceWTFwtfunicodeUnicodeh">trunk/Source/WTF/wtf/unicode/Unicode.h</a></li>
<li><a href="#trunkSourceWTFwtfunicodeicuCollatorICUcpp">trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingSmartReplacecpp">trunk/Source/WebCore/editing/SmartReplace.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTextIteratorcpp">trunk/Source/WebCore/editing/TextIterator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformThreadGlobalDatacpp">trunk/Source/WebCore/platform/ThreadGlobalData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformThreadGlobalDatah">trunk/Source/WebCore/platform/ThreadGlobalData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformURLcpp">trunk/Source/WebCore/platform/URL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsSurrogatePairAwareTextIteratorcpp">trunk/Source/WebCore/platform/graphics/SurrogatePairAwareTextIterator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextCodecICUcpp">trunk/Source/WebCore/platform/text/TextCodecICU.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextEncodingcpp">trunk/Source/WebCore/platform/text/TextEncoding.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextEncodingRegistrycpp">trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsWinCEcmake">trunk/Source/cmake/OptionsWinCE.cmake</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreeditingSmartReplaceICUcpp">trunk/Source/WebCore/editing/SmartReplaceICU.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/ChangeLog 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-25 Darin Adler <darin@apple.com>
+
+ Get rid of ICU_UNICODE and WCHAR_UNICODE remnants
+ https://bugs.webkit.org/show_bug.cgi?id=127623
+
+ Reviewed by Anders Carlsson.
+
+ * Source/cmake/OptionsEfl.cmake: Removed ICU_UNICODE and WCHAR_UNICODE flags.
+ * Source/cmake/OptionsGTK.cmake: Ditto.
+ * Source/cmake/OptionsWinCE.cmake: Ditto.
+
</ins><span class="cx"> 2014-01-23 Max Vujovic <mvujovic@adobe.com>
</span><span class="cx">
</span><span class="cx"> Remove CSS Custom Filters code and tests
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2014-01-25 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ Get rid of ICU_UNICODE and WCHAR_UNICODE remnants
+ https://bugs.webkit.org/show_bug.cgi?id=127623
+
+ Reviewed by Anders Carlsson.
+
+ * runtime/DatePrototype.cpp: Removed USE(ICU_UNICODE) checks, since that's always true now.
+
+2014-01-25 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> [Mac] Rewrite locale-specific date formatting code to remove strange string creation
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127624
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeDatePrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -34,20 +34,20 @@
</span><span class="cx"> #include "Lookup.h"
</span><span class="cx"> #include "ObjectPrototype.h"
</span><span class="cx"> #include "Operations.h"
</span><del>-
-#if !PLATFORM(MAC) && HAVE(LANGINFO_H)
-#include <langinfo.h>
-#endif
-
</del><span class="cx"> #include <limits.h>
</span><span class="cx"> #include <locale.h>
</span><span class="cx"> #include <math.h>
</span><span class="cx"> #include <stdlib.h>
</span><span class="cx"> #include <time.h>
</span><ins>+#include <unicode/udat.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/StringExtras.h>
</span><span class="cx">
</span><ins>+#if HAVE(LANGINFO_H)
+#include <langinfo.h>
+#endif
+
</ins><span class="cx"> #if HAVE(SYS_PARAM_H)
</span><span class="cx"> #include <sys/param.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -60,10 +60,8 @@
</span><span class="cx"> #include <sys/timeb.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(DARWIN) && USE(CF)
</del><ins>+#if USE(CF)
</ins><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><del>-#elif USE(ICU_UNICODE)
-#include <unicode/udat.h>
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace WTF;
</span><span class="lines">@@ -170,7 +168,7 @@
</span><span class="cx"> return jsNontrivialString(exec, adoptCF(CFDateFormatterCreateStringWithAbsoluteTime(kCFAllocatorDefault, formatter.get(), absoluteTime)).get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#elif USE(ICU_UNICODE) && !UCONFIG_NO_FORMATTING
</del><ins>+#elif !UCONFIG_NO_FORMATTING
</ins><span class="cx">
</span><span class="cx"> static JSCell* formatLocaleDate(ExecState* exec, DateInstance*, double timeInMilliseconds, LocaleDateTimeFormat format)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WTF/ChangeLog 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-01-25 Darin Adler <darin@apple.com>
+
+ Get rid of ICU_UNICODE and WCHAR_UNICODE remnants
+ https://bugs.webkit.org/show_bug.cgi?id=127623
+
+ Reviewed by Anders Carlsson.
+
+ * wtf/CMakeLists.txt: Removed WTF_USE_ICU_UNICODE and
+ WTF_USE_WCHAR_UNICODE since they are true and false respectively.
+
+ * wtf/Platform.h: Removed code to set WTF_USE_ICU_UNICODE.
+
+ * wtf/unicode/Collator.h: Removed ifdefs.
+ * wtf/unicode/CollatorDefault.cpp: Ditto.
+ * wtf/unicode/Unicode.h: Ditto.
+ * wtf/unicode/icu/CollatorICU.cpp: Ditto.
+
</ins><span class="cx"> 2014-01-25 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove atomicIncrement/atomicDecrement
</span></span></pre></div>
<a id="trunkSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CMakeLists.txt (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CMakeLists.txt 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -222,31 +222,20 @@
</span><span class="cx"> ${CMAKE_DL_LIBS}
</span><span class="cx"> )
</span><span class="cx">
</span><del>-if (WTF_USE_ICU_UNICODE)
- list(APPEND WTF_HEADERS
- unicode/icu/UnicodeIcu.h
- )
- list(APPEND WTF_SOURCES
- unicode/icu/CollatorICU.cpp
- )
- list(APPEND WTF_INCLUDE_DIRECTORIES
- ${ICU_INCLUDE_DIRS}
- )
- list(APPEND WTF_LIBRARIES
- ${ICU_I18N_LIBRARIES}
- ${ICU_LIBRARIES}
- )
-elseif (WTF_USE_WCHAR_UNICODE)
- list(APPEND WTF_HEADERS
- unicode/wchar/UnicodeWchar.h
- )
- list(APPEND WTF_SOURCES
- unicode/CollatorDefault.cpp
</del><ins>+list(APPEND WTF_HEADERS
+ unicode/icu/UnicodeIcu.h
+)
+list(APPEND WTF_SOURCES
+ unicode/icu/CollatorICU.cpp
+)
+list(APPEND WTF_INCLUDE_DIRECTORIES
+ ${ICU_INCLUDE_DIRS}
+)
+list(APPEND WTF_LIBRARIES
+ ${ICU_I18N_LIBRARIES}
+ ${ICU_LIBRARIES}
+)
</ins><span class="cx">
</span><del>- unicode/wchar/UnicodeWchar.cpp
- )
-endif ()
-
</del><span class="cx"> if (WIN32)
</span><span class="cx"> list(APPEND WTF_SOURCES
</span><span class="cx"> OSAllocatorWin.cpp
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WTF/wtf/Platform.h 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -470,10 +470,6 @@
</span><span class="cx"> #define WTF_USE_QUERY_PERFORMANCE_COUNTER 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !USE(WCHAR_UNICODE)
-#define WTF_USE_ICU_UNICODE 1
-#endif
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">
</span><span class="cx"> #define WTF_USE_CF 1
</span></span></pre></div>
<a id="trunkSourceWTFwtfunicodeCollatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/unicode/Collator.h (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/unicode/Collator.h 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WTF/wtf/unicode/Collator.h 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -33,9 +33,7 @@
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/unicode/Unicode.h>
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE) && !UCONFIG_NO_COLLATION
</del><span class="cx"> struct UCollator;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="lines">@@ -53,7 +51,7 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE Result collate(const ::UChar*, size_t, const ::UChar*, size_t) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-#if USE(ICU_UNICODE) && !UCONFIG_NO_COLLATION
</del><ins>+#if !UCONFIG_NO_COLLATION
</ins><span class="cx"> void createCollator() const;
</span><span class="cx"> void releaseCollator();
</span><span class="cx"> mutable UCollator* m_collator;
</span></span></pre></div>
<a id="trunkSourceWTFwtfunicodeCollatorDefaultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/unicode/CollatorDefault.cpp (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/unicode/CollatorDefault.cpp 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WTF/wtf/unicode/CollatorDefault.cpp 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Collator.h"
</span><span class="cx">
</span><del>-#if !USE(ICU_UNICODE) || UCONFIG_NO_COLLATION
</del><ins>+#if UCONFIG_NO_COLLATION
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfunicodeUnicodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/unicode/Unicode.h (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/unicode/Unicode.h 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WTF/wtf/unicode/Unicode.h 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -28,13 +28,7 @@
</span><span class="cx"> // Define platform neutral 8 bit character type (L is for Latin-1).
</span><span class="cx"> typedef unsigned char LChar;
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE)
</del><span class="cx"> #include <wtf/unicode/icu/UnicodeIcu.h>
</span><del>-#elif USE(WCHAR_UNICODE)
-#include <wtf/unicode/wchar/UnicodeWchar.h>
-#else
-#error "Unknown Unicode implementation"
-#endif
</del><span class="cx">
</span><span class="cx"> static_assert(sizeof(UChar) == 2, "UChar must be two bytes!");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfunicodeicuCollatorICUcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include <wtf/unicode/Collator.h>
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE) && !UCONFIG_NO_COLLATION
</del><ins>+#if !UCONFIG_NO_COLLATION
</ins><span class="cx">
</span><span class="cx"> #include <mutex>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="lines">@@ -156,4 +156,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><del>-#endif // USE(ICU_UNICODE) && !UCONFIG_NO_COLLATION
</del><ins>+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -2769,30 +2769,20 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+list(APPEND WebCore_SOURCES
+ platform/text/icu/UTextProvider.cpp
+ platform/text/icu/UTextProviderLatin1.cpp
+ platform/text/icu/UTextProviderUTF16.cpp
+ platform/text/TextCodecICU.cpp
+ platform/text/TextEncodingDetectorICU.cpp
+)
+list(APPEND WebCore_INCLUDE_DIRECTORIES
+ ${ICU_INCLUDE_DIRS}
+)
+list(APPEND WebCore_LIBRARIES
+ ${ICU_LIBRARIES}
+)
</ins><span class="cx">
</span><del>-if (WTF_USE_ICU_UNICODE)
- list(APPEND WebCore_SOURCES
- platform/text/icu/UTextProvider.cpp
- platform/text/icu/UTextProviderLatin1.cpp
- platform/text/icu/UTextProviderUTF16.cpp
- platform/text/TextCodecICU.cpp
- platform/text/TextEncodingDetectorICU.cpp
- )
- list(APPEND WebCore_INCLUDE_DIRECTORIES
- ${ICU_INCLUDE_DIRS}
- )
- list(APPEND WebCore_LIBRARIES
- ${ICU_LIBRARIES}
- )
-elseif (WTF_USE_WCHAR_UNICODE)
- list(APPEND WebCore_SOURCES
- platform/text/TextEncodingDetectorNone.cpp
-
- platform/text/wchar/TextBreakIteratorWchar.cpp
- )
-endif ()
-
-
</del><span class="cx"> if (WTF_USE_LEVELDB)
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${THIRDPARTY_DIR}/leveldb/include"
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/ChangeLog 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2014-01-25 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ Get rid of ICU_UNICODE and WCHAR_UNICODE remnants
+ https://bugs.webkit.org/show_bug.cgi?id=127623
+
+ Reviewed by Anders Carlsson.
+
+ * CMakeLists.txt: Removed SmartReplaceICU.cpp.
+ * GNUmakefile.list.am: Ditto.
+ * PlatformEfl.cmake: Ditto.
+ * PlatformGTK.cmake: Ditto.
+
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::modifyMovingRight): Ditto.
+ (WebCore::FrameSelection::modifyMovingLeft): Ditto.
+
+ * editing/SmartReplace.cpp: Moved code here from SmartReplaceICU,
+ since we always support ICU now. Added some FIXME comments about
+ bugs and mistakes I spotted in the code as I was moving it.
+ * editing/SmartReplaceICU.cpp: Removed.
+
+ * editing/TextIterator.cpp: Removed unneeded checks.
+ * platform/ThreadGlobalData.cpp:
+ (WebCore::ThreadGlobalData::ThreadGlobalData): Ditto.
+ (WebCore::ThreadGlobalData::destroy): Ditto.
+ * platform/ThreadGlobalData.h: Ditto.
+ * platform/URL.cpp:
+ (WebCore::appendEncodedHostname): Ditto.
+ * platform/graphics/SurrogatePairAwareTextIterator.cpp: Ditto.
+ Also removed unneeded "using namespace".
+ * platform/text/TextCodecICU.cpp: Ditto.
+ * platform/text/TextEncoding.cpp:
+ (WebCore::TextEncoding::encode): Ditto.
+ * platform/text/TextEncodingRegistry.cpp:
+ (WebCore::extendTextCodecMaps): Ditto.
+
+2014-01-25 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> Get rid of UnicodeRange.h/cpp, using ICU instead
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127622
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -3135,7 +3135,6 @@
</span><span class="cx"> Source/WebCore/editing/SimplifyMarkupCommand.h \
</span><span class="cx"> Source/WebCore/editing/SmartReplace.cpp \
</span><span class="cx"> Source/WebCore/editing/SmartReplace.h \
</span><del>- Source/WebCore/editing/SmartReplaceICU.cpp \
</del><span class="cx"> Source/WebCore/editing/SpellChecker.cpp \
</span><span class="cx"> Source/WebCore/editing/SpellChecker.h \
</span><span class="cx"> Source/WebCore/editing/SpellingCorrectionCommand.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> accessibility/atk/WebKitAccessibleUtil.cpp
</span><span class="cx"> accessibility/atk/WebKitAccessibleWrapperAtk.cpp
</span><span class="cx">
</span><del>- editing/SmartReplaceICU.cpp
</del><ins>+ editing/SmartReplace.cpp
</ins><span class="cx">
</span><span class="cx"> editing/atk/FrameSelectionAtk.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><del>- editing/SmartReplaceICU.cpp
</del><ins>+ editing/SmartReplace.cpp
</ins><span class="cx">
</span><span class="cx"> html/shadow/MediaControlsGtk.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -712,13 +712,11 @@
</span><span class="cx"> pos = VisiblePosition(m_selection.extent(), m_selection.affinity()).right(true);
</span><span class="cx"> break;
</span><span class="cx"> case WordGranularity: {
</span><del>-#if USE(ICU_UNICODE)
</del><span class="cx"> // Visual word movement relies on isWordTextBreak which is not implemented in WinCE and QT.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=81136.
</span><span class="cx"> bool skipsSpaceWhenMovingRight = m_frame && m_frame->editor().behavior().shouldSkipSpaceWhenMovingRight();
</span><span class="cx"> pos = rightWordPosition(VisiblePosition(m_selection.extent(), m_selection.affinity()), skipsSpaceWhenMovingRight);
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> case SentenceGranularity:
</span><span class="cx"> case LineGranularity:
</span><span class="lines">@@ -908,11 +906,9 @@
</span><span class="cx"> pos = VisiblePosition(m_selection.extent(), m_selection.affinity()).left(true);
</span><span class="cx"> break;
</span><span class="cx"> case WordGranularity: {
</span><del>-#if USE(ICU_UNICODE)
</del><span class="cx"> bool skipsSpaceWhenMovingRight = m_frame && m_frame->editor().behavior().shouldSkipSpaceWhenMovingRight();
</span><span class="cx"> pos = leftWordPosition(VisiblePosition(m_selection.extent(), m_selection.affinity()), skipsSpaceWhenMovingRight);
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> case SentenceGranularity:
</span><span class="cx"> case LineGranularity:
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingSmartReplacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/SmartReplace.cpp (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/SmartReplace.cpp 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/editing/SmartReplace.cpp 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2007 Apple Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2008 Tony Chang <idealisms@gmail.com>
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -29,13 +30,73 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SmartReplace.h"
</span><span class="cx">
</span><del>-#if !USE(CF) && !USE(ICU_UNICODE)
</del><ins>+#if !USE(CF)
</ins><span class="cx">
</span><ins>+#include <unicode/uset.h>
+#include <wtf/Assertions.h>
+#include <wtf/text/WTFString.h>
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static void addAllCodePoints(USet* smartSet, const String& string)
+{
+ const UChar* characters = string.characters();
+ for (size_t i = 0; i < string.length(); i++)
+ uset_add(smartSet, characters[i]);
+}
+
+// This is mostly a port of the code in WebCore/editing/SmartReplaceCF.cpp
+// except we use ICU instead of CoreFoundation character classes.
+static USet* getSmartSet(bool isPreviousCharacter)
+{
+ static USet* preSmartSet = nullptr;
+ static USet* postSmartSet = nullptr;
+ USet* smartSet = isPreviousCharacter ? preSmartSet : postSmartSet;
+ if (!smartSet) {
+ // Whitespace and newline (kCFCharacterSetWhitespaceAndNewline)
+ UErrorCode ec = U_ZERO_ERROR;
+ String whitespaceAndNewline = ASCIILiteral("[[:WSpace:] [\\u000A\\u000B\\u000C\\u000D\\u0085]]");
+ smartSet = uset_openPattern(whitespaceAndNewline.characters(), whitespaceAndNewline.length(), &ec);
+ ASSERT(U_SUCCESS(ec));
+
+ // CJK ranges
+ // FIXME: Looks like all these ranges include one extra character past the end.
+ uset_addRange(smartSet, 0x1100, 0x1100 + 256); // Hangul Jamo (0x1100 - 0x11FF)
+ uset_addRange(smartSet, 0x2E80, 0x2E80 + 352); // CJK & Kangxi Radicals (0x2E80 - 0x2FDF)
+ uset_addRange(smartSet, 0x2FF0, 0x2FF0 + 464); // Ideograph Descriptions, CJK Symbols, Hiragana, Katakana, Bopomofo, Hangul Compatibility Jamo, Kanbun, & Bopomofo Ext (0x2FF0 - 0x31BF)
+ uset_addRange(smartSet, 0x3200, 0x3200 + 29392); // Enclosed CJK, CJK Ideographs (Uni Han & Ext A), & Yi (0x3200 - 0xA4CF)
+ uset_addRange(smartSet, 0xAC00, 0xAC00 + 11183); // Hangul Syllables (0xAC00 - 0xD7AF)
+ uset_addRange(smartSet, 0xF900, 0xF900 + 352); // CJK Compatibility Ideographs (0xF900 - 0xFA5F)
+ uset_addRange(smartSet, 0xFE30, 0xFE30 + 32); // CJK Compatibility From (0xFE30 - 0xFE4F)
+ uset_addRange(smartSet, 0xFF00, 0xFF00 + 240); // Half/Full Width Form (0xFF00 - 0xFFEF)
+ uset_addRange(smartSet, 0x20000, 0x20000 + 0xA6D7); // CJK Ideograph Exntension B
+ uset_addRange(smartSet, 0x2F800, 0x2F800 + 0x021E); // CJK Compatibility Ideographs (0x2F800 - 0x2FA1D)
+
+ if (isPreviousCharacter) {
+ // FIXME: Silly to convert this to a WTF::String just to loop through the characters.
+ addAllCodePoints(smartSet, ASCIILiteral("([\"\'#$/-`{"));
+ preSmartSet = smartSet;
+ } else {
+ // FIXME: Silly to convert this to a WTF::String just to loop through the characters.
+ addAllCodePoints(smartSet, ASCIILiteral(")].,;:?\'!\"%*-/}"));
+
+ // Punctuation (kCFCharacterSetPunctuation)
+ UErrorCode ec = U_ZERO_ERROR;
+ String punctuationClass = ASCIILiteral("[:P:]");
+ USet* icuPunct = uset_openPattern(punctuationClass.characters(), punctuationClass.length(), &ec);
+ ASSERT(U_SUCCESS(ec));
+ uset_addAll(smartSet, icuPunct);
+ uset_close(icuPunct);
+
+ postSmartSet = smartSet;
+ }
+ }
+ return smartSet;
+}
+
</ins><span class="cx"> bool isCharacterSmartReplaceExempt(UChar32 c, bool isPreviousCharacter)
</span><span class="cx"> {
</span><del>- return false;
</del><ins>+ return uset_contains(getSmartSet(isPreviousCharacter), c);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingSmartReplaceICUcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/editing/SmartReplaceICU.cpp (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/SmartReplaceICU.cpp 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/editing/SmartReplaceICU.cpp 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -1,100 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
- * Copyright (C) 2008 Tony Chang <idealisms@gmail.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "SmartReplace.h"
-
-#if !USE(CF) && USE(ICU_UNICODE)
-#include <unicode/uset.h>
-#include <wtf/Assertions.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-static void addAllCodePoints(USet* smartSet, const String& string)
-{
- const UChar* characters = string.characters();
- for (size_t i = 0; i < string.length(); i++)
- uset_add(smartSet, characters[i]);
-}
-
-// This is mostly a port of the code in WebCore/editing/SmartReplaceCF.cpp
-// except we use icu in place of CoreFoundations character classes.
-static USet* getSmartSet(bool isPreviousCharacter)
-{
- static USet* preSmartSet = NULL;
- static USet* postSmartSet = NULL;
- USet* smartSet = isPreviousCharacter ? preSmartSet : postSmartSet;
- if (!smartSet) {
- // Whitespace and newline (kCFCharacterSetWhitespaceAndNewline)
- UErrorCode ec = U_ZERO_ERROR;
- String whitespaceAndNewline = ASCIILiteral("[[:WSpace:] [\\u000A\\u000B\\u000C\\u000D\\u0085]]");
- smartSet = uset_openPattern(whitespaceAndNewline.characters(), whitespaceAndNewline.length(), &ec);
- ASSERT(U_SUCCESS(ec));
-
- // CJK ranges
- uset_addRange(smartSet, 0x1100, 0x1100 + 256); // Hangul Jamo (0x1100 - 0x11FF)
- uset_addRange(smartSet, 0x2E80, 0x2E80 + 352); // CJK & Kangxi Radicals (0x2E80 - 0x2FDF)
- uset_addRange(smartSet, 0x2FF0, 0x2FF0 + 464); // Ideograph Descriptions, CJK Symbols, Hiragana, Katakana, Bopomofo, Hangul Compatibility Jamo, Kanbun, & Bopomofo Ext (0x2FF0 - 0x31BF)
- uset_addRange(smartSet, 0x3200, 0x3200 + 29392); // Enclosed CJK, CJK Ideographs (Uni Han & Ext A), & Yi (0x3200 - 0xA4CF)
- uset_addRange(smartSet, 0xAC00, 0xAC00 + 11183); // Hangul Syllables (0xAC00 - 0xD7AF)
- uset_addRange(smartSet, 0xF900, 0xF900 + 352); // CJK Compatibility Ideographs (0xF900 - 0xFA5F)
- uset_addRange(smartSet, 0xFE30, 0xFE30 + 32); // CJK Compatibility From (0xFE30 - 0xFE4F)
- uset_addRange(smartSet, 0xFF00, 0xFF00 + 240); // Half/Full Width Form (0xFF00 - 0xFFEF)
- uset_addRange(smartSet, 0x20000, 0x20000 + 0xA6D7); // CJK Ideograph Exntension B
- uset_addRange(smartSet, 0x2F800, 0x2F800 + 0x021E); // CJK Compatibility Ideographs (0x2F800 - 0x2FA1D)
-
- if (isPreviousCharacter) {
- addAllCodePoints(smartSet, ASCIILiteral("([\"\'#$/-`{"));
- preSmartSet = smartSet;
- } else {
- addAllCodePoints(smartSet, ASCIILiteral(")].,;:?\'!\"%*-/}"));
-
- // Punctuation (kCFCharacterSetPunctuation)
- UErrorCode ec = U_ZERO_ERROR;
- String punctuationClass = ASCIILiteral("[:P:]");
- USet* icuPunct = uset_openPattern(punctuationClass.characters(), punctuationClass.length(), &ec);
- ASSERT(U_SUCCESS(ec));
- uset_addAll(smartSet, icuPunct);
- uset_close(icuPunct);
-
- postSmartSet = smartSet;
- }
- }
- return smartSet;
-}
-
-bool isCharacterSmartReplaceExempt(UChar32 c, bool isPreviousCharacter)
-{
- return uset_contains(getSmartSet(isPreviousCharacter), c);
-}
-
-}
-
-#endif // !USE(CF) && USE(ICU_UNICODE)
</del></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.cpp (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.cpp 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE) && !UCONFIG_NO_COLLATION
</del><ins>+#if !UCONFIG_NO_COLLATION
</ins><span class="cx"> #include "TextBreakIteratorInternalICU.h"
</span><span class="cx"> #include <unicode/usearch.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> size_t search(size_t& startOffset);
</span><span class="cx"> bool atBreak() const;
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE) && !UCONFIG_NO_COLLATION
</del><ins>+#if !UCONFIG_NO_COLLATION
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool isBadMatch(const UChar*, size_t length) const;
</span><span class="lines">@@ -1702,7 +1702,7 @@
</span><span class="cx"> s.replace(softHyphen, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE) && !UCONFIG_NO_COLLATION
</del><ins>+#if !UCONFIG_NO_COLLATION
</ins><span class="cx">
</span><span class="cx"> static inline void foldQuoteMarksAndSoftHyphens(UChar* data, size_t length)
</span><span class="cx"> {
</span><span class="lines">@@ -2305,7 +2305,7 @@
</span><span class="cx"> return matchedLength;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#else // !ICU_UNICODE
</del><ins>+#else
</ins><span class="cx">
</span><span class="cx"> inline SearchBuffer::SearchBuffer(const String& target, FindOptions options)
</span><span class="cx"> : m_target(options & CaseInsensitive ? target.foldCase() : target)
</span><span class="lines">@@ -2415,7 +2415,7 @@
</span><span class="cx"> return length;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // !ICU_UNICODE
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // --------
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformThreadGlobalDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ThreadGlobalData.cpp (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ThreadGlobalData.cpp 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/platform/ThreadGlobalData.cpp 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -30,23 +30,18 @@
</span><span class="cx"> #include "CachedResourceRequestInitiators.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "InspectorCounters.h"
</span><ins>+#include "TextCodecICU.h"
</ins><span class="cx"> #include "ThreadTimers.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><ins>+#include <wtf/ThreadSpecific.h>
+#include <wtf/Threading.h>
</ins><span class="cx"> #include <wtf/WTFThreadData.h>
</span><span class="cx"> #include <wtf/text/StringImpl.h>
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE)
-#include "TextCodecICU.h"
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
+#include "TextCodeCMac.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
-#include "TextCodecMac.h"
-#endif
-
-#include <wtf/Threading.h>
-#include <wtf/ThreadSpecific.h>
-using namespace WTF;
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> ThreadSpecific<ThreadGlobalData>* ThreadGlobalData::staticData;
</span><span class="lines">@@ -61,9 +56,7 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_isMainThread(isMainThread())
</span><span class="cx"> #endif
</span><del>-#if USE(ICU_UNICODE)
</del><span class="cx"> , m_cachedConverterICU(adoptPtr(new ICUConverterWrapper))
</span><del>-#endif
</del><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="cx"> , m_cachedConverterTEC(adoptPtr(new TECConverterWrapper))
</span><span class="cx"> #endif
</span><span class="lines">@@ -89,9 +82,7 @@
</span><span class="cx"> m_cachedConverterTEC.clear();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE)
</del><span class="cx"> m_cachedConverterICU.clear();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> m_inspectorCounters.clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformThreadGlobalDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ThreadGlobalData.h (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ThreadGlobalData.h 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/platform/ThreadGlobalData.h 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -58,9 +58,7 @@
</span><span class="cx"> EventNames& eventNames() { return *m_eventNames; }
</span><span class="cx"> ThreadTimers& threadTimers() { return *m_threadTimers; }
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE)
</del><span class="cx"> ICUConverterWrapper& cachedConverterICU() { return *m_cachedConverterICU; }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="cx"> TECConverterWrapper& cachedConverterTEC() { return *m_cachedConverterTEC; }
</span><span class="lines">@@ -83,9 +81,7 @@
</span><span class="cx"> bool m_isMainThread;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE)
</del><span class="cx"> OwnPtr<ICUConverterWrapper> m_cachedConverterICU;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="cx"> OwnPtr<TECConverterWrapper> m_cachedConverterTEC;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.cpp (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.cpp 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/platform/URL.cpp 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx"> #include "TextEncoding.h"
</span><span class="cx"> #include <stdio.h>
</span><ins>+#include <unicode/uidna.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HexNumber.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="lines">@@ -38,10 +39,6 @@
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE)
-#include <unicode/uidna.h>
-#endif
-
</del><span class="cx"> // FIXME: This file makes too much use of the + operator on String.
</span><span class="cx"> // We either have to optimize that operator so it doesn't involve
</span><span class="cx"> // so many allocations, or change this to use StringBuffer instead.
</span><span class="lines">@@ -1504,14 +1501,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE)
</del><span class="cx"> UChar hostnameBuffer[hostnameBufferLength];
</span><span class="cx"> UErrorCode error = U_ZERO_ERROR;
</span><span class="cx"> int32_t numCharactersConverted = uidna_IDNToASCII(str, strLen, hostnameBuffer,
</span><span class="cx"> hostnameBufferLength, UIDNA_ALLOW_UNASSIGNED, 0, &error);
</span><span class="cx"> if (error == U_ZERO_ERROR)
</span><span class="cx"> buffer.append(hostnameBuffer, numCharactersConverted);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void findHostnamesInMailToURL(const UChar* str, int strLen, Vector<std::pair<int, int>>& nameRanges)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsSurrogatePairAwareTextIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/SurrogatePairAwareTextIterator.cpp (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/SurrogatePairAwareTextIterator.cpp 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/platform/graphics/SurrogatePairAwareTextIterator.cpp 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -23,13 +23,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SurrogatePairAwareTextIterator.h"
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE)
</del><span class="cx"> #include <unicode/unorm.h>
</span><del>-#endif
</del><span class="cx">
</span><del>-using namespace WTF;
-using namespace Unicode;
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> SurrogatePairAwareTextIterator::SurrogatePairAwareTextIterator(const UChar* characters, int currentCharacter, int lastCharacter, int endCharacter)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextCodecICUcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextCodecICU.cpp (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextCodecICU.cpp 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/platform/text/TextCodecICU.cpp 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#if USE(ICU_UNICODE)
</del><span class="cx"> #include "TextCodecICU.h"
</span><span class="cx">
</span><span class="cx"> #include "TextEncoding.h"
</span><span class="lines">@@ -542,5 +541,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-#endif
-
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextEncodingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextEncoding.cpp (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextEncoding.cpp 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/platform/text/TextEncoding.cpp 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -30,15 +30,12 @@
</span><span class="cx">
</span><span class="cx"> #include "TextCodec.h"
</span><span class="cx"> #include "TextEncodingRegistry.h"
</span><ins>+#include <unicode/unorm.h>
</ins><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE)
-#include <unicode/unorm.h>
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static const TextEncoding& UTF7Encoding()
</span><span class="lines">@@ -75,7 +72,6 @@
</span><span class="cx"> if (!length)
</span><span class="cx"> return "";
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE)
</del><span class="cx"> // FIXME: What's the right place to do normalization?
</span><span class="cx"> // It's a little strange to do it inside the encode function.
</span><span class="cx"> // Perhaps normalization should be an explicit step done before calling encode.
</span><span class="lines">@@ -101,11 +97,6 @@
</span><span class="cx"> sourceLength = normalizedLength;
</span><span class="cx"> }
</span><span class="cx"> return newTextCodec(*this)->encode(source, sourceLength, handling);
</span><del>-#elif OS(WINDOWS) && USE(WCHAR_UNICODE)
- // normalization will be done by Windows CE API
- OwnPtr<TextCodec> textCodec = newTextCodec(*this);
- return textCodec.get() ? textCodec->encode(characters, length, handling) : CString();
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* TextEncoding::domName() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextEncodingRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TextEncodingRegistry.h"
</span><span class="cx">
</span><ins>+#include "TextCodecICU.h"
</ins><span class="cx"> #include "TextCodecLatin1.h"
</span><span class="cx"> #include "TextCodecUserDefined.h"
</span><span class="cx"> #include "TextCodecUTF16.h"
</span><span class="lines">@@ -41,15 +42,9 @@
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/StringExtras.h>
</span><span class="cx">
</span><del>-#if USE(ICU_UNICODE)
-#include "TextCodecICU.h"
-#endif
</del><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="cx"> #include "TextCodecMac.h"
</span><span class="cx"> #endif
</span><del>-#if OS(WINDOWS) && USE(WCHAR_UNICODE)
-#include "win/TextCodecWin.h"
-#endif
</del><span class="cx">
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -281,21 +276,14 @@
</span><span class="cx">
</span><span class="cx"> static void extendTextCodecMaps()
</span><span class="cx"> {
</span><del>-#if USE(ICU_UNICODE)
</del><span class="cx"> TextCodecICU::registerEncodingNames(addToTextEncodingNameMap);
</span><span class="cx"> TextCodecICU::registerCodecs(addToTextCodecMap);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="cx"> TextCodecMac::registerEncodingNames(addToTextEncodingNameMap);
</span><span class="cx"> TextCodecMac::registerCodecs(addToTextCodecMap);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(WINDOWS) && USE(WCHAR_UNICODE)
- TextCodecWin::registerExtendedEncodingNames(addToTextEncodingNameMap);
- TextCodecWin::registerExtendedCodecs(addToTextCodecMap);
-#endif
-
</del><span class="cx"> pruneBlacklistedCodecs();
</span><span class="cx"> buildQuirksSets();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -28,13 +28,11 @@
</span><span class="cx"> find_package(GLIB 2.36.0 REQUIRED COMPONENTS gio gobject gthread)
</span><span class="cx"> find_package(LibSoup 2.42.0 REQUIRED)
</span><span class="cx">
</span><del>-set(WTF_USE_ICU_UNICODE 1)
</del><span class="cx"> set(WTF_USE_SOUP 1)
</span><span class="cx"> set(WTF_USE_UDIS86 1)
</span><span class="cx">
</span><span class="cx"> add_definitions(-DWTF_USE_GLIB=1)
</span><span class="cx"> add_definitions(-DWTF_USE_SOUP=1)
</span><del>-add_definitions(-DWTF_USE_ICU_UNICODE=1)
</del><span class="cx"> add_definitions(-DWTF_USE_CAIRO=1)
</span><span class="cx"> add_definitions(-DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -111,7 +111,6 @@
</span><span class="cx"> set(ENABLE_WEBKIT ON)
</span><span class="cx"> set(ENABLE_WEBKIT2 ON)
</span><span class="cx">
</span><del>-set(WTF_USE_ICU_UNICODE 1)
</del><span class="cx"> set(WTF_USE_SOUP 1)
</span><span class="cx">
</span><span class="cx"> set(WTF_OUTPUT_NAME WTFGTK)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWinCEcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWinCE.cmake (162781 => 162782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWinCE.cmake 2014-01-25 21:31:51 UTC (rev 162781)
+++ trunk/Source/cmake/OptionsWinCE.cmake 2014-01-25 21:36:37 UTC (rev 162782)
</span><span class="lines">@@ -1,11 +1,9 @@
</span><span class="cx"> include(OptionsWindows)
</span><span class="cx">
</span><span class="cx"> set(PORT_FALLBACK Win)
</span><del>-set(WTF_USE_WCHAR_UNICODE 1)
</del><span class="cx">
</span><span class="cx"> add_definitions(-D_CE_CRT_ALLOW_WIN_MINMAX)
</span><span class="cx"> add_definitions(-DWTF_USE_EXPORT_MACROS=0)
</span><del>-add_definitions(-DWTF_USE_WCHAR_UNICODE=1)
</del><span class="cx"> add_definitions(-DWTF_USE_WINGDI=1)
</span><span class="cx"> add_definitions(-DWTF_USE_WININET=1)
</span><span class="cx"> add_definitions(-DWINCEBASIC)
</span></span></pre>
</div>
</div>
</body>
</html>