commit 5267f701546148b83dfbe1d151cb184385bb5c22
author Torne (Richard Coles) <torne@google.com> Tue Jun 11 10:57:24 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Tue Jun 11 10:57:24 2013 +0100
tree 59c6e6ba5fe2109e3e2631e507c8c761110d3fbe
parent 849dee59310a97b012b82f8ce9840bc7b758f6fa

Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: Id50fcfa40590db3bd322348190cb5192c432eadf

Source/modules/mediastream/MediaStreamTrack.idl

diff --git a/Source/modules/mediastream/MediaStreamTrack.idl b/Source/modules/mediastream/MediaStreamTrack.idl
index 6710c70..116cc33 100644
--- a/Source/modules/mediastream/MediaStreamTrack.idl
+++ b/Source/modules/mediastream/MediaStreamTrack.idl
@@ -23,7 +23,6 @@
  */
 
 [
-    NoInterfaceObject,
     EventTarget,
     ActiveDOMObject
 ] interface MediaStreamTrack {
@@ -38,6 +37,8 @@
     attribute EventListener onunmute;
     attribute EventListener onended;
 
+    [CallWith=ScriptExecutionContext, RaisesException] static sequence<SourceInfo> getSourceInfos();
+
     // EventTarget interface
     void addEventListener(DOMString type,
                           EventListener listener,