webkit/media/webmediaplayer_util.h - Issue 15927003: Fix MediaPlayerDelegate error handling so it passes the webkitmediasource-errors.html LayoutTest.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: webkit/media/webmediaplayer_util.h

Issue 15927003: Fix MediaPlayerDelegate error handling so it passes the webkitmediasource-errors.html LayoutTest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_UTIL_H_	5 #ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_UTIL_H_

6 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_UTIL_H_	6 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_UTIL_H_

7	7

8 #include "base/time.h"	8 #include "base/time.h"

	9 #include "media/base/pipeline_status.h"

9 #include "media/base/ranges.h"	10 #include "media/base/ranges.h"

	11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"

10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTimeRange.h"	12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTimeRange.h"

11	13

12 namespace webkit_media {	14 namespace webkit_media {

13	15

14 // Platform independent method for converting and rounding floating point	16 // Platform independent method for converting and rounding floating point

15 // seconds to an int64 timestamp.	17 // seconds to an int64 timestamp.

16 //	18 //

17 // Refer to https://bugs.webkit.org/show_bug.cgi?id=52697 for details.	19 // Refer to https://bugs.webkit.org/show_bug.cgi?id=52697 for details.

18 base::TimeDelta ConvertSecondsToTimestamp(double seconds);	20 base::TimeDelta ConvertSecondsToTimestamp(double seconds);

19	21

20 WebKit::WebTimeRanges ConvertToWebTimeRanges(	22 WebKit::WebTimeRanges ConvertToWebTimeRanges(

21 const media::Ranges<base::TimeDelta>& ranges);	23 const media::Ranges<base::TimeDelta>& ranges);

22	24

	25 WebKit::WebMediaPlayer::NetworkState PipelineErrorToNetworkState(

	26 media::PipelineStatus error);

	27

23 } // namespace webkit_media	28 } // namespace webkit_media

24	29

25 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_UTIL_H_	30 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_UTIL_H_

OLD	NEW

« no previous file with comments | « webkit/media/webmediaplayer_impl.cc ('k') | webkit/media/webmediaplayer_util.cc » ('j') | no next file with comments »