diff options
author | zhaoqin <zhaoqin@chromium.org> | 2015-02-04 19:51:03 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-05 03:52:21 +0000 |
commit | c7c37ff30cd9dbacfaef0eef5a6b2b53cdae905c (patch) | |
tree | 518d78b50fddd4ea92182ac755e865867fdaddab /cc/resources | |
parent | acfb4199abf841a1577c3968579c43b0232a53b7 (diff) | |
download | chromium_src-c7c37ff30cd9dbacfaef0eef5a6b2b53cdae905c.zip chromium_src-c7c37ff30cd9dbacfaef0eef5a6b2b53cdae905c.tar.gz chromium_src-c7c37ff30cd9dbacfaef0eef5a6b2b53cdae905c.tar.bz2 |
Revert of Move tracing namespace from base::debug to base::trace_event. (patchset #7 id:120001 of https://codereview.chromium.org/882673002/)
Reason for revert:
broken Memory.FYI TSan bot.
crbug.com/455530
Original issue's description:
> Move tracing namespace from base::debug to base::trace_event.
>
> 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
> TBR=skyostil@chromium.org,jam@chromium.org
>
> Committed: https://crrev.com/97c5abba36f5ce473cd996fab74fbf5aa9bb5464
> Cr-Commit-Position: refs/heads/master@{#314657}
TBR=dsinclair@chromium.org,picksi@chromium.org,primiano@chromium.org,skyostil@chromium.org,ssid@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=451032
Review URL: https://codereview.chromium.org/904573002
Cr-Commit-Position: refs/heads/master@{#314740}
Diffstat (limited to 'cc/resources')
-rw-r--r-- | cc/resources/bitmap_tile_task_worker_pool.h | 8 | ||||
-rw-r--r-- | cc/resources/one_copy_tile_task_worker_pool.h | 9 | ||||
-rw-r--r-- | cc/resources/picture_layer_tiling.h | 8 | ||||
-rw-r--r-- | cc/resources/picture_layer_tiling_set.h | 8 | ||||
-rw-r--r-- | cc/resources/pixel_buffer_tile_task_worker_pool.h | 9 | ||||
-rw-r--r-- | cc/resources/tile_manager.h | 9 | ||||
-rw-r--r-- | cc/resources/zero_copy_tile_task_worker_pool.h | 8 |
7 files changed, 7 insertions, 52 deletions
diff --git a/cc/resources/bitmap_tile_task_worker_pool.h b/cc/resources/bitmap_tile_task_worker_pool.h index 20d57d2..404a3a5 100644 --- a/cc/resources/bitmap_tile_task_worker_pool.h +++ b/cc/resources/bitmap_tile_task_worker_pool.h @@ -11,16 +11,10 @@ #include "cc/resources/tile_task_worker_pool.h" namespace base { -namespace trace_event { +namespace debug { class ConvertableToTraceFormat; } - -// 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; } -} // namespace base namespace cc { class ResourceProvider; diff --git a/cc/resources/one_copy_tile_task_worker_pool.h b/cc/resources/one_copy_tile_task_worker_pool.h index 85b3f32..4568d35 100644 --- a/cc/resources/one_copy_tile_task_worker_pool.h +++ b/cc/resources/one_copy_tile_task_worker_pool.h @@ -15,18 +15,11 @@ #include "cc/resources/tile_task_worker_pool.h" namespace base { -namespace trace_event { +namespace debug { 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 namespace cc { class ResourcePool; diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h index c9672c9..15fdb43 100644 --- a/cc/resources/picture_layer_tiling.h +++ b/cc/resources/picture_layer_tiling.h @@ -21,16 +21,10 @@ #include "ui/gfx/geometry/rect.h" namespace base { -namespace trace_event { +namespace debug { 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::TracedValue; } -} // namespace base namespace cc { diff --git a/cc/resources/picture_layer_tiling_set.h b/cc/resources/picture_layer_tiling_set.h index 3e31ed9..9f6eba9 100644 --- a/cc/resources/picture_layer_tiling_set.h +++ b/cc/resources/picture_layer_tiling_set.h @@ -14,16 +14,10 @@ #include "ui/gfx/geometry/size.h" namespace base { -namespace trace_event { +namespace debug { 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::TracedValue; } -} // namespace base namespace cc { diff --git a/cc/resources/pixel_buffer_tile_task_worker_pool.h b/cc/resources/pixel_buffer_tile_task_worker_pool.h index edff89a..8ee4b9c 100644 --- a/cc/resources/pixel_buffer_tile_task_worker_pool.h +++ b/cc/resources/pixel_buffer_tile_task_worker_pool.h @@ -16,18 +16,11 @@ #include "cc/resources/tile_task_worker_pool.h" namespace base { -namespace trace_event { +namespace debug { 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 namespace cc { class ResourceProvider; diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h index 0af823e..37ab765 100644 --- a/cc/resources/tile_manager.h +++ b/cc/resources/tile_manager.h @@ -26,18 +26,11 @@ #include "cc/resources/tile_task_runner.h" namespace base { -namespace trace_event { +namespace debug { 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 namespace cc { class PictureLayerImpl; diff --git a/cc/resources/zero_copy_tile_task_worker_pool.h b/cc/resources/zero_copy_tile_task_worker_pool.h index 4f3085c..8d3c0cf 100644 --- a/cc/resources/zero_copy_tile_task_worker_pool.h +++ b/cc/resources/zero_copy_tile_task_worker_pool.h @@ -11,16 +11,10 @@ #include "cc/resources/tile_task_worker_pool.h" namespace base { -namespace trace_event { +namespace debug { class ConvertableToTraceFormat; } - -// 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; } -} // namespace base namespace cc { class ResourceProvider; |