DevTools: support configurable category filter for trace events callback

content/renderer/devtools/devtools_agent.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/devtools/devtools_agent.h"
 
 #include <map>
 
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
@@ skipping 122 matching lines @@
 }
 
 void DevToolsAgent::clearBrowserCache() {
   Send(new DevToolsHostMsg_ClearBrowserCache(routing_id()));
 }
 
 void DevToolsAgent::clearBrowserCookies() {
   Send(new DevToolsHostMsg_ClearBrowserCookies(routing_id()));
 }
 
-void DevToolsAgent::setTraceEventCallback(TraceEventCallback cb) {
+void DevToolsAgent::unsetTraceEventCallback()
+{
+  TraceLog::GetInstance()->SetEventCallbackDisabled();
+  base::subtle::NoBarrier_Store(&event_callback_, 0);
+}
+
+void DevToolsAgent::setTraceEventCallback(const WebString& category_filter,
+                                          TraceEventCallback cb) {
   TraceLog* trace_log = TraceLog::GetInstance();
   base::subtle::NoBarrier_Store(&event_callback_,
                                 reinterpret_cast<base::subtle::AtomicWord>(cb));
   if (!!cb) {
     trace_log->SetEventCallbackEnabled(base::debug::CategoryFilter(
-        base::debug::CategoryFilter::kDefaultCategoryFilterString),
-        TraceEventCallbackWrapper);
+        category_filter.utf8()), TraceEventCallbackWrapper);
   } else {
     trace_log->SetEventCallbackDisabled();
   }
 }
 
+void DevToolsAgent::setTraceEventCallback(TraceEventCallback cb) {
+  WebString category_filter = WebString::fromUTF8(
+      base::debug::CategoryFilter::kDefaultCategoryFilterString);
+  setTraceEventCallback(category_filter, cb);
+}
+
 // static
 void DevToolsAgent::TraceEventCallbackWrapper(
     base::TimeTicks timestamp,
     char phase,
     const unsigned char* category_group_enabled,
     const char* name,
     unsigned long long id,
     int num_args,
     const char* const arg_names[],
     const unsigned char arg_types[],
@@ skipping 173 matching lines @@
   if (!web_view)
     return NULL;
   return web_view->devToolsAgent();
 }
 
 bool DevToolsAgent::IsAttached() {
   return is_attached_;
 }
 
 }  // namespace content