From 59915fe6c76c1b875099eea6159050060d42640c Mon Sep 17 00:00:00 2001 From: jbroman Date: Thu, 22 Oct 2015 11:11:33 -0700 Subject: Don't include trace_event.h from trace_event_argument.h. This pulls in the trace event macros into the header, but all that is needed is base::trace_event::ConvertableToTraceFormat. This also fixes the missing includes that this change surfaces. CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1412943006 Cr-Commit-Position: refs/heads/master@{#355583} --- cc/animation/animation_registrar.cc | 1 + cc/quads/shared_quad_state.cc | 1 + 2 files changed, 2 insertions(+) (limited to 'cc') diff --git a/cc/animation/animation_registrar.cc b/cc/animation/animation_registrar.cc index 3fb8055..a3edd74 100644 --- a/cc/animation/animation_registrar.cc +++ b/cc/animation/animation_registrar.cc @@ -4,6 +4,7 @@ #include "cc/animation/animation_registrar.h" +#include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event_argument.h" #include "cc/animation/layer_animation_controller.h" diff --git a/cc/quads/shared_quad_state.cc b/cc/quads/shared_quad_state.cc index e09cdaf..aa630c5 100644 --- a/cc/quads/shared_quad_state.cc +++ b/cc/quads/shared_quad_state.cc @@ -4,6 +4,7 @@ #include "cc/quads/shared_quad_state.h" +#include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event_argument.h" #include "base/values.h" #include "cc/base/math_util.h" -- cgit v1.1