Changeset 251616 in webkit
- Timestamp:
- Oct 25, 2019 5:37:31 PM (4 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 4 edited
-
ChangeLog (modified) (1 diff)
-
UIProcess/Cocoa/PlaybackSessionManagerProxy.mm (modified) (20 diffs)
-
UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp (modified) (1 diff)
-
UIProcess/Cocoa/VideoFullscreenManagerProxy.mm (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r251612 r251616 1 2019-10-25 David Kilzer <ddkilzer@apple.com> 2 3 Unused arguments in MESSAGE_CHECK_CONTEXTID() macros 4 <https://webkit.org/b/203389> 5 <rdar://problem/55935374> 6 7 Reviewed by Alex Christensen. 8 9 * UIProcess/Cocoa/PlaybackSessionManagerProxy.mm: 10 (#define MESSAGE_CHECK_CONTEXTID): 11 - Rename macro argument from `contextID` to `identifier` 12 and change `contextId`to `identifier` in the body of 13 the macro so that the argument is always used. 14 (WebKit::PlaybackSessionManagerProxy::setUpPlaybackControlsManagerWithID): 15 (WebKit::PlaybackSessionManagerProxy::currentTimeChanged): 16 (WebKit::PlaybackSessionManagerProxy::bufferedTimeChanged): 17 (WebKit::PlaybackSessionManagerProxy::seekableRangesVectorChanged): 18 (WebKit::PlaybackSessionManagerProxy::canPlayFastReverseChanged): 19 (WebKit::PlaybackSessionManagerProxy::audioMediaSelectionOptionsChanged): 20 (WebKit::PlaybackSessionManagerProxy::legibleMediaSelectionOptionsChanged): 21 (WebKit::PlaybackSessionManagerProxy::audioMediaSelectionIndexChanged): 22 (WebKit::PlaybackSessionManagerProxy::legibleMediaSelectionIndexChanged): 23 (WebKit::PlaybackSessionManagerProxy::externalPlaybackPropertiesChanged): 24 (WebKit::PlaybackSessionManagerProxy::wirelessVideoPlaybackDisabledChanged): 25 (WebKit::PlaybackSessionManagerProxy::mutedChanged): 26 (WebKit::PlaybackSessionManagerProxy::volumeChanged): 27 (WebKit::PlaybackSessionManagerProxy::durationChanged): 28 (WebKit::PlaybackSessionManagerProxy::playbackStartedTimeChanged): 29 (WebKit::PlaybackSessionManagerProxy::rateChanged): 30 (WebKit::PlaybackSessionManagerProxy::pictureInPictureSupportedChanged): 31 (WebKit::PlaybackSessionManagerProxy::pictureInPictureActiveChanged): 32 (WebKit::PlaybackSessionManagerProxy::handleControlledElementIDResponse const): 33 - Change `contextID` to `contextId` to match local variable name 34 now that MESSAGE_CHECK_CONTEXTID() doesn't paper over this 35 typo for us. 36 37 * UIProcess/Cocoa/VideoFullscreenManagerProxy.mm: 38 (#define MESSAGE_CHECK_CONTEXTID): 39 - Rename macro argument from `contextID` to `identifier` 40 and change `contextId`to `identifier` in the body of 41 the macro so that the argument is always used. 42 43 * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp: 44 (#define MESSAGE_CHECK_CONTEXTID): 45 - Rename macro argument and variable in the body of the 46 macro from `id` to `identifier` for consistency. 47 1 48 2019-10-25 Per Arne Vollan <pvollan@apple.com> 2 49 -
trunk/Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.mm
r249275 r251616 34 34 #import "WebProcessProxy.h" 35 35 36 #define MESSAGE_CHECK_CONTEXTID( contextID) MESSAGE_CHECK_BASE(m_contextMap.isValidKey(contextId), m_page->process().connection())36 #define MESSAGE_CHECK_CONTEXTID(identifier) MESSAGE_CHECK_BASE(m_contextMap.isValidKey(identifier), m_page->process().connection()) 37 37 38 38 namespace WebKit { … … 369 369 void PlaybackSessionManagerProxy::setUpPlaybackControlsManagerWithID(uint64_t contextId) 370 370 { 371 MESSAGE_CHECK_CONTEXTID(contextI D);371 MESSAGE_CHECK_CONTEXTID(contextId); 372 372 if (m_controlsManagerContextId == contextId) 373 373 return; … … 395 395 void PlaybackSessionManagerProxy::currentTimeChanged(uint64_t contextId, double currentTime, double hostTime) 396 396 { 397 MESSAGE_CHECK_CONTEXTID(contextI D);397 MESSAGE_CHECK_CONTEXTID(contextId); 398 398 ensureModel(contextId).currentTimeChanged(currentTime); 399 399 } … … 401 401 void PlaybackSessionManagerProxy::bufferedTimeChanged(uint64_t contextId, double bufferedTime) 402 402 { 403 MESSAGE_CHECK_CONTEXTID(contextI D);403 MESSAGE_CHECK_CONTEXTID(contextId); 404 404 ensureModel(contextId).bufferedTimeChanged(bufferedTime); 405 405 } … … 407 407 void PlaybackSessionManagerProxy::seekableRangesVectorChanged(uint64_t contextId, Vector<std::pair<double, double>> ranges, double lastModifiedTime, double liveUpdateInterval) 408 408 { 409 MESSAGE_CHECK_CONTEXTID(contextI D);409 MESSAGE_CHECK_CONTEXTID(contextId); 410 410 Ref<TimeRanges> timeRanges = TimeRanges::create(); 411 411 for (const auto& range : ranges) { … … 421 421 void PlaybackSessionManagerProxy::canPlayFastReverseChanged(uint64_t contextId, bool value) 422 422 { 423 MESSAGE_CHECK_CONTEXTID(contextI D);423 MESSAGE_CHECK_CONTEXTID(contextId); 424 424 ensureModel(contextId).canPlayFastReverseChanged(value); 425 425 } … … 427 427 void PlaybackSessionManagerProxy::audioMediaSelectionOptionsChanged(uint64_t contextId, Vector<MediaSelectionOption> options, uint64_t selectedIndex) 428 428 { 429 MESSAGE_CHECK_CONTEXTID(contextI D);429 MESSAGE_CHECK_CONTEXTID(contextId); 430 430 ensureModel(contextId).audioMediaSelectionOptionsChanged(options, selectedIndex); 431 431 } … … 433 433 void PlaybackSessionManagerProxy::legibleMediaSelectionOptionsChanged(uint64_t contextId, Vector<MediaSelectionOption> options, uint64_t selectedIndex) 434 434 { 435 MESSAGE_CHECK_CONTEXTID(contextI D);435 MESSAGE_CHECK_CONTEXTID(contextId); 436 436 ensureModel(contextId).legibleMediaSelectionOptionsChanged(options, selectedIndex); 437 437 } … … 439 439 void PlaybackSessionManagerProxy::audioMediaSelectionIndexChanged(uint64_t contextId, uint64_t selectedIndex) 440 440 { 441 MESSAGE_CHECK_CONTEXTID(contextI D);441 MESSAGE_CHECK_CONTEXTID(contextId); 442 442 ensureModel(contextId).audioMediaSelectionIndexChanged(selectedIndex); 443 443 } … … 445 445 void PlaybackSessionManagerProxy::legibleMediaSelectionIndexChanged(uint64_t contextId, uint64_t selectedIndex) 446 446 { 447 MESSAGE_CHECK_CONTEXTID(contextI D);447 MESSAGE_CHECK_CONTEXTID(contextId); 448 448 ensureModel(contextId).legibleMediaSelectionIndexChanged(selectedIndex); 449 449 } … … 451 451 void PlaybackSessionManagerProxy::externalPlaybackPropertiesChanged(uint64_t contextId, bool enabled, uint32_t targetType, String localizedDeviceName) 452 452 { 453 MESSAGE_CHECK_CONTEXTID(contextI D);453 MESSAGE_CHECK_CONTEXTID(contextId); 454 454 PlaybackSessionModel::ExternalPlaybackTargetType type = static_cast<PlaybackSessionModel::ExternalPlaybackTargetType>(targetType); 455 455 ASSERT(type == PlaybackSessionModel::TargetTypeAirPlay || type == PlaybackSessionModel::TargetTypeTVOut || type == PlaybackSessionModel::TargetTypeNone); … … 460 460 void PlaybackSessionManagerProxy::wirelessVideoPlaybackDisabledChanged(uint64_t contextId, bool disabled) 461 461 { 462 MESSAGE_CHECK_CONTEXTID(contextI D);462 MESSAGE_CHECK_CONTEXTID(contextId); 463 463 ensureModel(contextId).wirelessVideoPlaybackDisabledChanged(disabled); 464 464 } … … 466 466 void PlaybackSessionManagerProxy::mutedChanged(uint64_t contextId, bool muted) 467 467 { 468 MESSAGE_CHECK_CONTEXTID(contextI D);468 MESSAGE_CHECK_CONTEXTID(contextId); 469 469 ensureModel(contextId).mutedChanged(muted); 470 470 } … … 472 472 void PlaybackSessionManagerProxy::volumeChanged(uint64_t contextId, double volume) 473 473 { 474 MESSAGE_CHECK_CONTEXTID(contextI D);474 MESSAGE_CHECK_CONTEXTID(contextId); 475 475 ensureModel(contextId).volumeChanged(volume); 476 476 } … … 478 478 void PlaybackSessionManagerProxy::durationChanged(uint64_t contextId, double duration) 479 479 { 480 MESSAGE_CHECK_CONTEXTID(contextI D);480 MESSAGE_CHECK_CONTEXTID(contextId); 481 481 ensureModel(contextId).durationChanged(duration); 482 482 } … … 484 484 void PlaybackSessionManagerProxy::playbackStartedTimeChanged(uint64_t contextId, double playbackStartedTime) 485 485 { 486 MESSAGE_CHECK_CONTEXTID(contextI D);486 MESSAGE_CHECK_CONTEXTID(contextId); 487 487 ensureModel(contextId).playbackStartedTimeChanged(playbackStartedTime); 488 488 } … … 490 490 void PlaybackSessionManagerProxy::rateChanged(uint64_t contextId, bool isPlaying, double rate) 491 491 { 492 MESSAGE_CHECK_CONTEXTID(contextI D);492 MESSAGE_CHECK_CONTEXTID(contextId); 493 493 ensureModel(contextId).rateChanged(isPlaying, rate); 494 494 } … … 496 496 void PlaybackSessionManagerProxy::pictureInPictureSupportedChanged(uint64_t contextId, bool supported) 497 497 { 498 MESSAGE_CHECK_CONTEXTID(contextI D);498 MESSAGE_CHECK_CONTEXTID(contextId); 499 499 ensureModel(contextId).pictureInPictureSupportedChanged(supported); 500 500 } … … 502 502 void PlaybackSessionManagerProxy::pictureInPictureActiveChanged(uint64_t contextId, bool active) 503 503 { 504 MESSAGE_CHECK_CONTEXTID(contextI D);504 MESSAGE_CHECK_CONTEXTID(contextId); 505 505 ensureModel(contextId).pictureInPictureActiveChanged(active); 506 506 } … … 508 508 void PlaybackSessionManagerProxy::handleControlledElementIDResponse(uint64_t contextId, String identifier) const 509 509 { 510 MESSAGE_CHECK_CONTEXTID(contextI D);510 MESSAGE_CHECK_CONTEXTID(contextId); 511 511 #if PLATFORM(MAC) 512 512 if (contextId == m_controlsManagerContextId) -
trunk/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp
r251445 r251616 41 41 #include <wtf/UniqueRef.h> 42 42 43 #define MESSAGE_CHECK_CONTEXTID(id ) MESSAGE_CHECK_BASE(m_proxies.isValidKey(id), m_process.connection())43 #define MESSAGE_CHECK_CONTEXTID(identifier) MESSAGE_CHECK_BASE(m_proxies.isValidKey(identifier), m_process.connection()) 44 44 45 45 namespace WebKit { -
trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm
r249275 r251616 122 122 #endif 123 123 124 #define MESSAGE_CHECK_CONTEXTID( contextID) MESSAGE_CHECK_BASE(m_contextMap.isValidKey(contextId), m_page->process().connection())124 #define MESSAGE_CHECK_CONTEXTID(identifier) MESSAGE_CHECK_BASE(m_contextMap.isValidKey(identifier), m_page->process().connection()) 125 125 126 126 namespace WebKit {
Note: See TracChangeset
for help on using the changeset viewer.
