diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 11:35:13 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 11:35:13 +0000 |
| commit | 6331a117c28954119c2f1bc935e8d62c28dcfe47 (patch) | |
| tree | 96ea40b50a1c31ad9ffe1ce22c12f48976d1ed57 /cc/skpicture_canvas_layer_texture_updater.cc | |
| parent | 5ef3331bbfc3c1b03801409e023f395177530ef0 (diff) | |
| download | chromium_src-6331a117c28954119c2f1bc935e8d62c28dcfe47.zip chromium_src-6331a117c28954119c2f1bc935e8d62c28dcfe47.tar.gz chromium_src-6331a117c28954119c2f1bc935e8d62c28dcfe47.tar.bz2 | |
Remove TraceEvent stub header from cc
We can just use base/debug/trace_event.h directly. Unfortunately, this produces
several more LOG macro collisions between wtf/Assertions.h and base/logging.h. I
added a config.h stub to cc/stubs/ to undef LOG for all files in cc and removed
the few other overrides we had in place.
BUG=154451
Review URL: https://chromiumcodereview.appspot.com/11187035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162692 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/skpicture_canvas_layer_texture_updater.cc')
| -rw-r--r-- | cc/skpicture_canvas_layer_texture_updater.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/skpicture_canvas_layer_texture_updater.cc b/cc/skpicture_canvas_layer_texture_updater.cc index c638b42..a007c4e 100644 --- a/cc/skpicture_canvas_layer_texture_updater.cc +++ b/cc/skpicture_canvas_layer_texture_updater.cc @@ -7,7 +7,7 @@ #include "cc/skpicture_canvas_layer_texture_updater.h" #include "CCTextureUpdateQueue.h" -#include "TraceEvent.h" +#include "base/debug/trace_event.h" #include "cc/layer_painter.h" #include "third_party/skia/include/core/SkCanvas.h" |