⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 259767 in webkit


Ignore:
Timestamp:
Apr 8, 2020, 5:06:00 PM (6 years ago)
Author:
Ross Kirsling
Message:

Remove ENABLE_INTL define
​https://bugs.webkit.org/show_bug.cgi?id=210164

Reviewed by Darin Adler.

.:

  • Source/cmake/OptionsFTW.cmake:
  • Source/cmake/OptionsMac.cmake:
  • Source/cmake/OptionsWin.cmake:
  • Source/cmake/WebKitFeatures.cmake:
  • Source/cmake/tools/vsprops/FeatureDefines.props:
  • Source/cmake/tools/vsprops/FeatureDefinesCairo.props:

Source/JavaScriptCore:

  • Scripts/generateIntlCanonicalizeLanguage.py:
  • builtins/DatePrototype.js:
  • runtime/ArrayPrototype.cpp:

(JSC::arrayProtoFuncToLocaleString):

  • runtime/DatePrototype.cpp:

(JSC::DatePrototype::finishCreation):

  • runtime/IntlCollator.cpp:
  • runtime/IntlCollator.h:
  • runtime/IntlCollatorConstructor.cpp:
  • runtime/IntlCollatorConstructor.h:
  • runtime/IntlCollatorPrototype.cpp:
  • runtime/IntlCollatorPrototype.h:
  • runtime/IntlDateTimeFormat.cpp:
  • runtime/IntlDateTimeFormat.h:
  • runtime/IntlDateTimeFormatConstructor.cpp:
  • runtime/IntlDateTimeFormatConstructor.h:
  • runtime/IntlDateTimeFormatPrototype.cpp:
  • runtime/IntlDateTimeFormatPrototype.h:
  • runtime/IntlNumberFormat.cpp:
  • runtime/IntlNumberFormat.h:
  • runtime/IntlNumberFormatConstructor.cpp:
  • runtime/IntlNumberFormatConstructor.h:
  • runtime/IntlNumberFormatPrototype.cpp:
  • runtime/IntlNumberFormatPrototype.h:
  • runtime/IntlObject.cpp:
  • runtime/IntlObject.h:
  • runtime/IntlObjectInlines.h:
  • runtime/IntlPluralRules.cpp:
  • runtime/IntlPluralRules.h:
  • runtime/IntlPluralRulesConstructor.cpp:
  • runtime/IntlPluralRulesConstructor.h:
  • runtime/IntlPluralRulesPrototype.cpp:
  • runtime/IntlPluralRulesPrototype.h:
  • runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::init):
(JSC::JSGlobalObject::visitChildren):

  • runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::defaultCollator const):
(JSC::JSGlobalObject::pluralRulesStructure):

  • runtime/JSGlobalObjectFunctions.cpp:

(JSC::globalFuncDateTimeFormat):

  • runtime/NumberPrototype.cpp:

(JSC::numberProtoFuncToLocaleString):

  • runtime/StringPrototype.cpp:

(JSC::StringPrototype::finishCreation):
(JSC::stringProtoFuncLocaleCompare):
(JSC::stringProtoFuncToLocaleUpperCase):

  • runtime/VM.cpp:

(JSC::VM::VM):

  • runtime/VM.h:

Source/WTF:

AppleWin (and, following suit, FTW) was the only upstream platform turning ENABLE_INTL off;
now that their headers have been upgraded to ICU 62, this define can be removed entirely.

Going forward, we thus assume JSC has an Intl object and can simply runtime-guard any new features added to it.

  • wtf/PlatformEnable.h:
  • wtf/PlatformEnableCocoa.h:

Tools:

  • Scripts/webkitperl/FeatureList.pm:
Location:
trunk
Files:
51 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r259755 r259767  
     12020-04-08  Ross Kirsling  <ross.kirsling@sony.com>
     2
     3        Remove ENABLE_INTL define
     4        https://bugs.webkit.org/show_bug.cgi?id=210164
     5
     6        Reviewed by Darin Adler.
     7
     8        * Source/cmake/OptionsFTW.cmake:
     9        * Source/cmake/OptionsMac.cmake:
     10        * Source/cmake/OptionsWin.cmake:
     11        * Source/cmake/WebKitFeatures.cmake:
     12        * Source/cmake/tools/vsprops/FeatureDefines.props:
     13        * Source/cmake/tools/vsprops/FeatureDefinesCairo.props:
     14
    1152020-04-08  Stephan Szabo  <stephan.szabo@sony.com>
    216

  • trunk/Source/JavaScriptCore/ChangeLog

    r259762 r259767  
     12020-04-08  Ross Kirsling  <ross.kirsling@sony.com>
     2
     3        Remove ENABLE_INTL define
     4        https://bugs.webkit.org/show_bug.cgi?id=210164
     5
     6        Reviewed by Darin Adler.
     7
     8        * Scripts/generateIntlCanonicalizeLanguage.py:
     9        * builtins/DatePrototype.js:
     10        * runtime/ArrayPrototype.cpp:
     11        (JSC::arrayProtoFuncToLocaleString):
     12        * runtime/DatePrototype.cpp:
     13        (JSC::DatePrototype::finishCreation):
     14        * runtime/IntlCollator.cpp:
     15        * runtime/IntlCollator.h:
     16        * runtime/IntlCollatorConstructor.cpp:
     17        * runtime/IntlCollatorConstructor.h:
     18        * runtime/IntlCollatorPrototype.cpp:
     19        * runtime/IntlCollatorPrototype.h:
     20        * runtime/IntlDateTimeFormat.cpp:
     21        * runtime/IntlDateTimeFormat.h:
     22        * runtime/IntlDateTimeFormatConstructor.cpp:
     23        * runtime/IntlDateTimeFormatConstructor.h:
     24        * runtime/IntlDateTimeFormatPrototype.cpp:
     25        * runtime/IntlDateTimeFormatPrototype.h:
     26        * runtime/IntlNumberFormat.cpp:
     27        * runtime/IntlNumberFormat.h:
     28        * runtime/IntlNumberFormatConstructor.cpp:
     29        * runtime/IntlNumberFormatConstructor.h:
     30        * runtime/IntlNumberFormatPrototype.cpp:
     31        * runtime/IntlNumberFormatPrototype.h:
     32        * runtime/IntlObject.cpp:
     33        * runtime/IntlObject.h:
     34        * runtime/IntlObjectInlines.h:
     35        * runtime/IntlPluralRules.cpp:
     36        * runtime/IntlPluralRules.h:
     37        * runtime/IntlPluralRulesConstructor.cpp:
     38        * runtime/IntlPluralRulesConstructor.h:
     39        * runtime/IntlPluralRulesPrototype.cpp:
     40        * runtime/IntlPluralRulesPrototype.h:
     41        * runtime/JSGlobalObject.cpp:
     42        (JSC::JSGlobalObject::init):
     43        (JSC::JSGlobalObject::visitChildren):
     44        * runtime/JSGlobalObject.h:
     45        (JSC::JSGlobalObject::defaultCollator const):
     46        (JSC::JSGlobalObject::pluralRulesStructure):
     47        * runtime/JSGlobalObjectFunctions.cpp:
     48        (JSC::globalFuncDateTimeFormat):
     49        * runtime/NumberPrototype.cpp:
     50        (JSC::numberProtoFuncToLocaleString):
     51        * runtime/StringPrototype.cpp:
     52        (JSC::StringPrototype::finishCreation):
     53        (JSC::stringProtoFuncLocaleCompare):
     54        (JSC::stringProtoFuncToLocaleUpperCase):
     55        * runtime/VM.cpp:
     56        (JSC::VM::VM):
     57        * runtime/VM.h:
     58
    1592020-04-08  Daniel Bates  <dabates@apple.com>
    260

  • trunk/Source/JavaScriptCore/Scripts/generateIntlCanonicalizeLanguage.py

    r236870 r259767  
    115115            file.write("// language-subtag-registry file date: {}\n".format(self.fileDate))
    116116        file.write("\n#pragma once\n")
    117         file.write("\n#if ENABLE(INTL)\n")
    118117        file.write("\nnamespace JSC {\n")
    119118        self.dumpLookup(file, "intlPreferredLanguageTag", self.languageMap)
    … …  
    123122        self.dumpLookup(file, "intlGrandfatheredLanguageTag", self.grandfatheredMap)
    124123        file.write("\n} // namespace JSC\n")
    125         file.write("\n#endif // ENABLE(INTL)\n")
    126124
    127125    def dumpLookup(self, file, name, map):

  • trunk/Source/JavaScriptCore/builtins/DatePrototype.js

    r242047 r259767  
    2323 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
    25 
    26 // @conditional=ENABLE(INTL)
    2725
    2826function toLocaleString(/* locales, options */)

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

    r259676 r259767  
    699699    RETURN_IF_EXCEPTION(scope, encodedJSValue());
    700700
    701 #if ENABLE(INTL)
    702701    ArgList arguments(callFrame);
    703 #endif
    704702    for (unsigned i = 0; i < length; ++i) {
    705703        JSValue element = thisObject->getIndex(globalObject, i);
    … …  
    713711            CallType callType = getCallData(vm, conversionFunction, callData);
    714712            if (callType != CallType::None) {
    715 #if ENABLE(INTL)
    716713                element = call(globalObject, conversionFunction, callType, callData, element, arguments);
    717 #else
    718                 element = call(globalObject, conversionFunction, callType, callData, element, *vm.emptyList);
    719 #endif
    720714                RETURN_IF_EXCEPTION(scope, encodedJSValue());
    721715            }

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

    r259547 r259767  
    518518    putDirectWithoutTransition(vm, Identifier::fromString(vm, "toGMTString"_s), toUTCStringFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
    519519
    520 #if ENABLE(INTL)
    521520    JSC_BUILTIN_FUNCTION_WITHOUT_TRANSITION("toLocaleString", datePrototypeToLocaleStringCodeGenerator, static_cast<unsigned>(PropertyAttribute::DontEnum));
    522521    JSC_BUILTIN_FUNCTION_WITHOUT_TRANSITION("toLocaleDateString", datePrototypeToLocaleDateStringCodeGenerator, static_cast<unsigned>(PropertyAttribute::DontEnum));
    523522    JSC_BUILTIN_FUNCTION_WITHOUT_TRANSITION("toLocaleTimeString", datePrototypeToLocaleTimeStringCodeGenerator, static_cast<unsigned>(PropertyAttribute::DontEnum));
    524 #endif
    525523
    526524    JSFunction* toPrimitiveFunction = JSFunction::create(vm, globalObject, 1, "[Symbol.toPrimitive]"_s, dateProtoFuncToPrimitiveSymbol, NoIntrinsic);

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

    r255120 r259767  
    2929#include "IntlCollator.h"
    3030
    31 #if ENABLE(INTL)
    32 
    3331#include "CatchScope.h"
    3432#include "Error.h"
    … …  
    4139#include "StructureInlines.h"
    4240#include <unicode/ucol.h>
    43 #include <wtf/unicode/Collator.h>
    4441
    4542namespace JSC {
    … …  
    437434
    438435} // namespace JSC
    439 
    440 #endif // ENABLE(INTL)

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

    r253019 r259767  
    2525
    2626#pragma once
    27 
    28 #if ENABLE(INTL)
    2927
    3028#include "JSObject.h"
    … …  
    9896
    9997} // namespace JSC
    100 
    101 #endif // ENABLE(INTL)

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

    r255120 r259767  
    2828#include "config.h"
    2929#include "IntlCollatorConstructor.h"
    30 
    31 #if ENABLE(INTL)
    3230
    3331#include "Error.h"
    … …  
    144142
    145143} // namespace JSC
    146 
    147 #endif // ENABLE(INTL)

  • trunk/Source/JavaScriptCore/runtime/IntlCollatorConstructor.h

    r253019 r259767  
    2626
    2727#pragma once
    28 
    29 #if ENABLE(INTL)
    3028
    3129#include "InternalFunction.h"
    … …  
    5856
    5957} // namespace JSC
    60 
    61 #endif // ENABLE(INTL)

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

    r253982 r259767  
    2727#include "config.h"
    2828#include "IntlCollatorPrototype.h"
    29 
    30 #if ENABLE(INTL)
    3129
    3230#include "Error.h"
    … …  
    151149
    152150} // namespace JSC
    153 
    154 #endif // ENABLE(INTL)

  • trunk/Source/JavaScriptCore/runtime/IntlCollatorPrototype.h

    r258059 r259767  
    2626
    2727#pragma once
    28 
    29 #if ENABLE(INTL)
    3028
    3129#include "JSObject.h"
    … …  
    5856
    5957} // namespace JSC
    60 
    61 #endif // ENABLE(INTL)

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

    r259606 r259767  
    2727#include "config.h"
    2828#include "IntlDateTimeFormat.h"
    29 
    30 #if ENABLE(INTL)
    3129
    3230#include "DateInstance.h"
    … …  
    10391037
    10401038} // namespace JSC
    1041 
    1042 #endif // ENABLE(INTL)

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

    r259606 r259767  
    2525
    2626#pragma once
    27 
    28 #if ENABLE(INTL)
    2927
    3028#include "JSObject.h"
    … …  
    125123
    126124} // namespace JSC
    127 
    128 #endif // ENABLE(INTL)

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

    r255120 r259767  
    2727#include "config.h"
    2828#include "IntlDateTimeFormatConstructor.h"
    29 
    30 #if ENABLE(INTL)
    3129
    3230#include "Error.h"
    … …  
    145143
    146144} // namespace JSC
    147 
    148 #endif // ENABLE(INTL)

  • trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatConstructor.h

    r253019 r259767  
    2626
    2727#pragma once
    28 
    29 #if ENABLE(INTL)
    3028
    3129#include "InternalFunction.h"
    … …  
    5856
    5957} // namespace JSC
    60 
    61 #endif // ENABLE(INTL)

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

    r259606 r259767  
    2727#include "config.h"
    2828#include "IntlDateTimeFormatPrototype.h"
    29 
    30 #if ENABLE(INTL)
    3129
    3230#include "BuiltinNames.h"
    … …  
    194192
    195193} // namespace JSC
    196 
    197 #endif // ENABLE(INTL)

  • trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.h

    r258059 r259767  
    2626
    2727#pragma once
    28 
    29 #if ENABLE(INTL)
    3028
    3129#include "JSObject.h"
    … …  
    5856
    5957} // namespace JSC
    60 
    61 #endif // ENABLE(INTL)

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

    r259606 r259767  
    2828#include "config.h"
    2929#include "IntlNumberFormat.h"
    30 
    31 #if ENABLE(INTL)
    3230
    3331#include "CatchScope.h"
    … …  
    540538
    541539} // namespace JSC
    542 
    543 #endif // ENABLE(INTL)

  • trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.h

    r259606 r259767  
    2525
    2626#pragma once
    27 
    28 #if ENABLE(INTL)
    2927
    3028#include "JSObject.h"
    … …  
    115113
    116114} // namespace JSC
    117 
    118 #endif // ENABLE(INTL)

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

    r255120 r259767  
    2727#include "config.h"
    2828#include "IntlNumberFormatConstructor.h"
    29 
    30 #if ENABLE(INTL)
    3129
    3230#include "Error.h"
    … …  
    145143
    146144} // namespace JSC
    147 
    148 #endif // ENABLE(INTL)

  • trunk/Source/JavaScriptCore/runtime/IntlNumberFormatConstructor.h

    r253019 r259767  
    2626
    2727#pragma once
    28 
    29 #if ENABLE(INTL)
    3028
    3129#include "InternalFunction.h"
    … …  
    5856
    5957} // namespace JSC
    60 
    61 #endif // ENABLE(INTL)

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

    r259606 r259767  
    2727#include "config.h"
    2828#include "IntlNumberFormatPrototype.h"
    29 
    30 #if ENABLE(INTL)
    3129
    3230#include "BuiltinNames.h"
    … …  
    180178
    181179} // namespace JSC
    182 
    183 #endif // ENABLE(INTL)

  • trunk/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.h

    r258059 r259767  
    2626
    2727#pragma once
    28 
    29 #if ENABLE(INTL)
    3028
    3129#include "JSObject.h"
    … …  
    5856
    5957} // namespace JSC
    60 
    61 #endif // ENABLE(INTL)

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

    r259481 r259767  
    2929#include "IntlObject.h"
    3030
    31 #if ENABLE(INTL)
    32 
    3331#include "Error.h"
    3432#include "FunctionPrototype.h"
    … …  
    10391037
    10401038} // namespace JSC
    1041 
    1042 #endif // ENABLE(INTL)

  • trunk/Source/JavaScriptCore/runtime/IntlObject.h

    r258059 r259767  
    2626
    2727#pragma once
    28 
    29 #if ENABLE(INTL)
    3028
    3129#include "JSCJSValueInlines.h"
    … …  
    8280
    8381} // namespace JSC
    84 
    85 #endif // ENABLE(INTL)

  • trunk/Source/JavaScriptCore/runtime/IntlObjectInlines.h

    r251425 r259767  
    2626
    2727#pragma once
    28 
    29 #if ENABLE(INTL)
    3028
    3129#include "BuiltinNames.h"
    … …  
    6260
    6361} // namespace JSC
    64 
    65 #endif // ENABLE(INTL)

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

    r259606 r259767  
    2828#include "IntlPluralRules.h"
    2929
    30 #if ENABLE(INTL)
    31 
    3230#include "Error.h"
    3331#include "IntlObject.h"
    … …  
    259257
    260258} // namespace JSC
    261 
    262 #endif // ENABLE(INTL)

  • trunk/Source/JavaScriptCore/runtime/IntlPluralRules.h

    r259606 r259767  
    2525
    2626#pragma once
    27 
    28 #if ENABLE(INTL)
    2927
    3028#include "JSObject.h"
    … …  
    9189
    9290} // namespace JSC
    93 
    94 #endif // ENABLE(INTL)

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

    r255120 r259767  
    2727#include "config.h"
    2828#include "IntlPluralRulesConstructor.h"
    29 
    30 #if ENABLE(INTL)
    3129
    3230#include "Error.h"
    … …  
    128126
    129127} // namespace JSC
    130 
    131 #endif // ENABLE(INTL)

  • trunk/Source/JavaScriptCore/runtime/IntlPluralRulesConstructor.h

    r253019 r259767  
    2626
    2727#pragma once
    28 
    29 #if ENABLE(INTL)
    3028
    3129#include "InternalFunction.h"
    … …  
    5856
    5957} // namespace JSC
    60 
    61 #endif // ENABLE(INTL)

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

    r253865 r259767  
    2727#include "config.h"
    2828#include "IntlPluralRulesPrototype.h"
    29 
    30 #if ENABLE(INTL)
    3129
    3230#include "Error.h"
    … …  
    113111
    114112} // namespace JSC
    115 
    116 #endif // ENABLE(INTL)

  • trunk/Source/JavaScriptCore/runtime/IntlPluralRulesPrototype.h

    r258059 r259767  
    2626
    2727#pragma once
    28 
    29 #if ENABLE(INTL)
    3028
    3129#include "JSObject.h"
    … …  
    5856
    5957} // namespace JSC
    60 
    61 #endif // ENABLE(INTL)
    62 

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

    r259029 r259767  
    7575#include "InspectorInstrumentationObject.h"
    7676#include "Interpreter.h"
     77#include "IntlCollator.h"
     78#include "IntlCollatorPrototype.h"
     79#include "IntlDateTimeFormat.h"
     80#include "IntlDateTimeFormatPrototype.h"
     81#include "IntlNumberFormat.h"
     82#include "IntlNumberFormatPrototype.h"
     83#include "IntlObject.h"
     84#include "IntlPluralRules.h"
     85#include "IntlPluralRulesPrototype.h"
    7786#include "IteratorPrototype.h"
    7887#include "JSAPIWrapperObject.h"
    … …  
    210219#include <wtf/RandomNumber.h>
    211220
    212 #if ENABLE(INTL)
    213 #include "IntlCollator.h"
    214 #include "IntlCollatorPrototype.h"
    215 #include "IntlDateTimeFormat.h"
    216 #include "IntlDateTimeFormatPrototype.h"
    217 #include "IntlNumberFormat.h"
    218 #include "IntlNumberFormatPrototype.h"
    219 #include "IntlObject.h"
    220 #include "IntlPluralRules.h"
    221 #include "IntlPluralRulesPrototype.h"
    222 #endif // ENABLE(INTL)
    223 
    224221#if ENABLE(REMOTE_INSPECTOR)
    225222#include "JSGlobalObjectDebuggable.h"
    … …  
    913910            init.set(JSFunction::create(init.vm, init.owner, 1, init.vm.propertyNames->eval.string(), globalFuncEval, NoIntrinsic));
    914911        });
    915    
    916 #if ENABLE(INTL)
     912
    917913    m_collatorStructure.initLater(
    918914        [] (const Initializer<Structure>& init) {
    … …  
    952948    IntlObject* intl = IntlObject::create(vm, IntlObject::createStructure(vm, this, m_objectPrototype.get()));
    953949    putDirectWithoutTransition(vm, vm.propertyNames->Intl, intl, static_cast<unsigned>(PropertyAttribute::DontEnum));
    954 #endif // ENABLE(INTL)
    955950
    956951    m_moduleLoader.initLater(
    … …  
    11611156        });
    11621157
    1163 #if ENABLE(INTL)
    11641158    m_linkTimeConstants[static_cast<unsigned>(LinkTimeConstant::dateTimeFormat)].initLater([] (const Initializer<JSCell>& init) {
    11651159            init.set(JSFunction::create(init.vm, jsCast<JSGlobalObject*>(init.owner), 0, String(), globalFuncDateTimeFormat));
    11661160        });
    1167 #endif // ENABLE(INTL)
     1161
    11681162#if ENABLE(WEBASSEMBLY) && ENABLE(WEBASSEMBLY_STREAMING_API)
    11691163    // WebAssembly Streaming API
    … …  
    17441738    visitor.append(thisObject->m_internalPromiseConstructor);
    17451739
    1746 #if ENABLE(INTL)
    17471740    thisObject->m_defaultCollator.visit(visitor);
    17481741    thisObject->m_collatorStructure.visit(visitor);
    … …  
    17501743    thisObject->m_dateTimeFormatStructure.visit(visitor);
    17511744    thisObject->m_pluralRulesStructure.visit(visitor);
    1752 #endif
     1745
    17531746    visitor.append(thisObject->m_nullGetterFunction);
    17541747    visitor.append(thisObject->m_nullSetterFunction);

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

    r255120 r259767  
    287287    WriteBarrier<JSInternalPromiseConstructor> m_internalPromiseConstructor;
    288288
    289 #if ENABLE(INTL)
    290289    LazyProperty<JSGlobalObject, IntlCollator> m_defaultCollator;
    291290    LazyProperty<JSGlobalObject, Structure> m_collatorStructure;
    … …  
    293292    LazyProperty<JSGlobalObject, Structure> m_dateTimeFormatStructure;
    294293    LazyProperty<JSGlobalObject, Structure> m_pluralRulesStructure;
    295 #endif
     294
    296295    WriteBarrier<NullGetterFunction> m_nullGetterFunction;
    297296    WriteBarrier<NullSetterFunction> m_nullSetterFunction;
    … …  
    599598    JSInternalPromiseConstructor* internalPromiseConstructor() const { return m_internalPromiseConstructor.get(); }
    600599
    601 #if ENABLE(INTL)
    602600    IntlCollator* defaultCollator() const { return m_defaultCollator.get(this); }
    603 #endif
    604601
    605602    NullGetterFunction* nullGetterFunction() const { return m_nullGetterFunction.get(); }
    … …  
    774771    Structure* webAssemblyWrapperFunctionStructure() const { return m_webAssemblyWrapperFunctionStructure.get(this); }
    775772#endif // ENABLE(WEBASSEMBLY)
    776 #if ENABLE(INTL)
    777773    Structure* collatorStructure() { return m_collatorStructure.get(this); }
    778774    Structure* numberFormatStructure() { return m_numberFormatStructure.get(this); }
    779775    Structure* dateTimeFormatStructure() { return m_dateTimeFormatStructure.get(this); }
    780776    Structure* pluralRulesStructure() { return m_pluralRulesStructure.get(this); }
    781 #endif // ENABLE(INTL)
    782777
    783778    JS_EXPORT_PRIVATE void setRemoteDebuggingEnabled(bool);

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

    r259676 r259767  
    856856}
    857857
    858 #if ENABLE(INTL)
    859858EncodedJSValue JSC_HOST_CALL globalFuncDateTimeFormat(JSGlobalObject* globalObject, CallFrame* callFrame)
    860859{
    … …  
    869868    RELEASE_AND_RETURN(scope, JSValue::encode(dateTimeFormat->format(globalObject, value)));
    870869}
    871 #endif
    872870
    873871} // namespace JSC

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

    r259547 r259767  
    579579        return throwVMToThisNumberError(globalObject, scope, callFrame->thisValue());
    580580
    581 #if ENABLE(INTL)
    582581    IntlNumberFormat* numberFormat = IntlNumberFormat::create(vm, globalObject->numberFormatStructure());
    583582    numberFormat->initializeNumberFormat(globalObject, callFrame->argument(0), callFrame->argument(1));
    584583    RETURN_IF_EXCEPTION(scope, encodedJSValue());
    585584    RELEASE_AND_RETURN(scope, JSValue::encode(numberFormat->formatNumber(globalObject, x)));
    586 #else
    587     return JSValue::encode(jsNumber(x).toString(globalObject));
    588 #endif
    589585}
    590586

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

    r259747 r259767  
    5959#include <wtf/text/StringBuilder.h>
    6060#include <wtf/text/StringView.h>
    61 #include <wtf/unicode/Collator.h>
    6261
    6362namespace JSC {
    … …  
    154153    JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("toUpperCase", stringProtoFuncToUpperCase, static_cast<unsigned>(PropertyAttribute::DontEnum), 0);
    155154    JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("localeCompare", stringProtoFuncLocaleCompare, static_cast<unsigned>(PropertyAttribute::DontEnum), 1);
    156 #if ENABLE(INTL)
    157155    JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("toLocaleLowerCase", stringProtoFuncToLocaleLowerCase, static_cast<unsigned>(PropertyAttribute::DontEnum), 0);
    158156    JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("toLocaleUpperCase", stringProtoFuncToLocaleUpperCase, static_cast<unsigned>(PropertyAttribute::DontEnum), 0);
    159 #else
    160     JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("toLocaleLowerCase", stringProtoFuncToLowerCase, static_cast<unsigned>(PropertyAttribute::DontEnum), 0);
    161     JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("toLocaleUpperCase", stringProtoFuncToUpperCase, static_cast<unsigned>(PropertyAttribute::DontEnum), 0);
    162 #endif
    163157    JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("trim", stringProtoFuncTrim, static_cast<unsigned>(PropertyAttribute::DontEnum), 0);
    164158    JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("startsWith", stringProtoFuncStartsWith, static_cast<unsigned>(PropertyAttribute::DontEnum), 1);
    … …  
    15421536    RETURN_IF_EXCEPTION(scope, encodedJSValue());
    15431537
    1544 #if ENABLE(INTL)
    15451538    JSValue locales = callFrame->argument(1);
    15461539    JSValue options = callFrame->argument(2);
    … …  
    15541547    }
    15551548    RELEASE_AND_RETURN(scope, JSValue::encode(collator->compareStrings(globalObject, string, that)));
    1556 #else
    1557     return JSValue::encode(jsNumber(Collator().collate(string, that)));
    1558 #endif
    1559 }
    1560 
    1561 #if ENABLE(INTL)
     1549}
     1550
    15621551enum class CaseConversionMode {
    15631552    Upper,
    … …  
    16691658    return toLocaleCase<CaseConversionMode::Upper>(globalObject,callFrame);
    16701659}
    1671 #endif // ENABLE(INTL)
    16721660
    16731661enum {

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

    r258059 r259767  
    7373#include "IndirectEvalExecutable.h"
    7474#include "Interpreter.h"
    75 #include "IntlCollatorConstructor.h"
    76 #include "IntlDateTimeFormatConstructor.h"
    77 #include "IntlNumberFormatConstructor.h"
    78 #include "IntlPluralRulesConstructor.h"
     75#include "IntlCollator.h"
     76#include "IntlDateTimeFormat.h"
     77#include "IntlNumberFormat.h"
     78#include "IntlPluralRules.h"
    7979#include "IsoHeapCellType.h"
    8080#include "IsoInlinedHeapCellType.h"
    … …  
    218218#endif
    219219
    220 #if ENABLE(INTL)
    221 #include "IntlCollator.h"
    222 #include "IntlDateTimeFormat.h"
    223 #include "IntlNumberFormat.h"
    224 #include "IntlPluralRules.h"
    225 #endif
    226 
    227220namespace JSC {
    228221
    … …  
    342335    , jscCallbackFunctionHeapCellType(IsoHeapCellType::create<JSCCallbackFunction>())
    343336#endif
    344 #if ENABLE(INTL)
    345337    , intlCollatorHeapCellType(IsoHeapCellType::create<IntlCollator>())
    346338    , intlDateTimeFormatHeapCellType(IsoHeapCellType::create<IntlDateTimeFormat>())
    347339    , intlNumberFormatHeapCellType(IsoHeapCellType::create<IntlNumberFormat>())
    348340    , intlPluralRulesHeapCellType(IsoHeapCellType::create<IntlPluralRules>())
    349 #endif
    350341#if ENABLE(WEBASSEMBLY)
    351342    , webAssemblyCodeBlockHeapCellType(IsoHeapCellType::create<JSWebAssemblyCodeBlock>())
    … …  
    15141505DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(callbackAPIWrapperGlobalObjectSpace, callbackAPIWrapperGlobalObjectHeapCellType.get(), JSCallbackObject<JSAPIWrapperGlobalObject>)
    15151506#endif
    1516 #if ENABLE(INTL)
    15171507DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(intlCollatorSpace, intlCollatorHeapCellType.get(), IntlCollator)
    15181508DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(intlDateTimeFormatSpace, intlDateTimeFormatHeapCellType.get(), IntlDateTimeFormat)
    15191509DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(intlNumberFormatSpace, intlNumberFormatHeapCellType.get(), IntlNumberFormat)
    15201510DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(intlPluralRulesSpace, intlPluralRulesHeapCellType.get(), IntlPluralRules)
    1521 #endif
    15221511#if ENABLE(WEBASSEMBLY)
    15231512DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(jsToWasmICCalleeSpace, cellHeapCellType.get(), JSToWasmICCallee)

  • trunk/Source/JavaScriptCore/runtime/VM.h

    r258059 r259767  
    397397    std::unique_ptr<IsoHeapCellType> jscCallbackFunctionHeapCellType;
    398398#endif
    399 #if ENABLE(INTL)
    400399    std::unique_ptr<IsoHeapCellType> intlCollatorHeapCellType;
    401400    std::unique_ptr<IsoHeapCellType> intlDateTimeFormatHeapCellType;
    402401    std::unique_ptr<IsoHeapCellType> intlNumberFormatHeapCellType;
    403402    std::unique_ptr<IsoHeapCellType> intlPluralRulesHeapCellType;
    404 #endif
    405403#if ENABLE(WEBASSEMBLY)
    406404    std::unique_ptr<IsoHeapCellType> webAssemblyCodeBlockHeapCellType;
    … …  
    554552    DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(weakMapSpace)
    555553    DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(withScopeSpace)
    556 #if ENABLE(INTL)
    557554    DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(intlCollatorSpace)
    558555    DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(intlDateTimeFormatSpace)
    559556    DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(intlNumberFormatSpace)
    560557    DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(intlPluralRulesSpace)
    561 #endif
    562558#if ENABLE(WEBASSEMBLY)
    563559    DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(jsToWasmICCalleeSpace)

  • trunk/Source/WTF/ChangeLog

    r259754 r259767  
     12020-04-08  Ross Kirsling  <ross.kirsling@sony.com>
     2
     3        Remove ENABLE_INTL define
     4        https://bugs.webkit.org/show_bug.cgi?id=210164
     5
     6        Reviewed by Darin Adler.
     7
     8        AppleWin (and, following suit, FTW) was the only upstream platform turning ENABLE_INTL off;
     9        now that their headers have been upgraded to ICU 62, this define can be removed entirely.
     10
     11        Going forward, we thus assume JSC has an Intl object and can simply runtime-guard any new features added to it.
     12
     13        * wtf/PlatformEnable.h:
     14        * wtf/PlatformEnableCocoa.h:
     15
    1162020-04-08  Adrian Perez de Castro  <aperez@igalia.com>
    217

  • trunk/Source/WTF/wtf/PlatformEnable.h

    r259582 r259767  
    329329#endif
    330330
    331 #if !defined(ENABLE_INTL)
    332 #define ENABLE_INTL 0
    333 #endif
    334 
    335331#if !defined(ENABLE_LAYOUT_FORMATTING_CONTEXT)
    336332#define ENABLE_LAYOUT_FORMATTING_CONTEXT 0

  • trunk/Source/WTF/wtf/PlatformEnableCocoa.h

    r259711 r259767  
    248248#endif
    249249
    250 #if !defined(ENABLE_INTL)
    251 #define ENABLE_INTL 1
    252 #endif
    253 
    254250/* FIXME: This should probably be HAVE_FAST_JIT_PERMISSIONS and may be entirely unnecessary due to runtime checking support via os_thread_self_restrict_rwx_is_supported() */
    255251#if !defined(ENABLE_FAST_JIT_PERMISSIONS) && CPU(ARM64) && !(OS(TVOS) || OS(WATCHOS)) && USE(APPLE_INTERNAL_SDK)

  • trunk/Source/cmake/OptionsFTW.cmake

    r259606 r259767  
    154154WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PRIVATE OFF)
    155155WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PRIVATE OFF)
    156 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PRIVATE OFF)
    157156WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE OFF)
    158157WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF)

  • trunk/Source/cmake/OptionsMac.cmake

    r259606 r259767  
    5555WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INSPECTOR_TELEMETRY PRIVATE ON)
    5656WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTERSECTION_OBSERVER PRIVATE ON)
    57 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PRIVATE ON)
    5857WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ON)
    5958WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_CSS_VENDOR_PREFIXES PRIVATE ON)

  • trunk/Source/cmake/OptionsWin.cmake

    r258181 r259767  
    7474    WEBKIT_OPTION_DEFINE(ENABLE_TLS_DEBUG "Enable TLS key log support" PRIVATE OFF)
    7575
    76     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC ON)
    7776    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PUBLIC OFF)
    7877    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE ON)
    … …  
    9897else ()
    9998    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_COMPOSITING PUBLIC OFF)
    100     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC OFF)
    10199    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PUBLIC ON)
    102100    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE OFF)

  • trunk/Source/cmake/WebKitFeatures.cmake

    r258498 r259767  
    152152    WEBKIT_OPTION_DEFINE(ENABLE_INSPECTOR_TELEMETRY "Toggle inspector telemetry support" PRIVATE OFF)
    153153    WEBKIT_OPTION_DEFINE(ENABLE_INTERSECTION_OBSERVER "Enable Intersection Observer support" PRIVATE ON)
    154     WEBKIT_OPTION_DEFINE(ENABLE_INTL "Toggle Intl support" PRIVATE ON)
    155154    WEBKIT_OPTION_DEFINE(ENABLE_IOS_GESTURE_EVENTS "Toggle iOS gesture events support" PRIVATE OFF)
    156155    WEBKIT_OPTION_DEFINE(ENABLE_IOS_TOUCH_EVENTS "Toggle iOS touch events support" PRIVATE OFF)

  • trunk/Source/cmake/tools/vsprops/FeatureDefines.props

    r258498 r259767  
    3939    <ENABLE_INPUT_TYPE_TIME />
    4040    <ENABLE_INPUT_TYPE_WEEK />
    41     <ENABLE_INTL>ENABLE_INTL</ENABLE_INTL>
    4241    <ENABLE_LEGACY_CSS_VENDOR_PREFIXES>ENABLE_LEGACY_CSS_VENDOR_PREFIXES</ENABLE_LEGACY_CSS_VENDOR_PREFIXES>
    4342    <ENABLE_LEGACY_ENCRYPTED_MEDIA>ENABLE_LEGACY_ENCRYPTED_MEDIA</ENABLE_LEGACY_ENCRYPTED_MEDIA>
    … …  
    7675  <ItemDefinitionGroup>
    7776    <ClCompile>
    78       <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_INTL);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_STREAMS_API);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBGPU);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     77      <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_STREAMS_API);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBGPU);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    7978    </ClCompile>
    8079  </ItemDefinitionGroup>
    … …  
    228227      <EnvironmentVariable>true</EnvironmentVariable>
    229228    </BuildMacro>
    230     <BuildMacro Include="ENABLE_INTL">
    231       <Value>$(ENABLE_INTL)</Value>
    232       <EnvironmentVariable>true</EnvironmentVariable>
    233     </BuildMacro>
    234229    <BuildMacro Include="ENABLE_LEGACY_CSS_VENDOR_PREFIXES">
    235230      <Value>$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES)</Value>

  • trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props

    r258498 r259767  
    3939    <ENABLE_INPUT_TYPE_TIME />
    4040    <ENABLE_INPUT_TYPE_WEEK />
    41     <ENABLE_INTL>ENABLE_INTL</ENABLE_INTL>
    4241    <ENABLE_LEGACY_CSS_VENDOR_PREFIXES>ENABLE_LEGACY_CSS_VENDOR_PREFIXES</ENABLE_LEGACY_CSS_VENDOR_PREFIXES>
    4342    <ENABLE_LEGACY_ENCRYPTED_MEDIA />
    … …  
    7574  <ItemDefinitionGroup>
    7675    <ClCompile>
    77       <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_INTL);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     76      <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    7877    </ClCompile>
    7978  </ItemDefinitionGroup>
    … …  
    231230      <EnvironmentVariable>true</EnvironmentVariable>
    232231    </BuildMacro>
    233     <BuildMacro Include="ENABLE_INTL">
    234       <Value>$(ENABLE_INTL)</Value>
    235       <EnvironmentVariable>true</EnvironmentVariable>
    236     </BuildMacro>
    237232    <BuildMacro Include="ENABLE_LEGACY_CSS_VENDOR_PREFIXES">
    238233      <Value>$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES)</Value>

  • trunk/Tools/ChangeLog

    r259762 r259767  
     12020-04-08  Ross Kirsling  <ross.kirsling@sony.com>
     2
     3        Remove ENABLE_INTL define
     4        https://bugs.webkit.org/show_bug.cgi?id=210164
     5
     6        Reviewed by Darin Adler.
     7
     8        * Scripts/webkitperl/FeatureList.pm:
     9
    1102020-04-08  Daniel Bates  <dabates@apple.com>
    211

  • trunk/Tools/Scripts/webkitperl/FeatureList.pm

    r258498 r259767  
    110110    $inspectorTelemetrySupport,
    111111    $intersectionObserverSupport,
    112     $intlSupport,
    113112    $iosGestureEventsSupport,
    114113    $iosTouchEventsSupport,
    … …  
    378377      define => "ENABLE_INTERSECTION_OBSERVER", value => \$intersectionObserverSupport },
    379378
    380     { option => "intl", desc => "Toggle Intl support",
    381       define => "ENABLE_INTL", value => \$intlSupport },
    382 
    383379    { option => "ios-gesture-events", desc => "Toggle iOS gesture events support",
    384380      define => "ENABLE_IOS_GESTURE_EVENTS", value => \$iosGestureEventsSupport },
Note: See TracChangeset for help on using the changeset viewer.