commit | ea8d0c2c3f2b1f6c15cdf821c174c318bed44ef8 | [log] [tgz] |
---|---|---|
author | Rakina Zata Amni <[email protected]> | Thu Jul 30 17:22:50 2020 |
committer | Commit Bot <[email protected]> | Thu Jul 30 17:22:50 2020 |
tree | cc386a5ede8510b3d6fe76226b1ab40a491a0df8 | |
parent | 58bbbee41d28daf4e9bd99f2b4d26b518896cccd [diff] [blame] |
Re-add canvas flag check to ComputeWebPreferences The flag was accidentally deleted in the RenderViewHost->WebContents move. See https://chromium-review.googlesource.com/c/chromium/src/+/2266917/11/content/browser/renderer_host/render_view_host_impl.cc Bug: 1085003. Change-Id: Ifdfa90eb02117c5a599ab12bc5b2375e966c704c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2329951 Commit-Queue: Rakina Zata Amni <[email protected]> Commit-Queue: Avi Drissman <[email protected]> Auto-Submit: Rakina Zata Amni <[email protected]> Reviewed-by: Avi Drissman <[email protected]> Cr-Commit-Position: refs/heads/master@{#793235}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index 2f09301..99ac313e 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2179,7 +2179,8 @@ prefs.accelerated_2d_canvas_enabled = !command_line.HasSwitch(switches::kDisableAccelerated2dCanvas); prefs.new_canvas_2d_api_enabled = - command_line.HasSwitch(switches::kEnableNewCanvas2DAPI); + command_line.HasSwitch(switches::kEnableNewCanvas2DAPI) || + base::FeatureList::IsEnabled(features::kEnableNewCanvas2DAPI); prefs.antialiased_2d_canvas_disabled = command_line.HasSwitch(switches::kDisable2dCanvasAntialiasing); prefs.antialiased_clips_2d_canvas_enabled =