| Index: content/renderer/media/webmediaplayer_util.cc
|
| diff --git a/content/renderer/media/webmediaplayer_util.cc b/content/renderer/media/webmediaplayer_util.cc
|
| index 741239addccaae80b82c421b6db55c625e7168b8..ef2dc679e4e838d9ad681ab2b362dd3571157eaf 100644
|
| --- a/content/renderer/media/webmediaplayer_util.cc
|
| +++ b/content/renderer/media/webmediaplayer_util.cc
|
| @@ -15,7 +15,7 @@ namespace content {
|
|
|
| #define COMPILE_ASSERT_MATCHING_ENUM(name) \
|
| COMPILE_ASSERT( \
|
| - static_cast<int>(WebKit::WebMediaPlayerClient::MediaKeyErrorCode ## name) == \
|
| + static_cast<int>(blink::WebMediaPlayerClient::MediaKeyErrorCode ## name) == \
|
| static_cast<int>(media::MediaKeys::k ## name ## Error), \
|
| mismatching_enums)
|
| COMPILE_ASSERT_MATCHING_ENUM(Unknown);
|
| @@ -28,9 +28,9 @@ base::TimeDelta ConvertSecondsToTimestamp(double seconds) {
|
| microseconds > 0 ? microseconds + 0.5 : ceil(microseconds - 0.5));
|
| }
|
|
|
| -WebKit::WebTimeRanges ConvertToWebTimeRanges(
|
| +blink::WebTimeRanges ConvertToWebTimeRanges(
|
| const media::Ranges<base::TimeDelta>& ranges) {
|
| - WebKit::WebTimeRanges result(ranges.size());
|
| + blink::WebTimeRanges result(ranges.size());
|
| for (size_t i = 0; i < ranges.size(); i++) {
|
| result[i].start = ranges.start(i).InSecondsF();
|
| result[i].end = ranges.end(i).InSecondsF();
|
| @@ -38,14 +38,14 @@ WebKit::WebTimeRanges ConvertToWebTimeRanges(
|
| return result;
|
| }
|
|
|
| -WebKit::WebMediaPlayer::NetworkState PipelineErrorToNetworkState(
|
| +blink::WebMediaPlayer::NetworkState PipelineErrorToNetworkState(
|
| media::PipelineStatus error) {
|
| DCHECK_NE(error, media::PIPELINE_OK);
|
|
|
| switch (error) {
|
| case media::PIPELINE_ERROR_NETWORK:
|
| case media::PIPELINE_ERROR_READ:
|
| - return WebKit::WebMediaPlayer::NetworkStateNetworkError;
|
| + return blink::WebMediaPlayer::NetworkStateNetworkError;
|
|
|
| // TODO(vrk): Because OnPipelineInitialize() directly reports the
|
| // NetworkStateFormatError instead of calling OnPipelineError(), I believe
|
| @@ -57,24 +57,24 @@ WebKit::WebMediaPlayer::NetworkState PipelineErrorToNetworkState(
|
| case media::DEMUXER_ERROR_COULD_NOT_PARSE:
|
| case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
|
| case media::DECODER_ERROR_NOT_SUPPORTED:
|
| - return WebKit::WebMediaPlayer::NetworkStateFormatError;
|
| + return blink::WebMediaPlayer::NetworkStateFormatError;
|
|
|
| case media::PIPELINE_ERROR_DECODE:
|
| case media::PIPELINE_ERROR_ABORT:
|
| case media::PIPELINE_ERROR_OPERATION_PENDING:
|
| case media::PIPELINE_ERROR_INVALID_STATE:
|
| - return WebKit::WebMediaPlayer::NetworkStateDecodeError;
|
| + return blink::WebMediaPlayer::NetworkStateDecodeError;
|
|
|
| case media::PIPELINE_ERROR_DECRYPT:
|
| // TODO(xhwang): Change to use NetworkStateDecryptError once it's added in
|
| // Webkit (see http://crbug.com/124486).
|
| - return WebKit::WebMediaPlayer::NetworkStateDecodeError;
|
| + return blink::WebMediaPlayer::NetworkStateDecodeError;
|
|
|
| case media::PIPELINE_OK:
|
| case media::PIPELINE_STATUS_MAX:
|
| NOTREACHED() << "Unexpected status! " << error;
|
| }
|
| - return WebKit::WebMediaPlayer::NetworkStateFormatError;
|
| + return blink::WebMediaPlayer::NetworkStateFormatError;
|
| }
|
|
|
| } // namespace content
|
|
|