aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-31 00:04:25 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-31 00:04:25 +0000
commit6169f2b4da39099b4e593f5ff85538dfe2f0249e (patch)
tree2f8f04d595050e97c99ac50ef234846081c242f7 /gyp
parentb5302b2cb40ae8d240b12107dfa80ce8e9208b90 (diff)
initial import of Chrome's trace_event into skia framework
This patch includes a modified version of Chrome's trace_event.h, which provides tracing macros that can easily integrate into the about://tracing framework. Currently the macros link to a default implementation of the (narrow) tracing class SkDefaultEventTracer which does nothing; next step will be to have Chrome subclass the SkEventTracer with a shim that bolts Skia's trace events to its own, allowing Skia's trace events to show up in about://tracing. I've verified that this file builds properly, and when I added a simple scoped TRACE_EVENT0 to SkCanvas::drawRect, along with some debug prints in the NOP implementation of tracing, I saw what I expected printed to the screen. BUG=skia: R=nduca@chromium.org, reed@google.com, mtklein@google.com, bsalomon@google.com Author: humper@google.com Review URL: https://codereview.chromium.org/149563004 git-svn-id: http://skia.googlecode.com/svn/trunk@13256 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
-rw-r--r--gyp/core.gypi1
-rw-r--r--gyp/tests.gyp1
-rw-r--r--gyp/utils.gyp2
3 files changed, 4 insertions, 0 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi
index fcd5e392f0..b1998682db 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -183,6 +183,7 @@
'<(skia_src_path)/core/SkTileGridPicture.cpp',
'<(skia_src_path)/core/SkTLList.h',
'<(skia_src_path)/core/SkTLS.cpp',
+ '<(skia_src_path)/core/SkTraceEvent.h',
'<(skia_src_path)/core/SkTSearch.cpp',
'<(skia_src_path)/core/SkTSort.h',
'<(skia_src_path)/core/SkTypeface.cpp',
diff --git a/gyp/tests.gyp b/gyp/tests.gyp
index 827ba3f7f2..42ddebe219 100644
--- a/gyp/tests.gyp
+++ b/gyp/tests.gyp
@@ -152,6 +152,7 @@
'../tests/Test.h',
'../tests/TestSize.cpp',
'../tests/TileGridTest.cpp',
+ '../tests/TracingTest.cpp',
'../tests/ToUnicode.cpp',
'../tests/Typeface.cpp',
'../tests/UnicodeTest.cpp',
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index e9e9109904..3f6e5b5bf1 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -41,6 +41,7 @@
'../include/utils/SkDebugUtils.h',
'../include/utils/SkDeferredCanvas.h',
'../include/utils/SkDumpCanvas.h',
+ '../include/utils/SkEventTracer.h',
'../include/utils/SkInterpolator.h',
'../include/utils/SkLayer.h',
'../include/utils/SkMatrix44.h',
@@ -74,6 +75,7 @@
'../src/utils/SkCullPoints.cpp',
'../src/utils/SkDeferredCanvas.cpp',
'../src/utils/SkDumpCanvas.cpp',
+ '../src/utils/SkEventTracer.cpp',
'../src/utils/SkFloatUtils.h',
'../src/utils/SkGatherPixelRefsAndRects.cpp',
'../src/utils/SkGatherPixelRefsAndRects.h',