diff options
| author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-18 11:45:02 +0000 |
|---|---|---|
| committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-18 11:45:02 +0000 |
| commit | 505ac48cfd55946304764901eabb997820ffacb4 (patch) | |
| tree | 7cd1a71d71d7da7e049b501af2d0f5a7af8fbdc7 | |
| parent | 1de75af3a06d15e958a6e3aefe5ad3dfcab01e5a (diff) | |
| download | chromium_src-505ac48cfd55946304764901eabb997820ffacb4.zip chromium_src-505ac48cfd55946304764901eabb997820ffacb4.tar.gz chromium_src-505ac48cfd55946304764901eabb997820ffacb4.tar.bz2 | |
Move MediaKeyErrorCode compile asserts to common file.
This also eliminates the obsolete MediaKeyErrorCode aliases currently used in the Android code.
BUG=https://bugs.webkit.org/show_bug.cgi?id=84046
Review URL: https://chromiumcodereview.appspot.com/16995002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206940 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/renderer/media/android/webmediaplayer_android.cc | 12 | ||||
| -rw-r--r-- | webkit/renderer/media/webmediaplayer_impl.cc | 13 | ||||
| -rw-r--r-- | webkit/renderer/media/webmediaplayer_util.cc | 18 |
3 files changed, 18 insertions, 25 deletions
diff --git a/webkit/renderer/media/android/webmediaplayer_android.cc b/webkit/renderer/media/android/webmediaplayer_android.cc index bd1f1f0..b6cc60b 100644 --- a/webkit/renderer/media/android/webmediaplayer_android.cc +++ b/webkit/renderer/media/android/webmediaplayer_android.cc @@ -1027,18 +1027,6 @@ void WebMediaPlayerAndroid::OnKeyAdded(const std::string& key_system, WebString::fromUTF8(session_id)); } -#define COMPILE_ASSERT_MATCHING_ENUM(name) \ - COMPILE_ASSERT(static_cast<int>(WebKit::WebMediaPlayerClient::name) == \ - static_cast<int>(media::MediaKeys::k ## name), \ - mismatching_enums) -COMPILE_ASSERT_MATCHING_ENUM(UnknownError); -COMPILE_ASSERT_MATCHING_ENUM(ClientError); -COMPILE_ASSERT_MATCHING_ENUM(ServiceError); -COMPILE_ASSERT_MATCHING_ENUM(OutputError); -COMPILE_ASSERT_MATCHING_ENUM(HardwareChangeError); -COMPILE_ASSERT_MATCHING_ENUM(DomainError); -#undef COMPILE_ASSERT_MATCHING_ENUM - void WebMediaPlayerAndroid::OnKeyError(const std::string& key_system, const std::string& session_id, media::MediaKeys::KeyError error_code, diff --git a/webkit/renderer/media/webmediaplayer_impl.cc b/webkit/renderer/media/webmediaplayer_impl.cc index 091ef7b..ca500fa 100644 --- a/webkit/renderer/media/webmediaplayer_impl.cc +++ b/webkit/renderer/media/webmediaplayer_impl.cc @@ -927,19 +927,6 @@ WebMediaPlayerImpl::OnTextTrack(media::TextKind kind, return scoped_ptr<media::TextTrack>(new TextTrackImpl(text_track)); } -#define COMPILE_ASSERT_MATCHING_ENUM(name) \ - COMPILE_ASSERT( \ - static_cast<int>(WebKit::WebMediaPlayerClient::MediaKeyErrorCode ## name) == \ - static_cast<int>(media::MediaKeys::k ## name ## Error), \ - mismatching_enums) -COMPILE_ASSERT_MATCHING_ENUM(Unknown); -COMPILE_ASSERT_MATCHING_ENUM(Client); -COMPILE_ASSERT_MATCHING_ENUM(Service); -COMPILE_ASSERT_MATCHING_ENUM(Output); -COMPILE_ASSERT_MATCHING_ENUM(HardwareChange); -COMPILE_ASSERT_MATCHING_ENUM(Domain); -#undef COMPILE_ASSERT_MATCHING_ENUM - void WebMediaPlayerImpl::OnKeyError(const std::string& key_system, const std::string& session_id, media::MediaKeys::KeyError error_code, diff --git a/webkit/renderer/media/webmediaplayer_util.cc b/webkit/renderer/media/webmediaplayer_util.cc index c2d3c0a..b0d9027 100644 --- a/webkit/renderer/media/webmediaplayer_util.cc +++ b/webkit/renderer/media/webmediaplayer_util.cc @@ -6,8 +6,26 @@ #include <math.h> +#include "media/base/media_keys.h" +#include "third_party/WebKit/public/web/WebMediaPlayerClient.h" + namespace webkit_media { +// Compile asserts shared by all platforms. + +#define COMPILE_ASSERT_MATCHING_ENUM(name) \ + COMPILE_ASSERT( \ + static_cast<int>(WebKit::WebMediaPlayerClient::MediaKeyErrorCode ## name) == \ + static_cast<int>(media::MediaKeys::k ## name ## Error), \ + mismatching_enums) +COMPILE_ASSERT_MATCHING_ENUM(Unknown); +COMPILE_ASSERT_MATCHING_ENUM(Client); +COMPILE_ASSERT_MATCHING_ENUM(Service); +COMPILE_ASSERT_MATCHING_ENUM(Output); +COMPILE_ASSERT_MATCHING_ENUM(HardwareChange); +COMPILE_ASSERT_MATCHING_ENUM(Domain); +#undef COMPILE_ASSERT_MATCHING_ENUM + base::TimeDelta ConvertSecondsToTimestamp(double seconds) { double microseconds = seconds * base::Time::kMicrosecondsPerSecond; return base::TimeDelta::FromMicroseconds( |