Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (262460 => 262461)
--- trunk/Source/_javascript_Core/ChangeLog 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-06-02 23:34:11 UTC (rev 262461)
@@ -1,3 +1,15 @@
+2020-06-02 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, reverting r262424.
+
+ Caused webkitpy test failure
+
+ Reverted changeset:
+
+ "Make generated C++ code use modern C++"
+ https://bugs.webkit.org/show_bug.cgi?id=190714
+ https://trac.webkit.org/changeset/262424
+
2020-06-02 Mark Lam <mark....@apple.com>
Change Gigacage::Config to use storage in WebConfig::g_config instead of its own.
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/cpp_generator_templates.py (262460 => 262461)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/cpp_generator_templates.py 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/cpp_generator_templates.py 2020-06-02 23:34:11 UTC (rev 262461)
@@ -139,8 +139,8 @@
RefPtr<JSON::Object> parameters;
message->getObject("params"_s, parameters);
- using CallHandler = void (${domainName}BackendDispatcher::*)(long requestId, RefPtr<JSON::Object>&& message);
- using DispatchMap = HashMap<String, CallHandler>;
+ typedef void (${domainName}BackendDispatcher::*CallHandler)(long requestId, RefPtr<JSON::Object>&& message);
+ typedef HashMap<String, CallHandler> DispatchMap;
static NeverDestroyed<DispatchMap> dispatchMap;
if (dispatchMap.get().isEmpty()) {
static const struct MethodTable {
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_protocol_types_header.py (262460 => 262461)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2020-06-02 23:34:11 UTC (rev 262461)
@@ -169,7 +169,7 @@
typedef_lines = []
if len(declaration.description) > 0:
typedef_lines.append('/* %s */' % declaration.description)
- typedef_lines.append('using %s = %s;' % (declaration.type_name, primitive_name))
+ typedef_lines.append('typedef %s %s;' % (primitive_name, declaration.type_name))
sections.append(self.wrap_with_guard_for_condition(declaration.condition, '\n'.join(typedef_lines)))
for declaration in array_declarations:
@@ -177,7 +177,7 @@
typedef_lines = []
if len(declaration.description) > 0:
typedef_lines.append('/* %s */' % declaration.description)
- typedef_lines.append('using %s = JSON::ArrayOf<%s>;' % (declaration.type_name, element_type))
+ typedef_lines.append('typedef JSON::ArrayOf<%s> %s;' % (element_type, declaration.type_name))
sections.append(self.wrap_with_guard_for_condition(declaration.condition, '\n'.join(typedef_lines)))
lines = []
@@ -486,7 +486,7 @@
enum_lines = []
enum_lines.append('template<>')
enum_lines.append('struct DefaultHash<Inspector::Protocol::%s::%s> {' % (domain.domain_name, enum_type.raw_name()))
- enum_lines.append(' using Hash = IntHash<Inspector::Protocol::%s::%s>;' % (domain.domain_name, enum_type.raw_name()))
+ enum_lines.append(' typedef IntHash<Inspector::Protocol::%s::%s> Hash;' % (domain.domain_name, enum_type.raw_name()))
enum_lines.append('};')
domain_lines.append(self.wrap_with_guard_for_condition(enum_type.declaration().condition, '\n'.join(enum_lines)))
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result (262460 => 262461)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2020-06-02 23:34:11 UTC (rev 262461)
@@ -618,8 +618,8 @@
// Typedefs.
namespace Database {
/* Unique identifier of Database object. */
-using DatabaseId = int;
-using ColorList = JSON::ArrayOf<Inspector::Protocol::Database::PrimaryColors>;
+typedef int DatabaseId;
+typedef JSON::ArrayOf<Inspector::Protocol::Database::PrimaryColors> ColorList;
} // Database
// End of typedefs.
@@ -734,7 +734,7 @@
// Hash declarations in the 'Database' Domain
template<>
struct DefaultHash<Inspector::Protocol::Database::PrimaryColors> {
- using Hash = IntHash<Inspector::Protocol::Database::PrimaryColors>;
+ typedef IntHash<Inspector::Protocol::Database::PrimaryColors> Hash;
};
} // namespace WTF
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (262460 => 262461)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2020-06-02 23:34:11 UTC (rev 262461)
@@ -529,8 +529,8 @@
// Typedefs.
namespace Database {
/* Unique identifier of Database object. */
-using DatabaseId = int;
-using ColorList = JSON::ArrayOf<Inspector::Protocol::Database::PrimaryColors>;
+typedef int DatabaseId;
+typedef JSON::ArrayOf<Inspector::Protocol::Database::PrimaryColors> ColorList;
} // Database
// End of typedefs.
@@ -645,7 +645,7 @@
// Hash declarations in the 'Database' Domain
template<>
struct DefaultHash<Inspector::Protocol::Database::PrimaryColors> {
- using Hash = IntHash<Inspector::Protocol::Database::PrimaryColors>;
+ typedef IntHash<Inspector::Protocol::Database::PrimaryColors> Hash;
};
} // namespace WTF
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result (262460 => 262461)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2020-06-02 23:34:11 UTC (rev 262461)
@@ -337,8 +337,8 @@
RefPtr<JSON::Object> parameters;
message->getObject("params"_s, parameters);
- using CallHandler = void (Network3BackendDispatcher::*)(long requestId, RefPtr<JSON::Object>&& message);
- using DispatchMap = HashMap<String, CallHandler>;
+ typedef void (Network3BackendDispatcher::*CallHandler)(long requestId, RefPtr<JSON::Object>&& message);
+ typedef HashMap<String, CallHandler> DispatchMap;
static NeverDestroyed<DispatchMap> dispatchMap;
if (dispatchMap.get().isEmpty()) {
static const struct MethodTable {
@@ -637,7 +637,7 @@
// Typedefs.
namespace Network2 {
/* Unique loader identifier. */
-using LoaderId = String;
+typedef String LoaderId;
} // Network2
// End of typedefs.
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result (262460 => 262461)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result 2020-06-02 23:34:11 UTC (rev 262461)
@@ -493,7 +493,7 @@
// Hash declarations in the 'TypeDomain' Domain
template<>
struct DefaultHash<Inspector::Protocol::TypeDomain::TypeDomainEnum> {
- using Hash = IntHash<Inspector::Protocol::TypeDomain::TypeDomainEnum>;
+ typedef IntHash<Inspector::Protocol::TypeDomain::TypeDomainEnum> Hash;
};
} // namespace WTF
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/events-with-optional-parameters.json-result (262460 => 262461)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2020-06-02 23:34:11 UTC (rev 262461)
@@ -382,9 +382,9 @@
// Typedefs.
namespace Database {
/* Unique identifier of Database object. */
-using DatabaseId = String;
-using PrimaryColors = String;
-using ColorList = JSON::ArrayOf<String>;
+typedef String DatabaseId;
+typedef String PrimaryColors;
+typedef JSON::ArrayOf<String> ColorList;
} // Database
// End of typedefs.
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/same-type-id-different-domain.json-result (262460 => 262461)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2020-06-02 23:34:11 UTC (rev 262461)
@@ -313,12 +313,12 @@
// Typedefs.
namespace Runtime {
/* Unique object identifier. */
-using RemoteObjectId = String;
+typedef String RemoteObjectId;
} // Runtime
namespace Runtime2 {
/* Unique object identifier. */
-using RemoteObjectId = String;
+typedef String RemoteObjectId;
} // Runtime2
// End of typedefs.
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result (262460 => 262461)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2020-06-02 23:34:11 UTC (rev 262461)
@@ -313,7 +313,7 @@
// Typedefs.
namespace Runtime {
/* Unique object identifier. */
-using RemoteObjectId = int;
+typedef int RemoteObjectId;
} // Runtime
// End of typedefs.
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-array-type.json-result (262460 => 262461)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2020-06-02 23:34:11 UTC (rev 262461)
@@ -322,16 +322,16 @@
// Typedefs.
namespace Debugger {
-using BreakpointId = int;
+typedef int BreakpointId;
} // Debugger
namespace Runtime {
-using ObjectId = int;
-using LuckyNumbers = JSON::ArrayOf<int>;
-using BabyNames = JSON::ArrayOf<String>;
-using NewObjects = JSON::ArrayOf<int>;
-using OldObjects = JSON::ArrayOf<int>;
-using StopReasons = JSON::ArrayOf<Inspector::Protocol::Debugger::Reason>;
+typedef int ObjectId;
+typedef JSON::ArrayOf<int> LuckyNumbers;
+typedef JSON::ArrayOf<String> BabyNames;
+typedef JSON::ArrayOf<int> NewObjects;
+typedef JSON::ArrayOf<int> OldObjects;
+typedef JSON::ArrayOf<Inspector::Protocol::Debugger::Reason> StopReasons;
} // Runtime
// End of typedefs.
@@ -380,7 +380,7 @@
// Hash declarations in the 'Debugger' Domain
template<>
struct DefaultHash<Inspector::Protocol::Debugger::Reason> {
- using Hash = IntHash<Inspector::Protocol::Debugger::Reason>;
+ typedef IntHash<Inspector::Protocol::Debugger::Reason> Hash;
};
} // namespace WTF
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-enum-type.json-result (262460 => 262461)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2020-06-02 23:34:11 UTC (rev 262461)
@@ -379,11 +379,11 @@
// Hash declarations in the 'Runtime' Domain
template<>
struct DefaultHash<Inspector::Protocol::Runtime::FarmAnimals> {
- using Hash = IntHash<Inspector::Protocol::Runtime::FarmAnimals>;
+ typedef IntHash<Inspector::Protocol::Runtime::FarmAnimals> Hash;
};
template<>
struct DefaultHash<Inspector::Protocol::Runtime::TwoLeggedAnimals> {
- using Hash = IntHash<Inspector::Protocol::Runtime::TwoLeggedAnimals>;
+ typedef IntHash<Inspector::Protocol::Runtime::TwoLeggedAnimals> Hash;
};
} // namespace WTF
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result (262460 => 262461)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2020-06-02 23:34:11 UTC (rev 262461)
@@ -333,7 +333,7 @@
// Typedefs.
namespace Database {
-using ErrorList = JSON::ArrayOf<Inspector::Protocol::Database::Error>;
+typedef JSON::ArrayOf<Inspector::Protocol::Database::Error> ErrorList;
} // Database
// End of typedefs.
@@ -909,7 +909,7 @@
// Hash declarations in the 'Database' Domain
template<>
struct DefaultHash<Inspector::Protocol::Database::MouseButton> {
- using Hash = IntHash<Inspector::Protocol::Database::MouseButton>;
+ typedef IntHash<Inspector::Protocol::Database::MouseButton> Hash;
};
} // namespace WTF
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (262460 => 262461)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2020-06-02 23:34:11 UTC (rev 262461)
@@ -327,8 +327,8 @@
// Typedefs.
namespace Test {
-using CastedObjectId = int;
-using UncastedObjectId = int;
+typedef int CastedObjectId;
+typedef int UncastedObjectId;
} // Test
// End of typedefs.
@@ -596,11 +596,11 @@
// Hash declarations in the 'Test' Domain
template<>
struct DefaultHash<Inspector::Protocol::Test::UncastedAnimals> {
- using Hash = IntHash<Inspector::Protocol::Test::UncastedAnimals>;
+ typedef IntHash<Inspector::Protocol::Test::UncastedAnimals> Hash;
};
template<>
struct DefaultHash<Inspector::Protocol::Test::CastedAnimals> {
- using Hash = IntHash<Inspector::Protocol::Test::CastedAnimals>;
+ typedef IntHash<Inspector::Protocol::Test::CastedAnimals> Hash;
};
} // namespace WTF
Modified: trunk/Source/_javascript_Core/yarr/generateYarrUnicodePropertyTables.py (262460 => 262461)
--- trunk/Source/_javascript_Core/yarr/generateYarrUnicodePropertyTables.py 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/_javascript_Core/yarr/generateYarrUnicodePropertyTables.py 2020-06-02 23:34:11 UTC (rev 262461)
@@ -551,7 +551,7 @@
for propertyData in cls.allPropertyData:
propertyData.dump(file, propertyData != cls.allPropertyData[-1])
- file.write("using CreateCharacterClass = std::unique_ptr<CharacterClass> (*)();\n")
+ file.write("typedef std::unique_ptr<CharacterClass> (*CreateCharacterClass)();\n")
file.write("static CreateCharacterClass createFunctions[{}] = {{\n ".format(len(cls.allPropertyData)))
functionsOnThisLine = 0
for propertyData in cls.allPropertyData:
Modified: trunk/Source/WebCore/ChangeLog (262460 => 262461)
--- trunk/Source/WebCore/ChangeLog 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/WebCore/ChangeLog 2020-06-02 23:34:11 UTC (rev 262461)
@@ -1,3 +1,15 @@
+2020-06-02 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, reverting r262424.
+
+ Caused webkitpy test failure
+
+ Reverted changeset:
+
+ "Make generated C++ code use modern C++"
+ https://bugs.webkit.org/show_bug.cgi?id=190714
+ https://trac.webkit.org/changeset/262424
+
2020-06-02 Peng Liu <peng.l...@apple.com>
Stressing webkitSetPresentationMode leads to wrong inline video dimensions
Modified: trunk/Source/WebCore/css/makeprop.pl (262460 => 262461)
--- trunk/Source/WebCore/css/makeprop.pl 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/WebCore/css/makeprop.pl 2020-06-02 23:34:11 UTC (rev 262461)
@@ -618,7 +618,7 @@
} // namespace WebCore
namespace WTF {
-template<> struct DefaultHash<WebCore::CSSPropertyID> { using Hash = IntHash<unsigned>; };
+template<> struct DefaultHash<WebCore::CSSPropertyID> { typedef IntHash<unsigned> Hash; };
template<> struct HashTraits<WebCore::CSSPropertyID> : GenericHashTraits<WebCore::CSSPropertyID> {
static const bool emptyValueIsZero = true;
static void constructDeletedValue(WebCore::CSSPropertyID& slot) { slot = static_cast<WebCore::CSSPropertyID>(WebCore::lastCSSProperty + 1); }
Modified: trunk/Source/WebCore/dom/make_names.pl (262460 => 262461)
--- trunk/Source/WebCore/dom/make_names.pl 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/WebCore/dom/make_names.pl 2020-06-02 23:34:11 UTC (rev 262461)
@@ -542,8 +542,10 @@
my ($F, $prefix, $namespace, $includes, $definitions) = @_;
print F<<END
-#pragma once
+#ifndef ${prefix}_${namespace}Names_h
+#define ${prefix}_${namespace}Names_h
+
$includes
namespace WebCore {
@@ -581,6 +583,7 @@
if ($isDefinition) {
print F "\nWEBCORE_EXPORT void init();\n\n";
print F "} }\n\n";
+ print F "#endif\n\n";
return;
}
@@ -692,11 +695,14 @@
open F, ">$headerPath";
printLicenseHeader($F);
- print F "#pragma once\n\n";
+ print F "#ifndef ".$parameters{namespace}."ElementTypeHelpers_h\n";
+ print F "#define ".$parameters{namespace}."ElementTypeHelpers_h\n\n";
print F "#include \"".$parameters{namespace}."Names.h\"\n\n";
printTypeHelpers($F, \%allTags);
+ print F "#endif\n";
+
close F;
}
@@ -961,7 +967,7 @@
namespace WebCore {
-using $parameters{namespace}ConstructorFunction = Ref<$parameters{namespace}Element> (*)(const QualifiedName&, Document&$formElementArgumentForDeclaration, bool createdByParser);
+typedef Ref<$parameters{namespace}Element> (*$parameters{namespace}ConstructorFunction)(const QualifiedName&, Document&$formElementArgumentForDeclaration, bool createdByParser);
END
;
@@ -1081,7 +1087,8 @@
printLicenseHeader($F);
print F<<END
-#pragma once
+#ifndef $parameters{namespace}ElementFactory_h
+#define $parameters{namespace}ElementFactory_h
#include <wtf/Forward.h>
@@ -1119,6 +1126,8 @@
}
+#endif // $parameters{namespace}ElementFactory_h
+
END
;
@@ -1238,7 +1247,7 @@
namespace WebCore {
-using Create$parameters{namespace}ElementWrapperFunction = JSDOMObject* (*)(JSDOMGlobalObject*, Ref<$parameters{namespace}Element>&&);
+typedef JSDOMObject* (*Create$parameters{namespace}ElementWrapperFunction)(JSDOMGlobalObject*, Ref<$parameters{namespace}Element>&&);
END
;
@@ -1329,8 +1338,11 @@
printLicenseHeader($F);
- print F "#pragma once\n\n";
+ print F "#ifndef JS$parameters{namespace}ElementWrapperFactory_h\n";
+ print F "#define JS$parameters{namespace}ElementWrapperFactory_h\n\n";
+ print F "#if $parameters{guardFactoryWith}\n" if $parameters{guardFactoryWith};
+
print F <<END
#include <wtf/Forward.h>
@@ -1347,5 +1359,9 @@
END
;
+ print F "#endif // $parameters{guardFactoryWith}\n\n" if $parameters{guardFactoryWith};
+
+ print F "#endif // JS$parameters{namespace}ElementWrapperFactory_h\n";
+
close F;
}
Modified: trunk/Source/WebKit/ChangeLog (262460 => 262461)
--- trunk/Source/WebKit/ChangeLog 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/WebKit/ChangeLog 2020-06-02 23:34:11 UTC (rev 262461)
@@ -1,3 +1,15 @@
+2020-06-02 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, reverting r262424.
+
+ Caused webkitpy test failure
+
+ Reverted changeset:
+
+ "Make generated C++ code use modern C++"
+ https://bugs.webkit.org/show_bug.cgi?id=190714
+ https://trac.webkit.org/changeset/262424
+
2020-06-02 Peng Liu <peng.l...@apple.com>
Stressing webkitSetPresentationMode leads to wrong inline video dimensions
Modified: trunk/Source/WebKit/Scripts/webkit/messages.py (262460 => 262461)
--- trunk/Source/WebKit/Scripts/webkit/messages.py 2020-06-02 23:18:03 UTC (rev 262460)
+++ trunk/Source/WebKit/Scripts/webkit/messages.py 2020-06-02 23:34:11 UTC (rev 262461)
@@ -140,7 +140,7 @@
result.append('class %s {\n' % message.name)
result.append('public:\n')
- result.append(' using Arguments = %s;\n' % arguments_type(message))
+ result.append(' typedef %s Arguments;\n' % arguments_type(message))
result.append('\n')
result.append(' static IPC::MessageName name() { return IPC::MessageName::%s_%s; }\n' % (receiver.name, message.name))
result.append(' static const bool isSync = %s;\n' % ('false', 'true')[message.reply_parameters != None and not message.has_attribute(ASYNC_ATTRIBUTE)])
