Index: tools/telemetry/docs/telemetry.page.actions.play.html |
diff --git a/tools/telemetry/docs/telemetry.page.actions.play.html b/tools/telemetry/docs/telemetry.page.actions.play.html |
index 88ece2442907d8b044ddad9240dcff5080f4245a..ebcdf5fa380d21c414740161204da5b76277bd49 100644 |
--- a/tools/telemetry/docs/telemetry.page.actions.play.html |
+++ b/tools/telemetry/docs/telemetry.page.actions.play.html |
@@ -25,10 +25,9 @@ the action to wait until playing and ended&nb |
<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.exceptions.html">telemetry.core.exceptions</a><br> |
-</td><td width="25%" valign=top><a href="os.html">os</a><br> |
+</td><td width="25%" valign=top><a href="telemetry.page.actions.media_action.html">telemetry.page.actions.media_action</a><br> |
</td><td width="25%" valign=top><a href="telemetry.page.actions.page_action.html">telemetry.page.actions.page_action</a><br> |
-</td><td width="25%" valign=top><a href="telemetry.core.util.html">telemetry.core.util</a><br> |
-</td></tr></table></td></tr></table><p> |
+</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"> |
<td colspan=3 valign=bottom> <br> |
@@ -36,7 +35,7 @@ the action to wait until playing and ended&nb |
<tr><td bgcolor="#ee77aa"><tt> </tt></td><td> </td> |
<td width="100%"><dl> |
-<dt><font face="helvetica, arial"><a href="telemetry.page.actions.page_action.html#PageAction">telemetry.page.actions.page_action.PageAction</a>(<a href="__builtin__.html#object">__builtin__.object</a>) |
+<dt><font face="helvetica, arial"><a href="telemetry.page.actions.media_action.html#MediaAction">telemetry.page.actions.media_action.MediaAction</a>(<a href="telemetry.page.actions.page_action.html#PageAction">telemetry.page.actions.page_action.PageAction</a>) |
</font></dt><dd> |
<dl> |
<dt><font face="helvetica, arial"><a href="telemetry.page.actions.play.html#PlayAction">PlayAction</a> |
@@ -47,27 +46,38 @@ the action to wait until playing and ended&nb |
<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="PlayAction">class <strong>PlayAction</strong></a>(<a href="telemetry.page.actions.page_action.html#PageAction">telemetry.page.actions.page_action.PageAction</a>)</font></td></tr> |
+<font color="#000000" face="helvetica, arial"><a name="PlayAction">class <strong>PlayAction</strong></a>(<a href="telemetry.page.actions.media_action.html#MediaAction">telemetry.page.actions.media_action.MediaAction</a>)</font></td></tr> |
<tr><td bgcolor="#ffc8d8"><tt> </tt></td><td> </td> |
<td width="100%"><dl><dt>Method resolution order:</dt> |
<dd><a href="telemetry.page.actions.play.html#PlayAction">PlayAction</a></dd> |
+<dd><a href="telemetry.page.actions.media_action.html#MediaAction">telemetry.page.actions.media_action.MediaAction</a></dd> |
<dd><a href="telemetry.page.actions.page_action.html#PageAction">telemetry.page.actions.page_action.PageAction</a></dd> |
<dd><a href="__builtin__.html#object">__builtin__.object</a></dd> |
</dl> |
<hr> |
Methods defined here:<br> |
-<dl><dt><a name="PlayAction-HasEventCompleted"><strong>HasEventCompleted</strong></a>(self, tab, selector, event_name)</dt></dl> |
- |
-<dl><dt><a name="PlayAction-RunAction"><strong>RunAction</strong></a>(self, page, tab, previous_action)</dt></dl> |
- |
-<dl><dt><a name="PlayAction-WaitForEvent"><strong>WaitForEvent</strong></a>(self, tab, selector, event_name, timeout)</dt><dd><tt>Halts play action until the selector's event is fired.</tt></dd></dl> |
+<dl><dt><a name="PlayAction-RunAction"><strong>RunAction</strong></a>(self, page, tab)</dt></dl> |
<dl><dt><a name="PlayAction-WillRunAction"><strong>WillRunAction</strong></a>(self, page, tab)</dt><dd><tt>Load the media metrics JS code prior to running the action.</tt></dd></dl> |
<dl><dt><a name="PlayAction-__init__"><strong>__init__</strong></a>(self, attributes<font color="#909090">=None</font>)</dt></dl> |
<hr> |
+Methods inherited from <a href="telemetry.page.actions.media_action.html#MediaAction">telemetry.page.actions.media_action.MediaAction</a>:<br> |
+<dl><dt><a name="PlayAction-HasEventCompletedOrError"><strong>HasEventCompletedOrError</strong></a>(self, tab, selector, event_name)</dt></dl> |
+ |
+<dl><dt><a name="PlayAction-LoadJS"><strong>LoadJS</strong></a>(self, tab, js_file_name)</dt><dd><tt>Loads and executes a JS file in the tab.</tt></dd></dl> |
+ |
+<dl><dt><a name="PlayAction-WaitForEvent"><strong>WaitForEvent</strong></a>(self, tab, selector, event_name, timeout)</dt><dd><tt>Halts media action until the selector's event is fired.<br> |
+ <br> |
+Args:<br> |
+ tab: The tab to check for event on.<br> |
+ selector: Media element selector.<br> |
+ event_name: Name of the event to check if fired or not.<br> |
+ timeout: Timeout to check for event, throws an exception if not fired.</tt></dd></dl> |
+ |
+<hr> |
Methods inherited from <a href="telemetry.page.actions.page_action.html#PageAction">telemetry.page.actions.page_action.PageAction</a>:<br> |
<dl><dt><a name="PlayAction-BindMeasurementJavaScript"><strong>BindMeasurementJavaScript</strong></a>(self, tab, start_js, stop_js)</dt><dd><tt>Let this action determine when measurements should start and stop.<br> |
<br> |
@@ -86,14 +96,23 @@ to return True so that a test knows it&n |
<dl><dt><a name="PlayAction-CleanUp"><strong>CleanUp</strong></a>(self, page, tab)</dt></dl> |
-<dl><dt><a name="PlayAction-CustomizeBrowserOptions"><strong>CustomizeBrowserOptions</strong></a>(self, options)</dt><dd><tt>Override to add action-specific options to the BrowserOptions<br> |
-object.</tt></dd></dl> |
+<dl><dt><a name="PlayAction-CustomizeBrowserOptionsForPageSet"><strong>CustomizeBrowserOptionsForPageSet</strong></a>(self, options)</dt><dd><tt>Override to add action-specific options to the BrowserOptions<br> |
+object. These options will be set for the whole page set.<br> |
+ <br> |
+If the browser is not being restarted for every page in the page set then<br> |
+all browser options required for the action must be set here. This, however,<br> |
+requires that they do not conflict with options require by other actions<br> |
+used up by the page set.</tt></dd></dl> |
+ |
+<dl><dt><a name="PlayAction-GetActiveRangeOnTimeline"><strong>GetActiveRangeOnTimeline</strong></a>(self, timeline)</dt></dl> |
-<dl><dt><a name="PlayAction-RunsPreviousAction"><strong>RunsPreviousAction</strong></a>(self)</dt><dd><tt>Some actions require some initialization to be performed before the<br> |
-previous action. For example, wait for href change needs to record the old<br> |
-href before the previous action changes it. Therefore, we allow actions to<br> |
-run the previous action. An action that does this should override this to<br> |
-return True in order to prevent the previous action from being run twice.</tt></dd></dl> |
+<dl><dt><a name="PlayAction-RunActionAndMaybeWait"><strong>RunActionAndMaybeWait</strong></a>(self, page, tab)</dt></dl> |
+ |
+<dl><dt><a name="PlayAction-WillWaitAfterRun"><strong>WillWaitAfterRun</strong></a>(self)</dt></dl> |
+ |
+<hr> |
+Static methods inherited from <a href="telemetry.page.actions.page_action.html#PageAction">telemetry.page.actions.page_action.PageAction</a>:<br> |
+<dl><dt><a name="PlayAction-ResetNextTimelineMarkerId"><strong>ResetNextTimelineMarkerId</strong></a>()</dt></dl> |
<hr> |
Data descriptors inherited from <a href="telemetry.page.actions.page_action.html#PageAction">telemetry.page.actions.page_action.PageAction</a>:<br> |