Title: [286082] trunk/Source/WebKit
Revision
286082
Author
grao...@webkit.org
Date
2021-11-19 15:14:48 -0800 (Fri, 19 Nov 2021)

Log 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):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (286081 => 286082)


--- trunk/Source/WebKit/ChangeLog	2021-11-19 22:41:30 UTC (rev 286081)
+++ trunk/Source/WebKit/ChangeLog	2021-11-19 23:14:48 UTC (rev 286082)
@@ -1,5 +1,22 @@
 2021-11-19  Antoine Quint  <grao...@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  <grao...@webkit.org>
+
         [Model] Reduce use of callOnMainRunLoop in ModelElementControllerCocoa
         https://bugs.webkit.org/show_bug.cgi?id=233376
 

Modified: trunk/Source/WebKit/WebProcess/Model/ARKitInlinePreviewModelPlayer.mm (286081 => 286082)


--- trunk/Source/WebKit/WebProcess/Model/ARKitInlinePreviewModelPlayer.mm	2021-11-19 22:41:30 UTC (rev 286081)
+++ trunk/Source/WebKit/WebProcess/Model/ARKitInlinePreviewModelPlayer.mm	2021-11-19 23:14:48 UTC (rev 286082)
@@ -63,7 +63,7 @@
         return;
     }
 
-    auto* strongPage = m_page.get();
+    RefPtr strongPage = m_page.get();
     if (!strongPage) {
         completionHandler(std::nullopt);
         return;
@@ -89,7 +89,7 @@
         return;
     }
 
-    auto* strongPage = m_page.get();
+    RefPtr strongPage = m_page.get();
     if (!strongPage) {
         completionHandler(false);
         return;
@@ -110,7 +110,7 @@
         return;
     }
 
-    auto* strongPage = m_page.get();
+    RefPtr strongPage = m_page.get();
     if (!strongPage) {
         completionHandler(std::nullopt);
         return;
@@ -136,7 +136,7 @@
         return;
     }
 
-    auto* strongPage = m_page.get();
+    RefPtr strongPage = m_page.get();
     if (!strongPage) {
         completionHandler(false);
         return;

Modified: trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.mm (286081 => 286082)


--- trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.mm	2021-11-19 22:41:30 UTC (rev 286081)
+++ trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.mm	2021-11-19 23:14:48 UTC (rev 286082)
@@ -63,7 +63,7 @@
 
 void ARKitInlinePreviewModelPlayerIOS::enterFullscreen()
 {
-    auto* strongPage = page();
+    RefPtr strongPage = page();
     if (!strongPage)
         return;
 

Modified: trunk/Source/WebKit/WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.mm (286081 => 286082)


--- trunk/Source/WebKit/WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.mm	2021-11-19 22:41:30 UTC (rev 286081)
+++ trunk/Source/WebKit/WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.mm	2021-11-19 23:14:48 UTC (rev 286082)
@@ -128,7 +128,7 @@
     if (!strongClient)
         return;
 
-    auto* strongPage = page();
+    RefPtr strongPage = page();
     if (!strongPage) {
         strongClient->didFailLoading(*this, WebCore::ResourceError { WebCore::errorDomainWebKitInternal, 0, modelSource.url(), "WebPage destroyed"_s });
         return;
@@ -140,7 +140,7 @@
     LOG(ModelElement, "ARKitInlinePreviewModelPlayer::modelDidChange() created preview with UUID %s and size %f x %f.", ((String)[m_inlinePreview uuid].UUIDString).utf8().data(), size.width(), size.height());
 
     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;
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to