diff options
author | primiano <primiano@chromium.org> | 2015-02-05 06:20:26 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-05 14:21:26 +0000 |
commit | 159604379ff8ef8d3db4577f44d3d6438092ccf0 (patch) | |
tree | 98831d0059db697439bf0a06e8dda9316bea30f4 /cc/output | |
parent | 8a73ddcc5a588be2b43797e72e21d33b07f29b71 (diff) | |
download | chromium_src-159604379ff8ef8d3db4577f44d3d6438092ccf0.zip chromium_src-159604379ff8ef8d3db4577f44d3d6438092ccf0.tar.gz chromium_src-159604379ff8ef8d3db4577f44d3d6438092ccf0.tar.bz2 |
Reland of Move tracing namespace from base::debug to base::trace_event.
Original CL: crrev.com/882673002
Reason for revert: Broke memory.fyi bot (crbug.com/455530)
Reason for reland: The CL was renaming the tracing namespace and missed
the rename of the tsan suppression (addressed here)
Original description:
After having transitioned all the tracing headers from base/debug/ to
base/trace_event, this CL addresses the namespace move.
In principle, this CL should only change the namespace of the
base/trace_event files but the namespace used by the tracing clients.
In order to achieve this, namespace aliases are appended to the
trace_event headers, to make it so that clients can still refer to
base::debug::TraceFoo, with that being aliased to
base::trace_event::TraceFoo.
The upcoming CLs will gradually migrate the clients to use the
base::trace_event namespace and will remove the ns aliases.
Unfortunately, this CL has also to update few tracing clients,
in particular the ones having forward declarations. Forward
declarations, in fact, cannot be aliased as the compiler sees them
before the alias itself.
See crrev.com/837303004 and the related bug for motivations and design doc.
BUG=451032,455530
TBR=skyostil@chromium.org,jam@chromium.org,dsinclair@chromium.org,ssid@chromium.org
Review URL: https://codereview.chromium.org/869043008
Cr-Commit-Position: refs/heads/master@{#314806}
Diffstat (limited to 'cc/output')
-rw-r--r-- | cc/output/begin_frame_args.h | 9 | ||||
-rw-r--r-- | cc/output/filter_operation.h | 10 | ||||
-rw-r--r-- | cc/output/filter_operations.h | 10 |
3 files changed, 24 insertions, 5 deletions
diff --git a/cc/output/begin_frame_args.h b/cc/output/begin_frame_args.h index 53745f9..47430ca 100644 --- a/cc/output/begin_frame_args.h +++ b/cc/output/begin_frame_args.h @@ -12,11 +12,18 @@ #include "cc/base/cc_export.h" namespace base { -namespace debug { +namespace trace_event { class ConvertableToTraceFormat; class TracedValue; } + +// TODO(ssid): remove these aliases after the tracing clients are moved to the +// new trace_event namespace. See crbug.com/451032. ETA: March 2015 +namespace debug { +using ::base::trace_event::ConvertableToTraceFormat; +using ::base::trace_event::TracedValue; } +} // namespace base /** * In debug builds we trace the creation origin of BeginFrameArgs objects. We diff --git a/cc/output/filter_operation.h b/cc/output/filter_operation.h index fc14cb1..157db99 100644 --- a/cc/output/filter_operation.h +++ b/cc/output/filter_operation.h @@ -16,11 +16,17 @@ #include "ui/gfx/geometry/point.h" namespace base { -namespace debug { +namespace trace_event { class TracedValue; } -class Value; + +// TODO(ssid): remove these aliases after the tracing clients are moved to the +// new trace_event namespace. See crbug.com/451032. ETA: March 2015 +namespace debug { +using ::base::trace_event::TracedValue; } +class Value; +} // namespace base namespace cc { diff --git a/cc/output/filter_operations.h b/cc/output/filter_operations.h index a8c206e..8e37933 100644 --- a/cc/output/filter_operations.h +++ b/cc/output/filter_operations.h @@ -12,11 +12,17 @@ #include "cc/output/filter_operation.h" namespace base { -namespace debug { +namespace trace_event { class TracedValue; } -class Value; + +// TODO(ssid): remove these aliases after the tracing clients are moved to the +// new trace_event namespace. See crbug.com/451032. ETA: March 2015 +namespace debug { +using ::base::trace_event::TracedValue; } +class Value; +} // namespace base namespace cc { |