Bug 77381 – The spec renamed addTrack() to addTextTrack()

• Component: Media
• Status: RESOLVED FIXED

[Silvia Pfeiffer]

The IDL of the tracks API in HTMLMediaElement has changed in the HTML spec:

===
third_party/WebKit/WebKitBuild/Release/DerivedSources/WebCore/WebCore/html/HTMLMediaElement.idl :

#if defined(ENABLE_VIDEO_TRACK) && ENABLE_VIDEO_TRACK
    [EnabledAtRuntime=webkitVideoTrack] TextTrack addTrack(in DOMString kind, in [Optional] DOMString label, in [Optional] DOMString language)
        raises (DOMException);
    readonly attribute [EnabledAtRuntime=webkitVideoTrack] TextTrackList textTracks;
#endif
===

===
http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#media-elements :

// tracks
  readonly attribute TextTrackList textTracks;
  TextTrack addTextTrack(DOMString kind, optional DOMString label, optional DOMString language);
===

Please rename the function from addTrack() to addTextTrack()

[Arko Saha]

Created attachment 124684 [details]
Patch

Incorporating spec change.

[WebKit Review Bot]

Attachment 124684 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9

Updating OpenSource
From git://git.webkit.org/WebKit
   c1d3a24..f16475a  master     -> origin/master
Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ...
Currently at 106344 = c1d3a24ee41e907f3a05d56935348677c33112a7
r106345 = f16475ae58a34ac80c6a00857d86913b818f1eea
Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc
First, rewinding head to replay your work on top of it...
Applying: Fix compilation errors on build-webkit --debug --no-workers on mac.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging LayoutTests/ChangeLog
CONFLICT (content): Merge conflict in LayoutTests/ChangeLog
Auto-merging LayoutTests/platform/qt/Skipped
CONFLICT (content): Merge conflict in LayoutTests/platform/qt/Skipped
Failed to merge in the changes.
Patch failed at 0001 Fix compilation errors on build-webkit --debug --no-workers on mac.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

rebase refs/remotes/origin/master: command returned error: 1

Died at Tools/Scripts/update-webkit line 164.


If any of these errors are false positives, please file a bug against check-webkit-style.

[Arko Saha]

Created attachment 124694 [details]
Updated patch

Resolved merge conflict.

[WebKit Review Bot]

Attachment 124694 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9

Updating OpenSource
First, rewinding head to replay your work on top of it...
Applying: Fix compilation errors on build-webkit --debug --no-workers on mac.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging LayoutTests/ChangeLog
CONFLICT (content): Merge conflict in LayoutTests/ChangeLog
Auto-merging LayoutTests/platform/qt/Skipped
CONFLICT (content): Merge conflict in LayoutTests/platform/qt/Skipped
Auto-merging Source/WebCore/ChangeLog
CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 Fix compilation errors on build-webkit --debug --no-workers on mac.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

rebase refs/remotes/origin/master: command returned error: 1

Died at Tools/Scripts/update-webkit line 164.


If any of these errors are false positives, please file a bug against check-webkit-style.

[Arko Saha]

Looks like there is some problem with style-queue, its failing for all the patches.

[WebKit Review Bot]

Comment on attachment 124694 [details]
Updated patch

Clearing flags on attachment: 124694

Committed r106361: <http://trac.webkit.org/changeset/106361>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.