Stick all of the WebKit API enum compile asserts in one file....

webkit/api/src/WebMediaPlayerClientImpl.cpp

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "WebMediaPlayerClientImpl.h"
 
 #if ENABLE(VIDEO)
 
 #include "TemporaryGlue.h"
@@ skipping 216 matching lines @@
 }
 
 void WebMediaPlayerClientImpl::setVolume(float volume)
 {
     if (m_webMediaPlayer.get())
         m_webMediaPlayer->setVolume(volume);
 }
 
 MediaPlayer::NetworkState WebMediaPlayerClientImpl::networkState() const
 {
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::Empty) == int(MediaPlayer::Empty), Empty);
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::Idle) == int(MediaPlayer::Idle), Idle);
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::Loading) == int(MediaPlayer::Loading), Loading);
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::Loaded) == int(MediaPlayer::Loaded), Loaded);
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::FormatError) == int(MediaPlayer::FormatError),
-        FormatError);
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::NetworkError) == int(MediaPlayer::NetworkError),
-        NetworkError);
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::DecodeError) == int(MediaPlayer::DecodeError),
-        DecodeError);
-
     if (m_webMediaPlayer.get())
         return static_cast<MediaPlayer::NetworkState>(m_webMediaPlayer->networkState());
     return MediaPlayer::Empty;
 }
 
 MediaPlayer::ReadyState WebMediaPlayerClientImpl::readyState() const
 {
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::HaveNothing) == int(MediaPlayer::HaveNothing),
-        HaveNothing);
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::HaveMetadata) == int(MediaPlayer::HaveMetadata),
-        HaveMetadata);
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::HaveCurrentData) == int(MediaPlayer::HaveCurrentData),
-        HaveCurrentData);
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::HaveFutureData) == int(MediaPlayer::HaveFutureData),
-        HaveFutureData);
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::HaveEnoughData) == int(MediaPlayer::HaveEnoughData),
-        HaveEnoughData);
-
     if (m_webMediaPlayer.get())
         return static_cast<MediaPlayer::ReadyState>(m_webMediaPlayer->readyState());
     return MediaPlayer::HaveNothing;
 }
 
 float WebMediaPlayerClientImpl::maxTimeSeekable() const
 {
     if (m_webMediaPlayer.get())
         return m_webMediaPlayer->maxTimeSeekable();
     return 0.0f;
@@ skipping 64 matching lines @@
 
 bool WebMediaPlayerClientImpl::hasSingleSecurityOrigin() const
 {
     if (m_webMediaPlayer.get())
         return m_webMediaPlayer->hasSingleSecurityOrigin();
     return false;
 }
 
 MediaPlayer::MovieLoadType WebMediaPlayerClientImpl::movieLoadType() const
 {
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::Unknown) == int(MediaPlayer::Unknown),
-        Unknown);
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::Download) == int(MediaPlayer::Download),
-        Download);
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::StoredStream) == int(MediaPlayer::StoredStream),
-        StoredStream);
-    COMPILE_ASSERT(
-        int(WebMediaPlayer::LiveStream) == int(MediaPlayer::LiveStream),
-        LiveStream);
-
     if (m_webMediaPlayer.get())
         return static_cast<MediaPlayer::MovieLoadType>(
             m_webMediaPlayer->movieLoadType());
     return MediaPlayer::Unknown;
 }
 
 MediaPlayerPrivateInterface* WebMediaPlayerClientImpl::create(MediaPlayer* player)
 {
     WebMediaPlayerClientImpl* client = new WebMediaPlayerClientImpl();
     client->m_mediaPlayer = player;
@@ skipping 12 matching lines @@
     WebMimeRegistry::SupportsType supportsType =
         webKitClient()->mimeRegistry()->supportsMediaMIMEType(type, codecs);
 
     switch (supportsType) {
     default:
         ASSERT_NOT_REACHED();
     case WebMimeRegistry::IsNotSupported:
         return MediaPlayer::IsNotSupported;
     case WebMimeRegistry::IsSupported:
         return MediaPlayer::IsSupported;
     case WebMimeRegistry::MayBeSupported:

[scherkus (not reviewing), 2009/09/08 20:15:34]

Hmm... it looks like we can't do the same trick here

I remember we decided that WebMimeRegistry will always return a SupportsType
enum value, which so happens to coincide with WebCore::MediaPlayer's enums --
but they are technically separate and we'll keep them that way

         return MediaPlayer::MayBeSupported;
     }
 }
 
 WebMediaPlayerClientImpl::WebMediaPlayerClientImpl()
     : m_mediaPlayer(0)
 {
 }
 
 } // namespace WebKit
 
 #endif  // ENABLE(VIDEO)