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

Unified Diff: content/common/gpu/gpu_channel_manager.h

Issue 1148813005: Fixing crash in GPU memory dump. Will investigate more correct solution in a separate CL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Did not revert correctly. Created 5 years, 7 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 | « no previous file | content/common/gpu/gpu_channel_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/gpu_channel_manager.h
diff --git a/content/common/gpu/gpu_channel_manager.h b/content/common/gpu/gpu_channel_manager.h
index 0b0d2180b19b685192ace807e62ddcef0cafd9dd..a15a8adbb784bbb121f0d59643c847675a2a04e1 100644
--- a/content/common/gpu/gpu_channel_manager.h
+++ b/content/common/gpu/gpu_channel_manager.h
@@ -13,7 +13,6 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "base/trace_event/memory_dump_provider.h"
#include "build/build_config.h"
#include "content/common/content_export.h"
#include "content/common/content_param_traits.h"
@@ -61,8 +60,7 @@ class MessageRouter;
// managing the lifetimes of GPU channels and forwarding IPC requests from the
// browser process to them based on the corresponding renderer ID.
class CONTENT_EXPORT GpuChannelManager : public IPC::Listener,
- public IPC::Sender,
- public base::trace_event::MemoryDumpProvider {
+ public IPC::Sender {
public:
GpuChannelManager(MessageRouter* router,
GpuWatchdog* watchdog,
@@ -106,9 +104,6 @@ class CONTENT_EXPORT GpuChannelManager : public IPC::Listener,
return gpu_memory_buffer_factory_.get();
}
- // base::trace_event::MemoryDumpProvider implementation.
- bool OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd) override;
-
private:
typedef base::ScopedPtrHashMap<int, scoped_ptr<GpuChannel>> GpuChannelMap;
« no previous file with comments | « no previous file | content/common/gpu/gpu_channel_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698