Changeset 185519 in webkit
- Timestamp:
- Jun 12, 2015 1:41:36 PM (9 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r185518 r185519 1 2015-06-12 Eric Carlson <eric.carlson@apple.com> 2 3 [Mac] AirPlay menu button doesn't always show on page load 4 https://bugs.webkit.org/show_bug.cgi?id=145936 5 6 Reviewed by Brent Fulgham. 7 8 * Modules/mediasession/WebMediaSessionManager.cpp: 9 (WebCore::mediaProducerStateString): New, return a string representing MediaStateFlags. 10 (WebCore::WebMediaSessionManager::clientStateDidChange): Log the states as strings. 11 (WebCore::WebMediaSessionManager::toString): New, return a string representing ConfigurationTasks. 12 (WebCore::WebMediaSessionManager::scheduleDelayedTask): Add logging. 13 (WebCore::WebMediaSessionManager::taskTimerFired): Add logging. 14 * Modules/mediasession/WebMediaSessionManager.h: 15 16 * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h: Override wirelessVideoPlaybackDisabled 17 so it is possible to activate route monitoring for a movie loaded with this engine. 18 * platform/graphics/mac/MediaPlayerPrivateQTKit.h: Ditto. 19 1 20 2015-06-12 Zan Dobersek <zdobersek@igalia.com> 2 21 -
trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp
r184788 r185519 33 33 #include "MediaPlaybackTargetPickerMac.h" 34 34 #include "WebMediaSessionManagerClient.h" 35 #include <wtf/text/StringBuilder.h> 35 36 36 37 namespace WebCore { … … 62 63 } 63 64 65 #if !LOG_DISABLED 66 static String mediaProducerStateString(MediaProducer::MediaStateFlags flags) 67 { 68 StringBuilder string; 69 if (flags & MediaProducer::IsPlayingAudio) 70 string.append("IsPlayingAudio + "); 71 if (flags & MediaProducer::IsPlayingVideo) 72 string.append("IsPlayingVideo + "); 73 if (flags & MediaProducer::IsPlayingToExternalDevice) 74 string.append("IsPlayingToExternalDevice + "); 75 if (flags & MediaProducer::RequiresPlaybackTargetMonitoring) 76 string.append("RequiresPlaybackTargetMonitoring + "); 77 if (flags & MediaProducer::ExternalDeviceAutoPlayCandidate) 78 string.append("ExternalDeviceAutoPlayCandidate + "); 79 if (string.isEmpty()) 80 string.append("IsNotPlaying"); 81 else 82 string.resize(string.length() - 2); 83 84 return string.toString(); 85 } 86 #endif 87 64 88 WebMediaSessionManager::WebMediaSessionManager() 65 89 : m_taskTimer(RunLoop::current(), this, &WebMediaSessionManager::taskTimerFired) … … 137 161 auto& changedClientState = m_clientState[index]; 138 162 MediaProducer::MediaStateFlags oldFlags = changedClientState->flags; 139 LOG(Media, "WebMediaSessionManager::clientStateDidChange(%p + %llu) - new flags = 0x%x, old flags = 0x%x", &client, contextId, newFlags, oldFlags);163 LOG(Media, "WebMediaSessionManager::clientStateDidChange(%p + %llu) - new flags = %s, old flags = %s", &client, contextId, mediaProducerStateString(newFlags).utf8().data(), mediaProducerStateString(oldFlags).utf8().data()); 140 164 if (newFlags == oldFlags) 141 165 return; … … 266 290 } 267 291 292 #if !LOG_DISABLED 293 String WebMediaSessionManager::toString(ConfigurationTasks tasks) 294 { 295 StringBuilder string; 296 if (tasks & InitialConfigurationTask) 297 string.append("InitialConfigurationTask + "); 298 if (tasks & TargetClientsConfigurationTask) 299 string.append("TargetClientsConfigurationTask + "); 300 if (tasks & TargetMonitoringConfigurationTask) 301 string.append("TargetMonitoringConfigurationTask + "); 302 if (string.isEmpty()) 303 string.append("NoTask"); 304 else 305 string.resize(string.length() - 2); 306 307 return string.toString(); 308 } 309 #endif 310 268 311 void WebMediaSessionManager::scheduleDelayedTask(ConfigurationTasks tasks) 269 312 { 313 LOG(Media, "WebMediaSessionManager::scheduleDelayedTask - tasks = %s", toString(tasks).utf8().data()); 314 270 315 m_taskFlags |= tasks; 271 316 m_taskTimer.startOneShot(taskDelayInterval); … … 274 319 void WebMediaSessionManager::taskTimerFired() 275 320 { 321 LOG(Media, "WebMediaSessionManager::taskTimerFired - tasks = %s", toString(m_taskFlags).utf8().data()); 322 276 323 if (m_taskFlags & InitialConfigurationTask) 277 324 configureNewClients(); -
trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h
r184204 r185519 76 76 }; 77 77 typedef unsigned ConfigurationTasks; 78 String toString(ConfigurationTasks); 78 79 79 80 void scheduleDelayedTask(ConfigurationTasks); -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h
r183509 r185519 176 176 virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&); 177 177 virtual void setShouldPlayToPlaybackTarget(bool) override; 178 bool wirelessVideoPlaybackDisabled() const override { return false; } 178 179 #endif 179 180 -
trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
r183509 r185519 184 184 virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&); 185 185 virtual void setShouldPlayToPlaybackTarget(bool) override; 186 bool wirelessVideoPlaybackDisabled() const override { return false; } 186 187 #endif 187 188
Note: See TracChangeset
for help on using the changeset viewer.