| Index: Source/WebKit/chromium/src/AssertMatchingEnums.cpp
|
| diff --git a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
|
| index a0e9944394cd8eaf99105f07a4ff88c9ec2cad94..205ef8ea74bf75d67171bb35afb573ac55e81cc6 100644
|
| --- a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
|
| +++ b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
|
| @@ -62,9 +62,7 @@
|
| #include "IDBMetadata.h"
|
| #include "IconURL.h"
|
| #include "MediaPlayer.h"
|
| -#if ENABLE(MEDIA_SOURCE)
|
| #include "MediaSourcePrivate.h"
|
| -#endif
|
| #include "MediaStreamSource.h"
|
| #include "NotificationClient.h"
|
| #include "PageVisibilityState.h"
|
| @@ -411,7 +409,6 @@ COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadNone, MediaPlayer::None);
|
| COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadMetaData, MediaPlayer::MetaData);
|
| COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadAuto, MediaPlayer::Auto);
|
|
|
| -#if ENABLE(MEDIA_SOURCE)
|
| COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::AddStatusOk, MediaSourcePrivate::Ok);
|
| COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::AddStatusNotSupported, MediaSourcePrivate::NotSupported);
|
| COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::AddStatusReachedIdLimit, MediaSourcePrivate::ReachedIdLimit);
|
| @@ -419,7 +416,6 @@ COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::AddStatusReachedIdLimit, Medi
|
| COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::EndOfStreamStatusNoError, MediaSourcePrivate::EosNoError);
|
| COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::EndOfStreamStatusNetworkError, MediaSourcePrivate::EosNetworkError);
|
| COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::EndOfStreamStatusDecodeError, MediaSourcePrivate::EosDecodeError);
|
| -#endif
|
|
|
| #if ENABLE(ENCRYPTED_MEDIA)
|
| COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MediaKeyExceptionNoError, MediaPlayer::NoError);
|
|
|