Don't fire window or tab events until the browser calls didOpenTab: and didOpenWindow:. #23841
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 25d7f5b)
|
|
Should this be |
b-weinstein
reviewed
Feb 5, 2024
| ASSERT(m_windowMap.get(window.identifier()) == &window); | ||
| ASSERT(isValidWindow(window)); | ||
|
|
||
| // The window might already be open, don't log an error. |
There was a problem hiding this comment.
Do we have any examples of when this could have been the case? It might be useful to list one here if we know what it is.
There was a problem hiding this comment.
We blindly call this in a couple places, to make sure it is open, like the delegate calls to populate on load, when the app might have already told us about the window directly too. These methods are also tied directly to the API, and I figured it was fine to no show too much noise if client app calls it multiple times since we ignore repeats.
b-weinstein
reviewed
Feb 5, 2024
| ASSERT(m_tabMap.get(tab.identifier()) == &tab); | ||
| ASSERT(isValidTab(tab)); | ||
|
|
||
| // The tab might already be open, don't log an error. |
There was a problem hiding this comment.
Ditto adding an example of when this could happen.
b-weinstein
approved these changes
Feb 5, 2024
xeenon
changed the title
xeenon
added
the
unsafe-merge-queue
|
EWS run on current version of this PR (hash 8669f6f)
|
…nd didOpenWindow:. https://webkit.org/b/268671 rdar://122143707 Reviewed by Brian Weinstein. Be more protective of when we fire window and tab events, so we never fire events if the window or tab hasn't fired the onCreated event. Also add more smart pointer use, assertions, and error logging to catch misuse. While fixing this, I discovered the WKWebExtensionAPITabs.QueryWithPrivateAccess test was not correct and was missing the tests for the incognito windows. Fixed things up there, and added optional chaining to avoid exceptions when things are incorrectly undefined / null. * Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionContext.mm: (toAPI): * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm: (WebKit::WebExtensionContext::postAsyncNotification): (WebKit::WebExtensionContext::removeGrantedPermissionMatchPatterns): (WebKit::WebExtensionContext::getOrCreateWindow const): (WebKit::WebExtensionContext::getWindow const): (WebKit::WebExtensionContext::forgetWindow const): (WebKit::WebExtensionContext::getOrCreateTab const): (WebKit::WebExtensionContext::getTab const): (WebKit::WebExtensionContext::getCurrentTab const): (WebKit::WebExtensionContext::forgetTab const): (WebKit::WebExtensionContext::populateWindowsAndTabs): (WebKit::WebExtensionContext::isValidWindow): (WebKit::WebExtensionContext::isValidTab): (WebKit::WebExtensionContext::openWindows const): (WebKit::WebExtensionContext::openTabs const): (WebKit::WebExtensionContext::frontmostWindow const): (WebKit::WebExtensionContext::didOpenWindow): (WebKit::WebExtensionContext::didCloseWindow): (WebKit::WebExtensionContext::didFocusWindow): (WebKit::WebExtensionContext::didOpenTab): (WebKit::WebExtensionContext::didCloseTab): (WebKit::WebExtensionContext::didActivateTab): (WebKit::WebExtensionContext::didSelectOrDeselectTabs): (WebKit::WebExtensionContext::didMoveTab): (WebKit::WebExtensionContext::didReplaceTab): (WebKit::WebExtensionContext::didChangeTabProperties): (WebKit::WebExtensionContext::resourceLoadDidSendRequest): (WebKit::WebExtensionContext::resourceLoadDidPerformHTTPRedirection): (WebKit::WebExtensionContext::resourceLoadDidReceiveChallenge): (WebKit::WebExtensionContext::resourceLoadDidReceiveResponse): (WebKit::WebExtensionContext::resourceLoadDidCompleteWithError): * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionTabCocoa.mm: (WebKit::WebExtensionTab::parameters const): (WebKit::WebExtensionTab::index const): (WebKit::WebExtensionTab::parentTab const): (WebKit::WebExtensionTab::mainWebView const): (WebKit::WebExtensionTab::webViews const): (WebKit::WebExtensionTab::isOpen const): (WebKit::WebExtensionTab::isActive const): (WebKit::WebExtensionTab::isPrivate const): * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionWindowCocoa.mm: (WebKit::WebExtensionWindow::activeTab const): (WebKit::WebExtensionWindow::isOpen const): * Source/WebKit/UIProcess/Extensions/WebExtensionContext.h: (WebKit::WebExtensionContext::openTabs const): Deleted. * Source/WebKit/UIProcess/Extensions/WebExtensionTab.h: (WebKit::WebExtensionTab::didOpen): (WebKit::WebExtensionTab::didClose): * Source/WebKit/UIProcess/Extensions/WebExtensionWindow.h: (WebKit::WebExtensionWindow::didOpen): (WebKit::WebExtensionWindow::didClose): * Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPITabs.mm: (TestWebKitAPI::TEST): Canonical link: https://commits.webkit.org/274103@main
webkit-commit-queue
force-pushed
the
bug/268671
branch
from
8669f6f
to
1e7cb6d
Compare
|
Committed 274103@main (1e7cb6d): https://commits.webkit.org/274103@main Reviewed commits have been landed. Closing PR #23841 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.
1e7cb6d
8669f6f
🛠 ios🛠 mac🛠 wpe🛠 wincairo🛠 ios-sim🛠 mac-AS-debug🧪 wpe-wk2🧪 webkitperl🧪 ios-wk2🧪 api-mac🧪 api-wpe🧪 ios-wk2-wpt🧪 mac-wk1🛠 gtk🧪 api-ios🧪 mac-wk2🧪 gtk-wk2🛠 tv🧪 mac-AS-debug-wk2🧪 api-gtk🛠 tv-sim🛠 watch🛠 watch-sim