Changeset 286082 in webkit

Timestamp:

Nov 19, 2021, 3:14:48 PM (5 years ago)

Author:

graouts@webkit.org

Message:

[Model] Use RefPtr across ARKitInlinePreviewModelPlayer when creating strong pointers
​https://bugs.webkit.org/show_bug.cgi?id=233375

Reviewed by Wenson Hsieh.

• WebProcess/Model/ARKitInlinePreviewModelPlayer.mm:

(WebKit::ARKitInlinePreviewModelPlayer::getCamera):
(WebKit::ARKitInlinePreviewModelPlayer::setCamera):
(WebKit::ARKitInlinePreviewModelPlayer::isPlayingAnimation):
(WebKit::ARKitInlinePreviewModelPlayer::setAnimationIsPlaying):

• WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.mm:

(WebKit::ARKitInlinePreviewModelPlayerIOS::enterFullscreen):

• WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.mm:

(WebKit::ARKitInlinePreviewModelPlayerMac::load):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Model/ARKitInlinePreviewModelPlayer.mm (modified) (4 diffs)
• WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.mm (modified) (1 diff)
• WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-19  Antoine Quint  <graouts@webkit.org>
+
+        [Model] Use RefPtr across ARKitInlinePreviewModelPlayer when creating strong pointers
+        https://bugs.webkit.org/show_bug.cgi?id=233375
+
+        Reviewed by Wenson Hsieh.
+
+        * WebProcess/Model/ARKitInlinePreviewModelPlayer.mm:
+        (WebKit::ARKitInlinePreviewModelPlayer::getCamera):
+        (WebKit::ARKitInlinePreviewModelPlayer::setCamera):
+        (WebKit::ARKitInlinePreviewModelPlayer::isPlayingAnimation):
+        (WebKit::ARKitInlinePreviewModelPlayer::setAnimationIsPlaying):
+        * WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.mm:
+        (WebKit::ARKitInlinePreviewModelPlayerIOS::enterFullscreen):
+        * WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.mm:
+        (WebKit::ARKitInlinePreviewModelPlayerMac::load):
+
 2021-11-19  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebKit/WebProcess/Model/ARKitInlinePreviewModelPlayer.mm

@@ -64 +64 @@
     }
 
-    auto* strongPage = m_page.get();
+    RefPtr strongPage = m_page.get();
     if (!strongPage) {
         completionHandler(std::nullopt);
@@ -90 +90 @@
     }
 
-    auto* strongPage = m_page.get();
+    RefPtr strongPage = m_page.get();
     if (!strongPage) {
         completionHandler(false);
@@ -111 +111 @@
     }
 
-    auto* strongPage = m_page.get();
+    RefPtr strongPage = m_page.get();
     if (!strongPage) {
         completionHandler(std::nullopt);
@@ -137 +137 @@
     }
 
-    auto* strongPage = m_page.get();
+    RefPtr strongPage = m_page.get();
     if (!strongPage) {
         completionHandler(false);

trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.mm

@@ -64 +64 @@
 void ARKitInlinePreviewModelPlayerIOS::enterFullscreen()
 {
-    auto* strongPage = page();
+    RefPtr strongPage = page();
     if (!strongPage)
         return;

trunk/Source/WebKit/WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.mm

@@ -129 +129 @@
         return;
 
-    auto* strongPage = page();
+    RefPtr strongPage = page();
     if (!strongPage) {
         strongClient->didFailLoading(*this, WebCore::ResourceError { WebCore::errorDomainWebKitInternal, 0, modelSource.url(), "WebPage destroyed"_s });
@@ -141 +141 @@
 
     CompletionHandler<void(Expected<std::pair<String, uint32_t>, WebCore::ResourceError>)> completionHandler = [weakSelf = WeakPtr { *this }] (Expected<std::pair<String, uint32_t>, WebCore::ResourceError> result) mutable {
-        auto strongSelf = weakSelf.get();
+        RefPtr strongSelf = weakSelf.get();
         if (!strongSelf)
             return;