Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(510)

Unified Diff: chrome/common/crash_keys.cc

Issue 2770953002: Revert of gpu: Add a util method to set crash-keys from a GPUInfo. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/crash_keys.h ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/crash_keys.cc
diff --git a/chrome/common/crash_keys.cc b/chrome/common/crash_keys.cc
index 819664763f766467d14c2b37303dd880c073e877..bfc80ff357d608baed44eb94f2642398dd7d7a81 100644
--- a/chrome/common/crash_keys.cc
+++ b/chrome/common/crash_keys.cc
@@ -16,7 +16,6 @@
#include "chrome/common/chrome_switches.h"
#include "components/flags_ui/flags_ui_switches.h"
#include "content/public/common/content_switches.h"
-#include "gpu/config/gpu_util.h"
#if defined(OS_CHROMEOS)
#include "chrome/common/chrome_switches.h"
@@ -35,6 +34,20 @@
const char kShutdownType[] = "shutdown-type";
const char kBrowserUnpinTrace[] = "browser-unpin-trace";
+
+#if !defined(OS_ANDROID)
+const char kGPUVendorID[] = "gpu-venid";
+const char kGPUDeviceID[] = "gpu-devid";
+#endif
+const char kGPUDriverVersion[] = "gpu-driver";
+const char kGPUPixelShaderVersion[] = "gpu-psver";
+const char kGPUVertexShaderVersion[] = "gpu-vsver";
+#if defined(OS_MACOSX)
+const char kGPUGLVersion[] = "gpu-glver";
+#elif defined(OS_POSIX)
+const char kGPUVendor[] = "gpu-gl-vendor";
+const char kGPURenderer[] = "gpu-gl-renderer";
+#endif
#if defined(OS_WIN)
const char kHungRendererOutstandingAckCount[] = "hung-outstanding-acks";
@@ -106,17 +119,17 @@
{kShutdownType, kSmallSize},
{kBrowserUnpinTrace, kMediumSize},
#if !defined(OS_ANDROID)
- {gpu::crash_keys::kGPUVendorID, kSmallSize},
- {gpu::crash_keys::kGPUDeviceID, kSmallSize},
-#endif
- {gpu::crash_keys::kGPUDriverVersion, kSmallSize},
- {gpu::crash_keys::kGPUPixelShaderVersion, kSmallSize},
- {gpu::crash_keys::kGPUVertexShaderVersion, kSmallSize},
+ {kGPUVendorID, kSmallSize},
+ {kGPUDeviceID, kSmallSize},
+#endif
+ {kGPUDriverVersion, kSmallSize},
+ {kGPUPixelShaderVersion, kSmallSize},
+ {kGPUVertexShaderVersion, kSmallSize},
#if defined(OS_MACOSX)
- {gpu::crash_keys::kGPUGLVersion, kSmallSize},
+ {kGPUGLVersion, kSmallSize},
#elif defined(OS_POSIX)
- {gpu::crash_keys::kGPUVendor, kSmallSize},
- {gpu::crash_keys::kGPURenderer, kSmallSize},
+ {kGPUVendor, kSmallSize},
+ {kGPURenderer, kSmallSize},
#endif
// content/:
« no previous file with comments | « chrome/common/crash_keys.h ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698