Fix build errors due to unused values and declarations

Unreviewed build fixes. * Source/JavaScriptCore/b3/B3Value.cpp: Guard B3ValueInternal::alwaysDumpConstructionSite with ASSERT_ENABLED, as it is used only inside assertions. * Source/JavaScriptCore/runtime/LiteralParser.cpp: (JSC::cannotBeIdentPartOrEscapeStart): Mark as [[maybe_unused]]. reached by other code. * Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp: Guard WasmB3IRGeneratorInternal::traceExecutionIncludesConstructionSite with ASSERT_ENABLED, as it is used only inside assertions. * Source/WebCore/Modules/mediastream/RTCRtpSFrameTransformer.cpp: Guard AES_CM_128_HMAC_SHA256_NONCE_SIZE with ASSERT_ENABLED, as it is used only inside assertions. * Source/WebCore/css/parser/CSSSelectorParser.cpp: Add missing CSSParserIdioms.h header. * Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp: Remove variable checkContextLossHandlingDelay, as it it unused in the code. * Source/WebCore/layout/formattingContexts/table/TableLayout.cpp: Add missing RenderStyleInlines.h header, to solve a linker error. * Source/WebCore/page/OpportunisticTaskScheduler.h: Add missing JavaScriptCore/MarkedSpace.h header inclusion. * Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp: Guard deviceChangeDebounceTimerInterval variable with !USE(GSTREAMER), as it is unused when using GStreamer for multimedia. * Source/WebCore/svg/SVGClipPathElement.cpp: Add missing SVGElementInlines.h header inclusion, to solve a linker error. * Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp: Guard c_defaultRefreshRate with !HAVE(DISPLAY_LINK), as it is unused with DisplayLink enabled. * Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp: Remove focusedActiveWindow, as it is not used in the code. Canonical link: https://commits.webkit.org/271093@main
WebKit · Nov 24, 2023 · 5266976 · 5266976
1 parent aa809c0
commit 5266976
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 7 deletions.
diff --git a/Source/JavaScriptCore/b3/B3Value.cpp b/Source/JavaScriptCore/b3/B3Value.cpp
@@ -49,11 +49,11 @@
 
 namespace JSC { namespace B3 {
 
+#if ASSERT_ENABLED
 namespace B3ValueInternal {
 constexpr bool alwaysDumpConstructionSite = false;
 }
 
-#if ASSERT_ENABLED
 String Value::generateCompilerConstructionSite()
 {
     StringPrintStream s;

diff --git a/Source/JavaScriptCore/runtime/LiteralParser.cpp b/Source/JavaScriptCore/runtime/LiteralParser.cpp
@@ -151,12 +151,12 @@ ALWAYS_INLINE JSString* LiteralParser<CharType>::makeJSString(VM& vm, typename L
     return jsString(vm, Identifier::fromString(vm, token->stringStart16, token->stringOrIdentifierLength).string());
 }
 
-static ALWAYS_INLINE bool cannotBeIdentPartOrEscapeStart(LChar)
+[[maybe_unused]] static ALWAYS_INLINE bool cannotBeIdentPartOrEscapeStart(LChar)
 {
     RELEASE_ASSERT_NOT_REACHED();
 }
 
-static ALWAYS_INLINE bool cannotBeIdentPartOrEscapeStart(UChar)
+[[maybe_unused]] static ALWAYS_INLINE bool cannotBeIdentPartOrEscapeStart(UChar)
 {
     RELEASE_ASSERT_NOT_REACHED();
 }

diff --git a/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp b/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp
@@ -96,8 +96,10 @@ namespace WasmB3IRGeneratorInternal {
 static constexpr bool verbose = false;
 static constexpr bool verboseInlining = false;
 static constexpr bool traceExecution = false;
-static constexpr bool traceExecutionIncludesConstructionSite = false;
 static constexpr bool traceStackValues = false;
+#if ASSERT_ENABLED
+static constexpr bool traceExecutionIncludesConstructionSite = false;
+#endif
 }
 }
 

diff --git a/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransformer.cpp b/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransformer.cpp
@@ -33,7 +33,9 @@
 
 namespace WebCore {
 
+#if ASSERT_ENABLED
 static constexpr unsigned AES_CM_128_HMAC_SHA256_NONCE_SIZE = 12;
+#endif
 
 static inline void writeUInt64(uint8_t* data, uint64_t value, uint8_t valueLength)
 {

diff --git a/Source/WebCore/css/parser/CSSSelectorParser.cpp b/Source/WebCore/css/parser/CSSSelectorParser.cpp
@@ -30,6 +30,7 @@
 #include "config.h"
 #include "CSSSelectorParser.h"
 
+#include "CSSParserIdioms.h"
 #include "CSSParserSelector.h"
 #include "CSSSelector.h"
 #include "CommonAtomStrings.h"

diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
@@ -181,7 +181,6 @@ WTF_MAKE_ISO_ALLOCATED_IMPL(WebGLRenderingContextBase);
 
 static constexpr Seconds secondsBetweenRestoreAttempts { 1_s };
 static constexpr int maxGLErrorsAllowedToConsole = 256;
-static constexpr Seconds checkContextLossHandlingDelay { 3_s };
 static constexpr size_t maxActiveContexts = 16;
 static constexpr size_t maxActiveWorkerContexts = 4;
 

diff --git a/Source/WebCore/layout/formattingContexts/table/TableLayout.cpp b/Source/WebCore/layout/formattingContexts/table/TableLayout.cpp
@@ -28,6 +28,7 @@
 
 #include "LayoutBox.h"
 #include "LayoutBoxGeometry.h"
+#include "RenderStyleInlines.h"
 #include "TableFormattingGeometry.h"
 
 namespace WebCore {

diff --git a/Source/WebCore/page/OpportunisticTaskScheduler.h b/Source/WebCore/page/OpportunisticTaskScheduler.h
@@ -28,6 +28,7 @@
 #include "RunLoopObserver.h"
 #include <JavaScriptCore/EdenGCActivityCallback.h>
 #include <JavaScriptCore/FullGCActivityCallback.h>
+#include <JavaScriptCore/MarkedSpace.h>
 #include <wtf/CheckedPtr.h>
 #include <wtf/MonotonicTime.h>
 #include <wtf/RefCounted.h>

diff --git a/Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp b/Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp
@@ -45,7 +45,9 @@
 
 namespace WebCore {
 
+#if !USE(GSTREAMER)
 static const Seconds deviceChangeDebounceTimerInterval { 200_ms };
+#endif
 
 RealtimeMediaSourceCenter& RealtimeMediaSourceCenter::singleton()
 {

diff --git a/Source/WebCore/svg/SVGClipPathElement.cpp b/Source/WebCore/svg/SVGClipPathElement.cpp
@@ -29,6 +29,7 @@
 #include "RenderSVGResourceClipper.h"
 #include "RenderSVGText.h"
 #include "RenderStyleInlines.h"
+#include "SVGElementInlines.h"
 #include "SVGNames.h"
 #include "StyleResolver.h"
 #include <wtf/IsoMallocInlines.h>

diff --git a/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp b/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
@@ -50,7 +50,9 @@
 namespace WebKit {
 using namespace WebCore;
 
+#if !HAVE(DISPLAY_LINK)
 static constexpr unsigned c_defaultRefreshRate = 60000;
+#endif
 
 #if HAVE(DISPLAY_LINK)
 Ref<ThreadedCompositor> ThreadedCompositor::create(Client& client, PlatformDisplayID displayID, const IntSize& viewportSize, float scaleFactor, bool flipY)

diff --git a/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp b/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp
@@ -41,8 +41,6 @@
 namespace WebKit {
 using namespace WebCore;
 
-static constexpr OptionSet<ActivityState> focusedActiveWindow = { ActivityState::IsFocused, ActivityState::WindowIsActive };
-
 UserMediaPermissionRequestManager::UserMediaPermissionRequestManager(WebPage& page)
     : m_page(page)
 {