Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Issue 1918023003: Merge M51: Prefer System Flash over non-local component updated Flash. (Closed)

Created:
4 years, 8 months ago by Will Harris
Modified:
4 years, 8 months ago
Reviewers:
CC:
chromium-reviews, darin-cc_chromium.org, jam
Base URL:
https://chromium.googlesource.com/chromium/src.git@2704
Target Ref:
refs/pending/branch-heads/2704
Project:
chromium
Visibility:
Public.

Description

Merge M51: Prefer System Flash over non-local component updated Flash. This avoids attempting to load a Flash DLL off a network drive if doing so would not result in loading an old version of Flash. When determining which Flash to load the following algorithm is evaluated: First, a candidate list of Flash versions is compiled sourced from: - System Flash (Adobe updated) - (could be the debug version) - Bundled Flash (ships with Chrome) - Component updated Flash (updated on user data dir by component updater)* * Note this really only applies on Linux when the component updated Flash is already available at Chrome startup. The highest single version will always win. If so, just use that version. If there are two or more available version of Flash with the same version then preference is given in the following order - Flash content Debugger - Bundled Flash - Local-drive Component updated Flash - System Flash - Network-mounted component updated Flash Because of the way that the pepperflash component updater injects its version of Flash later on in Chrome load, the network drive determination is done in two places, firstly inside ChromeContentClient when building a candidate list, since Linux could have a component updated flash ready for use at this point, and secondly when the pepperflash component comes to inject the new version it will evalulate the order based on the rule above on whether to inject itself. TEST=https://docs.google.com/document/d/1iTQiaqjuHsKV4cPqSOet-eJKWb2SsJLp2ieDj_Mul4s/preview TEST=unit_tests --gtest_filter=ChromeContentClientTest.* BUG=572131 Review URL: https://codereview.chromium.org/1867833003 Cr-Commit-Position: refs/heads/master@{#389006} (cherry picked from commit 73d6faae235add2deebf2a634f0cd0939751a946) Committed: https://chromium.googlesource.com/chromium/src/+/ff48a2fef7b3490f9c0c53e4e58c78184e743835

Patch Set 1 #

Total comments: 1
Unified diffs Side-by-side diffs Delta from patch set Stats (+216 lines, -97 lines) Patch
M chrome/browser/component_updater/pepper_flash_component_installer.cc View 1 chunk +34 lines, -9 lines 0 comments Download
M chrome/browser/ui/webui/plugins/plugins_handler.cc View 2 chunks +5 lines, -8 lines 0 comments Download
M chrome/common/chrome_content_client.cc View 8 chunks +43 lines, -48 lines 1 comment Download
M chrome/common/chrome_content_client_unittest.cc View 1 chunk +87 lines, -31 lines 0 comments Download
M chrome/common/pepper_flash.h View 1 chunk +5 lines, -0 lines 0 comments Download
M chrome/common/pepper_flash.cc View 2 chunks +24 lines, -1 line 0 comments Download
M content/public/common/pepper_plugin_info.h View 1 chunk +14 lines, -0 lines 0 comments Download
M content/public/common/pepper_plugin_info.cc View 2 chunks +4 lines, -0 lines 0 comments Download

Messages

Total messages: 3 (1 generated)
Will Harris
https://codereview.chromium.org/1918023003/diff/1/chrome/common/chrome_content_client.cc File chrome/common/chrome_content_client.cc (right): https://codereview.chromium.org/1918023003/diff/1/chrome/common/chrome_content_client.cc#newcode459 chrome/common/chrome_content_client.cc:459: using PluginSortKey = base::Tuple<base::Version, bool, bool, bool, bool>; note: ...
4 years, 8 months ago (2016-04-25 23:49:07 UTC) #1
Will Harris
4 years, 8 months ago (2016-04-25 23:53:11 UTC) #3
Message was sent while issue was closed.
Committed patchset #1 (id:1) manually as
ff48a2fef7b3490f9c0c53e4e58c78184e743835.

Powered by Google App Engine
This is Rietveld 408576698