Skip to content

[Site Isolation] Fix more cases where we unnecessarily skip code on out-of-process frames #21452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Dec 8, 2023
Merged

[Site Isolation] Fix more cases where we unnecessarily skip code on out-of-process frames #21452

merged 1 commit into from
Dec 8, 2023

Conversation

charliewolfe
Copy link
Member

@charliewolfe charliewolfe commented Dec 7, 2023 •
edited by webkit-early-warning-system
Loading

008862a

[Site Isolation] Fix more cases where we unnecessarily skip code on out-of-process frames
https://bugs.webkit.org/show_bug.cgi?id=266007
rdar://119326844

Reviewed by Pascoe.

* Source/WebCore/page/Frame.cpp:
(WebCore::Frame::arePluginsEnabled):
* Source/WebCore/page/Frame.h:
* Source/WebCore/page/LocalFrame.cpp:
(WebCore::LocalFrame::arePluginsEnabled): Deleted.
* Source/WebCore/page/LocalFrame.h:
* Source/WebCore/page/PageOverlay.cpp:
(WebCore::PageOverlay::viewToOverlayOffset const):
(WebCore::PageOverlay::mouseEvent):
* Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp:
(WebKit::WebAutomationSessionProxy::resolveChildFrameWithNodeHandle):
* Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageCopyContextMenuAtPointInWindow):
* Source/WebKit/WebProcess/WebPage/WebFoundTextRangeController.cpp:
(WebKit::WebFoundTextRangeController::rectsForTextMatchesInRect):
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setAlwaysShowsHorizontalScroller):
(WebKit::WebPage::setAlwaysShowsVerticalScroller):
(WebKit::WebPage::canShowMIMEType const):

Canonical link: https://commits.webkit.org/271723@main

3a9197b

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 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
✅ 🛠 🧪 merge ✅ 🛠 watch
✅ 🛠 watch-sim

@charliewolfe charliewolfe requested a review from cdumez as a code owner December 7, 2023 19:14
@charliewolfe charliewolfe self-assigned this Dec 7, 2023
@charliewolfe charliewolfe added the WebKit Process Model Bugs related to WebKit's multi-process architecture label Dec 7, 2023
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Dec 7, 2023 •
edited
Loading

EWS run on previous version of this PR (hash 1516e7d)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ⏳ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug   🧪 wpe-wk2
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
  🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 gtk
⏳ 🛠 🧪 jsc ✅ 🧪 api-ios ✅ 🧪 mac-wk2   🧪 gtk-wk2
⏳ 🛠 🧪 jsc-arm64 ⏳ 🛠 tv   🧪 mac-AS-debug-wk2   🧪 api-gtk
✅ 🛠 tv-sim
✅ 🛠 watch
⏳ 🛠 watch-sim

pascoej
pascoej approved these changes Dec 7, 2023
View reviewed changes
@charliewolfe charliewolfe force-pushed the eng/Site-Isolation-Fix-more-cases-where-we-unnecessarily-skip-code-on-out-of-process-frames branch from 1516e7d to 2365e0b Compare December 7, 2023 20:52
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Dec 7, 2023 •
edited
Loading

EWS run on previous version of this PR (hash 2365e0b)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 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

@charliewolfe charliewolfe added the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label Dec 7, 2023
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Dec 8, 2023
@webkit-ews-buildbot
Copy link
Collaborator

Failed mac-AS-debug-wk2 checks. Please resolve failures and re-apply safe-merge-queue label.

Rejecting #21452 from merge queue.

@webkit-ews-buildbot webkit-ews-buildbot removed the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label Dec 8, 2023
@webkit-ews-buildbot
Copy link
Collaborator

Safe-Merge-Queue: Build #5573.

@charliewolfe charliewolfe removed the merging-blocked Applied to prevent a change from being merged label Dec 8, 2023
@charliewolfe charliewolfe force-pushed the eng/Site-Isolation-Fix-more-cases-where-we-unnecessarily-skip-code-on-out-of-process-frames branch from 2365e0b to 3a9197b Compare December 8, 2023 04:50
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Dec 8, 2023 •
edited
Loading

EWS run on current version of this PR (hash 3a9197b)

Misc iOS, tvOS & watchOS macOS Linux Windows
loading 🧪 style ⏳ 🛠 ios ⏳ 🛠 mac ⏳ 🛠 wpe ⏳ 🛠 wincairo
loading 🧪 bindings ⏳ 🛠 ios-sim ⏳ 🛠 mac-AS-debug ⏳ 🧪 wpe-wk2
loading 🧪 webkitperl ⏳ 🧪 ios-wk2 ⏳ 🧪 api-mac ⏳ 🧪 api-wpe
⏳ 🧪 ios-wk2-wpt ⏳ 🧪 mac-wk1 ⏳ 🛠 gtk
⏳ 🛠 🧪 jsc ⏳ 🧪 api-ios ⏳ 🧪 mac-wk2 ⏳ 🧪 gtk-wk2
⏳ 🛠 🧪 jsc-arm64 ⏳ 🛠 tv ⏳ 🧪 mac-AS-debug-wk2 ⏳ 🧪 api-gtk
⏳ 🛠 tv-sim ⏳ 🧪 mac-wk2-stress ⏳ 🛠 jsc-armv7
⏳ 🛠 watch ⏳ 🧪 jsc-armv7-tests
⏳ 🛠 watch-sim

@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Dec 8, 2023 •
edited
Loading

EWS run on current version of this PR (hash 3a9197b)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 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
✅ 🛠 🧪 merge ✅ 🛠 watch
✅ 🛠 watch-sim

@charliewolfe charliewolfe added the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label Dec 8, 2023
@webkit-ews-buildbot webkit-ews-buildbot added merge-queue Applied to send a pull request to merge-queue and removed safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks labels Dec 8, 2023
@webkit-ews-buildbot
Copy link
Collaborator

Safe-Merge-Queue: Build #5606.

@charliewolfe
[Site Isolation] Fix more cases where we unnecessarily skip code on o…
008862a 
…ut-of-process frames

https://bugs.webkit.org/show_bug.cgi?id=266007
rdar://119326844

Reviewed by Pascoe.

* Source/WebCore/page/Frame.cpp:
(WebCore::Frame::arePluginsEnabled):
* Source/WebCore/page/Frame.h:
* Source/WebCore/page/LocalFrame.cpp:
(WebCore::LocalFrame::arePluginsEnabled): Deleted.
* Source/WebCore/page/LocalFrame.h:
* Source/WebCore/page/PageOverlay.cpp:
(WebCore::PageOverlay::viewToOverlayOffset const):
(WebCore::PageOverlay::mouseEvent):
* Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp:
(WebKit::WebAutomationSessionProxy::resolveChildFrameWithNodeHandle):
* Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageCopyContextMenuAtPointInWindow):
* Source/WebKit/WebProcess/WebPage/WebFoundTextRangeController.cpp:
(WebKit::WebFoundTextRangeController::rectsForTextMatchesInRect):
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setAlwaysShowsHorizontalScroller):
(WebKit::WebPage::setAlwaysShowsVerticalScroller):
(WebKit::WebPage::canShowMIMEType const):

Canonical link: https://commits.webkit.org/271723@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Site-Isolation-Fix-more-cases-where-we-unnecessarily-skip-code-on-out-of-process-frames branch from 3a9197b to 008862a Compare December 8, 2023 12:09
@webkit-commit-queue
Copy link
Collaborator

Committed 271723@main (008862a): https://commits.webkit.org/271723@main

Reviewed commits have been landed. Closing PR #21452 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 008862a into WebKit:main Dec 8, 2023
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Dec 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pascoej pascoej pascoej approved these changes

@cdumez cdumez Awaiting requested review from cdumez cdumez is a code owner

@achristensen07 achristensen07 Awaiting requested review from achristensen07

Assignees

@charliewolfe charliewolfe

Labels

WebKit Process Model Bugs related to WebKit's multi-process architecture

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@charliewolfe @webkit-early-warning-system @webkit-ews-buildbot @webkit-commit-queue @pascoej