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

Unified Diff: ppapi/proxy/host_dispatcher.cc

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: shared dll build, phishing test shutdown crashes, tsan warnings; merge 84612 Created 9 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
Index: ppapi/proxy/host_dispatcher.cc
diff --git a/ppapi/proxy/host_dispatcher.cc b/ppapi/proxy/host_dispatcher.cc
index 00c1c261b4615dc337e527ec4281d5a7b4374951..ebcfb1263d9e4548748c4e628f0947a6c1cf382f 100644
--- a/ppapi/proxy/host_dispatcher.cc
+++ b/ppapi/proxy/host_dispatcher.cc
@@ -6,8 +6,8 @@
#include <map>
+#include "base/debug/trace_event.h"
#include "base/logging.h"
-#include "gpu/common/gpu_trace_event.h"
#include "ppapi/c/private/ppb_proxy_private.h"
#include "ppapi/c/dev/ppb_var_deprecated.h"
#include "ppapi/proxy/host_var_serialization_rules.h"
@@ -130,9 +130,9 @@ bool HostDispatcher::IsPlugin() const {
}
bool HostDispatcher::Send(IPC::Message* msg) {
- GPU_TRACE_EVENT2("ppapi proxy", "HostDispatcher::Send",
- "Class", IPC_MESSAGE_ID_CLASS(msg->type()),
- "Line", IPC_MESSAGE_ID_LINE(msg->type()));
+ TRACE_EVENT2("ppapi proxy", "HostDispatcher::Send",
+ "Class", IPC_MESSAGE_ID_CLASS(msg->type()),
+ "Line", IPC_MESSAGE_ID_LINE(msg->type()));
// Normal sync messages are set to unblock, which would normally cause the
// plugin to be reentered to process them. We only want to do this when we
// know the plugin is in a state to accept reentrancy. Since the plugin side
@@ -144,9 +144,9 @@ bool HostDispatcher::Send(IPC::Message* msg) {
}
bool HostDispatcher::OnMessageReceived(const IPC::Message& msg) {
- GPU_TRACE_EVENT2("ppapi proxy", "HostDispatcher::OnMessageReceived",
- "Class", IPC_MESSAGE_ID_CLASS(msg.type()),
- "Line", IPC_MESSAGE_ID_LINE(msg.type()));
+ TRACE_EVENT2("ppapi proxy", "HostDispatcher::OnMessageReceived",
+ "Class", IPC_MESSAGE_ID_CLASS(msg.type()),
+ "Line", IPC_MESSAGE_ID_LINE(msg.type()));
// We only want to allow reentrancy when the most recent message from the
// plugin was a scripting message. We save the old state of the flag on the
// stack in case we're (we are the host) being reentered ourselves. The flag
« gpu/gpu.gyp ('K') | « gpu/gpu.gyp ('k') | ppapi/proxy/plugin_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698