Title: [288687] branches/safari-612.4.9.1-branch/Source/WebCore
- Revision
- 288687
- Author
- kocsen_ch...@apple.com
- Date
- 2022-01-27 11:25:28 -0800 (Thu, 27 Jan 2022)
Log Message
Cherry-pick r288539. rdar://problem/88139659
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:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288539 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.4.9.1-branch/Source/WebCore/ChangeLog (288686 => 288687)
--- branches/safari-612.4.9.1-branch/Source/WebCore/ChangeLog 2022-01-27 19:23:20 UTC (rev 288686)
+++ branches/safari-612.4.9.1-branch/Source/WebCore/ChangeLog 2022-01-27 19:25:28 UTC (rev 288687)
@@ -1,3 +1,37 @@
+2022-01-27 Kocsen Chung <kocsen_ch...@apple.com>
+
+ Cherry-pick r288539. rdar://problem/88139659
+
+ 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:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288539 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-01-24 Yusuke Suzuki <ysuz...@apple.com>
+
+ 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-16 Russell Epstein <repst...@apple.com>
Cherry-pick r288078. rdar://problem/85801310
Modified: branches/safari-612.4.9.1-branch/Source/WebCore/loader/FrameLoader.cpp (288686 => 288687)
--- branches/safari-612.4.9.1-branch/Source/WebCore/loader/FrameLoader.cpp 2022-01-27 19:23:20 UTC (rev 288686)
+++ branches/safari-612.4.9.1-branch/Source/WebCore/loader/FrameLoader.cpp 2022-01-27 19:25:28 UTC (rev 288687)
@@ -1107,7 +1107,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");
@@ -1169,7 +1169,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) {
@@ -3223,7 +3223,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: branches/safari-612.4.9.1-branch/Source/WebCore/loader/FrameLoader.h (288686 => 288687)
--- branches/safari-612.4.9.1-branch/Source/WebCore/loader/FrameLoader.h 2022-01-27 19:23:20 UTC (rev 288686)
+++ branches/safari-612.4.9.1-branch/Source/WebCore/loader/FrameLoader.h 2022-01-27 19:25:28 UTC (rev 288687)
@@ -392,7 +392,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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
