From 453e5205d460395da5d0cb7f269d1e1ce1eee9b7 Mon Sep 17 00:00:00 2001
From: Madhura Jayaraman <madjay@google.com>
Date: Fri, 20 Sep 2024 10:32:02 -0700
Subject: [PATCH] Clean up glimp references (#4130)

b/362374622
---
 .../renderer/backend/egl/graphics_system.cc   | 27 -------------------
 starboard/egl_and_gles/BUILD.gn               |  7 -----
 2 files changed, 34 deletions(-)

diff --git a/cobalt/renderer/backend/egl/graphics_system.cc b/cobalt/renderer/backend/egl/graphics_system.cc
index 664750c924b8..db1be3b300c6 100644
--- a/cobalt/renderer/backend/egl/graphics_system.cc
+++ b/cobalt/renderer/backend/egl/graphics_system.cc
@@ -18,19 +18,11 @@
 #include <utility>
 
 #include "base/debug/leak_annotations.h"
-#if defined(ENABLE_GLIMP_TRACING)
-#include "base/trace_event/trace_event.h"
-#endif
-
 #include "cobalt/configuration/configuration.h"
 #include "cobalt/renderer/backend/egl/display.h"
 #include "cobalt/renderer/backend/egl/graphics_context.h"
 #include "cobalt/renderer/backend/egl/texture.h"
 #include "cobalt/renderer/backend/egl/utils.h"
-#if defined(ENABLE_GLIMP_TRACING)
-#include "internal/starboard/shared/glimp/tracing/tracing.h"
-#endif
-
 #include "cobalt/renderer/egl_and_gles.h"
 
 #if defined(GLES3_SUPPORTED)
@@ -45,19 +37,6 @@ namespace cobalt {
 namespace renderer {
 namespace backend {
 
-#if defined(ENABLE_GLIMP_TRACING)
-// Hookup glimp tracing to Chromium's base trace_event tracing.
-class GlimpToBaseTraceEventBridge : public glimp::TraceEventImpl {
- public:
-  void BeginTrace(const char* name) override {
-    TRACE_EVENT_BEGIN0("glimp", name);
-  }
-  void EndTrace(const char* name) override { TRACE_EVENT_END0("glimp", name); }
-};
-
-GlimpToBaseTraceEventBridge s_glimp_to_base_trace_event_bridge;
-#endif  // #if defined(ENABLE_GLIMP_TRACING)
-
 namespace {
 
 struct ChooseConfigResult {
@@ -133,12 +112,6 @@ base::Optional<ChooseConfigResult> ChooseConfig(
 
 GraphicsSystemEGL::GraphicsSystemEGL(
     system_window::SystemWindow* system_window) {
-#if defined(ENABLE_GLIMP_TRACING)
-  // If glimp tracing is enabled, hook up glimp trace calls to Chromium's
-  // base trace_event calls.
-  glimp::SetTraceEventImplementation(&s_glimp_to_base_trace_event_bridge);
-#endif  // #if defined(ENABLE_GLIMP_TRACING)
-
   display_ = EGL_CALL_SIMPLE(eglGetDisplay(EGL_DEFAULT_DISPLAY));
   CHECK_NE(EGL_NO_DISPLAY, display_);
   CHECK_EQ(EGL_SUCCESS, EGL_CALL_SIMPLE(eglGetError()));
diff --git a/starboard/egl_and_gles/BUILD.gn b/starboard/egl_and_gles/BUILD.gn
index 41abd132336d..6905dbd698c9 100644
--- a/starboard/egl_and_gles/BUILD.gn
+++ b/starboard/egl_and_gles/BUILD.gn
@@ -35,13 +35,6 @@ config("egl_and_gles_glimp_public_config") {
   defines = [ "GL_GLEXT_PROTOTYPES" ]
 }
 
-if (gl_type == "glimp") {
-  group("egl_and_gles_glimp") {
-    public_configs = [ ":egl_and_gles_glimp_public_config" ]
-    public_deps = [ "//internal/starboard/shared/glimp" ]
-  }
-}
-
 declare_args() {
   enable_d3d11_feature_level_11 = false
 }