Changeset 219155 in webkit


Ignore:
Timestamp:
Jul 5, 2017 2:13:19 PM (7 years ago)
Author:
mmaxfield@apple.com
Message:

Remove copy of ICU headers from WebKit
​https://bugs.webkit.org/show_bug.cgi?id=116407

Reviewed by Alex Christensen.

Source/JavaScriptCore:

Use WTF's copy of ICU headers.

  • Configurations/Base.xcconfig:
  • icu/unicode/localpointer.h: Removed.
  • icu/unicode/parseerr.h: Removed.
  • icu/unicode/platform.h: Removed.
  • icu/unicode/ptypes.h: Removed.
  • icu/unicode/putil.h: Removed.
  • icu/unicode/uchar.h: Removed.
  • icu/unicode/ucnv.h: Removed.
  • icu/unicode/ucnv_err.h: Removed.
  • icu/unicode/ucol.h: Removed.
  • icu/unicode/uconfig.h: Removed.
  • icu/unicode/ucurr.h: Removed.
  • icu/unicode/uenum.h: Removed.
  • icu/unicode/uiter.h: Removed.
  • icu/unicode/uloc.h: Removed.
  • icu/unicode/umachine.h: Removed.
  • icu/unicode/unorm.h: Removed.
  • icu/unicode/unorm2.h: Removed.
  • icu/unicode/urename.h: Removed.
  • icu/unicode/uscript.h: Removed.
  • icu/unicode/uset.h: Removed.
  • icu/unicode/ustring.h: Removed.
  • icu/unicode/utf.h: Removed.
  • icu/unicode/utf16.h: Removed.
  • icu/unicode/utf8.h: Removed.
  • icu/unicode/utf_old.h: Removed.
  • icu/unicode/utypes.h: Removed.
  • icu/unicode/uvernum.h: Removed.
  • icu/unicode/uversion.h: Removed.
  • runtime/IntlCollator.cpp:
  • runtime/IntlDateTimeFormat.cpp:

(JSC::IntlDateTimeFormat::partTypeString):

  • runtime/JSGlobalObject.cpp:
  • runtime/StringPrototype.cpp:

(JSC::normalize):
(JSC::stringProtoFuncNormalize):

Source/WebCore:

Use WTF's copy of ICU headers.

No new tests because there is no behavior change.

  • Configurations/WebCore.xcconfig:
  • icu/unicode/bytestream.h: Removed.
  • icu/unicode/localpointer.h: Removed.
  • icu/unicode/parseerr.h: Removed.
  • icu/unicode/platform.h: Removed.
  • icu/unicode/ptypes.h: Removed.
  • icu/unicode/putil.h: Removed.
  • icu/unicode/rep.h: Removed.
  • icu/unicode/std_string.h: Removed.
  • icu/unicode/strenum.h: Removed.
  • icu/unicode/stringpiece.h: Removed.
  • icu/unicode/ubrk.h: Removed.
  • icu/unicode/uchar.h: Removed.
  • icu/unicode/ucnv.h: Removed.
  • icu/unicode/ucnv_err.h: Removed.
  • icu/unicode/ucol.h: Removed.
  • icu/unicode/uconfig.h: Removed.
  • icu/unicode/ucurr.h: Removed.
  • icu/unicode/uenum.h: Removed.
  • icu/unicode/uiter.h: Removed.
  • icu/unicode/uloc.h: Removed.
  • icu/unicode/umachine.h: Removed.
  • icu/unicode/unistr.h: Removed.
  • icu/unicode/unorm.h: Removed.
  • icu/unicode/unorm2.h: Removed.
  • icu/unicode/uobject.h: Removed.
  • icu/unicode/urename.h: Removed.
  • icu/unicode/uscript.h: Removed.
  • icu/unicode/uset.h: Removed.
  • icu/unicode/ustring.h: Removed.
  • icu/unicode/utext.h: Removed.
  • icu/unicode/utf.h: Removed.
  • icu/unicode/utf16.h: Removed.
  • icu/unicode/utf8.h: Removed.
  • icu/unicode/utf_old.h: Removed.
  • icu/unicode/utypes.h: Removed.
  • icu/unicode/uvernum.h: Removed.
  • icu/unicode/uversion.h: Removed.
  • platform/graphics/FontCache.h:

(WebCore::FontDescriptionKey::makeFlagsKey):

Source/WebKit/mac:

Use WTF's copy of ICU headers.

  • Configurations/WebKitLegacy.xcconfig:
  • icu/unicode/localpointer.h: Removed.
  • icu/unicode/parseerr.h: Removed.
  • icu/unicode/platform.h: Removed.
  • icu/unicode/ptypes.h: Removed.
  • icu/unicode/putil.h: Removed.
  • icu/unicode/uchar.h: Removed.
  • icu/unicode/uconfig.h: Removed.
  • icu/unicode/ucurr.h: Removed.
  • icu/unicode/uidna.h: Removed.
  • icu/unicode/uiter.h: Removed.
  • icu/unicode/umachine.h: Removed.
  • icu/unicode/unorm.h: Removed.
  • icu/unicode/unorm2.h: Removed.
  • icu/unicode/urename.h: Removed.
  • icu/unicode/uscript.h: Removed.
  • icu/unicode/ustring.h: Removed.
  • icu/unicode/utf.h: Removed.
  • icu/unicode/utf16.h: Removed.
  • icu/unicode/utf8.h: Removed.
  • icu/unicode/utf_old.h: Removed.
  • icu/unicode/utypes.h: Removed.
  • icu/unicode/uvernum.h: Removed.
  • icu/unicode/uversion.h: Removed.

Source/WebKit2:

  • Configurations/BaseTarget.xcconfig:

Source/WTF:

Add an extra rsync command to CopyWTFHeaders which copies the ICU headers
to DSTROOT/usr/local/include/. These headers already live inside a
"unicode" folder, so an example path of a header is
DSTROOT/usr/local/include/unicode/uchar.h. This is already in the search
path of the other WebKit projects, so those other projects can remove
their explicit listing of the old place these headers lived.

Also add the remaining ICU 55.1 headers which the other projects (like
WebCore) need. Revert any local changes to these headers in favor of
using the GCC_PREPROCESSOR_DEFINITIONS build setting. This is so we can
compile the same way against unmodified headers.

  • Configurations/Base.xcconfig:
  • Configurations/CopyWTFHeaders.xcconfig:
  • WTF.xcodeproj/project.pbxproj:
  • icu/unicode/alphaindex.h: Added.
  • icu/unicode/appendable.h: Added.
  • icu/unicode/basictz.h: Added.
  • icu/unicode/brkiter.h: Added.

(BreakIterator::isBufferClone):

  • icu/unicode/bytestrie.h: Added.
  • icu/unicode/bytestriebuilder.h: Added.
  • icu/unicode/calendar.h: Added.

(Calendar::createInstance):
(Calendar::roll):
(Calendar::internalSet):
(Calendar::weekNumber):

  • icu/unicode/caniter.h: Added.
  • icu/unicode/chariter.h: Renamed from Source/WebCore/icu/unicode/chariter.h.
  • icu/unicode/choicfmt.h: Added.
  • icu/unicode/coleitr.h: Added.

(CollationElementIterator::primaryOrder):
(CollationElementIterator::secondaryOrder):
(CollationElementIterator::tertiaryOrder):
(CollationElementIterator::isIgnorable):

  • icu/unicode/coll.h: Added.
  • icu/unicode/compactdecimalformat.h: Added.
  • icu/unicode/curramt.h: Added.

(CurrencyAmount::getCurrency):
(CurrencyAmount::getISOCurrency):

  • icu/unicode/currpinf.h: Added.

(CurrencyPluralInfo::operator!=):

  • icu/unicode/currunit.h: Added.

(CurrencyUnit::getISOCurrency):

  • icu/unicode/datefmt.h: Added.
  • icu/unicode/dbbi.h: Added.
  • icu/unicode/dcfmtsym.h: Added.

(DecimalFormatSymbols::getSymbol):
(DecimalFormatSymbols::getConstSymbol):
(DecimalFormatSymbols::setSymbol):
(DecimalFormatSymbols::getLocale):
(DecimalFormatSymbols::getCurrencyPattern):

  • icu/unicode/decimfmt.h: Added.

(DecimalFormat::getConstSymbol):

  • icu/unicode/docmain.h: Added.
  • icu/unicode/dtfmtsym.h: Added.
  • icu/unicode/dtintrv.h: Added.

(DateInterval::getFromDate):
(DateInterval::getToDate):
(DateInterval::operator!=):

  • icu/unicode/dtitvfmt.h: Added.

(DateIntervalFormat::operator!=):

  • icu/unicode/dtitvinf.h: Added.

(DateIntervalInfo::operator!=):

  • icu/unicode/dtptngen.h: Added.
  • icu/unicode/dtrule.h: Added.
  • icu/unicode/enumset.h: Added.

(EnumSet::EnumSet):
(EnumSet::~EnumSet):
(EnumSet::clear):
(EnumSet::add):
(EnumSet::remove):
(EnumSet::contains):
(EnumSet::set):
(EnumSet::get):
(EnumSet::isValidEnum):
(EnumSet::isValidValue):
(EnumSet::operator=):
(EnumSet::getAll):
(EnumSet::flag):

  • icu/unicode/errorcode.h: Added.
  • icu/unicode/fieldpos.h: Added.

(FieldPosition::operator=):
(FieldPosition::operator==):
(FieldPosition::operator!=):

  • icu/unicode/filteredbrk.h: Added.
  • icu/unicode/fmtable.h: Added.

(Formattable::getDate):
(Formattable::getString):
(Formattable::getLong):
(Formattable::toUFormattable):
(Formattable::fromUFormattable):

  • icu/unicode/format.h: Added.
  • icu/unicode/fpositer.h: Added.
  • icu/unicode/gender.h: Added.
  • icu/unicode/gregocal.h: Added.
  • icu/unicode/icudataver.h: Added.
  • icu/unicode/icuplug.h: Added.
  • icu/unicode/idna.h: Added.
  • icu/unicode/listformatter.h: Added.

(ListFormatData::ListFormatData):

  • icu/unicode/locdspnm.h: Added.

(LocaleDisplayNames::createInstance):

  • icu/unicode/locid.h: Added.

(Locale::operator!=):
(Locale::getCountry):
(Locale::getLanguage):
(Locale::getScript):
(Locale::getVariant):
(Locale::getName):
(Locale::isBogus):

  • icu/unicode/measfmt.h: Added.
  • icu/unicode/measunit.h: Added.
  • icu/unicode/measure.h: Added.

(Measure::getNumber):
(Measure::getUnit):

  • icu/unicode/messagepattern.h: Added.
  • icu/unicode/msgfmt.h: Added.
  • icu/unicode/normalizer2.h: Added.
  • icu/unicode/normlzr.h: Added.

(Normalizer::operator!= ):
(Normalizer::quickCheck):
(Normalizer::isNormalized):
(Normalizer::compare):

  • icu/unicode/numfmt.h: Added.

(NumberFormat::isParseIntegerOnly):
(NumberFormat::isLenient):

  • icu/unicode/numsys.h: Added.
  • icu/unicode/parsepos.h: Added.

(ParsePosition::operator=):
(ParsePosition::operator==):
(ParsePosition::operator!=):
(ParsePosition::getIndex):
(ParsePosition::setIndex):
(ParsePosition::getErrorIndex):
(ParsePosition::setErrorIndex):

  • icu/unicode/plurfmt.h: Added.
  • icu/unicode/plurrule.h: Added.
  • icu/unicode/rbbi.h: Added.

(RuleBasedBreakIterator::operator!=):

  • icu/unicode/rbnf.h: Added.

(RuleBasedNumberFormat::isLenient):
(RuleBasedNumberFormat::getDefaultRuleSet):

  • icu/unicode/rbtz.h: Added.
  • icu/unicode/regex.h: Added.
  • icu/unicode/region.h: Added.
  • icu/unicode/reldatefmt.h: Added.
  • icu/unicode/resbund.h: Added.
  • icu/unicode/schriter.h: Added.
  • icu/unicode/scientificnumberformatter.h: Added.
  • icu/unicode/search.h: Added.

(SearchIterator::operator!=):

  • icu/unicode/selfmt.h: Added.
  • icu/unicode/simpletz.h: Added.

(SimpleTimeZone::setStartRule):
(SimpleTimeZone::setEndRule):
(SimpleTimeZone::getOffset):

  • icu/unicode/smpdtfmt.h: Added.

(SimpleDateFormat::get2DigitYearStart):

  • icu/unicode/sortkey.h: Added.

(CollationKey::operator!=):
(CollationKey::isBogus):
(CollationKey::getByteArray):

  • icu/unicode/stringtriebuilder.h: Added.
  • icu/unicode/stsearch.h: Added.
  • icu/unicode/symtable.h: Added.
  • icu/unicode/tblcoll.h: Added.
  • icu/unicode/timezone.h: Added.

(TimeZone::getID):
(TimeZone::setID):

  • icu/unicode/tmunit.h: Added.
  • icu/unicode/tmutamt.h: Added.

(TimeUnitAmount::operator!=):

  • icu/unicode/tmutfmt.h: Added.

(TimeUnitFormat::operator!=):

  • icu/unicode/translit.h: Added.

(Transliterator::getMaximumContextLength):
(Transliterator::setID):
(Transliterator::integerToken):
(Transliterator::pointerToken):

  • icu/unicode/tzfmt.h: Added.
  • icu/unicode/tznames.h: Added.
  • icu/unicode/tzrule.h: Added.
  • icu/unicode/tztrans.h: Added.
  • icu/unicode/ubidi.h: Added.
  • icu/unicode/ucal.h: Renamed from Source/JavaScriptCore/icu/unicode/ucal.h.
  • icu/unicode/ucasemap.h: Added.
  • icu/unicode/ucat.h: Added.
  • icu/unicode/ucharstrie.h: Added.
  • icu/unicode/ucharstriebuilder.h: Added.
  • icu/unicode/uchriter.h: Added.
  • icu/unicode/uclean.h: Added.
  • icu/unicode/ucnv_cb.h: Renamed from Source/WebCore/icu/unicode/ucnv_cb.h.
  • icu/unicode/ucnvsel.h: Added.
  • icu/unicode/ucoleitr.h: Renamed from Source/WebCore/icu/unicode/ucoleitr.h.
  • icu/unicode/uconfig.h:
  • icu/unicode/ucsdet.h: Renamed from Source/WebCore/icu/unicode/ucsdet.h.
  • icu/unicode/udat.h: Renamed from Source/JavaScriptCore/icu/unicode/udat.h.
  • icu/unicode/udata.h: Added.
  • icu/unicode/udateintervalformat.h: Added.
  • icu/unicode/udatpg.h: Renamed from Source/JavaScriptCore/icu/unicode/udatpg.h.
  • icu/unicode/udisplaycontext.h: Renamed from Source/JavaScriptCore/icu/unicode/udisplaycontext.h.
  • icu/unicode/ufieldpositer.h: Renamed from Source/JavaScriptCore/icu/unicode/ufieldpositer.h.
  • icu/unicode/uformattable.h: Renamed from Source/JavaScriptCore/icu/unicode/uformattable.h.
  • icu/unicode/ugender.h: Added.
  • icu/unicode/uidna.h: Renamed from Source/WebCore/icu/unicode/uidna.h.
  • icu/unicode/uldnames.h: Added.
  • icu/unicode/ulistformatter.h: Added.
  • icu/unicode/ulocdata.h: Added.
  • icu/unicode/umisc.h: Renamed from Source/JavaScriptCore/icu/unicode/umisc.h.
  • icu/unicode/umsg.h: Added.
  • icu/unicode/unifilt.h: Added.
  • icu/unicode/unifunct.h: Added.
  • icu/unicode/unimatch.h: Added.
  • icu/unicode/unirepl.h: Added.
  • icu/unicode/uniset.h: Added.

(UnicodeSet::operator!=):
(UnicodeSet::isFrozen):
(UnicodeSet::containsSome):
(UnicodeSet::isBogus):
(UnicodeSet::fromUSet):
(UnicodeSet::toUSet):
(UnicodeSet::span):
(UnicodeSet::spanBack):

  • icu/unicode/unum.h: Renamed from Source/JavaScriptCore/icu/unicode/unum.h.
  • icu/unicode/unumsys.h: Renamed from Source/JavaScriptCore/icu/unicode/unumsys.h.
  • icu/unicode/upluralrules.h: Added.
  • icu/unicode/uregex.h: Added.
  • icu/unicode/uregion.h: Added.
  • icu/unicode/urep.h: Added.
  • icu/unicode/ures.h: Added.

(ures_getUnicodeString):
(ures_getNextUnicodeString):
(ures_getUnicodeStringByIndex):
(ures_getUnicodeStringByKey):

  • icu/unicode/usearch.h: Renamed from Source/WebCore/icu/unicode/usearch.h.
  • icu/unicode/usetiter.h: Added.

(UnicodeSetIterator::isString):
(UnicodeSetIterator::getCodepoint):
(UnicodeSetIterator::getCodepointEnd):

  • icu/unicode/ushape.h: Renamed from Source/WebCore/icu/unicode/ushape.h.
  • icu/unicode/uspoof.h: Added.
  • icu/unicode/usprep.h: Added.
  • icu/unicode/ustdio.h: Added.
  • icu/unicode/ustream.h: Added.
  • icu/unicode/ustringtrie.h: Added.
  • icu/unicode/utf32.h: Added.
  • icu/unicode/utmscale.h: Added.
  • icu/unicode/utrace.h: Added.
  • icu/unicode/utrans.h: Added.
  • icu/unicode/utypes.h:
  • icu/unicode/vtzone.h: Added.

Tools:

  • DumpRenderTree/mac/Configurations/Base.xcconfig:
  • TestWebKitAPI/Configurations/Base.xcconfig:
  • WebKitTestRunner/Configurations/Base.xcconfig:
Location:
trunk
Files:
117 added
3 deleted
23 edited
16 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r219150 r219155  
     12017-07-03  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        Remove copy of ICU headers from WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=116407
     5
     6        Reviewed by Alex Christensen.
     7
     8        Use WTF's copy of ICU headers.
     9
     10        * Configurations/Base.xcconfig:
     11        * icu/unicode/localpointer.h: Removed.
     12        * icu/unicode/parseerr.h: Removed.
     13        * icu/unicode/platform.h: Removed.
     14        * icu/unicode/ptypes.h: Removed.
     15        * icu/unicode/putil.h: Removed.
     16        * icu/unicode/uchar.h: Removed.
     17        * icu/unicode/ucnv.h: Removed.
     18        * icu/unicode/ucnv_err.h: Removed.
     19        * icu/unicode/ucol.h: Removed.
     20        * icu/unicode/uconfig.h: Removed.
     21        * icu/unicode/ucurr.h: Removed.
     22        * icu/unicode/uenum.h: Removed.
     23        * icu/unicode/uiter.h: Removed.
     24        * icu/unicode/uloc.h: Removed.
     25        * icu/unicode/umachine.h: Removed.
     26        * icu/unicode/unorm.h: Removed.
     27        * icu/unicode/unorm2.h: Removed.
     28        * icu/unicode/urename.h: Removed.
     29        * icu/unicode/uscript.h: Removed.
     30        * icu/unicode/uset.h: Removed.
     31        * icu/unicode/ustring.h: Removed.
     32        * icu/unicode/utf.h: Removed.
     33        * icu/unicode/utf16.h: Removed.
     34        * icu/unicode/utf8.h: Removed.
     35        * icu/unicode/utf_old.h: Removed.
     36        * icu/unicode/utypes.h: Removed.
     37        * icu/unicode/uvernum.h: Removed.
     38        * icu/unicode/uversion.h: Removed.
     39        * runtime/IntlCollator.cpp:
     40        * runtime/IntlDateTimeFormat.cpp:
     41        (JSC::IntlDateTimeFormat::partTypeString):
     42        * runtime/JSGlobalObject.cpp:
     43        * runtime/StringPrototype.cpp:
     44        (JSC::normalize):
     45        (JSC::stringProtoFuncNormalize):
     46
    1472017-07-05  Devin Rousso  <drousso@apple.com>
    248

  • trunk/Source/JavaScriptCore/Configurations/Base.xcconfig

    r219140 r219155  
    5858GCC_OBJC_CALL_CXX_CDTORS = YES;
    5959GCC_PRECOMPILE_PREFIX_HEADER = YES;
    60 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(inherited);
     60GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) U_HIDE_DEPRECATED_API U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 $(inherited);
    6161GCC_STRICT_ALIASING = YES;
    6262GCC_THREADSAFE_STATICS = NO;
    … …  
    138138SDKROOT = macosx.internal;
    139139
    140 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS) -isystem icu;
    141 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem icu -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
     140OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
     141OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
    142142OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
    143143

  • trunk/Source/JavaScriptCore/runtime/IntlCollator.cpp

    r219104 r219155  
    4040#include "SlotVisitorInlines.h"
    4141#include "StructureInlines.h"
     42#pragma clang diagnostic push
     43#pragma clang diagnostic ignored "-Wdocumentation"
    4244#include <unicode/ucol.h>
     45#pragma clang diagnostic pop
    4346#include <wtf/unicode/Collator.h>
    4447

  • trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp

    r219104 r219155  
    3838#include "ObjectConstructor.h"
    3939#include <unicode/ucal.h>
     40#pragma clang diagnostic push
     41#pragma clang diagnostic ignored "-Wdocumentation"
    4042#include <unicode/udatpg.h>
     43#pragma clang diagnostic pop
    4144#include <unicode/uenum.h>
    4245#include <wtf/text/StringBuilder.h>
    … …  
    960963    case UDAT_RELATED_YEAR_FIELD:
    961964    case UDAT_TIME_SEPARATOR_FIELD:
     965#if U_ICU_VERSION_MAJOR_NUM < 58
    962966    case UDAT_FIELD_COUNT:
     967#endif
    963968        return "literal";
    964969    }

  • trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

    r219104 r219155  
    170170#if ENABLE(INTL)
    171171#include "IntlObject.h"
     172#pragma clang diagnostic push
     173#pragma clang diagnostic ignored "-Wdocumentation"
    172174#include <unicode/ucol.h>
     175#pragma clang diagnostic pop
    173176#include <unicode/udat.h>
    174177#include <unicode/unum.h>

  • trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp

    r219104 r219155  
    4747#include <algorithm>
    4848#include <unicode/uconfig.h>
     49#pragma clang diagnostic push
     50#pragma clang diagnostic ignored "-Wdocumentation"
    4951#include <unicode/unorm.h>
     52#pragma clang diagnostic pop
    5053#include <unicode/ustring.h>
    5154#include <wtf/ASCIICType.h>
    … …  
    17451748}
    17461749
    1747 static JSValue normalize(ExecState* exec, const UChar* source, size_t sourceLength, UNormalizationMode form)
     1750enum class NormalizationForm {
     1751    CanonicalComposition,
     1752    CanonicalDecomposition,
     1753    CompatibilityComposition,
     1754    CompatibilityDecomposition
     1755};
     1756
     1757static JSValue normalize(ExecState* exec, const UChar* source, size_t sourceLength, NormalizationForm form)
    17481758{
    17491759    VM& vm = exec->vm();
    … …  
    17511761
    17521762    UErrorCode status = U_ZERO_ERROR;
    1753     int32_t normalizedStringLength = unorm_normalize(source, sourceLength, form, 0, nullptr, 0, &status);
     1763    // unorm2_get*Instance() documentation says: "Returns an unmodifiable singleton instance. Do not delete it."
     1764    const UNormalizer2* normalizer = nullptr;
     1765    switch (form) {
     1766    case NormalizationForm::CanonicalComposition:
     1767        normalizer = unorm2_getNFCInstance(&status);
     1768        break;
     1769    case NormalizationForm::CanonicalDecomposition:
     1770        normalizer = unorm2_getNFDInstance(&status);
     1771        break;
     1772    case NormalizationForm::CompatibilityComposition:
     1773        normalizer = unorm2_getNFKCInstance(&status);
     1774        break;
     1775    case NormalizationForm::CompatibilityDecomposition:
     1776        normalizer = unorm2_getNFKDInstance(&status);
     1777        break;
     1778    }
     1779
     1780    if (!normalizer || U_FAILURE(status))
     1781        return throwTypeError(exec, scope);
     1782
     1783    int32_t normalizedStringLength = unorm2_normalize(normalizer, source, sourceLength, nullptr, 0, &status);
    17541784
    17551785    if (U_FAILURE(status) && status != U_BUFFER_OVERFLOW_ERROR) {
    … …  
    17651795
    17661796    status = U_ZERO_ERROR;
    1767     unorm_normalize(source, sourceLength, form, 0, buffer, normalizedStringLength, &status);
     1797    unorm2_normalize(normalizer, source, sourceLength, buffer, normalizedStringLength, &status);
    17681798    if (U_FAILURE(status))
    17691799        return throwTypeError(exec, scope);
    … …  
    17851815    StringView view = viewWithString.view;
    17861816
    1787     UNormalizationMode form = UNORM_NFC;
     1817    NormalizationForm form = NormalizationForm::CanonicalComposition;
    17881818    // Verify that the argument is provided and is not undefined.
    17891819    if (!exec->argument(0).isUndefined()) {
    … …  
    17921822
    17931823        if (formString == "NFC")
    1794             form = UNORM_NFC;
     1824            form = NormalizationForm::CanonicalComposition;
    17951825        else if (formString == "NFD")
    1796             form = UNORM_NFD;
     1826            form = NormalizationForm::CanonicalDecomposition;
    17971827        else if (formString == "NFKC")
    1798             form = UNORM_NFKC;
     1828            form = NormalizationForm::CompatibilityComposition;
    17991829        else if (formString == "NFKD")
    1800             form = UNORM_NFKD;
     1830            form = NormalizationForm::CompatibilityDecomposition;
    18011831        else
    18021832            return throwVMError(exec, scope, createRangeError(exec, ASCIILiteral("argument does not match any normalization form")));

  • trunk/Source/WTF/ChangeLog

    r219124 r219155  
     12017-07-03  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        Remove copy of ICU headers from WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=116407
     5
     6        Reviewed by Alex Christensen.
     7
     8        Add an extra rsync command to CopyWTFHeaders which copies the ICU headers
     9        to DSTROOT/usr/local/include/. These headers already live inside a
     10        "unicode" folder, so an example path of a header is
     11        DSTROOT/usr/local/include/unicode/uchar.h. This is already in the search
     12        path of the other WebKit projects, so those other projects can remove
     13        their explicit listing of the old place these headers lived.
     14
     15        Also add the remaining ICU 55.1 headers which the other projects (like
     16        WebCore) need. Revert any local changes to these headers in favor of
     17        using the GCC_PREPROCESSOR_DEFINITIONS build setting. This is so we can
     18        compile the same way against unmodified headers.
     19
     20        * Configurations/Base.xcconfig:
     21        * Configurations/CopyWTFHeaders.xcconfig:
     22        * WTF.xcodeproj/project.pbxproj:
     23        * icu/unicode/alphaindex.h: Added.
     24        * icu/unicode/appendable.h: Added.
     25        * icu/unicode/basictz.h: Added.
     26        * icu/unicode/brkiter.h: Added.
     27        (BreakIterator::isBufferClone):
     28        * icu/unicode/bytestrie.h: Added.
     29        * icu/unicode/bytestriebuilder.h: Added.
     30        * icu/unicode/calendar.h: Added.
     31        (Calendar::createInstance):
     32        (Calendar::roll):
     33        (Calendar::internalSet):
     34        (Calendar::weekNumber):
     35        * icu/unicode/caniter.h: Added.
     36        * icu/unicode/chariter.h: Renamed from Source/WebCore/icu/unicode/chariter.h.
     37        * icu/unicode/choicfmt.h: Added.
     38        * icu/unicode/coleitr.h: Added.
     39        (CollationElementIterator::primaryOrder):
     40        (CollationElementIterator::secondaryOrder):
     41        (CollationElementIterator::tertiaryOrder):
     42        (CollationElementIterator::isIgnorable):
     43        * icu/unicode/coll.h: Added.
     44        * icu/unicode/compactdecimalformat.h: Added.
     45        * icu/unicode/curramt.h: Added.
     46        (CurrencyAmount::getCurrency):
     47        (CurrencyAmount::getISOCurrency):
     48        * icu/unicode/currpinf.h: Added.
     49        (CurrencyPluralInfo::operator!=):
     50        * icu/unicode/currunit.h: Added.
     51        (CurrencyUnit::getISOCurrency):
     52        * icu/unicode/datefmt.h: Added.
     53        * icu/unicode/dbbi.h: Added.
     54        * icu/unicode/dcfmtsym.h: Added.
     55        (DecimalFormatSymbols::getSymbol):
     56        (DecimalFormatSymbols::getConstSymbol):
     57        (DecimalFormatSymbols::setSymbol):
     58        (DecimalFormatSymbols::getLocale):
     59        (DecimalFormatSymbols::getCurrencyPattern):
     60        * icu/unicode/decimfmt.h: Added.
     61        (DecimalFormat::getConstSymbol):
     62        * icu/unicode/docmain.h: Added.
     63        * icu/unicode/dtfmtsym.h: Added.
     64        * icu/unicode/dtintrv.h: Added.
     65        (DateInterval::getFromDate):
     66        (DateInterval::getToDate):
     67        (DateInterval::operator!=):
     68        * icu/unicode/dtitvfmt.h: Added.
     69        (DateIntervalFormat::operator!=):
     70        * icu/unicode/dtitvinf.h: Added.
     71        (DateIntervalInfo::operator!=):
     72        * icu/unicode/dtptngen.h: Added.
     73        * icu/unicode/dtrule.h: Added.
     74        * icu/unicode/enumset.h: Added.
     75        (EnumSet::EnumSet):
     76        (EnumSet::~EnumSet):
     77        (EnumSet::clear):
     78        (EnumSet::add):
     79        (EnumSet::remove):
     80        (EnumSet::contains):
     81        (EnumSet::set):
     82        (EnumSet::get):
     83        (EnumSet::isValidEnum):
     84        (EnumSet::isValidValue):
     85        (EnumSet::operator=):
     86        (EnumSet::getAll):
     87        (EnumSet::flag):
     88        * icu/unicode/errorcode.h: Added.
     89        * icu/unicode/fieldpos.h: Added.
     90        (FieldPosition::operator=):
     91        (FieldPosition::operator==):
     92        (FieldPosition::operator!=):
     93        * icu/unicode/filteredbrk.h: Added.
     94        * icu/unicode/fmtable.h: Added.
     95        (Formattable::getDate):
     96        (Formattable::getString):
     97        (Formattable::getLong):
     98        (Formattable::toUFormattable):
     99        (Formattable::fromUFormattable):
     100        * icu/unicode/format.h: Added.
     101        * icu/unicode/fpositer.h: Added.
     102        * icu/unicode/gender.h: Added.
     103        * icu/unicode/gregocal.h: Added.
     104        * icu/unicode/icudataver.h: Added.
     105        * icu/unicode/icuplug.h: Added.
     106        * icu/unicode/idna.h: Added.
     107        * icu/unicode/listformatter.h: Added.
     108        (ListFormatData::ListFormatData):
     109        * icu/unicode/locdspnm.h: Added.
     110        (LocaleDisplayNames::createInstance):
     111        * icu/unicode/locid.h: Added.
     112        (Locale::operator!=):
     113        (Locale::getCountry):
     114        (Locale::getLanguage):
     115        (Locale::getScript):
     116        (Locale::getVariant):
     117        (Locale::getName):
     118        (Locale::isBogus):
     119        * icu/unicode/measfmt.h: Added.
     120        * icu/unicode/measunit.h: Added.
     121        * icu/unicode/measure.h: Added.
     122        (Measure::getNumber):
     123        (Measure::getUnit):
     124        * icu/unicode/messagepattern.h: Added.
     125        * icu/unicode/msgfmt.h: Added.
     126        * icu/unicode/normalizer2.h: Added.
     127        * icu/unicode/normlzr.h: Added.
     128        (Normalizer::operator!= ):
     129        (Normalizer::quickCheck):
     130        (Normalizer::isNormalized):
     131        (Normalizer::compare):
     132        * icu/unicode/numfmt.h: Added.
     133        (NumberFormat::isParseIntegerOnly):
     134        (NumberFormat::isLenient):
     135        * icu/unicode/numsys.h: Added.
     136        * icu/unicode/parsepos.h: Added.
     137        (ParsePosition::operator=):
     138        (ParsePosition::operator==):
     139        (ParsePosition::operator!=):
     140        (ParsePosition::getIndex):
     141        (ParsePosition::setIndex):
     142        (ParsePosition::getErrorIndex):
     143        (ParsePosition::setErrorIndex):
     144        * icu/unicode/plurfmt.h: Added.
     145        * icu/unicode/plurrule.h: Added.
     146        * icu/unicode/rbbi.h: Added.
     147        (RuleBasedBreakIterator::operator!=):
     148        * icu/unicode/rbnf.h: Added.
     149        (RuleBasedNumberFormat::isLenient):
     150        (RuleBasedNumberFormat::getDefaultRuleSet):
     151        * icu/unicode/rbtz.h: Added.
     152        * icu/unicode/regex.h: Added.
     153        * icu/unicode/region.h: Added.
     154        * icu/unicode/reldatefmt.h: Added.
     155        * icu/unicode/resbund.h: Added.
     156        * icu/unicode/schriter.h: Added.
     157        * icu/unicode/scientificnumberformatter.h: Added.
     158        * icu/unicode/search.h: Added.
     159        (SearchIterator::operator!=):
     160        * icu/unicode/selfmt.h: Added.
     161        * icu/unicode/simpletz.h: Added.
     162        (SimpleTimeZone::setStartRule):
     163        (SimpleTimeZone::setEndRule):
     164        (SimpleTimeZone::getOffset):
     165        * icu/unicode/smpdtfmt.h: Added.
     166        (SimpleDateFormat::get2DigitYearStart):
     167        * icu/unicode/sortkey.h: Added.
     168        (CollationKey::operator!=):
     169        (CollationKey::isBogus):
     170        (CollationKey::getByteArray):
     171        * icu/unicode/stringtriebuilder.h: Added.
     172        * icu/unicode/stsearch.h: Added.
     173        * icu/unicode/symtable.h: Added.
     174        * icu/unicode/tblcoll.h: Added.
     175        * icu/unicode/timezone.h: Added.
     176        (TimeZone::getID):
     177        (TimeZone::setID):
     178        * icu/unicode/tmunit.h: Added.
     179        * icu/unicode/tmutamt.h: Added.
     180        (TimeUnitAmount::operator!=):
     181        * icu/unicode/tmutfmt.h: Added.
     182        (TimeUnitFormat::operator!=):
     183        * icu/unicode/translit.h: Added.
     184        (Transliterator::getMaximumContextLength):
     185        (Transliterator::setID):
     186        (Transliterator::integerToken):
     187        (Transliterator::pointerToken):
     188        * icu/unicode/tzfmt.h: Added.
     189        * icu/unicode/tznames.h: Added.
     190        * icu/unicode/tzrule.h: Added.
     191        * icu/unicode/tztrans.h: Added.
     192        * icu/unicode/ubidi.h: Added.
     193        * icu/unicode/ucal.h: Renamed from Source/JavaScriptCore/icu/unicode/ucal.h.
     194        * icu/unicode/ucasemap.h: Added.
     195        * icu/unicode/ucat.h: Added.
     196        * icu/unicode/ucharstrie.h: Added.
     197        * icu/unicode/ucharstriebuilder.h: Added.
     198        * icu/unicode/uchriter.h: Added.
     199        * icu/unicode/uclean.h: Added.
     200        * icu/unicode/ucnv_cb.h: Renamed from Source/WebCore/icu/unicode/ucnv_cb.h.
     201        * icu/unicode/ucnvsel.h: Added.
     202        * icu/unicode/ucoleitr.h: Renamed from Source/WebCore/icu/unicode/ucoleitr.h.
     203        * icu/unicode/uconfig.h:
     204        * icu/unicode/ucsdet.h: Renamed from Source/WebCore/icu/unicode/ucsdet.h.
     205        * icu/unicode/udat.h: Renamed from Source/JavaScriptCore/icu/unicode/udat.h.
     206        * icu/unicode/udata.h: Added.
     207        * icu/unicode/udateintervalformat.h: Added.
     208        * icu/unicode/udatpg.h: Renamed from Source/JavaScriptCore/icu/unicode/udatpg.h.
     209        * icu/unicode/udisplaycontext.h: Renamed from Source/JavaScriptCore/icu/unicode/udisplaycontext.h.
     210        * icu/unicode/ufieldpositer.h: Renamed from Source/JavaScriptCore/icu/unicode/ufieldpositer.h.
     211        * icu/unicode/uformattable.h: Renamed from Source/JavaScriptCore/icu/unicode/uformattable.h.
     212        * icu/unicode/ugender.h: Added.
     213        * icu/unicode/uidna.h: Renamed from Source/WebCore/icu/unicode/uidna.h.
     214        * icu/unicode/uldnames.h: Added.
     215        * icu/unicode/ulistformatter.h: Added.
     216        * icu/unicode/ulocdata.h: Added.
     217        * icu/unicode/umisc.h: Renamed from Source/JavaScriptCore/icu/unicode/umisc.h.
     218        * icu/unicode/umsg.h: Added.
     219        * icu/unicode/unifilt.h: Added.
     220        * icu/unicode/unifunct.h: Added.
     221        * icu/unicode/unimatch.h: Added.
     222        * icu/unicode/unirepl.h: Added.
     223        * icu/unicode/uniset.h: Added.
     224        (UnicodeSet::operator!=):
     225        (UnicodeSet::isFrozen):
     226        (UnicodeSet::containsSome):
     227        (UnicodeSet::isBogus):
     228        (UnicodeSet::fromUSet):
     229        (UnicodeSet::toUSet):
     230        (UnicodeSet::span):
     231        (UnicodeSet::spanBack):
     232        * icu/unicode/unum.h: Renamed from Source/JavaScriptCore/icu/unicode/unum.h.
     233        * icu/unicode/unumsys.h: Renamed from Source/JavaScriptCore/icu/unicode/unumsys.h.
     234        * icu/unicode/upluralrules.h: Added.
     235        * icu/unicode/uregex.h: Added.
     236        * icu/unicode/uregion.h: Added.
     237        * icu/unicode/urep.h: Added.
     238        * icu/unicode/ures.h: Added.
     239        (ures_getUnicodeString):
     240        (ures_getNextUnicodeString):
     241        (ures_getUnicodeStringByIndex):
     242        (ures_getUnicodeStringByKey):
     243        * icu/unicode/usearch.h: Renamed from Source/WebCore/icu/unicode/usearch.h.
     244        * icu/unicode/usetiter.h: Added.
     245        (UnicodeSetIterator::isString):
     246        (UnicodeSetIterator::getCodepoint):
     247        (UnicodeSetIterator::getCodepointEnd):
     248        * icu/unicode/ushape.h: Renamed from Source/WebCore/icu/unicode/ushape.h.
     249        * icu/unicode/uspoof.h: Added.
     250        * icu/unicode/usprep.h: Added.
     251        * icu/unicode/ustdio.h: Added.
     252        * icu/unicode/ustream.h: Added.
     253        * icu/unicode/ustringtrie.h: Added.
     254        * icu/unicode/utf32.h: Added.
     255        * icu/unicode/utmscale.h: Added.
     256        * icu/unicode/utrace.h: Added.
     257        * icu/unicode/utrans.h: Added.
     258        * icu/unicode/utypes.h:
     259        * icu/unicode/vtzone.h: Added.
     260
    12612017-07-04  Yusuke Suzuki  <utatane.tea@gmail.com>
    2262

  • trunk/Source/WTF/Configurations/Base.xcconfig

    r219104 r219155  
    5959GCC_OBJC_CALL_CXX_CDTORS = YES;
    6060GCC_PRECOMPILE_PREFIX_HEADER = YES;
    61 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(inherited);
     61GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 $(inherited);
    6262GCC_STRICT_ALIASING = YES;
    6363GCC_THREADSAFE_STATICS = NO;
    … …  
    8686PREBINDING = NO;
    8787WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
    88 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include icu $(HEADER_SEARCH_PATHS);
     88HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include $(HEADER_SEARCH_PATHS);
    8989
    9090TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));

  • trunk/Source/WTF/Configurations/CopyWTFHeaders.xcconfig

    r219104 r219155  
    2323
    2424PRIVATE_HEADERS_FOLDER_PATH = usr/local/include/wtf;
     25ICU_PRIVATE_HEADERS_FOLDER_PATH = usr/local/include;
    2526INSTALLHDRS_SCRIPT_PHASE = YES;

  • trunk/Source/WTF/WTF.xcodeproj/project.pbxproj

    r219117 r219155  
    12711271                        runOnlyForDeploymentPostprocessing = 0;
    12721272                        shellPath = /bin/sh;
    1273                         shellScript = "if [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\n    PRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%/}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nelse\n    PRIVATE_HEADERS_PATH=\"${DSTROOT}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nfi;\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/wtf/\" \"${PRIVATE_HEADERS_PATH}\"\n";
     1273                        shellScript = "if [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\n    PRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%/}/${PRIVATE_HEADERS_FOLDER_PATH}\"\n    ICU_PRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%/}/${ICU_PRIVATE_HEADERS_FOLDER_PATH}\"\nelse\n    PRIVATE_HEADERS_PATH=\"${DSTROOT}/${PRIVATE_HEADERS_FOLDER_PATH}\"\n    ICU_PRIVATE_HEADERS_PATH=\"${DSTROOT}/${ICU_PRIVATE_HEADERS_FOLDER_PATH}\"\nfi;\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/wtf/\" \"${PRIVATE_HEADERS_PATH}\"\n\nif [[ \"${USE_INTERNAL_SDK}\" != \"YES\" ]]; then\nmkdir -p \"${ICU_PRIVATE_HEADERS_PATH}\"\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/icu/\" \"${ICU_PRIVATE_HEADERS_PATH}\"\nfi";
    12741274                };
    12751275/* End PBXShellScriptBuildPhase section */

  • trunk/Source/WTF/icu/unicode/chariter.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/ucal.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/ucnv_cb.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/ucoleitr.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/uconfig.h

    r219104 r219155  
    8888 */
    8989#ifndef U_DISABLE_RENAMING
    90 #define U_DISABLE_RENAMING 1
     90#define U_DISABLE_RENAMING 0
    9191#endif
    9292

  • trunk/Source/WTF/icu/unicode/ucsdet.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/udat.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/udatpg.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/udisplaycontext.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/ufieldpositer.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/uformattable.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/uidna.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/umisc.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/unum.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/unumsys.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/usearch.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/ushape.h

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Rev URL

  • trunk/Source/WTF/icu/unicode/utypes.h

    r219104 r219155  
    6060#ifdef __cplusplus
    6161#   ifndef U_SHOW_CPLUSPLUS_API
    62 #       define U_SHOW_CPLUSPLUS_API 0
     62#       define U_SHOW_CPLUSPLUS_API 1
    6363#   endif
    6464#else

  • trunk/Source/WebCore/ChangeLog

    r219153 r219155  
     12017-07-03  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        Remove copy of ICU headers from WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=116407
     5
     6        Reviewed by Alex Christensen.
     7
     8        Use WTF's copy of ICU headers.
     9
     10        No new tests because there is no behavior change.
     11
     12        * Configurations/WebCore.xcconfig:
     13        * icu/unicode/bytestream.h: Removed.
     14        * icu/unicode/localpointer.h: Removed.
     15        * icu/unicode/parseerr.h: Removed.
     16        * icu/unicode/platform.h: Removed.
     17        * icu/unicode/ptypes.h: Removed.
     18        * icu/unicode/putil.h: Removed.
     19        * icu/unicode/rep.h: Removed.
     20        * icu/unicode/std_string.h: Removed.
     21        * icu/unicode/strenum.h: Removed.
     22        * icu/unicode/stringpiece.h: Removed.
     23        * icu/unicode/ubrk.h: Removed.
     24        * icu/unicode/uchar.h: Removed.
     25        * icu/unicode/ucnv.h: Removed.
     26        * icu/unicode/ucnv_err.h: Removed.
     27        * icu/unicode/ucol.h: Removed.
     28        * icu/unicode/uconfig.h: Removed.
     29        * icu/unicode/ucurr.h: Removed.
     30        * icu/unicode/uenum.h: Removed.
     31        * icu/unicode/uiter.h: Removed.
     32        * icu/unicode/uloc.h: Removed.
     33        * icu/unicode/umachine.h: Removed.
     34        * icu/unicode/unistr.h: Removed.
     35        * icu/unicode/unorm.h: Removed.
     36        * icu/unicode/unorm2.h: Removed.
     37        * icu/unicode/uobject.h: Removed.
     38        * icu/unicode/urename.h: Removed.
     39        * icu/unicode/uscript.h: Removed.
     40        * icu/unicode/uset.h: Removed.
     41        * icu/unicode/ustring.h: Removed.
     42        * icu/unicode/utext.h: Removed.
     43        * icu/unicode/utf.h: Removed.
     44        * icu/unicode/utf16.h: Removed.
     45        * icu/unicode/utf8.h: Removed.
     46        * icu/unicode/utf_old.h: Removed.
     47        * icu/unicode/utypes.h: Removed.
     48        * icu/unicode/uvernum.h: Removed.
     49        * icu/unicode/uversion.h: Removed.
     50        * platform/graphics/FontCache.h:
     51        (WebCore::FontDescriptionKey::makeFlagsKey):
     52
    1532017-07-05  Wenson Hsieh  <wenson_hsieh@apple.com>
    254

  • trunk/Source/WebCore/Configurations/WebCore.xcconfig

    r219140 r219155  
    2626
    2727GCC_PREFIX_HEADER = WebCorePrefix.h;
    28 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(inherited);
     28GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 $(inherited);
    2929
    3030WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
    … …  
    4848WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
    4949
    50 HEADER_SEARCH_PATHS = PAL ForwardingHeaders icu /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
     50HEADER_SEARCH_PATHS = PAL ForwardingHeaders /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
    5151INFOPLIST_FILE = Info.plist;
    5252INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;

  • trunk/Source/WebCore/platform/graphics/FontCache.h

    r219104 r219155  
    122122    static std::array<unsigned, 2> makeFlagsKey(const FontDescription& description)
    123123    {
    124         static_assert(USCRIPT_CODE_LIMIT < 0x1000, "Script code must fit in an unsigned along with the other flags");
    125124        unsigned first = static_cast<unsigned>(description.script()) << 13
    126125            | static_cast<unsigned>(description.fontStyleAxis() == FontStyleAxis::slnt) << 12

  • trunk/Source/WebKit/mac/ChangeLog

    r219140 r219155  
     12017-07-03  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        Remove copy of ICU headers from WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=116407
     5
     6        Reviewed by Alex Christensen.
     7
     8        Use WTF's copy of ICU headers.
     9
     10        * Configurations/WebKitLegacy.xcconfig:
     11        * icu/unicode/localpointer.h: Removed.
     12        * icu/unicode/parseerr.h: Removed.
     13        * icu/unicode/platform.h: Removed.
     14        * icu/unicode/ptypes.h: Removed.
     15        * icu/unicode/putil.h: Removed.
     16        * icu/unicode/uchar.h: Removed.
     17        * icu/unicode/uconfig.h: Removed.
     18        * icu/unicode/ucurr.h: Removed.
     19        * icu/unicode/uidna.h: Removed.
     20        * icu/unicode/uiter.h: Removed.
     21        * icu/unicode/umachine.h: Removed.
     22        * icu/unicode/unorm.h: Removed.
     23        * icu/unicode/unorm2.h: Removed.
     24        * icu/unicode/urename.h: Removed.
     25        * icu/unicode/uscript.h: Removed.
     26        * icu/unicode/ustring.h: Removed.
     27        * icu/unicode/utf.h: Removed.
     28        * icu/unicode/utf16.h: Removed.
     29        * icu/unicode/utf8.h: Removed.
     30        * icu/unicode/utf_old.h: Removed.
     31        * icu/unicode/utypes.h: Removed.
     32        * icu/unicode/uvernum.h: Removed.
     33        * icu/unicode/uversion.h: Removed.
     34
    1352017-07-05  Jonathan Bedard  <jbedard@apple.com>
    236

  • trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig

    r219140 r219155  
    4545FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) "$(UMBRELLA_FRAMEWORKS_DIR)" $(inherited);
    4646
    47 OTHER_CFLAGS = $(inherited) -isystem "$(WEBCORE_PRIVATE_HEADERS_DIR)/icu" -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
     47OTHER_CFLAGS = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
    4848OTHER_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    4949OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
    5050
    5151GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
    52 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy $(inherited);
     52GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) U_HIDE_DEPRECATED_API U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 FRAMEWORK_NAME=WebKitLegacy $(inherited);
    5353
    5454WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;

  • trunk/Source/WebKit2/ChangeLog

    r219154 r219155  
     12017-07-03  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        Remove copy of ICU headers from WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=116407
     5
     6        Reviewed by Alex Christensen.
     7
     8        * Configurations/BaseTarget.xcconfig:
     9
    1102017-07-05  Chris Dumez  <cdumez@apple.com>
    211

  • trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig

    r219140 r219155  
    3737
    3838GCC_PREFIX_HEADER = WebKit2Prefix.h;
    39 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(WK_MANUAL_SANDBOXING_DEFINES) $(WK_CORE_PREDICTION_DEFINES) FRAMEWORK_NAME=WebKit;
     39GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(WK_MANUAL_SANDBOXING_DEFINES) $(WK_CORE_PREDICTION_DEFINES) U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 FRAMEWORK_NAME=WebKit;
    4040WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
    41 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(WEBCORE_PRIVATE_HEADERS_DIR)/icu" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
     41HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
    4242
    4343OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;

  • trunk/Tools/ChangeLog

    r219154 r219155  
     12017-07-03  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        Remove copy of ICU headers from WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=116407
     5
     6        Reviewed by Alex Christensen.
     7
     8        * DumpRenderTree/mac/Configurations/Base.xcconfig:
     9        * TestWebKitAPI/Configurations/Base.xcconfig:
     10        * WebKitTestRunner/Configurations/Base.xcconfig:
     11
    1122017-07-05  Chris Dumez  <cdumez@apple.com>
    213

  • trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig

    r219140 r219155  
    4343CLANG_CXX_LIBRARY = libc++;
    4444CLANG_WARN_CXX0X_EXTENSIONS = NO;
    45 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport ForwardingHeaders $(PLATFORM_HEADER_SEARCH_PATHS) $(SRCROOT)/../../Source/JavaScriptCore/icu;
     45HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport ForwardingHeaders $(PLATFORM_HEADER_SEARCH_PATHS);
    4646PLATFORM_HEADER_SEARCH_PATHS[sdk=iphone*] = $(SDKROOT)/usr/local/include $(SDKROOT)/usr/local/include/WebCoreTestSupport $(SRCROOT)/../../Source/WebKit2/Platform/spi/ios;
    4747PLATFORM_HEADER_SEARCH_PATHS[sdk=macosx*] = mac/InternalHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
    4848GCC_NO_COMMON_BLOCKS = YES;
    4949ENABLE_STRICT_OBJC_MSGSEND=YES;
    50 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(GCC_PREPROCESSOR_DEFINITIONS_$(PLATFORM_NAME));
     50GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 $(GCC_PREPROCESSOR_DEFINITIONS_$(PLATFORM_NAME));
    5151GCC_PREPROCESSOR_DEFINITIONS_macosx = ENABLE_DASHBOARD_SUPPORT;
    5252DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;

  • trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig

    r219104 r219155  
    3232CLANG_CXX_LIBRARY = libc++;
    3333CLANG_WARN_CXX0X_EXTENSIONS = NO;
    34 HEADER_SEARCH_PATHS = ${BUILT_PRODUCTS_DIR}/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport;
     34HEADER_SEARCH_PATHS = ${BUILT_PRODUCTS_DIR}/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport;
    3535
    3636GCC_NO_COMMON_BLOCKS = YES;
    37 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) GTEST_HAS_TR1_TUPLE=0 GTEST_HAS_RTTI=0 $(GCC_PREPROCESSOR_DEFINITIONS_$(PLATFORM_NAME));
     37GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) GTEST_HAS_TR1_TUPLE=0 GTEST_HAS_RTTI=0 U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 $(GCC_PREPROCESSOR_DEFINITIONS_$(PLATFORM_NAME));
    3838GCC_PREPROCESSOR_DEFINITIONS_macosx = ENABLE_DASHBOARD_SUPPORT;
    3939DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;

  • trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig

    r219140 r219155  
    3434CLANG_WARN_INFINITE_RECURSION = YES;
    3535CLANG_WARN_SUSPICIOUS_MOVE = YES;
    36 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(SRCROOT)/../../Source/JavaScriptCore/icu $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
    37 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) ENABLE_DASHBOARD_SUPPORT;
     36HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
     37GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 ENABLE_DASHBOARD_SUPPORT;
    3838DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
    3939PREBINDING = NO
Note: See TracChangeset for help on using the changeset viewer.