summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoralexeypa@google.com <alexeypa@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-04 23:49:05 +0000
committeralexeypa@google.com <alexeypa@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-04 23:49:05 +0000
commit396a0cdd358262a2c33c7068755f931fc9788887 (patch)
treea6a62c0ffce505c975dbe6ff01cc78bdac96b873 /webkit
parente9d46f8b56c8fdb4bf2ffab8900d53fe20a68890 (diff)
downloadchromium_src-396a0cdd358262a2c33c7068755f931fc9788887.zip
chromium_src-396a0cdd358262a2c33c7068755f931fc9788887.tar.gz
chromium_src-396a0cdd358262a2c33c7068755f931fc9788887.tar.bz2
Revert 175233 because Linux ASAN builder cannot compile it.
http://build.chromium.org/p/chromium.memory/buildstatus?builder=Linux%20ASAN%20Builder&number=15352 > Add trace event Pepper API > > This facilitates adding trace data to chrome://tracing from plugins. > > - broke out trace_event.h into trace_event.h/trace_event_internal.h > for easier transplanting to plugin code by eliminating dependence on base/. > - inlined trace_event.cc methods (4 total) so the trace_event_internal > implementation is contained in headers. > - added new PPB_TraceEvent_Dev interface (implemented entirely on the plugin side) > > BUG=none > TEST=base unittests, manual for plugin testing > > > Review URL: https://chromiumcodereview.appspot.com/11464005 TBR=elijahtaylor@chromium.org Review URL: https://codereview.chromium.org/11782008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/plugin_module.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 7c74822..b07c6af 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -32,7 +32,6 @@
#include "ppapi/c/dev/ppb_scrollbar_dev.h"
#include "ppapi/c/dev/ppb_testing_dev.h"
#include "ppapi/c/dev/ppb_text_input_dev.h"
-#include "ppapi/c/dev/ppb_trace_event_dev.h"
#include "ppapi/c/dev/ppb_url_util_dev.h"
#include "ppapi/c/dev/ppb_var_deprecated.h"
#include "ppapi/c/dev/ppb_video_capture_dev.h"