summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-02 19:45:06 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-02 19:45:06 +0000
commit198e0c44b137b9f55c304b961be133b6179b65c7 (patch)
tree4e43a44da4b3b393be13c4c2653c521e47cbc532 /base
parent0059eb96d9e2ed945a7f62c192f4b66120e51380 (diff)
downloadchromium_src-198e0c44b137b9f55c304b961be133b6179b65c7.zip
chromium_src-198e0c44b137b9f55c304b961be133b6179b65c7.tar.gz
chromium_src-198e0c44b137b9f55c304b961be133b6179b65c7.tar.bz2
Improve GPU tests to fail when GPU drawing fails.
Changed the accelerated html pages to use raf to draw multiple frames. Changed the webgl and canvas2d pages to draw onscreen rather than offscreen to make sure the compositor draws the page. BUG=105785,104142 Review URL: http://codereview.chromium.org/8692013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112763 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/debug/trace_event.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h
index 8996a58..ab56dfc 100644
--- a/base/debug/trace_event.h
+++ b/base/debug/trace_event.h
@@ -197,6 +197,11 @@
#define UNSHIPPED_TRACE_EVENT1(category, name, arg1_name, arg1_val) (void)0
#define UNSHIPPED_TRACE_EVENT2(category, name, arg1_name, arg1_val, \
arg2_name, arg2_val) (void)0
+#define UNSHIPPED_TRACE_EVENT_INSTANT0(category, name) (void)0
+#define UNSHIPPED_TRACE_EVENT_INSTANT1(category, name, arg1_name, arg1_val) \
+ (void)0
+#define UNSHIPPED_TRACE_EVENT_INSTANT2(category, name, arg1_name, arg1_val, \
+ arg2_name, arg2_val) (void)0
#else
#define UNSHIPPED_TRACE_EVENT0(category, name) \
TRACE_EVENT0(category, name)
@@ -205,6 +210,14 @@
#define UNSHIPPED_TRACE_EVENT2(category, name, arg1_name, arg1_val, \
arg2_name, arg2_val) \
TRACE_EVENT2(category, name, arg1_name, arg1_val, arg2_name, arg2_val)
+#define UNSHIPPED_TRACE_EVENT_INSTANT0(category, name) \
+ TRACE_EVENT_INSTANT0(category, name)
+#define UNSHIPPED_TRACE_EVENT_INSTANT1(category, name, arg1_name, arg1_val) \
+ TRACE_EVENT_INSTANT1(category, name, arg1_name, arg1_val)
+#define UNSHIPPED_TRACE_EVENT_INSTANT2(category, name, arg1_name, arg1_val, \
+ arg2_name, arg2_val) \
+ TRACE_EVENT_INSTANT2(category, name, arg1_name, arg1_val, \
+ arg2_name, arg2_val)
#endif
// Records a single event called "name" immediately, with 0, 1 or 2