Summary: | Stop using GenericCallback from WebPageProxy | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Alex Christensen <achristensen> | ||||||||||||||
Component: | New Bugs | Assignee: | Alex Christensen <achristensen> | ||||||||||||||
Status: | RESOLVED FIXED | ||||||||||||||||
Severity: | Normal | CC: | cdumez, cmarcelo, ews-watchlist, gyuyoung.kim, luiz, mcatanzaro, ryuan.choi, sergio, webkit-bug-importer, zeno | ||||||||||||||
Priority: | P2 | Keywords: | InRadar | ||||||||||||||
Version: | WebKit Nightly Build | ||||||||||||||||
Hardware: | Unspecified | ||||||||||||||||
OS: | Unspecified | ||||||||||||||||
See Also: |
https://bugs.webkit.org/show_bug.cgi?id=221741 https://bugs.webkit.org/show_bug.cgi?id=221843 |
||||||||||||||||
Attachments: |
|
Description
Alex Christensen
2021-02-09 22:52:15 PST
Created attachment 419817 [details]
Patch
Created attachment 419850 [details]
Patch
Created attachment 419870 [details]
Patch
Reverted r272702 for reason: Caused assertion failure on macOS debug WK2 bots Committed r272705: <https://trac.webkit.org/changeset/272705> Created attachment 420038 [details]
Patch
Created attachment 420044 [details]
Patch
This introduced an unused variable warning: [1954/2287] Building CXX object Source/WebKit/CMakeFiles/...ces/WebKit/unified-sources/UnifiedSource-88d1702b-7.cpp.o In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-7.cpp:8: ../../Source/WebKit/UIProcess/WebPageProxy.cpp: In member function ‘void WebKit::WebPageProxy::resetState(WebKit::WebPageProxy::ResetStateReason)’: ../../Source/WebKit/UIProcess/WebPageProxy.cpp:7462:25: warning: variable ‘error’ set but not used [-Wunused-but-set-variable] 7462 | CallbackBase::Error error { }; | ^~~~~ Solution is: diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp index 48d74e2fa57f..e25bca9cfad6 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -7459,18 +7459,6 @@ void WebPageProxy::resetState(ResetStateReason resetStateReason) m_webDeviceOrientationUpdateProviderProxy = nullptr; #endif - CallbackBase::Error error { }; - switch (resetStateReason) { - case ResetStateReason::NavigationSwap: - FALLTHROUGH; - case ResetStateReason::PageInvalidated: - error = CallbackBase::Error::OwnerWasInvalidated; - break; - case ResetStateReason::WebProcessExited: - error = CallbackBase::Error::ProcessExited; - break; - } - for (auto& editCommand : std::exchange(m_editCommandSet, { })) editCommand->invalidate(); Will attach a follow-up. Created attachment 420355 [details]
Patch
Committed r272879: <https://commits.webkit.org/r272879> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420355 [details]. |