summaryrefslogtreecommitdiffstats
path: root/cc/quads/render_pass.h
diff options
context:
space:
mode:
authorzhaoqin <zhaoqin@chromium.org>2015-02-04 19:51:03 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-05 03:52:21 +0000
commitc7c37ff30cd9dbacfaef0eef5a6b2b53cdae905c (patch)
tree518d78b50fddd4ea92182ac755e865867fdaddab /cc/quads/render_pass.h
parentacfb4199abf841a1577c3968579c43b0232a53b7 (diff)
downloadchromium_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/quads/render_pass.h')
-rw-r--r--cc/quads/render_pass.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h
index 8a40f17..2877588 100644
--- a/cc/quads/render_pass.h
+++ b/cc/quads/render_pass.h
@@ -20,17 +20,11 @@
#include "ui/gfx/transform.h"
namespace base {
-namespace trace_event {
+namespace debug {
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;
-}
-} // namespace base
+};
namespace cc {