<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[283706] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/283706">283706</a></dd>
<dt>Author</dt> <dd>jya@apple.com</dd>
<dt>Date</dt> <dd>2021-10-07 04:55:10 -0700 (Thu, 07 Oct 2021)</dd>
</dl>
<h3>Log Message</h3>
<pre>Streamline and make call to objective-C methods more consistent across call sites.
https://bugs.webkit.org/show_bug.cgi?id=231351
rdar://problem/83966853
Since bug 97403, RetainPtr<T*> has a T* conversion operator; the call to
RetainPtr::get() is now redundant under some circumstances.
Make the use of RetainPtr<T*> in objective-C call more consistent by using the pattern:
RetainPtr<T*> foo;
[foo methodOfT];
Source-wide replacement of "\[([_a-zA-Z]+)\.get\(\) " by "\[([_a-zA-Z]+)\ ",
then manually fixing NeverDestroyed<RetainPtr<T*>> cases which do not yet allow
for that.
Reviewed by Tim Horton.
No change in observable behaviour.
* bindings/js/ScriptControllerMac.mm:
(WebCore::ScriptController::updatePlatformScriptObjects):
* bridge/objc/objc_instance.mm:
(JSC::Bindings::ObjcInstance::~ObjcInstance):
(JSC::Bindings::ObjcInstance::supportsInvokeDefaultMethod const):
(JSC::Bindings::ObjcInstance::invokeDefaultMethod):
(JSC::Bindings::ObjcInstance::defaultValue const):
* bridge/objc/objc_runtime.mm:
(JSC::Bindings::ObjcArray::setValueAt const):
(JSC::Bindings::ObjcArray::valueAt const):
(JSC::Bindings::ObjcArray::getLength const):
* editing/cocoa/DataDetection.mm:
(WebCore::resultIsURL):
* page/cocoa/ResourceUsageOverlayCocoa.mm:
(WebCore::ResourceUsageOverlay::platformInitialize):
(WebCore::ResourceUsageOverlay::platformDraw):
* platform/cocoa/ParentalControlsContentFilter.mm:
(WebCore::ParentalControlsContentFilter::addData):
(WebCore::ParentalControlsContentFilter::finishedAddingData):
* platform/gamepad/cocoa/GameControllerGamepad.mm:
(WebCore::GameControllerGamepad::setupAsExtendedGamepad):
* platform/graphics/avfoundation/objc/AVOutputDeviceMenuControllerTargetPicker.mm:
(WebCore::AVOutputDeviceMenuControllerTargetPicker::devicePicker):
(WebCore::AVOutputDeviceMenuControllerTargetPicker::outputContext):
* platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:
(WebCore::CDMSessionAVFoundationObjC::generateKeyRequest):
* platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm:
(WebCore::InbandTextTrackPrivateAVFObjC::label const):
(WebCore::InbandTextTrackPrivateAVFObjC::language const):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::~MediaPlayerPrivateAVFoundationObjC):
(WebCore::MediaPlayerPrivateAVFoundationObjC::cancelLoad):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createImageGenerator):
(WebCore::MediaPlayerPrivateAVFoundationObjC::synchronizeTextTrackState):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem):
(WebCore::MediaPlayerPrivateAVFoundationObjC::checkPlayability):
(WebCore::MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata):
(WebCore::MediaPlayerPrivateAVFoundationObjC::accessLog const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::errorLog const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::platformSetVisible):
(WebCore::MediaPlayerPrivateAVFoundationObjC::platformDuration const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::currentMediaTime const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::seekToTime):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setVolume):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setMuted):
(WebCore::MediaPlayerPrivateAVFoundationObjC::assetStatus const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createImageForTimeInRect):
(WebCore::MediaPlayerPrivateAVFoundationObjC::updateVideoLayerGravity):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoOutput):
(WebCore::MediaPlayerPrivateAVFoundationObjC::destroyVideoOutput):
(WebCore::MediaPlayerPrivateAVFoundationObjC::updateLastPixelBuffer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::firstEnabledTrack const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::hasLoadedMediaSelectionGroups):
(WebCore::MediaPlayerPrivateAVFoundationObjC::safeMediaSelectionGroupForLegibleMedia):
(WebCore::MediaPlayerPrivateAVFoundationObjC::safeMediaSelectionGroupForAudibleMedia):
(WebCore::MediaPlayerPrivateAVFoundationObjC::safeMediaSelectionGroupForVisualMedia):
(WebCore::MediaPlayerPrivateAVFoundationObjC::processMediaSelectionOptions):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setCurrentTextTrack):
(WebCore::MediaPlayerPrivateAVFoundationObjC::languageOfPrimaryAudioTrack const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::wirelessVideoPlaybackDisabled const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setWirelessVideoPlaybackDisabled):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget):
(WebCore::MediaPlayerPrivateAVFoundationObjC::metadataDidArrive):
(-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]):
* platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:
(WebCore::WebCoreAVFResourceLoader::startLoading):
(WebCore::WebCoreAVFResourceLoader::responseReceived):
(WebCore::WebCoreAVFResourceLoader::loadFailed):
(WebCore::WebCoreAVFResourceLoader::loadFinished):
(WebCore::WebCoreAVFResourceLoader::newDataStoredInSharedBuffer):
* platform/graphics/cocoa/TextTrackRepresentationCocoa.mm:
(WebCore::TextTrackRepresentationCocoa::TextTrackRepresentationCocoa):
(WebCore::TextTrackRepresentationCocoa::~TextTrackRepresentationCocoa):
(WebCore::TextTrackRepresentationCocoa::update):
(WebCore::TextTrackRepresentationCocoa::setContentScale):
(WebCore::TextTrackRepresentationCocoa::setHidden const):
(WebCore::TextTrackRepresentationCocoa::bounds const):
* platform/ios/DragImageIOS.mm:
(WebCore::scaleDragImage):
(WebCore::createDragImageFromImage):
(WebCore::createDragImageForRange):
* platform/ios/LegacyTileCache.mm:
(WebCore::LegacyTileCache::~LegacyTileCache):
* platform/ios/LegacyTileLayerPool.mm:
(WebCore::LegacyTileLayerPool::addLayer):
* platform/ios/PlatformPasteboardIOS.mm:
(WebCore::PlatformPasteboard::readBuffer const):
* platform/ios/PlatformSpeechSynthesizerIOS.mm:
(WebCore::PlatformSpeechSynthesizer::pause):
(WebCore::PlatformSpeechSynthesizer::resume):
(WebCore::PlatformSpeechSynthesizer::speak):
(WebCore::PlatformSpeechSynthesizer::cancel):
(WebCore::PlatformSpeechSynthesizer::resetState):
* platform/ios/VideoFullscreenInterfaceAVKit.mm:
(-[WebAVPlayerLayer setVideoGravity:]):
(-[WebAVPlayerViewController enterFullScreenAnimated:completionHandler:]):
(-[WebAVPlayerViewController exitFullScreenAnimated:completionHandler:]):
(-[WebAVPlayerViewController MY_NO_RETURN]):
(-[WebAVPlayerViewController removeFromParentViewController]):
* platform/mac/PlatformPasteboardMac.mm:
(WebCore::PlatformPasteboard::getTypes):
(WebCore::PlatformPasteboard::bufferForType):
(WebCore::PlatformPasteboard::getPathnamesForType const):
(WebCore::PlatformPasteboard::changeCount const):
(WebCore::PlatformPasteboard::copy):
(WebCore::PlatformPasteboard::addTypes):
(WebCore::PlatformPasteboard::setURL):
(WebCore::PlatformPasteboard::setStringForType):
* platform/mac/PlatformSpeechSynthesizerMac.mm:
(WebCore::PlatformSpeechSynthesizer::~PlatformSpeechSynthesizer):
(WebCore::PlatformSpeechSynthesizer::pause):
(WebCore::PlatformSpeechSynthesizer::resume):
(WebCore::PlatformSpeechSynthesizer::speak):
(WebCore::PlatformSpeechSynthesizer::cancel):
(WebCore::PlatformSpeechSynthesizer::resetState):
* platform/mac/SerializedPlatformDataCueMac.mm:
(WebCore::SerializedPlatformDataCueMac::isEqual const):
(WebCore::SerializedPlatformDataCueMac::encodableValue const):
* platform/mac/WebCoreFullScreenPlaceholderView.mm:
(-[WebCoreFullScreenPlaceholderView initWithFrame:]):
* platform/mac/WebCoreFullScreenWarningView.mm:
* platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm:
(WebCore::MediaRecorderPrivateWriter::initialize):
(WebCore::MediaRecorderPrivateWriter::startAssetWriter):
(WebCore::MediaRecorderPrivateWriter::appendCompressedAudioSampleBufferIfPossible):
(WebCore::MediaRecorderPrivateWriter::appendCompressedVideoSampleBuffer):
(WebCore::MediaRecorderPrivateWriter::flushCompressedSampleBuffers):
* platform/mediastream/mac/AVCaptureDeviceManager.mm:
(WebCore::AVCaptureDeviceManager::updateCachedAVCaptureDevices):
* platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(-[WebCoreAVVideoCaptureSourceObserver observeValueForKeyPath:ofObject:change:context:]):
* platform/network/cocoa/ResourceRequestCocoa.mm:
(WebCore::ResourceRequest::doUpdateResourceRequest):
(WebCore::ResourceRequest::doUpdateResourceHTTPBody):
(WebCore::ResourceRequest::doUpdatePlatformRequest):
(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
* platform/network/cocoa/ResourceResponseCocoa.mm:
(WebCore::ResourceResponse::initNSURLResponse const):
(WebCore::ResourceResponse::platformLazyInit):
* platform/network/mac/AuthenticationMac.mm:
(WebCore::AuthenticationChallenge::setAuthenticationClient):
(WebCore::AuthenticationChallenge::authenticationClient const):
* platform/network/mac/ResourceErrorMac.mm:
(WebCore::createNSErrorFromResourceErrorBase):
(WebCore::ResourceError::mapPlatformError):
(WebCore::ResourceError::platformLazyInit):
* platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
(-[WebCoreResourceHandleAsOperationQueueDelegate connection:willSendRequest:redirectResponse:]):
* platform/text/cocoa/LocaleCocoa.mm:
(WebCore::LocaleCocoa::LocaleCocoa):
(WebCore::LocaleCocoa::timeAMPMLabels):
(WebCore::LocaleCocoa::initializeLocaleData):
* platform/text/cocoa/LocalizedDateCache.mm:
(WebCore::LocalizedDateCache::calculateMaximumWidth):
* rendering/RenderThemeCocoa.mm:
(WebCore::RenderThemeCocoa::mediaControlsFormattedStringForDuration):
* rendering/RenderThemeIOS.mm:
(WebCore::RenderThemeIOS::paintSystemPreviewBadge):
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::popupButton const):
(WebCore::RenderThemeMac::search const):
(WebCore::RenderThemeMac::sliderThumbHorizontal const):
(WebCore::RenderThemeMac::sliderThumbVertical const):
(WebCore::RenderThemeMac::textField const):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllerMacmm">trunk/Source/WebCore/bindings/js/ScriptControllerMac.mm</a></li>
<li><a href="#trunkSourceWebCorebridgeobjcobjc_instancemm">trunk/Source/WebCore/bridge/objc/objc_instance.mm</a></li>
<li><a href="#trunkSourceWebCorebridgeobjcobjc_runtimemm">trunk/Source/WebCore/bridge/objc/objc_runtime.mm</a></li>
<li><a href="#trunkSourceWebCorepagecocoaResourceUsageOverlayCocoamm">trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaParentalControlsContentFiltermm">trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgamepadcocoaGameControllerGamepadmm">trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcAVOutputDeviceMenuControllerTargetPickermm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVOutputDeviceMenuControllerTargetPicker.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcInbandTextTrackPrivateAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcWebCoreAVFResourceLoadermm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaTextTrackRepresentationCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosDragImageIOSmm">trunk/Source/WebCore/platform/ios/DragImageIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileCachemm">trunk/Source/WebCore/platform/ios/LegacyTileCache.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileLayerPoolmm">trunk/Source/WebCore/platform/ios/LegacyTileLayerPool.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPlatformPasteboardIOSmm">trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPlatformSpeechSynthesizerIOSmm">trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosVideoFullscreenInterfaceAVKitmm">trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPlatformPasteboardMacmm">trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPlatformSpeechSynthesizerMacmm">trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacSerializedPlatformDataCueMacmm">trunk/Source/WebCore/platform/mac/SerializedPlatformDataCueMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreFullScreenPlaceholderViewmm">trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreFullScreenWarningViewmm">trunk/Source/WebCore/platform/mac/WebCoreFullScreenWarningView.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediarecordercocoaMediaRecorderPrivateWriterCocoamm">trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagermm">trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaResourceRequestCocoamm">trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaResourceResponseCocoamm">trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacAuthenticationMacmm">trunk/Source/WebCore/platform/network/mac/AuthenticationMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceErrorMacmm">trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsOperationQueueDelegatemm">trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformtextcocoaLocaleCocoamm">trunk/Source/WebCore/platform/text/cocoa/LocaleCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformtextcocoaLocalizedDateCachemm">trunk/Source/WebCore/platform/text/cocoa/LocalizedDateCache.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeCocoamm">trunk/Source/WebCore/rendering/RenderThemeCocoa.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/ChangeLog 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -1,3 +1,190 @@
</span><ins>+2021-10-07 Jean-Yves Avenard <jya@apple.com>
+
+ Streamline and make call to objective-C methods more consistent across call sites.
+ https://bugs.webkit.org/show_bug.cgi?id=231351
+ rdar://problem/83966853
+
+ Since bug 97403, RetainPtr<T*> has a T* conversion operator; the call to
+ RetainPtr::get() is now redundant under some circumstances.
+ Make the use of RetainPtr<T*> in objective-C call more consistent by using the pattern:
+ RetainPtr<T*> foo;
+ [foo methodOfT];
+ Source-wide replacement of "\[([_a-zA-Z]+)\.get\(\) " by "\[([_a-zA-Z]+)\ ",
+ then manually fixing NeverDestroyed<RetainPtr<T*>> cases which do not yet allow
+ for that.
+
+ Reviewed by Tim Horton.
+
+ No change in observable behaviour.
+
+ * bindings/js/ScriptControllerMac.mm:
+ (WebCore::ScriptController::updatePlatformScriptObjects):
+ * bridge/objc/objc_instance.mm:
+ (JSC::Bindings::ObjcInstance::~ObjcInstance):
+ (JSC::Bindings::ObjcInstance::supportsInvokeDefaultMethod const):
+ (JSC::Bindings::ObjcInstance::invokeDefaultMethod):
+ (JSC::Bindings::ObjcInstance::defaultValue const):
+ * bridge/objc/objc_runtime.mm:
+ (JSC::Bindings::ObjcArray::setValueAt const):
+ (JSC::Bindings::ObjcArray::valueAt const):
+ (JSC::Bindings::ObjcArray::getLength const):
+ * editing/cocoa/DataDetection.mm:
+ (WebCore::resultIsURL):
+ * page/cocoa/ResourceUsageOverlayCocoa.mm:
+ (WebCore::ResourceUsageOverlay::platformInitialize):
+ (WebCore::ResourceUsageOverlay::platformDraw):
+ * platform/cocoa/ParentalControlsContentFilter.mm:
+ (WebCore::ParentalControlsContentFilter::addData):
+ (WebCore::ParentalControlsContentFilter::finishedAddingData):
+ * platform/gamepad/cocoa/GameControllerGamepad.mm:
+ (WebCore::GameControllerGamepad::setupAsExtendedGamepad):
+ * platform/graphics/avfoundation/objc/AVOutputDeviceMenuControllerTargetPicker.mm:
+ (WebCore::AVOutputDeviceMenuControllerTargetPicker::devicePicker):
+ (WebCore::AVOutputDeviceMenuControllerTargetPicker::outputContext):
+ * platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:
+ (WebCore::CDMSessionAVFoundationObjC::generateKeyRequest):
+ * platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm:
+ (WebCore::InbandTextTrackPrivateAVFObjC::label const):
+ (WebCore::InbandTextTrackPrivateAVFObjC::language const):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::~MediaPlayerPrivateAVFoundationObjC):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::cancelLoad):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createImageGenerator):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::synchronizeTextTrackState):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::checkPlayability):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::accessLog const):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::errorLog const):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::platformSetVisible):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::platformDuration const):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::currentMediaTime const):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::seekToTime):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setVolume):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setMuted):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::assetStatus const):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createImageForTimeInRect):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::updateVideoLayerGravity):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoOutput):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::destroyVideoOutput):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::updateLastPixelBuffer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::firstEnabledTrack const):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::hasLoadedMediaSelectionGroups):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::safeMediaSelectionGroupForLegibleMedia):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::safeMediaSelectionGroupForAudibleMedia):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::safeMediaSelectionGroupForVisualMedia):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::processMediaSelectionOptions):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setCurrentTextTrack):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::languageOfPrimaryAudioTrack const):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::wirelessVideoPlaybackDisabled const):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setWirelessVideoPlaybackDisabled):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::metadataDidArrive):
+ (-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]):
+ * platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:
+ (WebCore::WebCoreAVFResourceLoader::startLoading):
+ (WebCore::WebCoreAVFResourceLoader::responseReceived):
+ (WebCore::WebCoreAVFResourceLoader::loadFailed):
+ (WebCore::WebCoreAVFResourceLoader::loadFinished):
+ (WebCore::WebCoreAVFResourceLoader::newDataStoredInSharedBuffer):
+ * platform/graphics/cocoa/TextTrackRepresentationCocoa.mm:
+ (WebCore::TextTrackRepresentationCocoa::TextTrackRepresentationCocoa):
+ (WebCore::TextTrackRepresentationCocoa::~TextTrackRepresentationCocoa):
+ (WebCore::TextTrackRepresentationCocoa::update):
+ (WebCore::TextTrackRepresentationCocoa::setContentScale):
+ (WebCore::TextTrackRepresentationCocoa::setHidden const):
+ (WebCore::TextTrackRepresentationCocoa::bounds const):
+ * platform/ios/DragImageIOS.mm:
+ (WebCore::scaleDragImage):
+ (WebCore::createDragImageFromImage):
+ (WebCore::createDragImageForRange):
+ * platform/ios/LegacyTileCache.mm:
+ (WebCore::LegacyTileCache::~LegacyTileCache):
+ * platform/ios/LegacyTileLayerPool.mm:
+ (WebCore::LegacyTileLayerPool::addLayer):
+ * platform/ios/PlatformPasteboardIOS.mm:
+ (WebCore::PlatformPasteboard::readBuffer const):
+ * platform/ios/PlatformSpeechSynthesizerIOS.mm:
+ (WebCore::PlatformSpeechSynthesizer::pause):
+ (WebCore::PlatformSpeechSynthesizer::resume):
+ (WebCore::PlatformSpeechSynthesizer::speak):
+ (WebCore::PlatformSpeechSynthesizer::cancel):
+ (WebCore::PlatformSpeechSynthesizer::resetState):
+ * platform/ios/VideoFullscreenInterfaceAVKit.mm:
+ (-[WebAVPlayerLayer setVideoGravity:]):
+ (-[WebAVPlayerViewController enterFullScreenAnimated:completionHandler:]):
+ (-[WebAVPlayerViewController exitFullScreenAnimated:completionHandler:]):
+ (-[WebAVPlayerViewController MY_NO_RETURN]):
+ (-[WebAVPlayerViewController removeFromParentViewController]):
+ * platform/mac/PlatformPasteboardMac.mm:
+ (WebCore::PlatformPasteboard::getTypes):
+ (WebCore::PlatformPasteboard::bufferForType):
+ (WebCore::PlatformPasteboard::getPathnamesForType const):
+ (WebCore::PlatformPasteboard::changeCount const):
+ (WebCore::PlatformPasteboard::copy):
+ (WebCore::PlatformPasteboard::addTypes):
+ (WebCore::PlatformPasteboard::setURL):
+ (WebCore::PlatformPasteboard::setStringForType):
+ * platform/mac/PlatformSpeechSynthesizerMac.mm:
+ (WebCore::PlatformSpeechSynthesizer::~PlatformSpeechSynthesizer):
+ (WebCore::PlatformSpeechSynthesizer::pause):
+ (WebCore::PlatformSpeechSynthesizer::resume):
+ (WebCore::PlatformSpeechSynthesizer::speak):
+ (WebCore::PlatformSpeechSynthesizer::cancel):
+ (WebCore::PlatformSpeechSynthesizer::resetState):
+ * platform/mac/SerializedPlatformDataCueMac.mm:
+ (WebCore::SerializedPlatformDataCueMac::isEqual const):
+ (WebCore::SerializedPlatformDataCueMac::encodableValue const):
+ * platform/mac/WebCoreFullScreenPlaceholderView.mm:
+ (-[WebCoreFullScreenPlaceholderView initWithFrame:]):
+ * platform/mac/WebCoreFullScreenWarningView.mm:
+ * platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm:
+ (WebCore::MediaRecorderPrivateWriter::initialize):
+ (WebCore::MediaRecorderPrivateWriter::startAssetWriter):
+ (WebCore::MediaRecorderPrivateWriter::appendCompressedAudioSampleBufferIfPossible):
+ (WebCore::MediaRecorderPrivateWriter::appendCompressedVideoSampleBuffer):
+ (WebCore::MediaRecorderPrivateWriter::flushCompressedSampleBuffers):
+ * platform/mediastream/mac/AVCaptureDeviceManager.mm:
+ (WebCore::AVCaptureDeviceManager::updateCachedAVCaptureDevices):
+ * platform/mediastream/mac/AVVideoCaptureSource.mm:
+ (WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
+ (-[WebCoreAVVideoCaptureSourceObserver observeValueForKeyPath:ofObject:change:context:]):
+ * platform/network/cocoa/ResourceRequestCocoa.mm:
+ (WebCore::ResourceRequest::doUpdateResourceRequest):
+ (WebCore::ResourceRequest::doUpdateResourceHTTPBody):
+ (WebCore::ResourceRequest::doUpdatePlatformRequest):
+ (WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+ * platform/network/cocoa/ResourceResponseCocoa.mm:
+ (WebCore::ResourceResponse::initNSURLResponse const):
+ (WebCore::ResourceResponse::platformLazyInit):
+ * platform/network/mac/AuthenticationMac.mm:
+ (WebCore::AuthenticationChallenge::setAuthenticationClient):
+ (WebCore::AuthenticationChallenge::authenticationClient const):
+ * platform/network/mac/ResourceErrorMac.mm:
+ (WebCore::createNSErrorFromResourceErrorBase):
+ (WebCore::ResourceError::mapPlatformError):
+ (WebCore::ResourceError::platformLazyInit):
+ * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
+ (-[WebCoreResourceHandleAsOperationQueueDelegate connection:willSendRequest:redirectResponse:]):
+ * platform/text/cocoa/LocaleCocoa.mm:
+ (WebCore::LocaleCocoa::LocaleCocoa):
+ (WebCore::LocaleCocoa::timeAMPMLabels):
+ (WebCore::LocaleCocoa::initializeLocaleData):
+ * platform/text/cocoa/LocalizedDateCache.mm:
+ (WebCore::LocalizedDateCache::calculateMaximumWidth):
+ * rendering/RenderThemeCocoa.mm:
+ (WebCore::RenderThemeCocoa::mediaControlsFormattedStringForDuration):
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::RenderThemeIOS::paintSystemPreviewBadge):
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::popupButton const):
+ (WebCore::RenderThemeMac::search const):
+ (WebCore::RenderThemeMac::sliderThumbHorizontal const):
+ (WebCore::RenderThemeMac::sliderThumbVertical const):
+ (WebCore::RenderThemeMac::textField const):
+
</ins><span class="cx"> 2021-10-07 Kimmo Kinnunen <kkinnunen@apple.com>
</span><span class="cx">
</span><span class="cx"> ScopedEGLDefaultDisplay should be removed
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptControllerMac.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptControllerMac.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/bindings/js/ScriptControllerMac.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_windowScriptObject) {
</span><span class="cx"> JSC::Bindings::RootObject* root = bindingRootObject();
</span><del>- [m_windowScriptObject.get() _setOriginRootObject:root andRootObject:root];
</del><ins>+ [m_windowScriptObject _setOriginRootObject:root andRootObject:root];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebridgeobjcobjc_instancemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/objc/objc_instance.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/objc/objc_instance.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/bridge/objc/objc_instance.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -132,8 +132,8 @@
</span><span class="cx"> ASSERT(_instance);
</span><span class="cx"> wrapperCache().remove((__bridge CFTypeRef)_instance.get());
</span><span class="cx">
</span><del>- if ([_instance.get() respondsToSelector:@selector(finalizeForWebScript)])
- [_instance.get() performSelector:@selector(finalizeForWebScript)];
</del><ins>+ if ([_instance respondsToSelector:@selector(finalizeForWebScript)])
+ [_instance performSelector:@selector(finalizeForWebScript)];
</ins><span class="cx"> _instance = 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx">
</span><span class="cx"> bool ObjcInstance::supportsInvokeDefaultMethod() const
</span><span class="cx"> {
</span><del>- return [_instance.get() respondsToSelector:@selector(invokeDefaultMethodWithArguments:)];
</del><ins>+ return [_instance respondsToSelector:@selector(invokeDefaultMethodWithArguments:)];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class ObjCRuntimeMethod final : public RuntimeMethod {
</span><span class="lines">@@ -353,10 +353,10 @@
</span><span class="cx"> setGlobalException(nil);
</span><span class="cx">
</span><span class="cx"> @try {
</span><del>- if (![_instance.get() respondsToSelector:@selector(invokeDefaultMethodWithArguments:)])
</del><ins>+ if (![_instance respondsToSelector:@selector(invokeDefaultMethodWithArguments:)])
</ins><span class="cx"> return result;
</span><span class="cx">
</span><del>- NSMethodSignature* signature = [_instance.get() methodSignatureForSelector:@selector(invokeDefaultMethodWithArguments:)];
</del><ins>+ NSMethodSignature* signature = [_instance methodSignatureForSelector:@selector(invokeDefaultMethodWithArguments:)];
</ins><span class="cx"> NSInvocation* invocation = [NSInvocation invocationWithMethodSignature:signature];
</span><span class="cx"> [invocation setSelector:@selector(invokeDefaultMethodWithArguments:)];
</span><span class="cx"> [invocation setTarget:_instance.get()];
</span><span class="lines">@@ -467,9 +467,9 @@
</span><span class="cx"> return stringValue(lexicalGlobalObject);
</span><span class="cx"> if (hint == PreferNumber)
</span><span class="cx"> return numberValue(lexicalGlobalObject);
</span><del>- if ([_instance.get() isKindOfClass:[NSString class]])
</del><ins>+ if ([_instance isKindOfClass:[NSString class]])
</ins><span class="cx"> return stringValue(lexicalGlobalObject);
</span><del>- if ([_instance.get() isKindOfClass:[NSNumber class]])
</del><ins>+ if ([_instance isKindOfClass:[NSNumber class]])
</ins><span class="cx"> return numberValue(lexicalGlobalObject);
</span><span class="cx"> return valueOf(lexicalGlobalObject);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebridgeobjcobjc_runtimemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/objc/objc_runtime.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/objc/objc_runtime.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/bridge/objc/objc_runtime.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -170,12 +170,12 @@
</span><span class="cx"> JSC::VM& vm = lexicalGlobalObject->vm();
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><del>- if (![_array.get() respondsToSelector:@selector(insertObject:atIndex:)]) {
</del><ins>+ if (![_array respondsToSelector:@selector(insertObject:atIndex:)]) {
</ins><span class="cx"> throwTypeError(lexicalGlobalObject, scope, "Array is not mutable."_s);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (index > [_array.get() count]) {
</del><ins>+ if (index > [_array count]) {
</ins><span class="cx"> throwException(lexicalGlobalObject, scope, createRangeError(lexicalGlobalObject, "Index exceeds array size."));
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> ObjcValue oValue = convertValueToObjcValue (lexicalGlobalObject, aValue, ObjcObjectType);
</span><span class="cx">
</span><span class="cx"> @try {
</span><del>- [_array.get() insertObject:(__bridge id)oValue.objectValue atIndex:index];
</del><ins>+ [_array insertObject:(__bridge id)oValue.objectValue atIndex:index];
</ins><span class="cx"> return true;
</span><span class="cx"> } @catch(NSException* localException) {
</span><span class="cx"> throwException(lexicalGlobalObject, scope, createError(lexicalGlobalObject, "Objective-C exception."));
</span><span class="lines">@@ -198,10 +198,10 @@
</span><span class="cx"> JSC::VM& vm = lexicalGlobalObject->vm();
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><del>- if (index > [_array.get() count])
</del><ins>+ if (index > [_array count])
</ins><span class="cx"> return throwException(lexicalGlobalObject, scope, createRangeError(lexicalGlobalObject, "Index exceeds array size."));
</span><span class="cx"> @try {
</span><del>- id obj = [_array.get() objectAtIndex:index];
</del><ins>+ id obj = [_array objectAtIndex:index];
</ins><span class="cx"> if (obj)
</span><span class="cx"> return convertObjcValueToValue (lexicalGlobalObject, &obj, ObjcObjectType, m_rootObject.get());
</span><span class="cx"> } @catch(NSException* localException) {
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned int ObjcArray::getLength() const
</span><span class="cx"> {
</span><del>- return [_array.get() count];
</del><ins>+ return [_array count];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const ClassInfo ObjcFallbackObjectImp::s_info = { "ObjcFallbackObject", &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(ObjcFallbackObjectImp) };
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaResourceUsageOverlayCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -217,15 +217,15 @@
</span><span class="cx"> m_layer = adoptNS([[WebResourceUsageOverlayLayer alloc] initWithResourceUsageOverlay:this]);
</span><span class="cx">
</span><span class="cx"> m_containerLayer = adoptNS([[CALayer alloc] init]);
</span><del>- [m_containerLayer.get() addSublayer:m_layer.get()];
</del><ins>+ [m_containerLayer addSublayer:m_layer.get()];
</ins><span class="cx">
</span><del>- [m_containerLayer.get() setAnchorPoint:CGPointZero];
- [m_containerLayer.get() setBounds:CGRectMake(0, 0, normalWidth, normalHeight)];
</del><ins>+ [m_containerLayer setAnchorPoint:CGPointZero];
+ [m_containerLayer setBounds:CGRectMake(0, 0, normalWidth, normalHeight)];
</ins><span class="cx">
</span><del>- [m_layer.get() setAnchorPoint:CGPointZero];
- [m_layer.get() setContentsScale:2.0];
- [m_layer.get() setBackgroundColor:createColor(0, 0, 0, 0.8).get()];
- [m_layer.get() setBounds:CGRectMake(0, 0, normalWidth, normalHeight)];
</del><ins>+ [m_layer setAnchorPoint:CGPointZero];
+ [m_layer setContentsScale:2.0];
+ [m_layer setBackgroundColor:createColor(0, 0, 0, 0.8).get()];
+ [m_layer setBounds:CGRectMake(0, 0, normalWidth, normalHeight)];
</ins><span class="cx">
</span><span class="cx"> overlay().layer().setContentsToPlatformLayer(m_layer.get(), GraphicsLayer::ContentsLayerPurpose::None);
</span><span class="cx">
</span><span class="lines">@@ -445,7 +445,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto& data = historicUsageData();
</span><span class="cx">
</span><del>- if (![m_layer.get() contentsAreFlipped]) {
</del><ins>+ if (![m_layer contentsAreFlipped]) {
</ins><span class="cx"> CGContextScaleCTM(context, 1, -1);
</span><span class="cx"> CGContextTranslateCTM(context, 0, -normalHeight);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaParentalControlsContentFiltermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -96,15 +96,15 @@
</span><span class="cx">
</span><span class="cx"> void ParentalControlsContentFilter::addData(const uint8_t* data, int length)
</span><span class="cx"> {
</span><del>- ASSERT(![m_replacementData.get() length]);
</del><ins>+ ASSERT(![m_replacementData length]);
</ins><span class="cx"> m_replacementData = [m_webFilterEvaluator addData:[NSData dataWithBytesNoCopy:(void*)data length:length freeWhenDone:NO]];
</span><span class="cx"> updateFilterState();
</span><del>- ASSERT(needsMoreData() || [m_replacementData.get() length]);
</del><ins>+ ASSERT(needsMoreData() || [m_replacementData length]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ParentalControlsContentFilter::finishedAddingData()
</span><span class="cx"> {
</span><del>- ASSERT(![m_replacementData.get() length]);
</del><ins>+ ASSERT(![m_replacementData length]);
</ins><span class="cx"> m_replacementData = [m_webFilterEvaluator dataComplete];
</span><span class="cx"> updateFilterState();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgamepadcocoaGameControllerGamepadmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> // Thumbstick buttons are only in macOS 10.14.1 / iOS 12.1
</span><span class="cx"> #pragma clang diagnostic push
</span><span class="cx"> #pragma clang diagnostic ignored "-Wunguarded-availability"
</span><del>- if ([m_extendedGamepad.get() respondsToSelector:@selector(leftThumbstickButton)]) {
</del><ins>+ if ([m_extendedGamepad respondsToSelector:@selector(leftThumbstickButton)]) {
</ins><span class="cx"> bindButton(m_extendedGamepad.get().leftThumbstickButton, GamepadButtonRole::LeftStick);
</span><span class="cx"> bindButton(m_extendedGamepad.get().rightThumbstickButton, GamepadButtonRole::RightStick);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcAVOutputDeviceMenuControllerTargetPickermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVOutputDeviceMenuControllerTargetPicker.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVOutputDeviceMenuControllerTargetPicker.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVOutputDeviceMenuControllerTargetPicker.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -77,8 +77,8 @@
</span><span class="cx"> RetainPtr<AVOutputContext> context = adoptNS([PAL::allocAVOutputContextInstance() init]);
</span><span class="cx"> m_outputDeviceMenuController = adoptNS([allocAVOutputDeviceMenuControllerInstance() initWithOutputContext:context.get()]);
</span><span class="cx">
</span><del>- [m_outputDeviceMenuController.get() addObserver:m_outputDeviceMenuControllerDelegate.get() forKeyPath:externalOutputDeviceAvailableKeyName options:NSKeyValueObservingOptionNew context:nullptr];
- [m_outputDeviceMenuController.get() addObserver:m_outputDeviceMenuControllerDelegate.get() forKeyPath:externalOutputDevicePickedKeyName options:NSKeyValueObservingOptionNew context:nullptr];
</del><ins>+ [m_outputDeviceMenuController addObserver:m_outputDeviceMenuControllerDelegate.get() forKeyPath:externalOutputDeviceAvailableKeyName options:NSKeyValueObservingOptionNew context:nullptr];
+ [m_outputDeviceMenuController addObserver:m_outputDeviceMenuControllerDelegate.get() forKeyPath:externalOutputDevicePickedKeyName options:NSKeyValueObservingOptionNew context:nullptr];
</ins><span class="cx">
</span><span class="cx"> ALLOW_DEPRECATED_DECLARATIONS_BEGIN
</span><span class="cx"> if (m_outputDeviceMenuController.get().externalOutputDeviceAvailable)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx">
</span><span class="cx"> AVOutputContext * AVOutputDeviceMenuControllerTargetPicker::outputContext()
</span><span class="cx"> {
</span><del>- return m_outputDeviceMenuController ? [m_outputDeviceMenuController.get() outputContext] : nullptr;
</del><ins>+ return m_outputDeviceMenuController ? [m_outputDeviceMenuController outputContext] : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> systemCode = 0;
</span><span class="cx"> destinationURL = String();
</span><span class="cx">
</span><del>- auto keyRequestBuffer = ArrayBuffer::create([keyRequest.get() bytes], [keyRequest.get() length]);
</del><ins>+ auto keyRequestBuffer = ArrayBuffer::create([keyRequest bytes], [keyRequest length]);
</ins><span class="cx"> unsigned byteLength = keyRequestBuffer->byteLength();
</span><span class="cx"> return Uint8Array::tryCreate(WTFMove(keyRequestBuffer), 0, byteLength);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcInbandTextTrackPrivateAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">
</span><span class="cx"> NSString *title = 0;
</span><span class="cx">
</span><del>- NSArray *titles = [PAL::getAVMetadataItemClass() metadataItemsFromArray:[m_mediaSelectionOption.get() commonMetadata] withKey:AVMetadataCommonKeyTitle keySpace:AVMetadataKeySpaceCommon];
</del><ins>+ NSArray *titles = [PAL::getAVMetadataItemClass() metadataItemsFromArray:[m_mediaSelectionOption commonMetadata] withKey:AVMetadataCommonKeyTitle keySpace:AVMetadataKeySpaceCommon];
</ins><span class="cx"> if ([titles count]) {
</span><span class="cx"> // If possible, return a title in one of the user's preferred languages.
</span><span class="cx"> NSArray *titlesForPreferredLanguages = [PAL::getAVMetadataItemClass() metadataItemsFromArray:titles filteredAndSortedAccordingToPreferredLanguages:[NSLocale preferredLanguages]];
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> if (!m_mediaSelectionOption)
</span><span class="cx"> return emptyAtom();
</span><span class="cx">
</span><del>- return [[m_mediaSelectionOption.get() locale] localeIdentifier];
</del><ins>+ return [[m_mediaSelectionOption locale] localeIdentifier];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InbandTextTrackPrivateAVFObjC::isDefault() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx"> {
</span><span class="cx"> weakPtrFactory().revokeAll();
</span><span class="cx">
</span><del>- [[m_avAsset.get() resourceLoader] setDelegate:nil queue:0];
</del><ins>+ [[m_avAsset resourceLoader] setDelegate:nil queue:0];
</ins><span class="cx">
</span><span class="cx"> for (auto& pair : m_resourceLoaderMap)
</span><span class="cx"> pair.value->invalidate();
</span><span class="lines">@@ -480,12 +480,12 @@
</span><span class="cx"> tearDownVideoRendering();
</span><span class="cx">
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:m_objcObserver.get()];
</span><del>- [m_objcObserver.get() disconnect];
</del><ins>+ [m_objcObserver disconnect];
</ins><span class="cx">
</span><span class="cx"> // Tell our observer to do nothing when our cancellation of pending loading calls its completion handler.
</span><span class="cx"> setIgnoreLoadStateChanges(true);
</span><span class="cx"> if (m_avAsset) {
</span><del>- [m_avAsset.get() cancelLoading];
</del><ins>+ [m_avAsset cancelLoading];
</ins><span class="cx"> m_avAsset = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -493,7 +493,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_legibleOutput) {
</span><span class="cx"> if (m_avPlayerItem)
</span><del>- [m_avPlayerItem.get() removeOutput:m_legibleOutput.get()];
</del><ins>+ [m_avPlayerItem removeOutput:m_legibleOutput.get()];
</ins><span class="cx"> m_legibleOutput = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -500,29 +500,29 @@
</span><span class="cx"> if (m_metadataCollector) {
</span><span class="cx"> // FIXME - removeMediaDataCollector sometimes crashes, do not uncomment this until rdar://56617504 has been fixed.
</span><span class="cx"> // if (m_avPlayerItem)
</span><del>- // [m_avPlayerItem.get() removeMediaDataCollector:m_metadataCollector.get()];
</del><ins>+ // [m_avPlayerItem removeMediaDataCollector:m_metadataCollector.get()];
</ins><span class="cx"> m_metadataCollector = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_metadataOutput) {
</span><span class="cx"> if (m_avPlayerItem)
</span><del>- [m_avPlayerItem.get() removeOutput:m_metadataOutput.get()];
</del><ins>+ [m_avPlayerItem removeOutput:m_metadataOutput.get()];
</ins><span class="cx"> m_metadataOutput = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_avPlayerItem) {
</span><span class="cx"> for (NSString *keyName in itemKVOProperties())
</span><del>- [m_avPlayerItem.get() removeObserver:m_objcObserver.get() forKeyPath:keyName];
</del><ins>+ [m_avPlayerItem removeObserver:m_objcObserver.get() forKeyPath:keyName];
</ins><span class="cx">
</span><span class="cx"> m_avPlayerItem = nil;
</span><span class="cx"> }
</span><span class="cx"> if (m_avPlayer) {
</span><span class="cx"> if (m_timeObserver)
</span><del>- [m_avPlayer.get() removeTimeObserver:m_timeObserver.get()];
</del><ins>+ [m_avPlayer removeTimeObserver:m_timeObserver.get()];
</ins><span class="cx"> m_timeObserver = nil;
</span><span class="cx">
</span><span class="cx"> for (NSString *keyName in playerKVOProperties())
</span><del>- [m_avPlayer.get() removeObserver:m_objcObserver.get() forKeyPath:keyName];
</del><ins>+ [m_avPlayer removeObserver:m_objcObserver.get() forKeyPath:keyName];
</ins><span class="cx">
</span><span class="cx"> setShouldObserveTimeControlStatus(false);
</span><span class="cx">
</span><span class="lines">@@ -588,10 +588,10 @@
</span><span class="cx">
</span><span class="cx"> m_imageGenerator = [PAL::getAVAssetImageGeneratorClass() assetImageGeneratorWithAsset:m_avAsset.get()];
</span><span class="cx">
</span><del>- [m_imageGenerator.get() setApertureMode:AVAssetImageGeneratorApertureModeCleanAperture];
- [m_imageGenerator.get() setAppliesPreferredTrackTransform:YES];
- [m_imageGenerator.get() setRequestedTimeToleranceBefore:PAL::kCMTimeZero];
- [m_imageGenerator.get() setRequestedTimeToleranceAfter:PAL::kCMTimeZero];
</del><ins>+ [m_imageGenerator setApertureMode:AVAssetImageGeneratorApertureModeCleanAperture];
+ [m_imageGenerator setAppliesPreferredTrackTransform:YES];
+ [m_imageGenerator setRequestedTimeToleranceBefore:PAL::kCMTimeZero];
+ [m_imageGenerator setRequestedTimeToleranceAfter:PAL::kCMTimeZero];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::destroyContextVideoRenderer()
</span><span class="lines">@@ -741,7 +741,7 @@
</span><span class="cx"> for (auto& track : outOfBandTrackSources) {
</span><span class="cx"> RetainPtr<CFStringRef> uniqueID = String::number(track->uniqueId()).createCFString();
</span><span class="cx">
</span><del>- if (![[currentOption.get() outOfBandIdentifier] isEqual:(__bridge NSString *)uniqueID.get()])
</del><ins>+ if (![[currentOption outOfBandIdentifier] isEqual:(__bridge NSString *)uniqueID.get()])
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> InbandTextTrackPrivate::Mode mode = InbandTextTrackPrivate::Mode::Hidden;
</span><span class="lines">@@ -879,23 +879,23 @@
</span><span class="cx">
</span><span class="cx"> setDelayCallbacks(true);
</span><span class="cx">
</span><del>- [options.get() setObject:@(AVAssetReferenceRestrictionForbidRemoteReferenceToLocal | AVAssetReferenceRestrictionForbidLocalReferenceToRemote) forKey:AVURLAssetReferenceRestrictionsKey];
</del><ins>+ [options setObject:@(AVAssetReferenceRestrictionForbidRemoteReferenceToLocal | AVAssetReferenceRestrictionForbidLocalReferenceToRemote) forKey:AVURLAssetReferenceRestrictionsKey];
</ins><span class="cx">
</span><span class="cx"> RetainPtr<NSMutableDictionary> headerFields = adoptNS([[NSMutableDictionary alloc] init]);
</span><span class="cx">
</span><span class="cx"> String referrer = player()->referrer();
</span><span class="cx"> if (!referrer.isEmpty())
</span><del>- [headerFields.get() setObject:referrer forKey:@"Referer"];
</del><ins>+ [headerFields setObject:referrer forKey:@"Referer"];
</ins><span class="cx">
</span><span class="cx"> String userAgent = player()->userAgent();
</span><span class="cx"> if (!userAgent.isEmpty())
</span><del>- [headerFields.get() setObject:userAgent forKey:@"User-Agent"];
</del><ins>+ [headerFields setObject:userAgent forKey:@"User-Agent"];
</ins><span class="cx">
</span><del>- if ([headerFields.get() count])
- [options.get() setObject:headerFields.get() forKey:@"AVURLAssetHTTPHeaderFieldsKey"];
</del><ins>+ if ([headerFields count])
+ [options setObject:headerFields.get() forKey:@"AVURLAssetHTTPHeaderFieldsKey"];
</ins><span class="cx">
</span><span class="cx"> if (player()->doesHaveAttribute("x-itunes-inherit-uri-query-component"))
</span><del>- [options.get() setObject:@YES forKey: AVURLAssetInheritURIQueryComponentFromReferencingURIKey];
</del><ins>+ [options setObject:@YES forKey: AVURLAssetInheritURIQueryComponentFromReferencingURIKey];
</ins><span class="cx">
</span><span class="cx"> if (PAL::canLoad_AVFoundation_AVURLAssetUseClientURLLoadingExclusively())
</span><span class="cx"> [options setObject:@YES forKey:AVURLAssetUseClientURLLoadingExclusively];
</span><span class="lines">@@ -936,7 +936,7 @@
</span><span class="cx"> };
</span><span class="cx"> });
</span><span class="cx">
</span><del>- [options.get() setObject:outOfBandTracks.get() forKey:AVURLAssetOutOfBandAlternateTracksKey];
</del><ins>+ [options setObject:outOfBandTracks.get() forKey:AVURLAssetOutOfBandAlternateTracksKey];
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1047,7 +1047,7 @@
</span><span class="cx">
</span><span class="cx"> m_avPlayer = adoptNS([PAL::allocAVPlayerInstance() init]);
</span><span class="cx"> for (NSString *keyName in playerKVOProperties())
</span><del>- [m_avPlayer.get() addObserver:m_objcObserver.get() forKeyPath:keyName options:NSKeyValueObservingOptionNew context:(void *)MediaPlayerAVFoundationObservationContextPlayer];
</del><ins>+ [m_avPlayer addObserver:m_objcObserver.get() forKeyPath:keyName options:NSKeyValueObservingOptionNew context:(void *)MediaPlayerAVFoundationObservationContextPlayer];
</ins><span class="cx"> m_automaticallyWaitsToMinimizeStalling = [m_avPlayer automaticallyWaitsToMinimizeStalling];
</span><span class="cx">
</span><span class="cx"> setShouldObserveTimeControlStatus(true);
</span><span class="lines">@@ -1060,7 +1060,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> updateDisableExternalPlayback();
</span><del>- [m_avPlayer.get() setAllowsExternalPlayback:m_allowsWirelessVideoPlayback];
</del><ins>+ [m_avPlayer setAllowsExternalPlayback:m_allowsWirelessVideoPlayback];
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY)
</span><span class="lines">@@ -1076,7 +1076,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (m_muted) {
</span><del>- [m_avPlayer.get() setMuted:m_muted];
</del><ins>+ [m_avPlayer setMuted:m_muted];
</ins><span class="cx">
</span><span class="cx"> #if HAVE(AVPLAYER_SUPRESSES_AUDIO_RENDERING)
</span><span class="cx"> if (player()->isVideoPlayer())
</span><span class="lines">@@ -1139,7 +1139,7 @@
</span><span class="cx">
</span><span class="cx"> NSKeyValueObservingOptions options = NSKeyValueObservingOptionNew | NSKeyValueObservingOptionPrior;
</span><span class="cx"> for (NSString *keyName in itemKVOProperties())
</span><del>- [m_avPlayerItem.get() addObserver:m_objcObserver.get() forKeyPath:keyName options:options context:(void *)MediaPlayerAVFoundationObservationContextPlayerItem];
</del><ins>+ [m_avPlayerItem addObserver:m_objcObserver.get() forKeyPath:keyName options:options context:(void *)MediaPlayerAVFoundationObservationContextPlayerItem];
</ins><span class="cx">
</span><span class="cx"> [m_avPlayerItem setAudioTimePitchAlgorithm:audioTimePitchAlgorithmForMediaPlayerPitchCorrectionAlgorithm(player()->pitchCorrectionAlgorithm(), player()->preservesPitch(), m_requestedRate)];
</span><span class="cx">
</span><span class="lines">@@ -1157,12 +1157,12 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSArray> subtypes = adoptNS([[NSArray alloc] initWithObjects:@(kCMSubtitleFormatType_WebVTT), nil]);
</span><span class="cx"> m_legibleOutput = adoptNS([PAL::allocAVPlayerItemLegibleOutputInstance() initWithMediaSubtypesForNativeRepresentation:subtypes.get()]);
</span><del>- [m_legibleOutput.get() setSuppressesPlayerRendering:YES];
</del><ins>+ [m_legibleOutput setSuppressesPlayerRendering:YES];
</ins><span class="cx">
</span><del>- [m_legibleOutput.get() setDelegate:m_objcObserver.get() queue:dispatch_get_main_queue()];
- [m_legibleOutput.get() setAdvanceIntervalForDelegateInvocation:avPlayerOutputAdvanceInterval];
- [m_legibleOutput.get() setTextStylingResolution:AVPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly];
- [m_avPlayerItem.get() addOutput:m_legibleOutput.get()];
</del><ins>+ [m_legibleOutput setDelegate:m_objcObserver.get() queue:dispatch_get_main_queue()];
+ [m_legibleOutput setAdvanceIntervalForDelegateInvocation:avPlayerOutputAdvanceInterval];
+ [m_legibleOutput setTextStylingResolution:AVPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly];
+ [m_avPlayerItem addOutput:m_legibleOutput.get()];
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_AUDIO) && USE(MEDIATOOLBOX)
</span><span class="cx"> if (m_provider) {
</span><span class="lines">@@ -1172,13 +1172,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_metadataCollector = adoptNS([PAL::allocAVPlayerItemMetadataCollectorInstance() initWithIdentifiers:nil classifyingLabels:nil]);
</span><del>- [m_metadataCollector.get() setDelegate:m_objcObserver.get() queue:dispatch_get_main_queue()];
- [m_avPlayerItem.get() addMediaDataCollector:m_metadataCollector.get()];
</del><ins>+ [m_metadataCollector setDelegate:m_objcObserver.get() queue:dispatch_get_main_queue()];
+ [m_avPlayerItem addMediaDataCollector:m_metadataCollector.get()];
</ins><span class="cx">
</span><span class="cx"> m_metadataOutput = adoptNS([PAL::allocAVPlayerItemMetadataOutputInstance() initWithIdentifiers:nil]);
</span><del>- [m_metadataOutput.get() setDelegate:m_objcObserver.get() queue:dispatch_get_main_queue()];
- [m_metadataOutput.get() setAdvanceIntervalForDelegateInvocation:avPlayerOutputAdvanceInterval];
- [m_avPlayerItem.get() addOutput:m_metadataOutput.get()];
</del><ins>+ [m_metadataOutput setDelegate:m_objcObserver.get() queue:dispatch_get_main_queue()];
+ [m_metadataOutput setAdvanceIntervalForDelegateInvocation:avPlayerOutputAdvanceInterval];
+ [m_avPlayerItem addOutput:m_metadataOutput.get()];
</ins><span class="cx">
</span><span class="cx"> setDelayCallbacks(false);
</span><span class="cx"> }
</span><span class="lines">@@ -1192,7 +1192,7 @@
</span><span class="cx"> INFO_LOG(LOGIDENTIFIER);
</span><span class="cx"> auto weakThis = makeWeakPtr(*this);
</span><span class="cx">
</span><del>- [m_avAsset.get() loadValuesAsynchronouslyForKeys:@[@"playable", @"tracks"] completionHandler:^{
</del><ins>+ [m_avAsset loadValuesAsynchronouslyForKeys:@[@"playable", @"tracks"] completionHandler:^{
</ins><span class="cx"> callOnMainThread([weakThis] {
</span><span class="cx"> if (weakThis)
</span><span class="cx"> weakThis->scheduleMainThreadNotification(MediaPlayerPrivateAVFoundation::Notification::AssetPlayabilityKnown);
</span><span class="lines">@@ -1207,10 +1207,10 @@
</span><span class="cx"> OSObjectPtr<dispatch_group_t> metadataLoadingGroup = adoptOSObject(dispatch_group_create());
</span><span class="cx"> dispatch_group_enter(metadataLoadingGroup.get());
</span><span class="cx"> auto weakThis = makeWeakPtr(*this);
</span><del>- [m_avAsset.get() loadValuesAsynchronouslyForKeys:assetMetadataKeyNames() completionHandler:^{
</del><ins>+ [m_avAsset loadValuesAsynchronouslyForKeys:assetMetadataKeyNames() completionHandler:^{
</ins><span class="cx"> callOnMainThread([weakThis, metadataLoadingGroup] {
</span><del>- if (weakThis && [weakThis->m_avAsset.get() statusOfValueForKey:@"tracks" error:nil] == AVKeyValueStatusLoaded) {
- for (AVAssetTrack *track in [weakThis->m_avAsset.get() tracks]) {
</del><ins>+ if (weakThis && [weakThis->m_avAsset statusOfValueForKey:@"tracks" error:nil] == AVKeyValueStatusLoaded) {
+ for (AVAssetTrack *track in [weakThis->m_avAsset tracks]) {
</ins><span class="cx"> dispatch_group_enter(metadataLoadingGroup.get());
</span><span class="cx"> [track loadValuesAsynchronouslyForKeys:assetTrackMetadataKeyNames() completionHandler:^{
</span><span class="cx"> dispatch_group_leave(metadataLoadingGroup.get());
</span><span class="lines">@@ -1224,7 +1224,7 @@
</span><span class="cx"> dispatch_group_notify(metadataLoadingGroup.get(), dispatch_get_main_queue(), ^{
</span><span class="cx"> callOnMainThread([weakThis] {
</span><span class="cx"> if (weakThis)
</span><del>- [weakThis->m_objcObserver.get() metadataLoaded];
</del><ins>+ [weakThis->m_objcObserver metadataLoaded];
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -1345,7 +1345,7 @@
</span><span class="cx"> if (!m_avPlayerItem)
</span><span class="cx"> return emptyString();
</span><span class="cx">
</span><del>- AVPlayerItemAccessLog *log = [m_avPlayerItem.get() accessLog];
</del><ins>+ AVPlayerItemAccessLog *log = [m_avPlayerItem accessLog];
</ins><span class="cx"> RetainPtr<NSString> logString = adoptNS([[NSString alloc] initWithData:[log extendedLogData] encoding:[log extendedLogDataStringEncoding]]);
</span><span class="cx">
</span><span class="cx"> return logString.get();
</span><span class="lines">@@ -1356,7 +1356,7 @@
</span><span class="cx"> if (!m_avPlayerItem)
</span><span class="cx"> return emptyString();
</span><span class="cx">
</span><del>- AVPlayerItemErrorLog *log = [m_avPlayerItem.get() errorLog];
</del><ins>+ AVPlayerItemErrorLog *log = [m_avPlayerItem errorLog];
</ins><span class="cx"> RetainPtr<NSString> logString = adoptNS([[NSString alloc] initWithData:[log extendedLogData] encoding:[log extendedLogDataStringEncoding]]);
</span><span class="cx">
</span><span class="cx"> return logString.get();
</span><span class="lines">@@ -1374,7 +1374,7 @@
</span><span class="cx"> [CATransaction begin];
</span><span class="cx"> [CATransaction setDisableActions:YES];
</span><span class="cx"> if (m_videoLayer)
</span><del>- [m_videoLayer.get() setHidden:!isVisible];
</del><ins>+ [m_videoLayer setHidden:!isVisible];
</ins><span class="cx"> [CATransaction commit];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1442,9 +1442,9 @@
</span><span class="cx">
</span><span class="cx"> // Check the AVItem if we have one and it has loaded duration, some assets never report duration.
</span><span class="cx"> if (m_avPlayerItem && playerItemStatus() >= MediaPlayerAVPlayerItemStatusReadyToPlay)
</span><del>- cmDuration = [m_avPlayerItem.get() duration];
</del><ins>+ cmDuration = [m_avPlayerItem duration];
</ins><span class="cx"> else
</span><del>- cmDuration = [m_avAsset.get() duration];
</del><ins>+ cmDuration = [m_avAsset duration];
</ins><span class="cx">
</span><span class="cx"> if (CMTIME_IS_NUMERIC(cmDuration))
</span><span class="cx"> return PAL::toMediaTime(cmDuration);
</span><span class="lines">@@ -1467,7 +1467,7 @@
</span><span class="cx"> return MediaTime::zeroTime();
</span><span class="cx">
</span><span class="cx"> if (!m_wallClockAtCachedCurrentTime)
</span><del>- currentMediaTimeDidChange(PAL::toMediaTime([m_avPlayerItem.get() currentTime]));
</del><ins>+ currentMediaTimeDidChange(PAL::toMediaTime([m_avPlayerItem currentTime]));
</ins><span class="cx"> ASSERT(m_wallClockAtCachedCurrentTime);
</span><span class="cx">
</span><span class="cx"> auto itemTime = m_cachedCurrentMediaTime;
</span><span class="lines">@@ -1518,7 +1518,7 @@
</span><span class="cx"> auto weakThis = makeWeakPtr(*this);
</span><span class="cx">
</span><span class="cx"> setShouldObserveTimeControlStatus(false);
</span><del>- [m_avPlayerItem.get() seekToTime:cmTime toleranceBefore:cmBefore toleranceAfter:cmAfter completionHandler:^(BOOL finished) {
</del><ins>+ [m_avPlayerItem seekToTime:cmTime toleranceBefore:cmBefore toleranceAfter:cmAfter completionHandler:^(BOOL finished) {
</ins><span class="cx"> callOnMainThread([weakThis, finished] {
</span><span class="cx"> auto _this = weakThis.get();
</span><span class="cx"> if (!_this)
</span><span class="lines">@@ -1544,7 +1544,7 @@
</span><span class="cx">
</span><span class="cx"> ALWAYS_LOG(LOGIDENTIFIER, volume);
</span><span class="cx">
</span><del>- [m_avPlayer.get() setVolume:volume];
</del><ins>+ [m_avPlayer setVolume:volume];
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1560,7 +1560,7 @@
</span><span class="cx"> if (!m_avPlayer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- [m_avPlayer.get() setMuted:m_muted];
</del><ins>+ [m_avPlayer setMuted:m_muted];
</ins><span class="cx"> #if HAVE(AVPLAYER_SUPRESSES_AUDIO_RENDERING)
</span><span class="cx"> if (!m_muted)
</span><span class="cx"> m_avPlayer.get().suppressesAudioRendering = NO;
</span><span class="lines">@@ -1763,7 +1763,7 @@
</span><span class="cx"> if (!m_cachedAssetIsLoaded) {
</span><span class="cx"> for (NSString *keyName in assetMetadataKeyNames()) {
</span><span class="cx"> NSError *error = nil;
</span><del>- AVKeyValueStatus keyStatus = [m_avAsset.get() statusOfValueForKey:keyName error:&error];
</del><ins>+ AVKeyValueStatus keyStatus = [m_avAsset statusOfValueForKey:keyName error:&error];
</ins><span class="cx">
</span><span class="cx"> if (error)
</span><span class="cx"> ERROR_LOG(LOGIDENTIFIER, "failed for ", [keyName UTF8String], ", error = ", [[error localizedDescription] UTF8String]);
</span><span class="lines">@@ -1794,7 +1794,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_cachedAssetIsPlayable)
</span><del>- m_cachedAssetIsPlayable = [[m_avAsset.get() valueForKey:@"playable"] boolValue];
</del><ins>+ m_cachedAssetIsPlayable = [[m_avAsset valueForKey:@"playable"] boolValue];
</ins><span class="cx">
</span><span class="cx"> if (*m_cachedAssetIsPlayable && m_tracksArePlayable.value())
</span><span class="cx"> return MediaPlayerAVAssetStatusPlayable;
</span><span class="lines">@@ -1867,8 +1867,8 @@
</span><span class="cx">
</span><span class="cx"> MonotonicTime start = MonotonicTime::now();
</span><span class="cx">
</span><del>- [m_imageGenerator.get() setMaximumSize:CGSize(rect.size())];
- RetainPtr<CGImageRef> rawImage = adoptCF([m_imageGenerator.get() copyCGImageAtTime:PAL::CMTimeMakeWithSeconds(time, 600) actualTime:nil error:nil]);
</del><ins>+ [m_imageGenerator setMaximumSize:CGSize(rect.size())];
+ RetainPtr<CGImageRef> rawImage = adoptCF([m_imageGenerator copyCGImageAtTime:PAL::CMTimeMakeWithSeconds(time, 600) actualTime:nil error:nil]);
</ins><span class="cx"> RetainPtr<CGImageRef> image = adoptCF(CGImageCreateCopyWithColorSpace(rawImage.get(), sRGBColorSpaceRef()));
</span><span class="cx">
</span><span class="cx"> INFO_LOG(LOGIDENTIFIER, "creating image took ", (MonotonicTime::now() - start).seconds());
</span><span class="lines">@@ -2081,7 +2081,7 @@
</span><span class="cx"> [CATransaction begin];
</span><span class="cx"> [CATransaction setDisableActions:YES];
</span><span class="cx"> NSString* gravity = shouldMaintainAspectRatio() ? AVLayerVideoGravityResizeAspect : AVLayerVideoGravityResize;
</span><del>- [m_videoLayer.get() setVideoGravity:gravity];
</del><ins>+ [m_videoLayer setVideoGravity:gravity];
</ins><span class="cx"> [CATransaction commit];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2472,7 +2472,7 @@
</span><span class="cx"> m_videoOutputDelegate = adoptNS([[WebCoreAVFPullDelegate alloc] initWithPlayer:makeWeakPtr(*this)]);
</span><span class="cx"> [m_videoOutput setDelegate:m_videoOutputDelegate.get() queue:globalPullDelegateQueue()];
</span><span class="cx">
</span><del>- [m_avPlayerItem.get() addOutput:m_videoOutput.get()];
</del><ins>+ [m_avPlayerItem addOutput:m_videoOutput.get()];
</ins><span class="cx">
</span><span class="cx"> setNeedsRenderingModeChanged();
</span><span class="cx"> }
</span><span class="lines">@@ -2483,7 +2483,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_avPlayerItem)
</span><del>- [m_avPlayerItem.get() removeOutput:m_videoOutput.get()];
</del><ins>+ [m_avPlayerItem removeOutput:m_videoOutput.get()];
</ins><span class="cx">
</span><span class="cx"> INFO_LOG(LOGIDENTIFIER);
</span><span class="cx">
</span><span class="lines">@@ -2501,12 +2501,12 @@
</span><span class="cx"> createVideoOutput();
</span><span class="cx"> ASSERT(m_videoOutput);
</span><span class="cx">
</span><del>- CMTime currentTime = [m_avPlayerItem.get() currentTime];
</del><ins>+ CMTime currentTime = [m_avPlayerItem currentTime];
</ins><span class="cx">
</span><del>- if (![m_videoOutput.get() hasNewPixelBufferForItemTime:currentTime])
</del><ins>+ if (![m_videoOutput hasNewPixelBufferForItemTime:currentTime])
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- m_lastPixelBuffer = adoptCF([m_videoOutput.get() copyPixelBufferForItemTime:currentTime itemTimeForDisplay:nil]);
</del><ins>+ m_lastPixelBuffer = adoptCF([m_videoOutput copyPixelBufferForItemTime:currentTime itemTimeForDisplay:nil]);
</ins><span class="cx">
</span><span class="cx"> if (m_imageRotationSession)
</span><span class="cx"> m_lastPixelBuffer = m_imageRotationSession->rotate(m_lastPixelBuffer.get());
</span><span class="lines">@@ -2754,7 +2754,7 @@
</span><span class="cx"> if (!m_avAsset)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- if ([m_avAsset.get() statusOfValueForKey:@"tracks" error:NULL] != AVKeyValueStatusLoaded)
</del><ins>+ if ([m_avAsset statusOfValueForKey:@"tracks" error:NULL] != AVKeyValueStatusLoaded)
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> return [] (NSArray* tracks) -> AVAssetTrack* {
</span><span class="lines">@@ -2782,7 +2782,7 @@
</span><span class="cx"> if (!m_avAsset)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ([m_avAsset.get() statusOfValueForKey:@"availableMediaCharacteristicsWithMediaSelectionOptions" error:NULL] != AVKeyValueStatusLoaded)
</del><ins>+ if ([m_avAsset statusOfValueForKey:@"availableMediaCharacteristicsWithMediaSelectionOptions" error:NULL] != AVKeyValueStatusLoaded)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -2793,7 +2793,7 @@
</span><span class="cx"> if (!hasLoadedMediaSelectionGroups())
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- return [m_avAsset.get() mediaSelectionGroupForMediaCharacteristic:AVMediaCharacteristicLegible];
</del><ins>+ return [m_avAsset mediaSelectionGroupForMediaCharacteristic:AVMediaCharacteristicLegible];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AVMediaSelectionGroup* MediaPlayerPrivateAVFoundationObjC::safeMediaSelectionGroupForAudibleMedia()
</span><span class="lines">@@ -2801,7 +2801,7 @@
</span><span class="cx"> if (!hasLoadedMediaSelectionGroups())
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- return [m_avAsset.get() mediaSelectionGroupForMediaCharacteristic:AVMediaCharacteristicAudible];
</del><ins>+ return [m_avAsset mediaSelectionGroupForMediaCharacteristic:AVMediaCharacteristicAudible];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AVMediaSelectionGroup* MediaPlayerPrivateAVFoundationObjC::safeMediaSelectionGroupForVisualMedia()
</span><span class="lines">@@ -2809,7 +2809,7 @@
</span><span class="cx"> if (!hasLoadedMediaSelectionGroups())
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- return [m_avAsset.get() mediaSelectionGroupForMediaCharacteristic:AVMediaCharacteristicVisual];
</del><ins>+ return [m_avAsset mediaSelectionGroupForMediaCharacteristic:AVMediaCharacteristicVisual];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::processMediaSelectionOptions()
</span><span class="lines">@@ -2823,7 +2823,7 @@
</span><span class="cx"> // We enabled automatic media selection because we want alternate audio tracks to be enabled/disabled automatically,
</span><span class="cx"> // but set the selected legible track to nil so text tracks will not be automatically configured.
</span><span class="cx"> if (!m_textTracks.size())
</span><del>- [m_avPlayerItem.get() selectMediaOption:nil inMediaSelectionGroup:safeMediaSelectionGroupForLegibleMedia()];
</del><ins>+ [m_avPlayerItem selectMediaOption:nil inMediaSelectionGroup:safeMediaSelectionGroupForLegibleMedia()];
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<InbandTextTrackPrivateAVF>> removedTextTracks = m_textTracks;
</span><span class="cx"> NSArray *legibleOptions = [PAL::getAVMediaSelectionGroupClass() playableMediaSelectionOptionsFromArray:[legibleGroup options]];
</span><span class="lines">@@ -2845,7 +2845,7 @@
</span><span class="cx"> currentOption = track->mediaSelectionOption();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ([currentOption.get() isEqual:option]) {
</del><ins>+ if ([currentOption isEqual:option]) {
</ins><span class="cx"> removedTextTracks.remove(i - 1);
</span><span class="cx"> newTrack = false;
</span><span class="cx"> break;
</span><span class="lines">@@ -2910,18 +2910,18 @@
</span><span class="cx"> if (track) {
</span><span class="cx"> if (track->textTrackCategory() == InbandTextTrackPrivateAVF::LegacyClosedCaption)
</span><span class="cx"> ALLOW_DEPRECATED_DECLARATIONS_BEGIN
</span><del>- [m_avPlayer.get() setClosedCaptionDisplayEnabled:YES];
</del><ins>+ [m_avPlayer setClosedCaptionDisplayEnabled:YES];
</ins><span class="cx"> ALLOW_DEPRECATED_DECLARATIONS_END
</span><span class="cx"> #if ENABLE(AVF_CAPTIONS)
</span><span class="cx"> else if (track->textTrackCategory() == InbandTextTrackPrivateAVF::OutOfBand)
</span><del>- [m_avPlayerItem.get() selectMediaOption:static_cast<OutOfBandTextTrackPrivateAVF*>(track)->mediaSelectionOption() inMediaSelectionGroup:safeMediaSelectionGroupForLegibleMedia()];
</del><ins>+ [m_avPlayerItem selectMediaOption:static_cast<OutOfBandTextTrackPrivateAVF*>(track)->mediaSelectionOption() inMediaSelectionGroup:safeMediaSelectionGroupForLegibleMedia()];
</ins><span class="cx"> #endif
</span><span class="cx"> else
</span><del>- [m_avPlayerItem.get() selectMediaOption:static_cast<InbandTextTrackPrivateAVFObjC*>(track)->mediaSelectionOption() inMediaSelectionGroup:safeMediaSelectionGroupForLegibleMedia()];
</del><ins>+ [m_avPlayerItem selectMediaOption:static_cast<InbandTextTrackPrivateAVFObjC*>(track)->mediaSelectionOption() inMediaSelectionGroup:safeMediaSelectionGroupForLegibleMedia()];
</ins><span class="cx"> } else {
</span><del>- [m_avPlayerItem.get() selectMediaOption:0 inMediaSelectionGroup:safeMediaSelectionGroupForLegibleMedia()];
</del><ins>+ [m_avPlayerItem selectMediaOption:0 inMediaSelectionGroup:safeMediaSelectionGroupForLegibleMedia()];
</ins><span class="cx"> ALLOW_DEPRECATED_DECLARATIONS_BEGIN
</span><del>- [m_avPlayer.get() setClosedCaptionDisplayEnabled:NO];
</del><ins>+ [m_avPlayer setClosedCaptionDisplayEnabled:NO];
</ins><span class="cx"> ALLOW_DEPRECATED_DECLARATIONS_END
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2936,9 +2936,9 @@
</span><span class="cx"> return emptyString();
</span><span class="cx">
</span><span class="cx"> // If AVFoundation has an audible group, return the language of the currently selected audible option.
</span><del>- AVMediaSelectionGroup *audibleGroup = [m_avAsset.get() mediaSelectionGroupForMediaCharacteristic:AVMediaCharacteristicAudible];
</del><ins>+ AVMediaSelectionGroup *audibleGroup = [m_avAsset mediaSelectionGroupForMediaCharacteristic:AVMediaCharacteristicAudible];
</ins><span class="cx"> ALLOW_DEPRECATED_DECLARATIONS_BEGIN
</span><del>- AVMediaSelectionOption *currentlySelectedAudibleOption = [m_avPlayerItem.get() selectedMediaOptionInMediaSelectionGroup:audibleGroup];
</del><ins>+ AVMediaSelectionOption *currentlySelectedAudibleOption = [m_avPlayerItem selectedMediaOptionInMediaSelectionGroup:audibleGroup];
</ins><span class="cx"> ALLOW_DEPRECATED_DECLARATIONS_END
</span><span class="cx"> if (currentlySelectedAudibleOption) {
</span><span class="cx"> m_languageOfPrimaryAudioTrack = [[currentlySelectedAudibleOption locale] localeIdentifier];
</span><span class="lines">@@ -2949,7 +2949,7 @@
</span><span class="cx">
</span><span class="cx"> // AVFoundation synthesizes an audible group when there is only one ungrouped audio track if there is also a legible group (one or
</span><span class="cx"> // more in-band text tracks). It doesn't know about out-of-band tracks, so if there is a single audio track return its language.
</span><del>- NSArray *tracks = [m_avAsset.get() tracksWithMediaType:AVMediaTypeAudio];
</del><ins>+ NSArray *tracks = [m_avAsset tracksWithMediaType:AVMediaTypeAudio];
</ins><span class="cx"> if (!tracks || [tracks count] != 1) {
</span><span class="cx"> m_languageOfPrimaryAudioTrack = emptyString();
</span><span class="cx"> INFO_LOG(LOGIDENTIFIER, tracks ? [tracks count] : 0, " audio tracks, returning empty");
</span><span class="lines">@@ -3112,7 +3112,7 @@
</span><span class="cx"> if (!m_avPlayer)
</span><span class="cx"> return !m_allowsWirelessVideoPlayback;
</span><span class="cx">
</span><del>- m_allowsWirelessVideoPlayback = [m_avPlayer.get() allowsExternalPlayback];
</del><ins>+ m_allowsWirelessVideoPlayback = [m_avPlayer allowsExternalPlayback];
</ins><span class="cx"> INFO_LOG(LOGIDENTIFIER, !m_allowsWirelessVideoPlayback);
</span><span class="cx">
</span><span class="cx"> return !m_allowsWirelessVideoPlayback;
</span><span class="lines">@@ -3126,7 +3126,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> setDelayCallbacks(true);
</span><del>- [m_avPlayer.get() setAllowsExternalPlayback:!disabled];
</del><ins>+ [m_avPlayer setAllowsExternalPlayback:!disabled];
</ins><span class="cx"> setDelayCallbacks(false);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3163,7 +3163,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RetainPtr<AVOutputContext> currentContext = m_avPlayer.get().outputContext;
</span><del>- if ((!newContext && !currentContext.get()) || [currentContext.get() isEqual:newContext])
</del><ins>+ if ((!newContext && !currentContext.get()) || [currentContext isEqual:newContext])
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> setDelayCallbacks(true);
</span><span class="lines">@@ -3379,7 +3379,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_currentMetaData = metadata && ![metadata isKindOfClass:[NSNull class]] ? metadata : nil;
</span><span class="cx">
</span><del>- INFO_LOG(LOGIDENTIFIER, "adding ", m_currentMetaData ? [m_currentMetaData.get() count] : 0, " at time ", mediaTime);
</del><ins>+ INFO_LOG(LOGIDENTIFIER, "adding ", m_currentMetaData ? [m_currentMetaData count] : 0, " at time ", mediaTime);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DATACUE_VALUE)
</span><span class="cx"> if (seeking())
</span><span class="lines">@@ -3841,7 +3841,7 @@
</span><span class="cx"> player->logger().debug(player->logChannel(), identifier, "did change '", [keyPath UTF8String], "' to ", PAL::toMediaTime([newValue CMTimeValue]));
</span><span class="cx"> else {
</span><span class="cx"> RetainPtr<NSString> valueString = adoptNS([[NSString alloc] initWithFormat:@"%@", newValue]);
</span><del>- player->logger().debug(player->logChannel(), identifier, "did change '", [keyPath UTF8String], "' to ", [valueString.get() UTF8String]);
</del><ins>+ player->logger().debug(player->logChannel(), identifier, "did change '", [keyPath UTF8String], "' to ", [valueString UTF8String]);
</ins><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> player->logger().debug(player->logChannel(), identifier, willChange ? "will" : "did", " change '", [keyPath UTF8String], "'");
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcWebCoreAVFResourceLoadermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> if (m_dataURLMediaLoader || m_resourceMediaLoader || m_platformMediaLoader || !m_parent)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- NSURLRequest *nsRequest = [m_avRequest.get() request];
</del><ins>+ NSURLRequest *nsRequest = [m_avRequest request];
</ins><span class="cx">
</span><span class="cx"> ResourceRequest request(nsRequest);
</span><span class="cx"> request.setPriority(ResourceLoadPriority::Low);
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LOG_ERROR("Failed to start load for media at url %s", [[[nsRequest URL] absoluteString] UTF8String]);
</span><del>- [m_avRequest.get() finishLoadingWithError:0];
</del><ins>+ [m_avRequest finishLoadingWithError:0];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebCoreAVFResourceLoader::stopLoading()
</span><span class="lines">@@ -346,7 +346,7 @@
</span><span class="cx"> {
</span><span class="cx"> int status = response.httpStatusCode();
</span><span class="cx"> if (status && (status < 200 || status > 299)) {
</span><del>- [m_avRequest.get() finishLoadingWithError:0];
</del><ins>+ [m_avRequest finishLoadingWithError:0];
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -354,7 +354,7 @@
</span><span class="cx"> if (contentRange.isValid())
</span><span class="cx"> m_responseOffset = static_cast<NSUInteger>(contentRange.firstBytePosition());
</span><span class="cx">
</span><del>- if (AVAssetResourceLoadingContentInformationRequest* contentInfo = [m_avRequest.get() contentInformationRequest]) {
</del><ins>+ if (AVAssetResourceLoadingContentInformationRequest* contentInfo = [m_avRequest contentInformationRequest]) {
</ins><span class="cx"> String uti = UTIFromMIMEType(response.mimeType());
</span><span class="cx">
</span><span class="cx"> [contentInfo setContentType:uti];
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> [contentInfo setEntireLengthAvailableOnDemand:YES];
</span><span class="cx">
</span><span class="cx"> if (![m_avRequest dataRequest]) {
</span><del>- [m_avRequest.get() finishLoading];
</del><ins>+ [m_avRequest finishLoading];
</ins><span class="cx"> stopLoading();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -376,16 +376,16 @@
</span><span class="cx"> {
</span><span class="cx"> // <rdar://problem/13987417> Set the contentType of the contentInformationRequest to an empty
</span><span class="cx"> // string to trigger AVAsset's playable value to complete loading.
</span><del>- if ([m_avRequest.get() contentInformationRequest] && ![[m_avRequest.get() contentInformationRequest] contentType])
- [[m_avRequest.get() contentInformationRequest] setContentType:@""];
</del><ins>+ if ([m_avRequest contentInformationRequest] && ![[m_avRequest contentInformationRequest] contentType])
+ [[m_avRequest contentInformationRequest] setContentType:@""];
</ins><span class="cx">
</span><del>- [m_avRequest.get() finishLoadingWithError:error.nsError()];
</del><ins>+ [m_avRequest finishLoadingWithError:error.nsError()];
</ins><span class="cx"> stopLoading();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebCoreAVFResourceLoader::loadFinished()
</span><span class="cx"> {
</span><del>- [m_avRequest.get() finishLoading];
</del><ins>+ [m_avRequest finishLoading];
</ins><span class="cx"> stopLoading();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (dataRequest.currentOffset + dataRequest.requestedLength >= dataRequest.requestedOffset) {
</span><del>- [m_avRequest.get() finishLoading];
</del><ins>+ [m_avRequest finishLoading];
</ins><span class="cx"> stopLoading();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaTextTrackRepresentationCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -117,35 +117,35 @@
</span><span class="cx"> , m_layer(adoptNS([[CALayer alloc] init]))
</span><span class="cx"> , m_delegate(adoptNS([[WebCoreTextTrackRepresentationCocoaHelper alloc] initWithParent:this]))
</span><span class="cx"> {
</span><del>- [m_layer.get() setDelegate:m_delegate.get()];
- [m_layer.get() setContentsGravity:kCAGravityBottom];
</del><ins>+ [m_layer setDelegate:m_delegate.get()];
+ [m_layer setContentsGravity:kCAGravityBottom];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextTrackRepresentationCocoa::~TextTrackRepresentationCocoa()
</span><span class="cx"> {
</span><del>- [m_layer.get() setDelegate:nil];
- [m_delegate.get() setParent:nullptr];
</del><ins>+ [m_layer setDelegate:nil];
+ [m_delegate setParent:nullptr];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextTrackRepresentationCocoa::update()
</span><span class="cx"> {
</span><span class="cx"> if (auto representation = m_client.createTextTrackRepresentationImage())
</span><del>- [m_layer.get() setContents:(__bridge id)representation->nativeImage()->platformImage().get()];
</del><ins>+ [m_layer setContents:(__bridge id)representation->nativeImage()->platformImage().get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextTrackRepresentationCocoa::setContentScale(float scale)
</span><span class="cx"> {
</span><del>- [m_layer.get() setContentsScale:scale];
</del><ins>+ [m_layer setContentsScale:scale];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextTrackRepresentationCocoa::setHidden(bool hidden) const
</span><span class="cx"> {
</span><del>- [m_layer.get() setHidden:hidden];
</del><ins>+ [m_layer setHidden:hidden];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect TextTrackRepresentationCocoa::bounds() const
</span><span class="cx"> {
</span><del>- return enclosingIntRect(FloatRect([m_layer.get() bounds]));
</del><ins>+ return enclosingIntRect(FloatRect([m_layer bounds]));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextTrackRepresentationCocoa::boundsChanged()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosDragImageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/DragImageIOS.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/DragImageIOS.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/ios/DragImageIOS.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> CGRect imageRect = { CGPointZero, imageSize };
</span><span class="cx">
</span><span class="cx"> RetainPtr<UIGraphicsImageRenderer> render = adoptNS([PAL::allocUIGraphicsImageRendererInstance() initWithSize:imageSize]);
</span><del>- UIImage *imageCopy = [render.get() imageWithActions:^(UIGraphicsImageRendererContext *rendererContext) {
</del><ins>+ UIImage *imageCopy = [render imageWithActions:^(UIGraphicsImageRendererContext *rendererContext) {
</ins><span class="cx"> CGContextRef context = rendererContext.CGContext;
</span><span class="cx"> CGContextTranslateCTM(context, 0, imageSize.height);
</span><span class="cx"> CGContextScaleCTM(context, 1, -1);
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RetainPtr<UIGraphicsImageRenderer> render = adoptNS([PAL::allocUIGraphicsImageRendererInstance() initWithSize:imageSize]);
</span><del>- UIImage *imageCopy = [render.get() imageWithActions:^(UIGraphicsImageRendererContext *rendererContext) {
</del><ins>+ UIImage *imageCopy = [render imageWithActions:^(UIGraphicsImageRendererContext *rendererContext) {
</ins><span class="cx"> GraphicsContextCG context(rendererContext.CGContext);
</span><span class="cx"> context.translate(0, imageSize.height);
</span><span class="cx"> context.scale({ adjustedImageScale, -adjustedImageScale });
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> auto& image = *textIndicator->contentImage();
</span><span class="cx"> auto render = adoptNS([PAL::allocUIGraphicsImageRendererInstance() initWithSize:image.size()]);
</span><del>- UIImage *finalImage = [render.get() imageWithActions:[&image](UIGraphicsImageRendererContext *rendererContext) {
</del><ins>+ UIImage *finalImage = [render imageWithActions:[&image](UIGraphicsImageRendererContext *rendererContext) {
</ins><span class="cx"> GraphicsContextCG context(rendererContext.CGContext);
</span><span class="cx"> context.drawImage(image, FloatPoint());
</span><span class="cx"> }];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileCache.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileCache.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/ios/LegacyTileCache.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">
</span><span class="cx"> LegacyTileCache::~LegacyTileCache()
</span><span class="cx"> {
</span><del>- [m_tombstone.get() setDead:true];
</del><ins>+ [m_tombstone setDead:true];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CGFloat LegacyTileCache::screenScale() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileLayerPoolmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileLayerPool.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileLayerPool.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/ios/LegacyTileLayerPool.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -72,8 +72,8 @@
</span><span class="cx">
</span><span class="cx"> void LegacyTileLayerPool::addLayer(const RetainPtr<LegacyTileLayer>& layer)
</span><span class="cx"> {
</span><del>- IntSize layerSize([layer.get() frame].size);
- layerSize.scale([layer.get() contentsScale]);
</del><ins>+ IntSize layerSize([layer frame].size);
+ layerSize.scale([layer contentsScale]);
</ins><span class="cx"> if (!canReuseLayerWithSize(layerSize))
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPlatformPasteboardIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -758,7 +758,7 @@
</span><span class="cx">
</span><span class="cx"> if (![pasteboardItem count])
</span><span class="cx"> return nullptr;
</span><del>- return SharedBuffer::create([pasteboardItem.get() objectAtIndex:0]);
</del><ins>+ return SharedBuffer::create([pasteboardItem objectAtIndex:0]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String PlatformPasteboard::readString(size_t index, const String& type) const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPlatformSpeechSynthesizerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -284,12 +284,12 @@
</span><span class="cx">
</span><span class="cx"> void PlatformSpeechSynthesizer::pause()
</span><span class="cx"> {
</span><del>- [m_platformSpeechWrapper.get() pause];
</del><ins>+ [m_platformSpeechWrapper pause];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformSpeechSynthesizer::resume()
</span><span class="cx"> {
</span><del>- [m_platformSpeechWrapper.get() resume];
</del><ins>+ [m_platformSpeechWrapper resume];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformSpeechSynthesizer::speak(RefPtr<PlatformSpeechSynthesisUtterance>&& utterance)
</span><span class="lines">@@ -297,17 +297,17 @@
</span><span class="cx"> if (!m_platformSpeechWrapper)
</span><span class="cx"> m_platformSpeechWrapper = adoptNS([[WebSpeechSynthesisWrapper alloc] initWithSpeechSynthesizer:this]);
</span><span class="cx">
</span><del>- [m_platformSpeechWrapper.get() speakUtterance:utterance.get()];
</del><ins>+ [m_platformSpeechWrapper speakUtterance:utterance.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformSpeechSynthesizer::cancel()
</span><span class="cx"> {
</span><del>- [m_platformSpeechWrapper.get() cancel];
</del><ins>+ [m_platformSpeechWrapper cancel];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformSpeechSynthesizer::resetState()
</span><span class="cx"> {
</span><del>- [m_platformSpeechWrapper.get() cancel];
</del><ins>+ [m_platformSpeechWrapper cancel];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> videoGravity = AVLayerVideoGravityResizeAspect;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if ([_videoGravity.get() isEqualToString:videoGravity])
</del><ins>+ if ([_videoGravity isEqualToString:videoGravity])
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> _previousVideoGravity = _videoGravity;
</span><span class="lines">@@ -647,7 +647,7 @@
</span><span class="cx"> completionHandler(YES, nil);
</span><span class="cx"> }];
</span><span class="cx"> #else
</span><del>- [_avPlayerViewController.get() enterFullScreenAnimated:animated completionHandler:completionHandler];
</del><ins>+ [_avPlayerViewController enterFullScreenAnimated:animated completionHandler:completionHandler];
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -663,7 +663,7 @@
</span><span class="cx"> completionHandler(YES, nil);
</span><span class="cx"> }];
</span><span class="cx"> #else
</span><del>- [_avPlayerViewController.get() exitFullScreenAnimated:animated completionHandler:completionHandler];
</del><ins>+ [_avPlayerViewController exitFullScreenAnimated:animated completionHandler:completionHandler];
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -704,7 +704,7 @@
</span><span class="cx"> #if PLATFORM(WATCHOS)
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> #else
</span><del>- [_avPlayerViewController.get() startPictureInPicture];
</del><ins>+ [_avPlayerViewController startPictureInPicture];
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -713,7 +713,7 @@
</span><span class="cx"> #if PLATFORM(WATCHOS)
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> #else
</span><del>- [_avPlayerViewController.get() stopPictureInPicture];
</del><ins>+ [_avPlayerViewController stopPictureInPicture];
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -807,7 +807,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)removeFromParentViewController
</span><span class="cx"> {
</span><del>- [_avPlayerViewController.get() removeFromParentViewController];
</del><ins>+ [_avPlayerViewController removeFromParentViewController];
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPlatformPasteboardMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -65,12 +65,12 @@
</span><span class="cx">
</span><span class="cx"> void PlatformPasteboard::getTypes(Vector<String>& types)
</span><span class="cx"> {
</span><del>- types = makeVector<String>([m_pasteboard.get() types]);
</del><ins>+ types = makeVector<String>([m_pasteboard types]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<SharedBuffer> PlatformPasteboard::bufferForType(const String& pasteboardType)
</span><span class="cx"> {
</span><del>- NSData *data = [m_pasteboard.get() dataForType:pasteboardType];
</del><ins>+ NSData *data = [m_pasteboard dataForType:pasteboardType];
</ins><span class="cx"> if (!data)
</span><span class="cx"> return nullptr;
</span><span class="cx"> return SharedBuffer::create(adoptNS([data copy]).get());
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> void PlatformPasteboard::getPathnamesForType(Vector<String>& pathnames, const String& pasteboardType) const
</span><span class="cx"> {
</span><del>- id paths = [m_pasteboard.get() propertyListForType:pasteboardType];
</del><ins>+ id paths = [m_pasteboard propertyListForType:pasteboardType];
</ins><span class="cx"> if ([paths isKindOfClass:[NSString class]]) {
</span><span class="cx"> pathnames.append((NSString *)paths);
</span><span class="cx"> return;
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx">
</span><span class="cx"> int64_t PlatformPasteboard::changeCount() const
</span><span class="cx"> {
</span><del>- return [m_pasteboard.get() changeCount];
</del><ins>+ return [m_pasteboard changeCount];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String PlatformPasteboard::platformPasteboardTypeForSafeTypeForDOMToReadAndWrite(const String& domType, IncludeImageTypes includeImageTypes)
</span><span class="lines">@@ -318,10 +318,10 @@
</span><span class="cx"> NSPasteboard* pasteboard = [NSPasteboard pasteboardWithName:fromPasteboard];
</span><span class="cx"> NSArray* types = [pasteboard types];
</span><span class="cx">
</span><del>- [m_pasteboard.get() addTypes:types owner:nil];
</del><ins>+ [m_pasteboard addTypes:types owner:nil];
</ins><span class="cx"> for (NSUInteger i = 0; i < [types count]; i++) {
</span><span class="cx"> NSString* type = [types objectAtIndex:i];
</span><del>- if (![m_pasteboard.get() setData:[pasteboard dataForType:type] forType:type])
</del><ins>+ if (![m_pasteboard setData:[pasteboard dataForType:type] forType:type])
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> return changeCount();
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx">
</span><span class="cx"> int64_t PlatformPasteboard::addTypes(const Vector<String>& pasteboardTypes)
</span><span class="cx"> {
</span><del>- return [m_pasteboard.get() addTypes:createNSArray(pasteboardTypes).get() owner:nil];
</del><ins>+ return [m_pasteboard addTypes:createNSArray(pasteboardTypes).get() owner:nil];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int64_t PlatformPasteboard::setTypes(const Vector<String>& pasteboardTypes)
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx">
</span><span class="cx"> NSArray *urlWithTitle = @[ @[ urlString ], @[ pasteboardURL.title ] ];
</span><span class="cx"> NSString *pasteboardType = [NSString stringWithUTF8String:WebURLsWithTitlesPboardType];
</span><del>- BOOL didWriteData = [m_pasteboard.get() setPropertyList:urlWithTitle forType:pasteboardType];
</del><ins>+ BOOL didWriteData = [m_pasteboard setPropertyList:urlWithTitle forType:pasteboardType];
</ins><span class="cx"> if (!didWriteData)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -384,35 +384,35 @@
</span><span class="cx"> if (pasteboardType == String(legacyURLPasteboardType())) {
</span><span class="cx"> // We cannot just use -NSPasteboard writeObjects:], because -declareTypes has been already called, implicitly creating an item.
</span><span class="cx"> NSURL *url = [NSURL URLWithString:string];
</span><del>- if ([[m_pasteboard.get() types] containsObject:legacyURLPasteboardType()]) {
</del><ins>+ if ([[m_pasteboard types] containsObject:legacyURLPasteboardType()]) {
</ins><span class="cx"> NSURL *base = [url baseURL];
</span><span class="cx"> if (base)
</span><del>- didWriteData = [m_pasteboard.get() setPropertyList:@[[url relativeString], [base absoluteString]] forType:legacyURLPasteboardType()];
</del><ins>+ didWriteData = [m_pasteboard setPropertyList:@[[url relativeString], [base absoluteString]] forType:legacyURLPasteboardType()];
</ins><span class="cx"> else if (url)
</span><del>- didWriteData = [m_pasteboard.get() setPropertyList:@[[url absoluteString], @""] forType:legacyURLPasteboardType()];
</del><ins>+ didWriteData = [m_pasteboard setPropertyList:@[[url absoluteString], @""] forType:legacyURLPasteboardType()];
</ins><span class="cx"> else
</span><del>- didWriteData = [m_pasteboard.get() setPropertyList:@[@"", @""] forType:legacyURLPasteboardType()];
</del><ins>+ didWriteData = [m_pasteboard setPropertyList:@[@"", @""] forType:legacyURLPasteboardType()];
</ins><span class="cx">
</span><span class="cx"> if (!didWriteData)
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- if ([[m_pasteboard.get() types] containsObject:(NSString *)kUTTypeURL]) {
- didWriteData = [m_pasteboard.get() setString:[url absoluteString] forType:(NSString *)kUTTypeURL];
</del><ins>+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
+ if ([[m_pasteboard types] containsObject:(NSString *)kUTTypeURL]) {
+ didWriteData = [m_pasteboard setString:[url absoluteString] forType:(NSString *)kUTTypeURL];
</ins><span class="cx"> if (!didWriteData)
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ([[m_pasteboard.get() types] containsObject:(NSString *)kUTTypeFileURL] && [url isFileURL]) {
- didWriteData = [m_pasteboard.get() setString:[url absoluteString] forType:(NSString *)kUTTypeFileURL];
</del><ins>+ if ([[m_pasteboard types] containsObject:(NSString *)kUTTypeFileURL] && [url isFileURL]) {
+ didWriteData = [m_pasteboard setString:[url absoluteString] forType:(NSString *)kUTTypeFileURL];
</ins><span class="cx"> if (!didWriteData)
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><del>-ALLOW_DEPRECATED_DECLARATIONS_END
</del><ins>+ ALLOW_DEPRECATED_DECLARATIONS_END
</ins><span class="cx">
</span><span class="cx"> } else {
</span><del>- didWriteData = [m_pasteboard.get() setString:string forType:pasteboardType];
</del><ins>+ didWriteData = [m_pasteboard setString:string forType:pasteboardType];
</ins><span class="cx"> if (!didWriteData)
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPlatformSpeechSynthesizerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx">
</span><span class="cx"> PlatformSpeechSynthesizer::~PlatformSpeechSynthesizer()
</span><span class="cx"> {
</span><del>- [m_platformSpeechWrapper.get() invalidate];
</del><ins>+ [m_platformSpeechWrapper invalidate];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static RetainPtr<CFArrayRef> speechSynthesisGetVoiceIdentifiers()
</span><span class="lines">@@ -258,12 +258,12 @@
</span><span class="cx">
</span><span class="cx"> void PlatformSpeechSynthesizer::pause()
</span><span class="cx"> {
</span><del>- [m_platformSpeechWrapper.get() pause];
</del><ins>+ [m_platformSpeechWrapper pause];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformSpeechSynthesizer::resume()
</span><span class="cx"> {
</span><del>- [m_platformSpeechWrapper.get() resume];
</del><ins>+ [m_platformSpeechWrapper resume];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformSpeechSynthesizer::speak(RefPtr<PlatformSpeechSynthesisUtterance>&& utterance)
</span><span class="lines">@@ -271,17 +271,17 @@
</span><span class="cx"> if (!m_platformSpeechWrapper)
</span><span class="cx"> m_platformSpeechWrapper = adoptNS([[WebSpeechSynthesisWrapper alloc] initWithSpeechSynthesizer:this]);
</span><span class="cx">
</span><del>- [m_platformSpeechWrapper.get() speakUtterance:utterance.get()];
</del><ins>+ [m_platformSpeechWrapper speakUtterance:utterance.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformSpeechSynthesizer::cancel()
</span><span class="cx"> {
</span><del>- [m_platformSpeechWrapper.get() cancel];
</del><ins>+ [m_platformSpeechWrapper cancel];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformSpeechSynthesizer::resetState()
</span><span class="cx"> {
</span><del>- [m_platformSpeechWrapper.get() cancel];
</del><ins>+ [m_platformSpeechWrapper cancel];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacSerializedPlatformDataCueMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/SerializedPlatformDataCueMac.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/SerializedPlatformDataCueMac.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/mac/SerializedPlatformDataCueMac.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> if (!m_nativeValue || !otherObjC->nativeValue())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return [m_nativeValue.get() isEqual:otherObjC->nativeValue()];
</del><ins>+ return [m_nativeValue isEqual:otherObjC->nativeValue()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SerializedPlatformDataCueMac* toSerializedPlatformDataCueMac(SerializedPlatformDataCue* rep)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">
</span><span class="cx"> SerializedPlatformDataCueValue SerializedPlatformDataCueMac::encodableValue() const
</span><span class="cx"> {
</span><del>- if ([m_nativeValue.get() isKindOfClass:PAL::getAVMetadataItemClass()])
</del><ins>+ if ([m_nativeValue isKindOfClass:PAL::getAVMetadataItemClass()])
</ins><span class="cx"> return { SerializedPlatformDataCueValue::PlatformType::ObjC, NSDictionaryWithAVMetadataItem(m_nativeValue.get()).get() };
</span><span class="cx">
</span><span class="cx"> return { SerializedPlatformDataCueValue::PlatformType::ObjC, m_nativeValue.get() };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreFullScreenPlaceholderViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> _exitWarning.get().textColor = [NSColor tertiaryLabelColor];
</span><span class="cx"> [_exitWarning sizeToFit];
</span><span class="cx">
</span><del>- NSRect warningFrame = [_exitWarning.get() frame];
</del><ins>+ NSRect warningFrame = [_exitWarning frame];
</ins><span class="cx"> warningFrame.origin = NSMakePoint((frameRect.size.width - warningFrame.size.width) / 2, frameRect.size.height / 2);
</span><span class="cx"> _exitWarning.get().frame = warningFrame;
</span><span class="cx"> [_effectView addSubview:_exitWarning.get()];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreFullScreenWarningViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreFullScreenWarningView.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreFullScreenWarningView.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/mac/WebCoreFullScreenWarningView.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -58,10 +58,10 @@
</span><span class="cx"> [self setTitlePosition:NSNoTitle];
</span><span class="cx">
</span><span class="cx"> _textField = adoptNS([[NSTextField alloc] initWithFrame:NSZeroRect]);
</span><del>- [_textField.get() setEditable:NO];
- [_textField.get() setSelectable:NO];
- [_textField.get() setBordered:NO];
- [_textField.get() setDrawsBackground:NO];
</del><ins>+ [_textField setEditable:NO];
+ [_textField setSelectable:NO];
+ [_textField setBordered:NO];
+ [_textField setDrawsBackground:NO];
</ins><span class="cx">
</span><span class="cx"> NSFont* textFont = [NSFont boldSystemFontOfSize:WarningViewTextSize];
</span><span class="cx"> NSColor* textColor = [NSColor colorWithCalibratedWhite:WarningViewTextWhite alpha:WarningViewTextAlpha];
</span><span class="lines">@@ -70,9 +70,9 @@
</span><span class="cx"> textColor, NSForegroundColorAttributeName,
</span><span class="cx"> nil]);
</span><span class="cx"> RetainPtr<NSAttributedString> text = adoptNS([[NSAttributedString alloc] initWithString:title attributes:attributes.get()]);
</span><del>- [_textField.get() setAttributedStringValue:text.get()];
- [_textField.get() sizeToFit];
- NSRect textFieldFrame = [_textField.get() frame];
</del><ins>+ [_textField setAttributedStringValue:text.get()];
+ [_textField sizeToFit];
+ NSRect textFieldFrame = [_textField frame];
</ins><span class="cx"> NSSize frameSize = textFieldFrame.size;
</span><span class="cx"> frameSize.width += WarningViewPadding * 2;
</span><span class="cx"> frameSize.height += WarningViewPadding * 2;
</span><span class="lines">@@ -83,9 +83,9 @@
</span><span class="cx"> (frameSize.height - textFieldFrame.size.height) / 2);
</span><span class="cx">
</span><span class="cx"> // Offset the origin by the font's descender, to center the text field about the baseline:
</span><del>- textFieldFrame.origin.y += [[_textField.get() font] descender];
</del><ins>+ textFieldFrame.origin.y += [[_textField font] descender];
</ins><span class="cx">
</span><del>- [_textField.get() setFrame:NSIntegralRect(textFieldFrame)];
</del><ins>+ [_textField setFrame:NSIntegralRect(textFieldFrame)];
</ins><span class="cx"> [self addSubview:_textField.get()];
</span><span class="cx">
</span><span class="cx"> NSColor* backgroundColor = [NSColor colorWithCalibratedWhite:WarningViewBackgroundWhite alpha:WarningViewBackgroundAlpha];
</span><span class="lines">@@ -97,9 +97,9 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSShadow> shadow = adoptNS([[NSShadow alloc] init]);
</span><span class="cx"> RetainPtr<NSColor> shadowColor = [NSColor colorWithCalibratedWhite:WarningViewShadowWhite alpha:WarningViewShadowAlpha];
</span><del>- [shadow.get() setShadowColor:shadowColor.get()];
- [shadow.get() setShadowOffset:WarningViewShadowOffset];
- [shadow.get() setShadowBlurRadius:WarningViewShadowRadius];
</del><ins>+ [shadow setShadowColor:shadowColor.get()];
+ [shadow setShadowOffset:WarningViewShadowOffset];
+ [shadow setShadowBlurRadius:WarningViewShadowRadius];
</ins><span class="cx"> [self setShadow:shadow.get()];
</span><span class="cx">
</span><span class="cx"> return self;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediarecordercocoaMediaRecorderPrivateWriterCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_writerDelegate = adoptNS([[WebAVAssetWriterDelegate alloc] initWithWriter: *this]);
</span><del>- [m_writer.get() setDelegate:m_writerDelegate.get()];
</del><ins>+ [m_writer setDelegate:m_writerDelegate.get()];
</ins><span class="cx">
</span><span class="cx"> if (m_hasAudio) {
</span><span class="cx"> m_audioCompressor = AudioSampleBufferCompressor::create(compressedAudioOutputBufferCallback, this);
</span><span class="lines">@@ -219,29 +219,29 @@
</span><span class="cx"> if (m_videoTransform)
</span><span class="cx"> m_videoAssetWriterInput.get().transform = *m_videoTransform;
</span><span class="cx">
</span><del>- if (![m_writer.get() canAddInput:m_videoAssetWriterInput.get()]) {
</del><ins>+ if (![m_writer canAddInput:m_videoAssetWriterInput.get()]) {
</ins><span class="cx"> RELEASE_LOG_ERROR(MediaStream, "MediaRecorderPrivateWriter::startAssetWriter failed canAddInput for video");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- [m_writer.get() addInput:m_videoAssetWriterInput.get()];
</del><ins>+ [m_writer addInput:m_videoAssetWriterInput.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_hasAudio) {
</span><span class="cx"> m_audioAssetWriterInput = adoptNS([PAL::allocAVAssetWriterInputInstance() initWithMediaType:AVMediaTypeAudio outputSettings:nil sourceFormatHint:m_audioFormatDescription.get()]);
</span><span class="cx"> [m_audioAssetWriterInput setExpectsMediaDataInRealTime:true];
</span><del>- if (![m_writer.get() canAddInput:m_audioAssetWriterInput.get()]) {
</del><ins>+ if (![m_writer canAddInput:m_audioAssetWriterInput.get()]) {
</ins><span class="cx"> RELEASE_LOG_ERROR(MediaStream, "MediaRecorderPrivateWriter::startAssetWriter failed canAddInput for audio");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- [m_writer.get() addInput:m_audioAssetWriterInput.get()];
</del><ins>+ [m_writer addInput:m_audioAssetWriterInput.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (![m_writer.get() startWriting]) {
</del><ins>+ if (![m_writer startWriting]) {
</ins><span class="cx"> RELEASE_LOG_ERROR(MediaStream, "MediaRecorderPrivateWriter::startAssetWriter failed startWriting");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- [m_writer.get() startSessionAtSourceTime:PAL::kCMTimeZero];
</del><ins>+ [m_writer startSessionAtSourceTime:PAL::kCMTimeZero];
</ins><span class="cx">
</span><span class="cx"> appendCompressedSampleBuffers();
</span><span class="cx">
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> while (!m_pendingAudioSampleQueue.isEmpty() && [m_audioAssetWriterInput isReadyForMoreMediaData])
</span><del>- [m_audioAssetWriterInput.get() appendSampleBuffer:m_pendingAudioSampleQueue.takeFirst().get()];
</del><ins>+ [m_audioAssetWriterInput appendSampleBuffer:m_pendingAudioSampleQueue.takeFirst().get()];
</ins><span class="cx">
</span><span class="cx"> if (![m_audioAssetWriterInput isReadyForMoreMediaData]) {
</span><span class="cx"> m_pendingAudioSampleQueue.append(WTFMove(buffer));
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- [m_audioAssetWriterInput.get() appendSampleBuffer:buffer.get()];
</del><ins>+ [m_audioAssetWriterInput appendSampleBuffer:buffer.get()];
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> m_lastVideoDecodingTime = PAL::CMSampleBufferGetDecodeTimeStamp(buffer);
</span><span class="cx"> m_hasEncodedVideoSamples = true;
</span><span class="cx">
</span><del>- [m_videoAssetWriterInput.get() appendSampleBuffer:buffer];
</del><ins>+ [m_videoAssetWriterInput appendSampleBuffer:buffer];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaRecorderPrivateWriter::appendCompressedSampleBuffers()
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> while (!audioSampleQueue.isEmpty() && [m_audioAssetWriterInput isReadyForMoreMediaData])
</span><del>- [m_audioAssetWriterInput.get() appendSampleBuffer:audioSampleQueue.takeFirst().get()];
</del><ins>+ [m_audioAssetWriterInput appendSampleBuffer:audioSampleQueue.takeFirst().get()];
</ins><span class="cx">
</span><span class="cx"> while (!videoSampleQueue.isEmpty() && [m_videoAssetWriterInput isReadyForMoreMediaData])
</span><span class="cx"> appendCompressedVideoSampleBuffer(videoSampleQueue.takeFirst().get());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -112,11 +112,11 @@
</span><span class="cx"> if (![device hasMediaType:AVMediaTypeVideo] && ![device hasMediaType:AVMediaTypeMuxed])
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- if ([m_avCaptureDevices.get() containsObject:device])
</del><ins>+ if ([m_avCaptureDevices containsObject:device])
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> [device addObserver:m_objcObserver.get() forKeyPath:@"suspended" options:NSKeyValueObservingOptionNew context:(void *)nil];
</span><del>- [m_avCaptureDevices.get() addObject:device];
</del><ins>+ [m_avCaptureDevices addObject:device];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> , m_device(device)
</span><span class="cx"> , m_verifyCapturingTimer(*this, &AVVideoCaptureSource::verifyIsCapturing)
</span><span class="cx"> {
</span><del>- [m_device.get() addObserver:m_objcObserver.get() forKeyPath:@"suspended" options:NSKeyValueObservingOptionNew context:(void *)nil];
</del><ins>+ [m_device addObserver:m_objcObserver.get() forKeyPath:@"suspended" options:NSKeyValueObservingOptionNew context:(void *)nil];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AVVideoCaptureSource::~AVVideoCaptureSource()
</span><span class="lines">@@ -727,7 +727,7 @@
</span><span class="cx"> if (m_callback->loggerPtr()) {
</span><span class="cx"> auto identifier = Logger::LogSiteIdentifier("AVVideoCaptureSource", "observeValueForKeyPath", m_callback->logIdentifier());
</span><span class="cx"> RetainPtr<NSString> valueString = adoptNS([[NSString alloc] initWithFormat:@"%@", newValue]);
</span><del>- m_callback->logger().logAlways(m_callback->logChannel(), identifier, willChange ? "will" : "did", " change '", [keyPath UTF8String], "' to ", [valueString.get() UTF8String]);
</del><ins>+ m_callback->logger().logAlways(m_callback->logChannel(), identifier, willChange ? "will" : "did", " change '", [keyPath UTF8String], "' to ", [valueString UTF8String]);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaResourceRequestCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -83,21 +83,21 @@
</span><span class="cx">
</span><span class="cx"> void ResourceRequest::doUpdateResourceRequest()
</span><span class="cx"> {
</span><del>- m_url = [m_nsRequest.get() URL];
</del><ins>+ m_url = [m_nsRequest URL];
</ins><span class="cx">
</span><span class="cx"> if (m_cachePolicy == ResourceRequestCachePolicy::UseProtocolCachePolicy)
</span><del>- m_cachePolicy = fromPlatformRequestCachePolicy([m_nsRequest.get() cachePolicy]);
- m_timeoutInterval = [m_nsRequest.get() timeoutInterval];
- m_firstPartyForCookies = [m_nsRequest.get() mainDocumentURL];
</del><ins>+ m_cachePolicy = fromPlatformRequestCachePolicy([m_nsRequest cachePolicy]);
+ m_timeoutInterval = [m_nsRequest timeoutInterval];
+ m_firstPartyForCookies = [m_nsRequest mainDocumentURL];
</ins><span class="cx">
</span><del>- URL siteForCookies { [m_nsRequest.get() _propertyForKey:@"_kCFHTTPCookiePolicyPropertySiteForCookies"] };
</del><ins>+ URL siteForCookies { [m_nsRequest _propertyForKey:@"_kCFHTTPCookiePolicyPropertySiteForCookies"] };
</ins><span class="cx"> m_sameSiteDisposition = siteForCookies.isNull() ? SameSiteDisposition::Unspecified : (areRegistrableDomainsEqual(siteForCookies, m_url) ? SameSiteDisposition::SameSite : SameSiteDisposition::CrossSite);
</span><span class="cx">
</span><del>- m_isTopSite = static_cast<NSNumber*>([m_nsRequest.get() _propertyForKey:@"_kCFHTTPCookiePolicyPropertyIsTopLevelNavigation"]).boolValue;
</del><ins>+ m_isTopSite = static_cast<NSNumber*>([m_nsRequest _propertyForKey:@"_kCFHTTPCookiePolicyPropertyIsTopLevelNavigation"]).boolValue;
</ins><span class="cx">
</span><del>- if (NSString* method = [m_nsRequest.get() HTTPMethod])
</del><ins>+ if (NSString* method = [m_nsRequest HTTPMethod])
</ins><span class="cx"> m_httpMethod = method;
</span><del>- m_allowCookies = [m_nsRequest.get() HTTPShouldHandleCookies];
</del><ins>+ m_allowCookies = [m_nsRequest HTTPShouldHandleCookies];
</ins><span class="cx">
</span><span class="cx"> if (resourcePrioritiesEnabled())
</span><span class="cx"> m_priority = toResourceLoadPriority(m_nsRequest ? CFURLRequestGetRequestPriority([m_nsRequest _CFURLRequest]) : 0);
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> }];
</span><span class="cx">
</span><span class="cx"> m_responseContentDispositionEncodingFallbackArray.clear();
</span><del>- NSArray *encodingFallbacks = [m_nsRequest.get() contentDispositionEncodingFallbackArray];
</del><ins>+ NSArray *encodingFallbacks = [m_nsRequest contentDispositionEncodingFallbackArray];
</ins><span class="cx"> m_responseContentDispositionEncodingFallbackArray.reserveCapacity([encodingFallbacks count]);
</span><span class="cx"> for (NSNumber *encodingFallback in [m_nsRequest contentDispositionEncodingFallbackArray]) {
</span><span class="cx"> CFStringEncoding encoding = CFStringConvertNSStringEncodingToEncoding([encodingFallback unsignedLongValue]);
</span><span class="lines">@@ -125,9 +125,9 @@
</span><span class="cx">
</span><span class="cx"> void ResourceRequest::doUpdateResourceHTTPBody()
</span><span class="cx"> {
</span><del>- if (NSData* bodyData = [m_nsRequest.get() HTTPBody])
</del><ins>+ if (NSData* bodyData = [m_nsRequest HTTPBody])
</ins><span class="cx"> m_httpBody = FormData::create([bodyData bytes], [bodyData length]);
</span><del>- else if (NSInputStream* bodyStream = [m_nsRequest.get() HTTPBodyStream]) {
</del><ins>+ else if (NSInputStream* bodyStream = [m_nsRequest HTTPBodyStream]) {
</ins><span class="cx"> FormData* formData = httpBodyFromStream(bodyStream);
</span><span class="cx"> // There is no FormData object if a client provided a custom data stream.
</span><span class="cx"> // We shouldn't be looking at http body after client callbacks.
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto nsRequest = adoptNS([m_nsRequest.get() mutableCopy]);
</del><ins>+ auto nsRequest = adoptNS([m_nsRequest mutableCopy]);
</ins><span class="cx">
</span><span class="cx"> if (nsRequest)
</span><span class="cx"> [nsRequest setURL:url()];
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto nsRequest = adoptNS([m_nsRequest.get() mutableCopy]);
</del><ins>+ auto nsRequest = adoptNS([m_nsRequest mutableCopy]);
</ins><span class="cx">
</span><span class="cx"> if (nsRequest)
</span><span class="cx"> [nsRequest setURL:url()];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaResourceResponseCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> m_nsResponse = adoptNS([[NSHTTPURLResponse alloc] initWithURL:m_url statusCode:m_httpStatusCode HTTPVersion:(NSString*)kCFHTTPVersion1_1 headerFields:headerDictionary]);
</span><span class="cx">
</span><span class="cx"> // Mime type sniffing doesn't work with a synthesized response.
</span><del>- [m_nsResponse.get() _setMIMEType:(NSString *)m_mimeType];
</del><ins>+ [m_nsResponse _setMIMEType:(NSString *)m_mimeType];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceResponse::disableLazyInitialization()
</span><span class="lines">@@ -160,14 +160,14 @@
</span><span class="cx">
</span><span class="cx"> @autoreleasepool {
</span><span class="cx">
</span><del>- auto messageRef = [m_nsResponse.get() isKindOfClass:[NSHTTPURLResponse class]] ? CFURLResponseGetHTTPResponse([ (NSHTTPURLResponse *)m_nsResponse.get() _CFURLResponse]) : nullptr;
</del><ins>+ auto messageRef = [m_nsResponse isKindOfClass:[NSHTTPURLResponse class]] ? CFURLResponseGetHTTPResponse([ (NSHTTPURLResponse *)m_nsResponse.get() _CFURLResponse]) : nullptr;
</ins><span class="cx">
</span><span class="cx"> if (m_initLevel < CommonFieldsOnly) {
</span><del>- m_url = [m_nsResponse.get() URL];
- m_mimeType = [m_nsResponse.get() MIMEType];
- m_expectedContentLength = [m_nsResponse.get() expectedContentLength];
</del><ins>+ m_url = [m_nsResponse URL];
+ m_mimeType = [m_nsResponse MIMEType];
+ m_expectedContentLength = [m_nsResponse expectedContentLength];
</ins><span class="cx"> // Stripping double quotes as a workaround for <rdar://problem/8757088>, can be removed once that is fixed.
</span><del>- m_textEncodingName = stripLeadingAndTrailingDoubleQuote([m_nsResponse.get() textEncodingName]);
</del><ins>+ m_textEncodingName = stripLeadingAndTrailingDoubleQuote([m_nsResponse textEncodingName]);
</ins><span class="cx"> m_httpStatusCode = messageRef ? CFHTTPMessageGetResponseStatusCode(messageRef) : 0;
</span><span class="cx"> if (messageRef)
</span><span class="cx"> m_httpHeaderFields = initializeHTTPHeaders(messageRef);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacAuthenticationMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/AuthenticationMac.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/AuthenticationMac.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/network/mac/AuthenticationMac.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> if (m_nsChallenge)
</span><span class="cx"> m_nsChallenge = adoptNS([[NSURLAuthenticationChallenge alloc] initWithAuthenticationChallenge:m_nsChallenge.get() sender:m_sender.get()]);
</span><span class="cx"> } else {
</span><del>- if ([m_sender.get() isMemberOfClass:[WebCoreAuthenticationClientAsChallengeSender class]])
</del><ins>+ if ([m_sender isMemberOfClass:[WebCoreAuthenticationClientAsChallengeSender class]])
</ins><span class="cx"> [(WebCoreAuthenticationClientAsChallengeSender *)m_sender.get() detachClient];
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> AuthenticationClient* AuthenticationChallenge::authenticationClient() const
</span><span class="cx"> {
</span><del>- if ([m_sender.get() isMemberOfClass:[WebCoreAuthenticationClientAsChallengeSender class]])
</del><ins>+ if ([m_sender isMemberOfClass:[WebCoreAuthenticationClientAsChallengeSender class]])
</ins><span class="cx"> return [static_cast<WebCoreAuthenticationClientAsChallengeSender*>(m_sender.get()) client];
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceErrorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -98,12 +98,12 @@
</span><span class="cx"> RetainPtr<NSMutableDictionary> userInfo = adoptNS([[NSMutableDictionary alloc] init]);
</span><span class="cx">
</span><span class="cx"> if (!resourceError.localizedDescription().isEmpty())
</span><del>- [userInfo.get() setValue:resourceError.localizedDescription() forKey:NSLocalizedDescriptionKey];
</del><ins>+ [userInfo setValue:resourceError.localizedDescription() forKey:NSLocalizedDescriptionKey];
</ins><span class="cx">
</span><span class="cx"> if (!resourceError.failingURL().isEmpty()) {
</span><del>- [userInfo.get() setValue:(NSString *)resourceError.failingURL().string() forKey:@"NSErrorFailingURLStringKey"];
</del><ins>+ [userInfo setValue:(NSString *)resourceError.failingURL().string() forKey:@"NSErrorFailingURLStringKey"];
</ins><span class="cx"> if (NSURL *cocoaURL = (NSURL *)resourceError.failingURL())
</span><del>- [userInfo.get() setValue:cocoaURL forKey:@"NSErrorFailingURLKey"];
</del><ins>+ [userInfo setValue:cocoaURL forKey:@"NSErrorFailingURLKey"];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return adoptNS([[NSError alloc] initWithDomain:resourceError.domain() code:resourceError.errorCode() userInfo:userInfo.get()]);
</span><span class="lines">@@ -142,8 +142,8 @@
</span><span class="cx"> if (!m_platformError)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto domain = [m_platformError.get() domain];
- auto errorCode = [m_platformError.get() code];
</del><ins>+ auto domain = [m_platformError domain];
+ auto errorCode = [m_platformError code];
</ins><span class="cx">
</span><span class="cx"> if ([domain isEqualToString:NSURLErrorDomain] || [domain isEqualToString:(__bridge NSString *)kCFErrorDomainCFNetwork])
</span><span class="cx"> setType((errorCode == NSURLErrorTimedOut) ? Type::Timeout : (errorCode == NSURLErrorCancelled) ? Type::Cancellation : Type::General);
</span><span class="lines">@@ -156,17 +156,17 @@
</span><span class="cx"> if (m_dataIsUpToDate)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_domain = [m_platformError.get() domain];
- m_errorCode = [m_platformError.get() code];
</del><ins>+ m_domain = [m_platformError domain];
+ m_errorCode = [m_platformError code];
</ins><span class="cx">
</span><del>- if (NSString* failingURLString = [[m_platformError.get() userInfo] valueForKey:@"NSErrorFailingURLStringKey"])
</del><ins>+ if (NSString* failingURLString = [[m_platformError userInfo] valueForKey:@"NSErrorFailingURLStringKey"])
</ins><span class="cx"> m_failingURL = URL(URL(), failingURLString);
</span><span class="cx"> else
</span><del>- m_failingURL = URL((NSURL *)[[m_platformError.get() userInfo] valueForKey:@"NSErrorFailingURLKey"]);
</del><ins>+ m_failingURL = URL((NSURL *)[[m_platformError userInfo] valueForKey:@"NSErrorFailingURLKey"]);
</ins><span class="cx"> // Workaround for <rdar://problem/6554067>
</span><span class="cx"> m_localizedDescription = m_failingURL.string();
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><del>- m_localizedDescription = [m_platformError.get() _web_localizedDescription];
</del><ins>+ m_localizedDescription = [m_platformError _web_localizedDescription];
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx">
</span><span class="cx"> m_dataIsUpToDate = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsOperationQueueDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> ResourceResponse response(redirectResponse.get());
</span><span class="cx"> ResourceRequest redirectRequest = newRequest.get();
</span><del>- if ([newRequest.get() HTTPBodyStream]) {
</del><ins>+ if ([newRequest HTTPBodyStream]) {
</ins><span class="cx"> ASSERT(m_handle->firstRequest().httpBody());
</span><span class="cx"> redirectRequest.setHTTPBody(m_handle->firstRequest().httpBody());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextcocoaLocaleCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/cocoa/LocaleCocoa.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/cocoa/LocaleCocoa.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/text/cocoa/LocaleCocoa.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -67,10 +67,10 @@
</span><span class="cx"> {
</span><span class="cx"> NSArray* availableLanguages = [NSLocale ISOLanguageCodes];
</span><span class="cx"> // NSLocale returns a lower case NSLocaleLanguageCode so we don't have care about case.
</span><del>- NSString* language = [m_locale.get() objectForKey:NSLocaleLanguageCode];
</del><ins>+ NSString* language = [m_locale objectForKey:NSLocaleLanguageCode];
</ins><span class="cx"> if ([availableLanguages indexOfObject:language] == NSNotFound)
</span><span class="cx"> m_locale = adoptNS([[NSLocale alloc] initWithLocaleIdentifier:defaultLanguage()]);
</span><del>- [m_gregorianCalendar.get() setLocale:m_locale.get()];
</del><ins>+ [m_gregorianCalendar setLocale:m_locale.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LocaleCocoa::~LocaleCocoa()
</span><span class="lines">@@ -248,8 +248,8 @@
</span><span class="cx"> return m_timeAMPMLabels;
</span><span class="cx"> m_timeAMPMLabels.reserveCapacity(2);
</span><span class="cx"> RetainPtr<NSDateFormatter> formatter = shortTimeFormatter();
</span><del>- m_timeAMPMLabels.append([formatter.get() AMSymbol]);
- m_timeAMPMLabels.append([formatter.get() PMSymbol]);
</del><ins>+ m_timeAMPMLabels.append([formatter AMSymbol]);
+ m_timeAMPMLabels.append([formatter PMSymbol]);
</ins><span class="cx"> return m_timeAMPMLabels;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -284,12 +284,12 @@
</span><span class="cx"> m_didInitializeNumberData = true;
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSNumberFormatter> formatter = adoptNS([[NSNumberFormatter alloc] init]);
</span><del>- [formatter.get() setLocale:m_locale.get()];
- [formatter.get() setNumberStyle:NSNumberFormatterDecimalStyle];
- [formatter.get() setUsesGroupingSeparator:NO];
</del><ins>+ [formatter setLocale:m_locale.get()];
+ [formatter setNumberStyle:NSNumberFormatterDecimalStyle];
+ [formatter setUsesGroupingSeparator:NO];
</ins><span class="cx">
</span><span class="cx"> RetainPtr<NSNumber> sampleNumber = adoptNS([[NSNumber alloc] initWithDouble:9876543210]);
</span><del>- String nineToZero([formatter.get() stringFromNumber:sampleNumber.get()]);
</del><ins>+ String nineToZero([formatter stringFromNumber:sampleNumber.get()]);
</ins><span class="cx"> if (nineToZero.length() != 10)
</span><span class="cx"> return;
</span><span class="cx"> Vector<String, DecimalSymbolsSize> symbols;
</span><span class="lines">@@ -296,15 +296,15 @@
</span><span class="cx"> for (unsigned i = 0; i < 10; ++i)
</span><span class="cx"> symbols.append(nineToZero.substring(9 - i, 1));
</span><span class="cx"> ASSERT(symbols.size() == DecimalSeparatorIndex);
</span><del>- symbols.append([formatter.get() decimalSeparator]);
</del><ins>+ symbols.append([formatter decimalSeparator]);
</ins><span class="cx"> ASSERT(symbols.size() == GroupSeparatorIndex);
</span><del>- symbols.append([formatter.get() groupingSeparator]);
</del><ins>+ symbols.append([formatter groupingSeparator]);
</ins><span class="cx"> ASSERT(symbols.size() == DecimalSymbolsSize);
</span><span class="cx">
</span><del>- String positivePrefix([formatter.get() positivePrefix]);
- String positiveSuffix([formatter.get() positiveSuffix]);
- String negativePrefix([formatter.get() negativePrefix]);
- String negativeSuffix([formatter.get() negativeSuffix]);
</del><ins>+ String positivePrefix([formatter positivePrefix]);
+ String positiveSuffix([formatter positiveSuffix]);
+ String negativePrefix([formatter negativePrefix]);
+ String negativeSuffix([formatter negativeSuffix]);
</ins><span class="cx"> setLocaleData(symbols, positivePrefix, positiveSuffix, negativePrefix, negativeSuffix);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextcocoaLocalizedDateCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/cocoa/LocalizedDateCache.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/cocoa/LocalizedDateCache.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/platform/text/cocoa/LocalizedDateCache.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -146,12 +146,12 @@
</span><span class="cx"> // date doesn't adjust for the current timezone. This is an arbitrary date
</span><span class="cx"> // (x-27-2007) and time (10:45 PM).
</span><span class="cx"> RetainPtr<NSCalendar> gregorian = adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]);
</span><del>- [gregorian.get() setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
</del><ins>+ [gregorian setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
</ins><span class="cx"> RetainPtr<NSDateComponents> components = adoptNS([[NSDateComponents alloc] init]);
</span><del>- [components.get() setDay:27];
- [components.get() setYear:2007];
- [components.get() setHour:22];
- [components.get() setMinute:45];
</del><ins>+ [components setDay:27];
+ [components setYear:2007];
+ [components setHour:22];
+ [components setMinute:45];
</ins><span class="cx">
</span><span class="cx"> static const NSUInteger numberOfGregorianMonths = [[dateFormatter monthSymbols] count];
</span><span class="cx"> ASSERT(numberOfGregorianMonths == 12);
</span><span class="lines">@@ -163,8 +163,8 @@
</span><span class="cx"> || type == DateComponentsType::Month)
</span><span class="cx"> totalMonthsToTest = numberOfGregorianMonths;
</span><span class="cx"> for (NSUInteger i = 0; i < totalMonthsToTest; ++i) {
</span><del>- [components.get() setMonth:(i + 1)];
- NSDate *date = [gregorian.get() dateFromComponents:components.get()];
</del><ins>+ [components setMonth:(i + 1)];
+ NSDate *date = [gregorian dateFromComponents:components.get()];
</ins><span class="cx"> NSString *formattedDate = [dateFormatter stringFromDate:date];
</span><span class="cx"> maximumWidth = max(maximumWidth, measurer.measureText(String(formattedDate)));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeCocoa.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> m_durationFormatter.get().formattingContext = NSFormattingContextStandalone;
</span><span class="cx"> m_durationFormatter.get().maximumUnitCount = 2;
</span><span class="cx"> }
</span><del>- return [m_durationFormatter.get() stringFromTimeInterval:durationInSeconds];
</del><ins>+ return [m_durationFormatter stringFromTimeInterval:durationInSeconds];
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -2009,10 +2009,10 @@
</span><span class="cx"> m_largeBadgeSurface = IOSurface::create({ largeBadgeDimension, largeBadgeDimension }, DestinationColorSpace::SRGB());
</span><span class="cx"> surface = m_largeBadgeSurface->surface();
</span><span class="cx"> }
</span><del>- [m_ciContext.get() render:translatedImage toIOSurface:surface bounds:badgeRect colorSpace:sRGBColorSpaceRef()];
</del><ins>+ [m_ciContext render:translatedImage toIOSurface:surface bounds:badgeRect colorSpace:sRGBColorSpaceRef()];
</ins><span class="cx"> cgImage = useSmallBadge ? m_smallBadgeSurface->createImage() : m_largeBadgeSurface->createImage();
</span><span class="cx"> #else
</span><del>- cgImage = adoptCF([m_ciContext.get() createCGImage:sourceOverFilter.outputImage fromRect:flippedInsetBadgeRect]);
</del><ins>+ cgImage = adoptCF([m_ciContext createCGImage:sourceOverFilter.outputImage fromRect:flippedInsetBadgeRect]);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Before we render the result, we should clip to a circle around the badge rectangle.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (283705 => 283706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2021-10-07 11:27:44 UTC (rev 283705)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2021-10-07 11:55:10 UTC (rev 283706)
</span><span class="lines">@@ -2124,8 +2124,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_popupButton) {
</span><span class="cx"> m_popupButton = adoptNS([[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO]);
</span><del>- [m_popupButton.get() setUsesItemFromMenu:NO];
- [m_popupButton.get() setFocusRingType:NSFocusRingTypeExterior];
</del><ins>+ [m_popupButton setUsesItemFromMenu:NO];
+ [m_popupButton setFocusRingType:NSFocusRingTypeExterior];
</ins><span class="cx"> [m_popupButton setUserInterfaceLayoutDirection:NSUserInterfaceLayoutDirectionLeftToRight];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2136,11 +2136,11 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_search) {
</span><span class="cx"> m_search = adoptNS([[NSSearchFieldCell alloc] initTextCell:@""]);
</span><del>- [m_search.get() setBezelStyle:NSTextFieldRoundedBezel];
- [m_search.get() setBezeled:YES];
- [m_search.get() setEditable:YES];
- [m_search.get() setFocusRingType:NSFocusRingTypeExterior];
- [m_search.get() setCenteredLook:NO];
</del><ins>+ [m_search setBezelStyle:NSTextFieldRoundedBezel];
+ [m_search setBezeled:YES];
+ [m_search setEditable:YES];
+ [m_search setFocusRingType:NSFocusRingTypeExterior];
+ [m_search setCenteredLook:NO];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return m_search.get();
</span><span class="lines">@@ -2158,9 +2158,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_sliderThumbHorizontal) {
</span><span class="cx"> m_sliderThumbHorizontal = adoptNS([[NSSliderCell alloc] init]);
</span><del>- [m_sliderThumbHorizontal.get() setSliderType:NSSliderTypeLinear];
- [m_sliderThumbHorizontal.get() setControlSize:NSControlSizeSmall];
- [m_sliderThumbHorizontal.get() setFocusRingType:NSFocusRingTypeExterior];
</del><ins>+ [m_sliderThumbHorizontal setSliderType:NSSliderTypeLinear];
+ [m_sliderThumbHorizontal setControlSize:NSControlSizeSmall];
+ [m_sliderThumbHorizontal setFocusRingType:NSFocusRingTypeExterior];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return m_sliderThumbHorizontal.get();
</span><span class="lines">@@ -2170,9 +2170,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_sliderThumbVertical) {
</span><span class="cx"> m_sliderThumbVertical = adoptNS([[NSSliderCell alloc] init]);
</span><del>- [m_sliderThumbVertical.get() setSliderType:NSSliderTypeLinear];
- [m_sliderThumbVertical.get() setControlSize:NSControlSizeSmall];
- [m_sliderThumbVertical.get() setFocusRingType:NSFocusRingTypeExterior];
</del><ins>+ [m_sliderThumbVertical setSliderType:NSSliderTypeLinear];
+ [m_sliderThumbVertical setControlSize:NSControlSizeSmall];
+ [m_sliderThumbVertical setFocusRingType:NSFocusRingTypeExterior];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return m_sliderThumbVertical.get();
</span><span class="lines">@@ -2182,13 +2182,13 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_textField) {
</span><span class="cx"> m_textField = adoptNS([[WebCoreTextFieldCell alloc] initTextCell:@""]);
</span><del>- [m_textField.get() setBezeled:YES];
- [m_textField.get() setEditable:YES];
- [m_textField.get() setFocusRingType:NSFocusRingTypeExterior];
</del><ins>+ [m_textField setBezeled:YES];
+ [m_textField setEditable:YES];
+ [m_textField setFocusRingType:NSFocusRingTypeExterior];
</ins><span class="cx"> // Post-Lion, WebCore can be in charge of paintinng the background thanks to
</span><span class="cx"> // the workaround in place for <rdar://problem/11385461>, which is implemented
</span><span class="cx"> // above as _coreUIDrawOptionsWithFrame.
</span><del>- [m_textField.get() setDrawsBackground:NO];
</del><ins>+ [m_textField setDrawsBackground:NO];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return m_textField.get();
</span></span></pre>
</div>
</div>
</body>
</html>