Index: cc/output/begin_frame_args.h |
diff --git a/cc/output/begin_frame_args.h b/cc/output/begin_frame_args.h |
index 0be5241dfea50ea5df9b1da74eb025c9219fb1c8..06bff5855d776dc89c45da6f9e94440ee4ebfe34 100644 |
--- a/cc/output/begin_frame_args.h |
+++ b/cc/output/begin_frame_args.h |
@@ -5,6 +5,7 @@ |
#ifndef CC_OUTPUT_BEGIN_FRAME_ARGS_H_ |
#define CC_OUTPUT_BEGIN_FRAME_ARGS_H_ |
+#include "base/location.h" |
#include "base/memory/ref_counted.h" |
#include "base/time/time.h" |
#include "base/values.h" |
@@ -17,6 +18,22 @@ class TracedValue; |
} |
} |
+/** |
danakj
2014/11/19 15:46:00
Use c++ style comments
|
+ * In debug builds we trace the creation origin of BeginFrameArgs objects. We |
+ * reuse the tracked_objects::Location system to do that. |
+ * |
+ * However, in release builds we don't want this as it doubles the size of the |
+ * BeginFrameArgs object. As well it adds a number of largish strings to the |
+ * binary. Despite the argument being unused, most compilers are unable to |
+ * optimise it away even when unused. Instead we use the BEGINFRAME_FROM_HERE |
+ * macro to prevent the data even getting referenced. |
+ */ |
+#ifdef NDEBUG |
+#define BEGINFRAME_FROM_HERE nullptr |
+#else |
+#define BEGINFRAME_FROM_HERE (new FROM_HERE) |
+#endif |
+ |
namespace cc { |
struct CC_EXPORT BeginFrameArgs { |
@@ -33,7 +50,9 @@ struct CC_EXPORT BeginFrameArgs { |
// You should be able to find all instances where a BeginFrame has been |
// created by searching for "BeginFrameArgs::Create". |
- static BeginFrameArgs Create(base::TimeTicks frame_time, |
+ // The location argument should **always** be BEGINFRAME_FROM_HERE macro. |
danakj
2014/11/19 15:46:00
The **'s seem excessive?
|
+ static BeginFrameArgs Create(const tracked_objects::Location* location, |
+ base::TimeTicks frame_time, |
base::TimeTicks deadline, |
base::TimeDelta interval, |
BeginFrameArgsType type); |
@@ -61,6 +80,9 @@ struct CC_EXPORT BeginFrameArgs { |
base::TimeTicks deadline; |
base::TimeDelta interval; |
BeginFrameArgsType type; |
+#ifndef NDEBUG |
brianderson
2014/11/19 20:43:30
Do we have any kind of policy against differing st
danakj
2014/11/19 20:45:45
We've done this before, though we tend to do it by
mithro-old
2014/11/20 04:30:13
I would normally 100% agree that it is a bad idea
mithro-old
2014/11/20 04:30:13
What is the difference between DCHECK_IS_ON and ND
danakj
2014/11/20 16:02:20
You can build a release build with dchecks on via
|
+ tracked_objects::Location created_by; |
+#endif |
private: |
BeginFrameArgs(base::TimeTicks frame_time, |