Adopt smart pointers in WebProcessProxy #19674
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
EWS run on previous version of this PR (hash e594fc3)
|
webkit-ews-buildbot
added
the
merging-blocked
cdumez
force-pushed
the
263820_WebProcessProxy_smart_pointers
branch
from
e594fc3
to
fb2f134
Compare
|
EWS run on previous version of this PR (hash fb2f134)
|
webkit-ews-buildbot
added
the
merging-blocked
cdumez
force-pushed
the
263820_WebProcessProxy_smart_pointers
branch
from
fb2f134
to
5659316
Compare
|
EWS run on previous version of this PR (hash 5659316)
|
webkit-ews-buildbot
added
the
merging-blocked
cdumez
force-pushed
the
263820_WebProcessProxy_smart_pointers
branch
from
5659316
to
166f321
Compare
|
EWS run on previous version of this PR (hash 166f321)
|
rniwa
reviewed
Oct 28, 2023
| if (page) | ||
| result.append(std::make_pair(page->process().coreProcessIdentifier(), RegistrableDomain(URL(page->currentURL())))); | ||
| } | ||
| for (auto& page : globalPages()) |
There was a problem hiding this comment.
auto& is already a Ref& here. globalPages() returns a Vector<Ref<WebPageProxy>>
rniwa
reviewed
Oct 28, 2023
| if (page) | ||
| page->disconnectFramesFromPage(); | ||
| } | ||
| for (auto& page : pages()) |
There was a problem hiding this comment.
pages() returns a Vector<Ref<WebPageProxy>>. I guess I can use Ref&& instead of auto&.
There was a problem hiding this comment.
Ref& or Ref&& doesn't build. I'll just use Ref then. It's a bit more ref counting churn than auto& though.
rniwa
reviewed
Oct 28, 2023
| } | ||
|
|
||
| RefPtr<WebPageProxy> WebProcessProxy::webPage(WebPageProxyIdentifier pageID) | ||
| { | ||
| return globalPageMap().get(pageID).get(); | ||
| return globalPageMap().get(pageID); | ||
| } | ||
|
|
||
| RefPtr<WebPageProxy> WebProcessProxy::audioCapturingWebPage() | ||
| { | ||
| for (auto& page : globalPages()) { |
rniwa
reviewed
Oct 28, 2023
| if (page) | ||
| page->postMessageToInjectedBundle("WebsiteDataScanForRegistrableDomainsFinished"_s, nullptr); | ||
| } | ||
| for (auto& page : globalPages()) |
rniwa
reviewed
Oct 28, 2023
| if (page) | ||
| page->postMessageToInjectedBundle("WebsiteDataScanForRegistrableDomainsFinished"_s, nullptr); | ||
| } | ||
| for (auto& page : globalPages()) |
rniwa
reviewed
Oct 28, 2023
| if (page) | ||
| page->postMessageToInjectedBundle("WebsiteDataDeletionForRegistrableDomainsFinished"_s, nullptr); | ||
| } | ||
| for (auto& page : globalPages()) |
rniwa
reviewed
Oct 28, 2023
| if (page) | ||
| page->gpuProcessDidFinishLaunching(); | ||
| } | ||
| for (auto& page : pages()) |
rniwa
reviewed
Oct 28, 2023
| if (page) | ||
| page->gpuProcessExited(reason); | ||
| } | ||
| for (auto& page : pages()) |
rniwa
reviewed
Oct 28, 2023
| if (page) | ||
| page->dispatchProcessDidTerminate(reason); | ||
| } | ||
| for (auto& page : pages) |
rniwa
reviewed
Oct 28, 2023
| if (page) | ||
| page->processDidBecomeUnresponsive(); | ||
| } | ||
| for (auto& page : pages()) |
rniwa
reviewed
Oct 28, 2023
| if (page) | ||
| page->processDidBecomeResponsive(); | ||
| } | ||
| for (auto& page : pages()) |
rniwa
reviewed
Oct 28, 2023
| if (page) | ||
| page->willChangeProcessIsResponsive(); | ||
| } | ||
| for (auto& page : pages()) |
rniwa
reviewed
Oct 28, 2023
| if (page) | ||
| page->didChangeProcessIsResponsive(); | ||
| } | ||
| for (auto& page : pages()) |
rniwa
reviewed
Oct 28, 2023
| @@ -1299,8 +1277,8 @@ void WebProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connect | |||
| } | |||
| #endif // USE(EXTENSIONKIT_ASSERTIONS) | |||
| #if PLATFORM(MAC) | |||
| for (const auto& page : pages()) { | |||
| if (page && page->preferences().backgroundWebContentRunningBoardThrottlingEnabled()) | |||
| for (auto& page : pages()) { | |||
rniwa
reviewed
Oct 28, 2023
| if (page) | ||
| page->activityStateDidChange(ActivityState::IsVisuallyIdle); | ||
| } | ||
| for (auto& page : pages()) |
rniwa
reviewed
Oct 28, 2023
| if (page) | ||
| page->processWillBecomeSuspended(); | ||
| } | ||
| for (auto& page : pages()) |
rniwa
reviewed
Oct 28, 2023
| if (page) | ||
| page->processWillBecomeForeground(); | ||
| } | ||
| for (auto& page : pages()) |
rniwa
reviewed
Oct 28, 2023
| @@ -2152,8 +2120,8 @@ PAL::SessionID WebProcessProxy::sessionID() const | |||
| void WebProcessProxy::createSpeechRecognitionServer(SpeechRecognitionServerIdentifier identifier) | |||
| { | |||
| RefPtr<WebPageProxy> targetPage; | |||
| for (auto& page : pages()) { | |||
| if (page && page->webPageID() == identifier) { | |||
| for (auto&& page : pages()) { | |||
There was a problem hiding this comment.
Why &&? But also use Ref/CheckedRef instead?
rniwa
approved these changes
Oct 28, 2023
cdumez
force-pushed
the
263820_WebProcessProxy_smart_pointers
branch
from
166f321
to
8429de7
Compare
|
EWS run on previous version of this PR (hash 8429de7)
|
webkit-ews-buildbot
added
the
merging-blocked
cdumez
force-pushed
the
263820_WebProcessProxy_smart_pointers
branch
from
8429de7
to
668ea96
Compare
|
EWS run on current version of this PR (hash 668ea96)
|
cdumez
added
the
unsafe-merge-queue
https://bugs.webkit.org/show_bug.cgi?id=263820 Reviewed by Ryosuke Niwa. * Source/WebKit/Shared/WebBackForwardListItem.h: * Source/WebKit/UIProcess/API/C/WKPage.cpp: (WKPageCopyRelatedPages): * Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp: (WebKit::WebAutomationSession::getBrowsingContexts): * Source/WebKit/UIProcess/HighPerformanceGraphicsUsageSampler.cpp: (WebKit::HighPerformanceGraphicsUsageSampler::timerFired): * Source/WebKit/UIProcess/PerActivityStateCPUUsageSampler.cpp: (WebKit::PerActivityStateCPUUsageSampler::pageForLogging const): * Source/WebKit/UIProcess/ProvisionalPageProxy.h: * Source/WebKit/UIProcess/RemotePageProxy.cpp: (WebKit::RemotePageProxy::protectedPage const): * Source/WebKit/UIProcess/RemotePageProxy.h: * Source/WebKit/UIProcess/WebBackForwardCache.h: * Source/WebKit/UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::~WebPageProxy): (WebKit::WebPageProxy::nonEphemeralWebPageProxy): (WebKit::WebPageProxy::protectedVisitedLinkStore): * Source/WebKit/UIProcess/WebPageProxy.h: * Source/WebKit/UIProcess/WebProcessCache.h: * Source/WebKit/UIProcess/WebProcessPool.cpp: (WebKit::WebProcessPool::anyProcessPoolNeedsUIBackgroundAssertion): (WebKit::WebProcessPool::forEachProcessForSession): (WebKit::WebProcessPool::checkedWebProcessCache): (WebKit::WebProcessPool::checkedBackForwardCache): * Source/WebKit/UIProcess/WebProcessPool.h: * Source/WebKit/UIProcess/WebProcessProxy.cpp: (WebKit::WebProcessProxy::allProcesses): (WebKit::WebProcessProxy::processForIdentifier): (WebKit::WebProcessProxy::globalPages): (WebKit::WebProcessProxy::pages const): (WebKit::WebProcessProxy::forWebPagesWithOrigin): (WebKit::WebProcessProxy::allowedFirstPartiesForCookies): (WebKit::WebProcessProxy::create): (WebKit::WebProcessProxy::createForRemoteWorkers): (WebKit::m_routingArbitrator): (WebKit::WebProcessProxy::~WebProcessProxy): (WebKit::WebProcessProxy::updateRegistrationWithDataStore): (WebKit::WebProcessProxy::addProvisionalPageProxy): (WebKit::WebProcessProxy::addRemotePageProxy): (WebKit::WebProcessProxy::getLaunchOptions): (WebKit::WebProcessProxy::shouldSendPendingMessage): (WebKit::WebProcessProxy::processWillShutDown): (WebKit::WebProcessProxy::startDisplayLink): (WebKit::WebProcessProxy::stopDisplayLink): (WebKit::WebProcessProxy::setDisplayLinkPreferredFramesPerSecond): (WebKit::WebProcessProxy::setDisplayLinkForDisplayWantsFullSpeedUpdates): (WebKit::WebProcessProxy::shutDown): (WebKit::WebProcessProxy::webPage): (WebKit::WebProcessProxy::audioCapturingWebPage): (WebKit::WebProcessProxy::webPageWithActiveXRSession): (WebKit::WebProcessProxy::notifyPageStatisticsAndDataRecordsProcessed): (WebKit::WebProcessProxy::notifyWebsiteDataScanForRegistrableDomainsFinished): (WebKit::WebProcessProxy::notifyWebsiteDataDeletionForRegistrableDomainsFinished): (WebKit::WebProcessProxy::createWebPage): (WebKit::WebProcessProxy::addExistingWebPage): (WebKit::WebProcessProxy::removeWebPage): (WebKit::WebProcessProxy::updateBackForwardItem): (WebKit::WebProcessProxy::getNetworkProcessConnection): (WebKit::WebProcessProxy::createGPUProcessConnection): (WebKit::WebProcessProxy::gpuProcessDidFinishLaunching): (WebKit::WebProcessProxy::gpuProcessExited): (WebKit::WebProcessProxy::didReceiveMessage): (WebKit::WebProcessProxy::didReceiveSyncMessage): (WebKit::WebProcessProxy::processDidTerminateOrFailedToLaunch): (WebKit::WebProcessProxy::didBecomeUnresponsive): (WebKit::WebProcessProxy::didBecomeResponsive): (WebKit::WebProcessProxy::willChangeIsResponsive): (WebKit::WebProcessProxy::didChangeIsResponsive): (WebKit::WebProcessProxy::setIgnoreInvalidMessageForTesting): (WebKit::WebProcessProxy::didFinishLaunching): (WebKit::WebProcessProxy::didDestroyFrame): (WebKit::WebProcessProxy::recordUserGestureAuthorizationToken): (WebKit::WebProcessProxy::postMessageToRemote): (WebKit::WebProcessProxy::closeRemoteFrame): (WebKit::WebProcessProxy::renderTreeAsText): (WebKit::WebProcessProxy::maybeShutDown): (WebKit::WebProcessProxy::canTerminateAuxiliaryProcess): (WebKit::WebProcessProxy::windowServerConnectionStateChanged): (WebKit::WebProcessProxy::updateAudibleMediaAssertions): (WebKit::WebProcessProxy::updateMediaStreamingActivity): (WebKit::WebProcessProxy::isResponsive): (WebKit::WebProcessProxy::isResponsiveWithLazyStop): (WebKit::WebProcessProxy::logDiagnosticMessageForResourceLimitTermination): (WebKit::WebProcessProxy::didExceedCPULimit): (WebKit::WebProcessProxy::updateBlobRegistryPartitioningState const): (WebKit::WebProcessProxy::didCollectPrewarmInformation): (WebKit::WebProcessProxy::didStartProvisionalLoadForMainFrame): (WebKit::WebProcessProxy::reportProcessDisassociatedWithPageIfNecessary): (WebKit::WebProcessProxy::createSpeechRecognitionServer): (WebKit::WebProcessProxy::muteCaptureInPagesExcept): (WebKit::WebProcessProxy::disableRemoteWorkers): (WebKit::WebProcessProxy::enableRemoteWorkers): (WebKit::WebProcessProxy::protectedWebsiteDataStore const): (WebKit::WebProcessProxy::getNotifications): (WebKit::WebProcessProxy::setAppBadge): (WebKit::WebProcessProxy::setClientBadge): (WebKit::WebProcessProxy::logger): * Source/WebKit/UIProcess/WebProcessProxy.h: * Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp: (WebKit::WebsiteDataStore::isBlobRegistryPartitioningEnabled const): Canonical link: https://commits.webkit.org/269895@main
webkit-commit-queue
force-pushed
the
263820_WebProcessProxy_smart_pointers
branch
from
668ea96
to
6c1701a
Compare
|
Committed 269895@main (6c1701a): https://commits.webkit.org/269895@main Reviewed commits have been landed. Closing PR #19674 and removing active labels. |
webkit-commit-queue
removed
the
unsafe-merge-queue
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
6c1701a
668ea96
🧪 wpe-wk2