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 5745eaf16077 from chromium #28802

Merged
merged 2 commits into from
Apr 28, 2021

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Apr 23, 2021

[privacy_budget] Remove unnecessary kCanvasReadback metrics.

The identifiability metrics recorded under kCanvasReadback surface type
used two conflicting sources as inputs: the CanvasRenderingContext
type, and the paint-op digest.

There are known collisions between resulting IdentifiableSurface values
from the two sources, which makes it impossible to losslessly separate
the two during analysis.

While the fact that a canvas readback happened is interesting, it
doesn't help determine the observed diversity of clients. Hence this
change removes one of those sources: the CanvasRenderingContext type.

M86 merge conflicts and resolution:

  • third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.cc
    M86 does not have the code removed in original CL.
  • third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
    third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
    Removed corresponding code, kept old API.

(cherry picked from commit 809231f0c9fdc6180b6a99cf067d0a32db053034)

(cherry picked from commit b206b57b96985713ad167738f6839a8d32db78f2)

Bug: 1161379, 1186641
Change-Id: I770cb631c9c4afe4c36d1b129aaf61410db25d43
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2600386
Commit-Queue: Asanka Herath asanka@chromium.org
Reviewed-by: Caleb Raitto caraitto@chromium.org
Reviewed-by: Kentaro Hara haraken@chromium.org
Cr-Original-Original-Commit-Position: refs/heads/master@{#847480}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2785145
Reviewed-by: Justin Novosad junov@chromium.org
Reviewed-by: Juanmi Huertas juanmihd@chromium.org
Reviewed-by: Asanka Herath asanka@chromium.org
Commit-Queue: Yi Xu yiyix@chromium.org
Cr-Original-Commit-Position: refs/branch-heads/4389@{#1599}
Cr-Original-Branched-From: 9251c5db2b6d5a59fe4eac7aafa5fed37c139bb7-refs/heads/master@{#843830}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2794506
Reviewed-by: Artem Sumaneev asumaneev@google.com
Reviewed-by: Victor-Gabriel Savu vsavu@google.com
Auto-Submit: Artem Sumaneev asumaneev@google.com
Commit-Queue: Artem Sumaneev asumaneev@google.com
Cr-Commit-Position: refs/branch-heads/4240@{#1586}
Cr-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218}

Notes: Security: backported fix for 1161379, 1186641.

@ppontes ppontes requested a review from a team as a code owner April 23, 2021 12:12
@ppontes ppontes added 10-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes labels Apr 23, 2021
@electron-cation electron-cation bot added new-pr 🌱 PR opened in the last 24 hours and removed new-pr 🌱 PR opened in the last 24 hours labels Apr 23, 2021
@ppontes ppontes force-pushed the cherry-pick/10-x-y/chromium/5745eaf16077 branch from 4155dc0 to 9b224ca Compare April 27, 2021 10:49
@MarshallOfSound MarshallOfSound merged commit c840550 into 10-x-y Apr 28, 2021
@release-clerk
Copy link

release-clerk bot commented Apr 28, 2021

Release Notes Persisted

Security: backported fix for 1161379, 1186641.

@MarshallOfSound MarshallOfSound deleted the cherry-pick/10-x-y/chromium/5745eaf16077 branch April 28, 2021 04:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants