Title: [288539] trunk/Source/WebCore
Revision
288539
Author
[email protected]
Date
2022-01-24 21:48:06 -0800 (Mon, 24 Jan 2022)

Log Message

Expand RefPtr / Ref use in FrameLoader
https://bugs.webkit.org/show_bug.cgi?id=235551
rdar://87986840

Reviewed by Mark Lam.

Apply Ref / RefPtr instead of taking SerializedScriptValue*.

* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadInSameDocument):
(WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy):
* loader/FrameLoader.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (288538 => 288539)


--- trunk/Source/WebCore/ChangeLog	2022-01-25 05:38:35 UTC (rev 288538)
+++ trunk/Source/WebCore/ChangeLog	2022-01-25 05:48:06 UTC (rev 288539)
@@ -1,3 +1,18 @@
+2022-01-24  Yusuke Suzuki  <[email protected]>
+
+        Expand RefPtr / Ref use in FrameLoader
+        https://bugs.webkit.org/show_bug.cgi?id=235551
+        rdar://87986840
+
+        Reviewed by Mark Lam.
+
+        Apply Ref / RefPtr instead of taking SerializedScriptValue*.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadInSameDocument):
+        (WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy):
+        * loader/FrameLoader.h:
+
 2022-01-24  Simon Fraser  <[email protected]>
 
         REGRESSION (r286932): Fixed position elements jiggle sometimes (Twitter, Facebook)

Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (288538 => 288539)


--- trunk/Source/WebCore/loader/FrameLoader.cpp	2022-01-25 05:38:35 UTC (rev 288538)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp	2022-01-25 05:48:06 UTC (rev 288539)
@@ -1093,7 +1093,7 @@
 
 // This does the same kind of work that didOpenURL does, except it relies on the fact
 // that a higher level already checked that the URLs match and the scrolling is the right thing to do.
-void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stateObject, bool isNewNavigation)
+void FrameLoader::loadInSameDocument(URL url, RefPtr<SerializedScriptValue> stateObject, bool isNewNavigation)
 {
     FRAMELOADER_RELEASE_LOG(ResourceLoading, "loadInSameDocument: frame load started");
 
@@ -1155,7 +1155,7 @@
 
     m_client->dispatchDidNavigateWithinPage();
 
-    m_frame.document()->statePopped(stateObject ? Ref<SerializedScriptValue> { *stateObject } : SerializedScriptValue::nullValue());
+    m_frame.document()->statePopped(stateObject ? stateObject.releaseNonNull() : SerializedScriptValue::nullValue());
     m_client->dispatchDidPopStateWithinPage();
     
     if (hashChange) {
@@ -3229,7 +3229,7 @@
     }
 
     bool isRedirect = m_quickRedirectComing || policyChecker().loadType() == FrameLoadType::RedirectWithLockedBackForwardList;
-    loadInSameDocument(request.url(), 0, !isRedirect);
+    loadInSameDocument(request.url(), nullptr, !isRedirect);
 }
 
 bool FrameLoader::shouldPerformFragmentNavigation(bool isFormSubmission, const String& httpMethod, FrameLoadType loadType, const URL& url)

Modified: trunk/Source/WebCore/loader/FrameLoader.h (288538 => 288539)


--- trunk/Source/WebCore/loader/FrameLoader.h	2022-01-25 05:38:35 UTC (rev 288538)
+++ trunk/Source/WebCore/loader/FrameLoader.h	2022-01-25 05:48:06 UTC (rev 288539)
@@ -393,7 +393,7 @@
     WEBCORE_EXPORT void detachChildren();
     void closeAndRemoveChild(Frame&);
 
-    void loadInSameDocument(const URL&, SerializedScriptValue* stateObject, bool isNewNavigation);
+    void loadInSameDocument(URL, RefPtr<SerializedScriptValue> stateObject, bool isNewNavigation);
 
     void prepareForLoadStart();
     void provisionalLoadStarted();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to