Title: [289775] releases/WebKitGTK/webkit-2.34/Source/WebCore
- Revision
- 289775
- Author
- [email protected]
- Date
- 2022-02-14 15:33:19 -0800 (Mon, 14 Feb 2022)
Log Message
Merge r288539 - 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: releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog (289774 => 289775)
--- releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog 2022-02-14 23:26:54 UTC (rev 289774)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog 2022-02-14 23:33:19 UTC (rev 289775)
@@ -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-02-10 Alexander Mikhaylenko <[email protected]>
[GTK] Scrollbars painted incorrectly if theme enables steppers (steppers misplaced on vertical scrollbars, horizontal scrollbars very broken)
Modified: releases/WebKitGTK/webkit-2.34/Source/WebCore/loader/FrameLoader.cpp (289774 => 289775)
--- releases/WebKitGTK/webkit-2.34/Source/WebCore/loader/FrameLoader.cpp 2022-02-14 23:26:54 UTC (rev 289774)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/loader/FrameLoader.cpp 2022-02-14 23:33:19 UTC (rev 289775)
@@ -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: releases/WebKitGTK/webkit-2.34/Source/WebCore/loader/FrameLoader.h (289774 => 289775)
--- releases/WebKitGTK/webkit-2.34/Source/WebCore/loader/FrameLoader.h 2022-02-14 23:26:54 UTC (rev 289774)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/loader/FrameLoader.h 2022-02-14 23:33:19 UTC (rev 289775)
@@ -391,7 +391,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
