[ftrace] include tracing of skia, angle and libwebrtc

emutavchi · emutavchi · commit f329c071f7bf · 2026-01-15T16:33:58.000Z
diff --git a/Source/ThirdParty/ANGLE/CMakeLists.txt b/Source/ThirdParty/ANGLE/CMakeLists.txt
@@ -90,6 +90,12 @@ set(ANGLE_SOURCES
     src/libANGLE/capture/serialize_mock.cpp
 )
 
+if (USE_LINUX_FTRACE)
+   list(APPEND ANGLE_DEFINITIONS
+       ANGLE_ENABLE_DEBUG_TRACE=1
+   )
+endif()
+
 if (WIN32)
     # FIXME: DX11 support will not compile if this preprocessor definition is set
     # DirectX Documentation is setting that version to 0x700 but there is no
@@ -120,8 +126,8 @@ set(zlib_wrapper_sources
 )
 
 set(angle_gl_enum_utils
-    "src/libANGLE/gl_enum_utils.cpp"
-    "src/libANGLE/gl_enum_utils_autogen.cpp"
+    "src/common/gl_enum_utils.cpp"
+    "src/common/gl_enum_utils_autogen.cpp"
 )
 
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
@@ -140,6 +146,7 @@ if (USE_ANGLE_EGL OR ENABLE_WEBGL)
         ${libangle_image_util_headers}
         ${xxhash_sources}
         ${zlib_wrapper_sources}
+        ${angle_gl_enum_utils}
     )
     target_include_directories(ANGLE PRIVATE ${ANGLE_PRIVATE_INCLUDE_DIRECTORIES})
     target_compile_definitions(ANGLE PRIVATE
diff --git a/Source/ThirdParty/ANGLE/include/CMakeLists.txt b/Source/ThirdParty/ANGLE/include/CMakeLists.txt
@@ -47,6 +47,16 @@ if (ENABLE_WEBGL)
     )
 endif ()
 
+if (USE_LINUX_FTRACE)
+    set(platform_headers ${includes})
+    list(FILTER platform_headers INCLUDE REGEX "platform/PlatformMethods.h")
+
+    WEBKIT_COPY_FILES(ANGLEPlatformHeaders
+        DESTINATION ${ANGLE_FRAMEWORK_HEADERS_DIR}/ANGLE
+        FILES ${platform_headers}
+    )
+endif()
+
 # Cocoa expects headers in an ANGLE directory
 WEBKIT_COPY_FILES(GLSLANGHeaders
     DESTINATION ${ANGLE_FRAMEWORK_HEADERS_DIR}/ANGLE
diff --git a/Source/ThirdParty/skia/CMakeLists.txt b/Source/ThirdParty/skia/CMakeLists.txt
@@ -850,12 +850,14 @@ add_library(Skia STATIC
     src/sksl/transform/SkSLEliminateDeadLocalVariables.cpp
     src/sksl/transform/SkSLEliminateEmptyStatements.cpp
     src/sksl/transform/SkSLEliminateUnreachableCode.cpp
+    src/sksl/transform/SkSLEliminateUnnecessaryBraces.cpp
     src/sksl/transform/SkSLFindAndDeclareBuiltinFunctions.cpp
     src/sksl/transform/SkSLFindAndDeclareBuiltinStructs.cpp
     src/sksl/transform/SkSLFindAndDeclareBuiltinVariables.cpp
     src/sksl/transform/SkSLHoistSwitchVarDeclarationsAtTopLevel.cpp
     src/sksl/transform/SkSLRenamePrivateSymbols.cpp
     src/sksl/transform/SkSLReplaceConstVarsWithLiterals.cpp
+    src/sksl/transform/SkSLReplaceSplatCastsWithSwizzles.cpp
     src/sksl/transform/SkSLRewriteIndexedSwizzle.cpp
 
     src/utils/SkCharToGlyphCache.cpp
@@ -871,6 +873,9 @@ add_library(Skia STATIC
     src/utils/SkShaderUtils.cpp
     src/utils/SkShadowTessellator.cpp
     src/utils/SkShadowUtils.cpp
+    src/utils/SkJSON.cpp
+    src/utils/SkParse.cpp
+    src/utils/SkEventTracer.cpp
 
     src/opts/SkOpts_hsw.cpp
     src/opts/SkOpts_skx.cpp
@@ -962,7 +967,6 @@ target_compile_definitions(Skia PUBLIC
     SK_DISABLE_LEGACY_IMAGE_READBUFFER
     SK_DISABLE_LEGACY_INIT_DECODERS
     SK_DISABLE_LEGACY_PNG_WRITEBUFFER
-    SK_DISABLE_TRACING
     SK_DISABLE_WEBGL_INTERFACE
 
     SK_ENABLE_PRECOMPILE
@@ -975,6 +979,12 @@ target_compile_definitions(Skia PUBLIC
     SK_RELEASE
 )
 
+if (NOT USE_LINUX_FTRACE)
+   target_compile_definitions(Skia PUBLIC
+       SK_DISABLE_TRACING
+   )
+endif()
+
 #
 # This saves some reference churning and ctor/dtor calls in the
 # implementation of the sk_sp<> smart pointer template. It needs to
diff --git a/Source/WTF/wtf/linux/SystemTracingFTrace.h b/Source/WTF/wtf/linux/SystemTracingFTrace.h
@@ -24,7 +24,11 @@
 #include <wtf/Assertions.h>
 #include <wtf/SystemTracing.h>
 #include <wtf/text/ASCIILiteral.h>
+#include <wtf/text/StringBuilder.h>
+#include <wtf/HexNumber.h>
+#include <wtf/StdLibExtras.h>
 
+#include <algorithm>
 #include <cstdio>
 #include <cstring>
 #include <mutex>
@@ -208,6 +212,117 @@ class SystemTracingFTrace {
         }
     }
 
+    void addMark(const char phase, std::span<const char> name, const char* format, va_list args) WTF_ATTRIBUTE_PRINTF(4, 0) {
+        // "<phase>|<pid>|<name>[|<args>]"
+        Vector<char> buffer(1024);
+
+        size_t len = 0;
+        int ret;
+
+        ret = snprintf(buffer.data(), buffer.size(), "%c|%u|%.*s", phase, m_pid, name.size(), name.data());
+        if (ret < 0) {
+            return;
+        }
+        len += ret;
+
+        if (format && format[0] != '\0' && len < buffer.size()) {
+            buffer[len++] = (phase == 'I' ? ',' : '|'); // add args to the name so it is easier to see data in timeline
+            ret = vsnprintf(buffer.data() + len, buffer.size() - len, format, args);
+            if (ret < 0) {
+                return;
+            }
+            len += ret;
+        }
+
+        writeFTraceMarker(buffer.data(), std::min(buffer.size() - 1, len));
+    }
+
+    void addMark(const char phase, std::span<const char> name, const char *format, ...) WTF_ATTRIBUTE_PRINTF(4, 5) {
+        va_list args;
+        va_start(args, format);
+        addMark(phase, WTFMove(name), format, args);
+        va_end(args);
+    }
+
+    void addMark(const char phase, std::span<const char> name) {
+        addMark(phase, WTFMove(name), "");
+    }
+
+    void addTraceEvent(char phase,
+                       const unsigned char* categoryEnabled,
+                       const char* name,
+                       unsigned long long id,
+                       int numArgs,
+                       const char** argNames,
+                       const unsigned char* argTypes,
+                       const unsigned long long* argValues,
+                       unsigned char flags) {
+        UNUSED_PARAM(id);
+        UNUSED_PARAM(flags);
+
+        // "<phase>|<pid>|<name>[|<argNames0>=<argValues0>,<argNames1>=<argValues1>...]"
+        StringBuilder builder;
+
+        builder.append(phase, '|', String::number(m_pid), '|');
+        builder.append(StringView::fromLatin1(reinterpret_cast<const char*>(categoryEnabled)), ':', StringView::fromLatin1(name));
+
+        for (int i = 0; i < numArgs; ++i) {
+            union TraceArgValueUnion {
+                bool as_bool;
+                unsigned long long as_uint;
+                long long as_int;
+                double as_double;
+                const void* as_pointer;
+                const char* as_string;
+            } arg;
+
+            enum TraceArgValueType : int8_t {
+                Bool = 1,
+                Uint = 2,
+                Int = 3,
+                Double = 4,
+                Pointer = 5,
+                String = 6,
+                CopyString = 7
+            };
+
+            const auto argName = StringView::fromLatin1(argNames[i]);
+            arg.as_uint = argValues[i];
+            if (i == 0)
+                builder.append('|');
+            else
+                builder.append(',');
+            builder.append(argName, '=');
+
+            switch(argTypes[i]) {
+                case TraceArgValueType::String:
+                case TraceArgValueType::CopyString:
+                    builder.append(StringView::fromLatin1(arg.as_string));
+                    break;
+                case TraceArgValueType::Bool:
+                    builder.append(arg.as_bool ? "true"_s : "false"_s);
+                    break;
+                case TraceArgValueType::Uint:
+                    builder.append(String::number(arg.as_uint));
+                    break;
+                case TraceArgValueType::Int:
+                    builder.append(String::number(arg.as_int));
+                    break;
+                case TraceArgValueType::Double:
+                    builder.append(String::number(arg.as_double));
+                    break;
+                case TraceArgValueType::Pointer:
+                    builder.append("0x"_s, hex(reinterpret_cast<uintptr_t>(arg.as_pointer)));
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        const auto buffer = spanReinterpretCast<const char>(builder.span<uint8_t>());
+        writeFTraceMarker(buffer.data(), buffer.size());
+    }
+
     static bool isEnabled() {
         return !(instance().m_traceMarkerFd < 0);
     }
diff --git a/Source/WebCore/platform/Skia.cmake b/Source/WebCore/platform/Skia.cmake
@@ -16,6 +16,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     platform/graphics/skia/SkiaAcceleratedBufferPool.h
     platform/graphics/skia/SkiaHarfBuzzFont.h
     platform/graphics/skia/SkiaHarfBuzzFontCache.h
+    platform/graphics/skia/SkiaEventTracer.h
 )
 
 list(APPEND WebCore_LIBRARIES
diff --git a/Source/WebCore/platform/graphics/angle/PlatformDisplayANGLE.cpp b/Source/WebCore/platform/graphics/angle/PlatformDisplayANGLE.cpp
@@ -25,8 +25,51 @@
 #include "GLContext.h"
 #include "Logging.h"
 
+#if USE(LINUX_FTRACE)
+#include <wtf/SystemTracing.h>
+#include <wtf/MonotonicTime.h>
+#include <wtf/text/MakeString.h>
+ALLOW_UNUSED_PARAMETERS_BEGIN
+#include <ANGLE/platform/PlatformMethods.h>
+ALLOW_UNUSED_PARAMETERS_END
+#endif
+
 namespace WebCore {
 
+#if USE(LINUX_FTRACE)
+static const unsigned char* ANGLE_getTraceCategoryEnabledFlag(angle::PlatformMethods* platform,
+                                                              const char* categoryGroup) {
+    UNUSED_PARAM(platform);
+    return reinterpret_cast<const unsigned char*>(categoryGroup);
+}
+
+static angle::TraceEventHandle ANGLE_addTraceEvent(angle::PlatformMethods* platform,
+                                                   char phase,
+                                                   const unsigned char* categoryGroupEnabled,
+                                                   const char* name,
+                                                   unsigned long long id,
+                                                   double timestamp,
+                                                   int numArgs,
+                                                   const char** argNames,
+                                                   const unsigned char* argTypes,
+                                                   const unsigned long long* argValues,
+                                                   unsigned char flags) {
+    UNUSED_PARAM(platform);
+    UNUSED_PARAM(timestamp);
+
+    SystemTracingFTrace::instance().addTraceEvent(
+        phase, categoryGroupEnabled, name, id,
+        numArgs, argNames, argTypes, argValues, flags);
+
+    return static_cast<angle::TraceEventHandle>(0);
+}
+
+static double ANGLE_monotonicallyIncreasingTime(angle::PlatformMethods* platform) {
+    UNUSED_PARAM(platform);
+    return MonotonicTime::now().secondsSinceEpoch().value();
+}
+#endif
+
 EGLDisplay PlatformDisplay::angleEGLDisplay() const
 {
 #if PLATFORM(WIN)
@@ -55,6 +98,22 @@ EGLDisplay PlatformDisplay::angleEGLDisplay() const
     if (angleDisplay == EGL_NO_DISPLAY)
         return EGL_NO_DISPLAY;
 
+#if USE(LINUX_FTRACE)
+    if (SystemTracingFTrace::isEnabled()) {
+        angle::GetDisplayPlatformFunc getPlatform = reinterpret_cast<angle::GetDisplayPlatformFunc>(
+            EGL_GetProcAddress("ANGLEGetDisplayPlatform"));
+        if (getPlatform) {
+            angle::PlatformMethods* platformMethods = nullptr;
+            if (getPlatform(angleDisplay, angle::g_PlatformMethodNames, angle::g_NumPlatformMethods,
+                            nullptr, &platformMethods)) {
+                platformMethods->addTraceEvent               = ANGLE_addTraceEvent;
+                platformMethods->getTraceCategoryEnabledFlag = ANGLE_getTraceCategoryEnabledFlag;
+                platformMethods->monotonicallyIncreasingTime = ANGLE_monotonicallyIncreasingTime;
+            }
+        };
+    }
+#endif
+
     EGLint majorVersion, minorVersion;
     if (EGL_Initialize(angleDisplay, &majorVersion, &minorVersion) == EGL_TRUE) {
         LOG(WebGL, "ANGLE initialised Major: %d Minor: %d", majorVersion, minorVersion);
diff --git a/Source/WebCore/platform/graphics/skia/SkiaEventTracer.h b/Source/WebCore/platform/graphics/skia/SkiaEventTracer.h
diff --git a/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp b/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp
diff --git a/Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp b/Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS`
`16`	`16`	`platform/graphics/skia/SkiaAcceleratedBufferPool.h`
`17`	`17`	`platform/graphics/skia/SkiaHarfBuzzFont.h`
`18`	`18`	`platform/graphics/skia/SkiaHarfBuzzFontCache.h`
	`19`	`+ platform/graphics/skia/SkiaEventTracer.h`
`19`	`20`	`)`
`20`	`21`
`21`	`22`	`list(APPEND WebCore_LIBRARIES`