Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(323)

Unified Diff: cc/quads/shared_quad_state.h

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/quads/render_pass_draw_quad.cc ('k') | cc/quads/shared_quad_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/quads/shared_quad_state.h
diff --git a/cc/quads/shared_quad_state.h b/cc/quads/shared_quad_state.h
index 0db23e195200b309c7752c87f9d456e7a4612b2e..6f0ef92908d1106f5c545d1a5a3162aee4a994fe 100644
--- a/cc/quads/shared_quad_state.h
+++ b/cc/quads/shared_quad_state.h
@@ -16,13 +16,7 @@ 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;
}
-} // namespace base
namespace cc {
@@ -46,7 +40,7 @@ class CC_EXPORT SharedQuadState {
float opacity,
SkXfermode::Mode blend_mode,
int sorting_context_id);
- void AsValueInto(base::debug::TracedValue* dict) const;
+ void AsValueInto(base::trace_event::TracedValue* dict) const;
// Transforms from quad's original content space to its target content space.
gfx::Transform content_to_target_transform;
« no previous file with comments | « cc/quads/render_pass_draw_quad.cc ('k') | cc/quads/shared_quad_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698