| Index: tools/telemetry/docs/telemetry.core.timeline.thread.html | 
| diff --git a/tools/telemetry/docs/telemetry.core.timeline.tracing.thread.html b/tools/telemetry/docs/telemetry.core.timeline.thread.html | 
| similarity index 71% | 
| rename from tools/telemetry/docs/telemetry.core.timeline.tracing.thread.html | 
| rename to tools/telemetry/docs/telemetry.core.timeline.thread.html | 
| index 8fe688d94597d27331a78efa9ae9517d2f6180d2..081f2ee55a9aaba7386be2db955d9d57e7046d94 100644 | 
| --- a/tools/telemetry/docs/telemetry.core.timeline.tracing.thread.html | 
| +++ b/tools/telemetry/docs/telemetry.core.timeline.thread.html | 
| @@ -1,14 +1,14 @@ | 
|  | 
| <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> | 
| -<html><head><title>Python: module telemetry.core.timeline.tracing.thread</title> | 
| +<html><head><title>Python: module telemetry.core.timeline.thread</title> | 
| </head><body bgcolor="#f0f0f8"> | 
|  | 
| <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading"> | 
| <tr bgcolor="#7799ee"> | 
| <td valign=bottom> <br> | 
| -<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="telemetry.html"><font color="#ffffff">telemetry</font></a>.<a href="telemetry.core.html"><font color="#ffffff">core</font></a>.<a href="telemetry.core.timeline.html"><font color="#ffffff">timeline</font></a>.<a href="telemetry.core.timeline.tracing.html"><font color="#ffffff">tracing</font></a>.thread</strong></big></big></font></td | 
| +<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="telemetry.html"><font color="#ffffff">telemetry</font></a>.<a href="telemetry.core.html"><font color="#ffffff">core</font></a>.<a href="telemetry.core.timeline.html"><font color="#ffffff">timeline</font></a>.thread</strong></big></big></font></td | 
| ><td align=right valign=bottom | 
| -><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="../telemetry/core/timeline/tracing/thread.py">telemetry/core/timeline/tracing/thread.py</a></font></td></tr></table> | 
| +><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="../telemetry/core/timeline/thread.py">telemetry/core/timeline/thread.py</a></font></td></tr></table> | 
| <p><tt># Copyright 2013 The Chromium Authors. All rights reserved.<br> | 
| # Use of this source code is governed by a BSD-style license that can be<br> | 
| # found in the LICENSE file.</tt></p> | 
| @@ -19,9 +19,9 @@ | 
| <font color="#ffffff" face="helvetica, arial"><big><strong>Modules</strong></big></font></td></tr> | 
|  | 
| <tr><td bgcolor="#aa55cc"><tt>      </tt></td><td> </td> | 
| -<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="telemetry.core.timeline.event.html">telemetry.core.timeline.event</a><br> | 
| -</td><td width="25%" valign=top><a href="telemetry.core.timeline.tracing.sample.html">telemetry.core.timeline.tracing.sample</a><br> | 
| -</td><td width="25%" valign=top><a href="telemetry.core.timeline.tracing.slice.html">telemetry.core.timeline.tracing.slice</a><br> | 
| +<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="telemetry.core.timeline.event_container.html">telemetry.core.timeline.event_container</a><br> | 
| +</td><td width="25%" valign=top><a href="telemetry.core.timeline.sample.html">telemetry.core.timeline.sample</a><br> | 
| +</td><td width="25%" valign=top><a href="telemetry.core.timeline.slice.html">telemetry.core.timeline.slice</a><br> | 
| </td><td width="25%" valign=top></td></tr></table></td></tr></table><p> | 
| <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> | 
| <tr bgcolor="#ee77aa"> | 
| @@ -30,10 +30,10 @@ | 
|  | 
| <tr><td bgcolor="#ee77aa"><tt>      </tt></td><td> </td> | 
| <td width="100%"><dl> | 
| -<dt><font face="helvetica, arial"><a href="telemetry.core.timeline.event.html#TimelineEvent">telemetry.core.timeline.event.TimelineEvent</a>(<a href="__builtin__.html#object">__builtin__.object</a>) | 
| +<dt><font face="helvetica, arial"><a href="telemetry.core.timeline.event_container.html#TimelineEventContainer">telemetry.core.timeline.event_container.TimelineEventContainer</a>(<a href="__builtin__.html#object">__builtin__.object</a>) | 
| </font></dt><dd> | 
| <dl> | 
| -<dt><font face="helvetica, arial"><a href="telemetry.core.timeline.tracing.thread.html#Thread">Thread</a> | 
| +<dt><font face="helvetica, arial"><a href="telemetry.core.timeline.thread.html#Thread">Thread</a> | 
| </font></dt></dl> | 
| </dd> | 
| </dl> | 
| @@ -41,7 +41,7 @@ | 
| <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> | 
| <tr bgcolor="#ffc8d8"> | 
| <td colspan=3 valign=bottom> <br> | 
| -<font color="#000000" face="helvetica, arial"><a name="Thread">class <strong>Thread</strong></a>(<a href="telemetry.core.timeline.event.html#TimelineEvent">telemetry.core.timeline.event.TimelineEvent</a>)</font></td></tr> | 
| +<font color="#000000" face="helvetica, arial"><a name="Thread">class <strong>Thread</strong></a>(<a href="telemetry.core.timeline.event_container.html#TimelineEventContainer">telemetry.core.timeline.event_container.TimelineEventContainer</a>)</font></td></tr> | 
|  | 
| <tr bgcolor="#ffc8d8"><td rowspan=2><tt>   </tt></td> | 
| <td colspan=2><tt>A <a href="#Thread">Thread</a> stores all the trace events collected for a particular<br> | 
| @@ -50,8 +50,8 @@ subrow 0 has all the root slices, subrow  | 
| The asynchronous slices are stored in an AsyncSliceGroup object.<br> </tt></td></tr> | 
| <tr><td> </td> | 
| <td width="100%"><dl><dt>Method resolution order:</dt> | 
| -<dd><a href="telemetry.core.timeline.tracing.thread.html#Thread">Thread</a></dd> | 
| -<dd><a href="telemetry.core.timeline.event.html#TimelineEvent">telemetry.core.timeline.event.TimelineEvent</a></dd> | 
| +<dd><a href="telemetry.core.timeline.thread.html#Thread">Thread</a></dd> | 
| +<dd><a href="telemetry.core.timeline.event_container.html#TimelineEventContainer">telemetry.core.timeline.event_container.TimelineEventContainer</a></dd> | 
| <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> | 
| </dl> | 
| <hr> | 
| @@ -60,7 +60,7 @@ Methods defined here:<br> | 
|  | 
| <dl><dt><a name="Thread-AddSample"><strong>AddSample</strong></a>(self, category, name, timestamp, args<font color="#909090">=None</font>)</dt></dl> | 
|  | 
| -<dl><dt><a name="Thread-AutoCloseOpenSlices"><strong>AutoCloseOpenSlices</strong></a>(self, max_timestamp<font color="#909090">=None</font>)</dt></dl> | 
| +<dl><dt><a name="Thread-AutoCloseOpenSlices"><strong>AutoCloseOpenSlices</strong></a>(self, max_timestamp)</dt></dl> | 
|  | 
| <dl><dt><a name="Thread-BeginSlice"><strong>BeginSlice</strong></a>(self, category, name, timestamp, args<font color="#909090">=None</font>)</dt><dd><tt>Opens a new slice for the thread.<br> | 
| Calls to beginSlice and endSlice must be made with<br> | 
| @@ -84,43 +84,35 @@ returns completed slice.</tt></dd></dl> | 
|  | 
| <dl><dt><a name="Thread-IsTimestampValidForBeginOrEnd"><strong>IsTimestampValidForBeginOrEnd</strong></a>(self, timestamp)</dt></dl> | 
|  | 
| -<dl><dt><a name="Thread-PushSlice"><strong>PushSlice</strong></a>(self, new_slice)</dt></dl> | 
| +<dl><dt><a name="Thread-IterAllSlices"><strong>IterAllSlices</strong></a>(self)</dt></dl> | 
| + | 
| +<dl><dt><a name="Thread-IterChildContainers"><strong>IterChildContainers</strong></a>(self)</dt></dl> | 
| + | 
| +<dl><dt><a name="Thread-IterEventsInThisContainer"><strong>IterEventsInThisContainer</strong></a>(self)</dt></dl> | 
|  | 
| -<dl><dt><a name="Thread-UpdateBounds"><strong>UpdateBounds</strong></a>(self)</dt></dl> | 
| +<dl><dt><a name="Thread-PushSlice"><strong>PushSlice</strong></a>(self, new_slice)</dt></dl> | 
|  | 
| <dl><dt><a name="Thread-__init__"><strong>__init__</strong></a>(self, process, tid)</dt></dl> | 
|  | 
| <hr> | 
| Data descriptors defined here:<br> | 
| +<dl><dt><strong>all_slices</strong></dt> | 
| +</dl> | 
| <dl><dt><strong>async_slices</strong></dt> | 
| </dl> | 
| <dl><dt><strong>open_slice_count</strong></dt> | 
| </dl> | 
| <dl><dt><strong>samples</strong></dt> | 
| </dl> | 
| -<dl><dt><strong>slices</strong></dt> | 
| +<dl><dt><strong>toplevel_slices</strong></dt> | 
| </dl> | 
| <hr> | 
| -Methods inherited from <a href="telemetry.core.timeline.event.html#TimelineEvent">telemetry.core.timeline.event.TimelineEvent</a>:<br> | 
| -<dl><dt><a name="Thread-GetAllChildrenRecursive"><strong>GetAllChildrenRecursive</strong></a>(self, include_self<font color="#909090">=False</font>)</dt></dl> | 
| - | 
| -<dl><dt><a name="Thread-ShiftTimestampsForward"><strong>ShiftTimestampsForward</strong></a>(self, delta_time)</dt><dd><tt>Shifts start time of event by delta_time and also<br> | 
| -recursively shifts child events.</tt></dd></dl> | 
| - | 
| -<dl><dt><a name="Thread-__repr__"><strong>__repr__</strong></a>(self)</dt></dl> | 
| - | 
| -<hr> | 
| -Data descriptors inherited from <a href="telemetry.core.timeline.event.html#TimelineEvent">telemetry.core.timeline.event.TimelineEvent</a>:<br> | 
| +Data descriptors inherited from <a href="telemetry.core.timeline.event_container.html#TimelineEventContainer">telemetry.core.timeline.event_container.TimelineEventContainer</a>:<br> | 
| <dl><dt><strong>__dict__</strong></dt> | 
| <dd><tt>dictionary for instance variables (if defined)</tt></dd> | 
| </dl> | 
| <dl><dt><strong>__weakref__</strong></dt> | 
| <dd><tt>list of weak references to the object (if defined)</tt></dd> | 
| </dl> | 
| -<dl><dt><strong>end</strong></dt> | 
| -</dl> | 
| -<dl><dt><strong>self_time</strong></dt> | 
| -<dd><tt>Time spent in this function less any time spent in child events.</tt></dd> | 
| -</dl> | 
| </td></tr></table></td></tr></table> | 
| </body></html> | 
|  |