diff options
| author | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 21:12:31 +0000 |
|---|---|---|
| committer | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 21:12:31 +0000 |
| commit | fef31643b213eebe53b8bea846217b96b1f24917 (patch) | |
| tree | 9238058864516604d1a2c3e2e54a3e3ff9722bec | |
| parent | dfd68c44bdf5dbd7c151c4a9a54763a0d9598378 (diff) | |
| download | chromium_src-fef31643b213eebe53b8bea846217b96b1f24917.zip chromium_src-fef31643b213eebe53b8bea846217b96b1f24917.tar.gz chromium_src-fef31643b213eebe53b8bea846217b96b1f24917.tar.bz2 | |
Fix telemetry image_decoding_tests
TBR=tonyg
CC=sullivan
Review URL: https://codereview.chromium.org/11778070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175886 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | tools/perf/perf_tools/image_decoding_benchmark.py | 2 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/inspector_timeline.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/perf/perf_tools/image_decoding_benchmark.py b/tools/perf/perf_tools/image_decoding_benchmark.py index 00d0d40..9436fc8 100644 --- a/tools/perf/perf_tools/image_decoding_benchmark.py +++ b/tools/perf/perf_tools/image_decoding_benchmark.py @@ -15,7 +15,7 @@ class ImageDecoding(multi_page_benchmark.MultiPageBenchmark): return tab.runtime.Evaluate('isDone') decode_image_events = \ - tab.timeline.timeline_events.GetAllOfName('DecodeImage') + tab.timeline.timeline_model.GetAllOfName('DecodeImage') # If it is a real image benchmark, then store only the last-minIterations # decode tasks. diff --git a/tools/telemetry/telemetry/inspector_timeline.py b/tools/telemetry/telemetry/inspector_timeline.py index 8faf38d..7daf6fc 100644 --- a/tools/telemetry/telemetry/inspector_timeline.py +++ b/tools/telemetry/telemetry/inspector_timeline.py @@ -65,7 +65,8 @@ class InspectorTimeline(object): record = msg.get('params', {}).get('record') if record: newly_created_event = InspectorTimeline.RawEventToTimelineEvent(record) - self._timeline_model.AddEvent(newly_created_event) + if newly_created_event: + self._timeline_model.AddEvent(newly_created_event) @staticmethod def RawEventToTimelineEvent(raw_inspector_event): |