Skip to content
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.

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

chore: cherry-pick f6cb89728f04 from chromium #25290

Merged
merged 4 commits into from Sep 3, 2020

Conversation

nornagon
Copy link
Member

@nornagon nornagon commented Sep 2, 2020

M85: Correctly retrieve the plugin when printing.

The logic in PrintRenderFrameHelper to retrieve a plugin is out of sync
with the logic in WebLocalFrameImpl::PrintBegin(). If
PrintRenderFrameHelper thinks it is printing a webpage, while
WebLocalFrameImpl thinks it is printing a plugin, bad things happen.

Fix this by adding WebLocalFrame::GetPluginToPrint(), to expose the
plugin finding logic in WebLocalFrameImpl. With GetPluginToPrint()
available, PrintRenderFrameHelper can delete its own GetPlugin() helper,
and switch the GetPlugin() callers to use GetPluginToPrint() instead.

Once synchronized, some use cases for printing Flash now work correctly.

(cherry picked from commit f8d7d428b1549ff1f87e3d34c5ca0b53d6ce4e84)

Tbr: japhet@chromium.org
Bug: 1098860
Change-Id: I9500db9ed2d6da0f87dad84c197f738d3a1e3c84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2317168
Reviewed-by: Nate Chapin japhet@chromium.org
Commit-Queue: Lei Zhang thestig@chromium.org
Cr-Original-Commit-Position: refs/heads/master@{#791564}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2324664
Reviewed-by: Lei Zhang thestig@chromium.org
Cr-Commit-Position: refs/branch-heads/4183@{#1009}
Cr-Branched-From: 740e9e8a40505392ba5c8e022a8024b3d018ca65-refs/heads/master@{#782793}

Notes: Security: backported fix for 1098860.

@nornagon nornagon requested a review from a team as a code owner September 2, 2020 20:19
@nornagon nornagon added 8-x-y backport-check-skip Skip trop's backport validity checking labels Sep 2, 2020
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Sep 2, 2020
@nornagon
Copy link
Member Author

nornagon commented Sep 3, 2020

CI failures unrelated; merging.

@nornagon nornagon merged commit fd3d252 into 8-x-y Sep 3, 2020
@release-clerk
Copy link

release-clerk bot commented Sep 3, 2020

Release Notes Persisted

Security: backported fix for 1098860.

@nornagon nornagon deleted the cherry-pick/8-x-y/chromium/f6cb89728f04 branch September 3, 2020 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8-x-y backport-check-skip Skip trop's backport validity checking new-pr 🌱 PR opened in the last 24 hours
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants