diff --git a/Userland/Libraries/LibWeb/NavigationTiming/EntryNames.cpp b/Userland/Libraries/LibWeb/NavigationTiming/EntryNames.cpp index 2769f4690c..cc337d1fdd 100644 --- a/Userland/Libraries/LibWeb/NavigationTiming/EntryNames.cpp +++ b/Userland/Libraries/LibWeb/NavigationTiming/EntryNames.cpp @@ -8,7 +8,7 @@ namespace Web::NavigationTiming::EntryNames { -#define __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(name) FlyString name; +#define __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(name, _) FlyString name; ENUMERATE_NAVIGATION_TIMING_ENTRY_NAMES #undef __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME @@ -17,7 +17,7 @@ ErrorOr initialize_strings() static bool s_initialized = false; VERIFY(!s_initialized); -#define __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(name) \ +#define __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(name, _) \ name = TRY(#name##_fly_string); ENUMERATE_NAVIGATION_TIMING_ENTRY_NAMES #undef __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME diff --git a/Userland/Libraries/LibWeb/NavigationTiming/EntryNames.h b/Userland/Libraries/LibWeb/NavigationTiming/EntryNames.h index 3343f745fd..9fc275c067 100644 --- a/Userland/Libraries/LibWeb/NavigationTiming/EntryNames.h +++ b/Userland/Libraries/LibWeb/NavigationTiming/EntryNames.h @@ -10,30 +10,30 @@ namespace Web::NavigationTiming::EntryNames { -#define ENUMERATE_NAVIGATION_TIMING_ENTRY_NAMES \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(navigationStart) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(unloadEventStart) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(unloadEventEnd) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(redirectStart) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(redirectEnd) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(fetchStart) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(domainLookupStart) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(domainLookupEnd) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(connectStart) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(connectEnd) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(secureConnectionStart) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(requestStart) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(responseStart) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(responseEnd) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(domLoading) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(domInteractive) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(domContentLoadedEventStart) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(domContentLoadedEventEnd) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(domComplete) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(loadEventStart) \ - __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(loadEventEnd) +#define ENUMERATE_NAVIGATION_TIMING_ENTRY_NAMES \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(navigationStart, navigation_start) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(unloadEventStart, unload_event_start) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(unloadEventEnd, unload_event_end) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(redirectStart, redirect_start) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(redirectEnd, redirect_end) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(fetchStart, fetch_start) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(domainLookupStart, domain_lookup_start) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(domainLookupEnd, domain_lookup_end) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(connectStart, connect_start) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(connectEnd, connect_end) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(secureConnectionStart, secure_connection_start) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(requestStart, request_start) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(responseStart, response_start) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(responseEnd, response_end) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(domLoading, dom_loading) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(domInteractive, dom_interactive) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(domContentLoadedEventStart, dom_content_loaded_event_start) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(domContentLoadedEventEnd, dom_content_loaded_event_end) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(domComplete, dom_complete) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(loadEventStart, load_event_start) \ + __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(loadEventEnd, load_event_end) -#define __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(name) extern FlyString name; +#define __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(name, _) extern FlyString name; ENUMERATE_NAVIGATION_TIMING_ENTRY_NAMES #undef __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME diff --git a/Userland/Libraries/LibWeb/UserTiming/PerformanceMark.cpp b/Userland/Libraries/LibWeb/UserTiming/PerformanceMark.cpp index d2da66c87f..af7c96d60f 100644 --- a/Userland/Libraries/LibWeb/UserTiming/PerformanceMark.cpp +++ b/Userland/Libraries/LibWeb/UserTiming/PerformanceMark.cpp @@ -34,8 +34,8 @@ WebIDL::ExceptionOr> PerformanceMark::construc if (is(current_global_object)) { bool matched = false; -#define __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(name) \ - if (mark_name == NavigationTiming::EntryNames::name) \ +#define __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME(name, _) \ + if (mark_name == NavigationTiming::EntryNames::name) \ matched = true; ENUMERATE_NAVIGATION_TIMING_ENTRY_NAMES #undef __ENUMERATE_NAVIGATION_TIMING_ENTRY_NAME