Changeset 87828 in webkit

Timestamp:

Jun 1, 2011 11:16:14 AM (13 years ago)

Author:

abecsi@webkit.org

Message:

2011-06-01 Andras Becsi <​abecsi@webkit.org>

Reviewed by Csaba Osztrogonác.

[Qt] Fix the Phonon build when logging is disabled
​https://bugs.webkit.org/show_bug.cgi?id=61869

No new tests needed.

• platform/graphics/qt/MediaPlayerPrivatePhonon.cpp: Add missing guards. (WebCore::MediaPlayerPrivatePhonon::networkState): (WebCore::MediaPlayerPrivatePhonon::readyState): (WebCore::MediaPlayerPrivatePhonon::updateStates): (WebCore::MediaPlayerPrivatePhonon::stateChanged):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/MediaPlayerPrivatePhonon.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-01  Andras Becsi  <abecsi@webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] Fix the Phonon build when logging is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=61869
+
+        No new tests needed.
+
+        * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp: Add missing guards.
+        (WebCore::MediaPlayerPrivatePhonon::networkState):
+        (WebCore::MediaPlayerPrivatePhonon::readyState):
+        (WebCore::MediaPlayerPrivatePhonon::updateStates):
+        (WebCore::MediaPlayerPrivatePhonon::stateChanged):
+
 2011-06-01  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp

@@ -351 +351 @@
 MediaPlayer::NetworkState MediaPlayerPrivatePhonon::networkState() const
 {
+#if !LOG_DISABLED
     const QMetaObject* metaObj = this->metaObject();
     QMetaEnum networkStates = metaObj->enumerator(metaObj->indexOfEnumerator("NetworkState"));
     LOG(Media, "MediaPlayerPrivatePhonon::networkState() --> %s", networkStates.valueToKey(m_networkState));
+#endif
     return m_networkState;
 }
@@ -359 +361 @@
 MediaPlayer::ReadyState MediaPlayerPrivatePhonon::readyState() const
 {
+#if !LOG_DISABLED
     const QMetaObject* metaObj = this->metaObject();
     QMetaEnum readyStates = metaObj->enumerator(metaObj->indexOfEnumerator("ReadyState"));
     LOG(Media, "MediaPlayerPrivatePhonon::readyState() --> %s", readyStates.valueToKey(m_readyState));
+#endif
     return m_readyState;
 }
@@ -395 +399 @@
 
     if (m_networkState != oldNetworkState) {
+#if !LOG_DISABLED
         const QMetaObject* metaObj = this->metaObject();
         QMetaEnum networkStates = metaObj->enumerator(metaObj->indexOfEnumerator("NetworkState"));
@@ -400 +405 @@
                 networkStates.valueToKey(oldNetworkState),
                 networkStates.valueToKey(m_networkState));
+#endif
         m_player->networkStateChanged();
     }
 
     if (m_readyState != oldReadyState) {
+#if !LOG_DISABLED
         const QMetaObject* metaObj = this->metaObject();
         QMetaEnum readyStates = metaObj->enumerator(metaObj->indexOfEnumerator("ReadyState"));
@@ -409 +416 @@
                 readyStates.valueToKey(oldReadyState),
                 readyStates.valueToKey(m_readyState));
+#endif
         m_player->readyStateChanged();
     }
@@ -484 +492 @@
 void MediaPlayerPrivatePhonon::stateChanged(Phonon::State newState, Phonon::State oldState)
 {
+#if !LOG_DISABLED
     const QMetaObject* metaObj = this->metaObject();
     QMetaEnum phononStates = metaObj->enumerator(metaObj->indexOfEnumerator("PhononState"));
     LOG(Media, "MediaPlayerPrivatePhonon::stateChanged(newState=%s, oldState=%s)",
             phononStates.valueToKey(newState), phononStates.valueToKey(oldState));
+#endif
 
     updateStates();