Title: [87828] trunk/Source/WebCore
- Revision
- 87828
- Author
- [email protected]
- Date
- 2011-06-01 11:16:14 -0700 (Wed, 01 Jun 2011)
Log Message
2011-06-01 Andras Becsi <[email protected]>
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (87827 => 87828)
--- trunk/Source/WebCore/ChangeLog 2011-06-01 18:12:53 UTC (rev 87827)
+++ trunk/Source/WebCore/ChangeLog 2011-06-01 18:16:14 UTC (rev 87828)
@@ -1,3 +1,18 @@
+2011-06-01 Andras Becsi <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Antti Koivisto.
Modified: trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp (87827 => 87828)
--- trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp 2011-06-01 18:12:53 UTC (rev 87827)
+++ trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp 2011-06-01 18:16:14 UTC (rev 87828)
@@ -350,17 +350,21 @@
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;
}
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;
}
@@ -394,20 +398,24 @@
m_readyState = MediaPlayer::HaveNothing;
if (m_networkState != oldNetworkState) {
+#if !LOG_DISABLED
const QMetaObject* metaObj = this->metaObject();
QMetaEnum networkStates = metaObj->enumerator(metaObj->indexOfEnumerator("NetworkState"));
LOG(Media, "Network state changed from '%s' to '%s'",
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"));
LOG(Media, "Ready state changed from '%s' to '%s'",
readyStates.valueToKey(oldReadyState),
readyStates.valueToKey(m_readyState));
+#endif
m_player->readyStateChanged();
}
}
@@ -483,10 +491,12 @@
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();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
