third_party


Log

Author Commit Date CI Message
Jamie Madill 2b73d625 2018-10-18T14:26:33 Remove SpvPostProcess.h from glslang's BUILD.gn. Reported by bratell@opera.com. Bug: angleproject:2727 Change-Id: I92750c11fc7d811fa627c8691f6f047023086239 Reviewed-on: https://chromium-review.googlesource.com/c/1289235 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
Shahbaz Youssefi b4ead90b 2018-10-02T17:08:04 Roll VK and SPIR-V deps forward An incorrect validation is preventing work on queries: https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/269 Bug: angleproject:2855 Change-Id: I0454b74f714e69efcfa56e42ff751ffffacaf78c Reviewed-on: https://chromium-review.googlesource.com/c/1258085 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
Corentin Wallez a883dd06 2018-08-03T18:11:46 Use SPIRV-Tools' BUILD.gn files This adds build_overrides/spirv_tools.gni to tell it where to find its dependencies. BUG=chromium:870747 Change-Id: Id1d9fb836e74597860a4411df0a4fd0651840f57 Reviewed-on: https://chromium-review.googlesource.com/1162240 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Jamie Madill 7ada46c9 2018-09-06T10:58:26 Fix JSON cpp DEPS. We need two repos to get jsoncpp working. First is the Chromium tree mirror and second is the jsoncpp source itself. The Chromium version includes only the build files and some source file overrides. Bug: angleproject:2794 Change-Id: I0e1acaf783c5ae3935803eacdf93ffbe01f9fe4d Reviewed-on: https://chromium-review.googlesource.com/1210562 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>
Jamie Madill 4ab19079 2018-09-05T15:19:45 Update jsoncpp DEPS. This points to a mirror of the Chromium jsoncpp folder. The Chromium version includes a BUILD.gn that we can use. Bug: angleproject:2794 Change-Id: I08f34e693d547cd01caefdeddaf43ce4b4bbc29d Reviewed-on: https://chromium-review.googlesource.com/1208510 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
Tobin Ehlis cc046630 2018-09-04T11:58:14 Use chromium mirror for jsoncpp Chromium has a jsoncpp mirror that matches github and has a ninja build config so use that instead of Android mirror. Bug: angleproject:2794 Change-Id: I48423818817f439f3a43f5edee557deae24bf028 Reviewed-on: https://chromium-review.googlesource.com/1203940 Reviewed-by: Ian Elliott <ianelliott@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Ian Elliott <ianelliott@google.com>
Tobin Ehlis 3a181e3e 2018-08-29T15:17:05 Roll VK deps forward as of 8/31/2018 Roll Vulkan ANGLE dependencies forward as of 8/31/2018. This grabs some new validation checks including point-related checks that may be interesting for bug 2727. One of these checks, related to PointSize, is firing so I've added some code in the VK debug callback to suppress those error messages for now and filed a separate bug (2796) to fix that issue in the renderer. Had to overhaul the json gen script as validation changed how these are generated. They now use a base template with some strings replaced to account for platform and Vulkan header version. Offloaded all of that work to our existing json generate script which was previously more of an intelligent copy but now had some further intelligence for transforming from input template into final json files. Had to also roll glslang forward to meet shader validation dependency. Bug: angleproject:2727 Change-Id: I929619cd258cddd6bc9c6743600e072c46736f5c Reviewed-on: https://chromium-review.googlesource.com/1194617 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Tobin Ehlis <tobine@google.com>
Tobin Ehlis 5fdc38cf 2018-08-28T09:20:57 Add jsoncpp as third_party dep Adding jsoncpp in third_party/jsoncpp dir. This is a C++ library to parse json files. Bug: angleproject:2785 Change-Id: I12f467ef87c8d4801815c79f211fc57a3a9f4b49 Reviewed-on: https://chromium-review.googlesource.com/1194840 Reviewed-by: Ian Elliott <ianelliott@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Ian Elliott <ianelliott@google.com>
Tobin Ehlis c56adf60 2018-07-03T11:29:11 Roll Vulkan repos fwd as of 7/3 Update Vulkan Layers/Loader/Tools/Header to latest versions as of 7/3. This updates the ICD build to use inputs from the Header repo instead of copies of the file from its own repo. Those copies have been deleted and some of the generation scripts in Tools repo have been renamed. Also put script dependencies from Vulkan-Headers repo into a shared var that's imported by the other repos to minimize repeat code. Bug: angleproject:2704 Change-Id: I98a18be055482dccdad8468115b4045d09342bfb Reviewed-on: https://chromium-review.googlesource.com/1124966 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Tobin Ehlis <tobine@google.com>
Jamie Madill 1698d7d4 2018-06-27T14:09:58 Vulkan: Roll glslang (June 2018). Includes potential bug fixes. Bug: angleproject:2691 Change-Id: I9a22dbdc96045df36de086f7edf7c914bae1cdbf Reviewed-on: https://chromium-review.googlesource.com/1117320 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Luc Ferron <lucferron@chromium.org> Reviewed-by: Tobin Ehlis <tobine@google.com>
Jamie Madill 57186360 2018-06-27T13:29:40 Roll SPIRV-Tools and SPIRV-headers (June 2018) Bug: angleproject:2691 Change-Id: I754431c7cf7cdbb5b631e9db90b7c1471b5bf9ee Reviewed-on: https://chromium-review.googlesource.com/1117309 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Luc Ferron <lucferron@chromium.org> Reviewed-by: Tobin Ehlis <tobine@google.com>
Tobin Ehlis b971f499 2018-05-24T10:56:17 Migrating ANGLE to split LVL repos Separated the Vulkan Validation Layers, Loader, Tools and Headers into separate dirs to map to the new separate repo structure. Bug: angleproject:2558 Change-Id: I422038f7dd7efe8c5b7a49dc5074de5caf40edfa Reviewed-on: https://chromium-review.googlesource.com/1071880 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tom Anderson a4a3c19a 2018-06-07T11:05:40 Remove manual references to exe_and_shlib_deps After [1], a manual dependency on exe_and_shlib_deps is no longer necessary since it's automatically added. This CL removes all remaining manual references to exe_and_shlib_deps. [1] https://chromium.googlesource.com/chromium/src.git/+/d7ed1f0a9c28c932fddc834ca5de44f28266c7f5 BUG=chromium:845700 Change-Id: I66bcead6586050bf952c4aa1f4d3f726c88d2277 Reviewed-on: https://chromium-review.googlesource.com/1091231 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>
Tobin Ehlis 505ea1bb 2018-04-18T07:26:45 Roll (2/2) to latest LVL as of 4/18/18 Bug: angleproject:2482 Moving to HEAD of master as of 4/18/18. Disable workaround to copy reg.py in BUILD.gn. Re-enable ANGLE Vulkan build. Change-Id: I62d79f532bf8fed40872ee9c175caa4b51c2dd25 Reviewed-on: https://chromium-review.googlesource.com/1016683 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
Tobin Ehlis 3fac3ccc 2018-04-19T14:51:27 Make Mock ICD json file a data_dep of Mock ICD Bug: angleproject:2471 Mock ICD json file was only being copied to angledata when "build all" was done. This fix causes the json file to be copied anytime something with a Vulkan dep is compiled. Change-Id: Ic56ecf12ff5996d14bd2ed419f50b2362453b939 Reviewed-on: https://chromium-review.googlesource.com/1020233 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
Jamie Madill aaa19de0 2018-04-18T16:36:34 Re-land "Vulkan: Add glslang validator to build." This binary will be used to generate internal shaders for clearing/blit/etc. Re-land fixes missing GN dependencies. Bug: angleproject:2339 Change-Id: I99a966906f6cd31049807b7b7adf39484c951622 Reviewed-on: https://chromium-review.googlesource.com/924177 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Luc Ferron <lucferron@chromium.org>
Jamie Madill c61a24d4 2018-04-17T07:22:55 Vulkan: Fix build after roll. Remove struct_size_helper from LVL build. This was causing significant problems on the Chromium CQ. Also fix the warning of duplicate definitions in reg.py by staging scripts to a temporary folder so we can use a fixed version. Bug: angleproject:2482 Bug: chromium:833736 Change-Id: Ide7202fe14bf6c83419f19bc07113df23d51807a Reviewed-on: https://chromium-review.googlesource.com/1014902 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
Jamie Madill 08b9e046 2018-04-16T20:16:39 Vulkan: Disable warning in Mock ICD. We were missing a "no chromium code" config in the mock ICD. This was causing a build error, but the build error was mostly invisible because the mock ICD wasn't being built by default. Fix this by including it in the angle_vulkan target. Bug: angleproject:2482 Change-Id: I417d3fbf6a4acd93c06bab61967409730c2ea4ed Reviewed-on: https://chromium-review.googlesource.com/1012497 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
Tobin Ehlis 41c43ce7 2018-04-16T08:42:56 Roll (2/2) to latest LVL as of 4/16/18 Moving to HEAD of LVL master on morning of 4/16/18. Made some updates to BUILD.gn to add use debug_utils files now instead of debug_report. Re-enable ANGLE Vulkan build. Bug: angleproject:2482 Change-Id: Ic2ab2a1cd7ecdba3152d433efcdbf427864e7e2b Reviewed-on: https://chromium-review.googlesource.com/1014258 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
Tobin Ehlis a3b220f3 2018-03-06T16:22:13 Vulkan: Adding null driver as device option Bug: angleproject:2159 Plumbing to allow VK Mock ICD to be selected as the Vulkan driver. Adding new ANGLE env var "ANGLE_VK_ICD_JSON" to point to json file of mock ICD in angle and use this to override Vk loader ICD search path. At Vulkan renderer initialization time, enable the Mock ICD if device is EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE. Default physicalDevice is still the first detected device. If Mock ICD is requested but not available, fall back to the first device that was detected. Added a VULKAN_NULL() testing config that uses Vulkan as renderer but NULL as device. Turned on Vulkan NULL testing for DrawCallPerf. Change-Id: I04e15c14e998448f8c98f9fd72e796389f297993 Reviewed-on: https://chromium-review.googlesource.com/961494 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
Yuly Novikov 40a945f2 2018-03-01T17:37:43 Rename vulkan_loader to libvulkan Also add a build argument to build it as a shared library. BUG=angleproject:2343 Change-Id: Ia590632b94d71b10d3ee64974fa4f5b4f00c3a70 Reviewed-on: https://chromium-review.googlesource.com/954403 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Jamie Madill e2995cce 2018-03-09T17:43:45 Vulkan: Fix layers not being enabled on the bots. We were missing the data definition for the standard validation layer. This file was missing from the isolate, and the entire layer system was not working. Found this as a side-effect of working on depth stencil support. Also fixes a missing definition in the white_box_tests BUILD.gn. Also temporarily disables the ClearTest support for Vulkan because of an implementation bug on AMD. Unfortunately because of the failure mode it didn't work to just skip the test in the preamble. Bug: angleproject:2357 Change-Id: I4d06c54191b09e09a4ba68c24613db6f148b17e3 Reviewed-on: https://chromium-review.googlesource.com/956759 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tobin Ehlis da6dd738 2018-03-06T17:02:47 Roll (2/2) to latest LVL as of 3/6/18 Bug: angleproject:2393 Moving to HEAD of LVL master on afternoon of 3/6/18. Made some updates to BUILD.gn to add args to spirv tools external_revision_generator.py script. Re-enable ANGLE Vulkan build. Change-Id: I1705d7a2acae578bab9bbd8bb93176107e0e21dc Reviewed-on: https://chromium-review.googlesource.com/952547 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
Nico Weber b66de58f 2018-02-15T14:02:33 Mark third-party code in ANGLE as no_chromium_code. That way, we don't have to explicitly disable Wimplicit-fallthrough for these targets, and when we add new warnings to chromium_code in the future, these targets won't need any special attention. Like https://chromium-review.googlesource.com/c/chromium/src/+/905222 Bug: 807632 Change-Id: I3a605dd3ef9ed7d8cfe9e36964c3433040bfc330 Reviewed-on: https://chromium-review.googlesource.com/922503 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Nico Weber <thakis@chromium.org>
Jamie Madill 26403533 2018-02-14T14:19:13 Revert "Vulkan: Add glslang validator to build." This reverts commit 560bfbcb7860267888db2e8933c187710f4e1512. Reason for revert: Appears to be causing a compile error on the ANGLE roll. https://chromium-review.googlesource.com/c/chromium/src/+/914429 https://ci.chromium.org/p/chromium/builders/luci.chromium.try/linux_chromium_compile_dbg_ng/11598 /b/swarming/w/ir/cache/builder/linux/src/out/Debug/../../third_party/llvm-build/Release+Asserts/bin/ld.lld: error: undefined symbol: std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::compare(unsigned long, unsigned long, char const*) const >>> referenced by StandAlone.cpp Original change's description: > Vulkan: Add glslang validator to build. > > This binary will be used to generate internal shaders for > clearing/blit/etc. > > Bug: angleproject:2339 > Change-Id: I13db7d7a4f5a0155798c9b9a6d2972dd69a680ef > Reviewed-on: https://chromium-review.googlesource.com/904683 > Commit-Queue: Jamie Madill <jmadill@chromium.org> > Reviewed-by: Geoff Lang <geofflang@chromium.org> TBR=ynovikov@chromium.org,geofflang@chromium.org,jmadill@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: angleproject:2339 Change-Id: I7bcedf27831648d4c659294d12cab50f6ef9f33f Reviewed-on: https://chromium-review.googlesource.com/919141 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Luc Ferron <lucferron@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
Tobin Ehlis d9ed9c1a 2018-02-12T14:50:10 Put Vulkan mock ICD json file in separate dir Create "icd" subdir in angledata directory where the Vulkan mock ICD json file is stored. This prevents potential loader conflicts with the layer json files. This change means that when running with the mock ICD a user will need to set their VK_ICD_FILENAMES env variable to now point to "<build_out_dir>/angledata/icd/VkICD_mock_icd.json" and make sure that the built mock icd library resides in the system's shared object search path. Bug: angleproject:2159 Change-Id: I802bb61a06a2f370bb1fa7a28d9c3548e5f94ecf Reviewed-on: https://chromium-review.googlesource.com/914819 Commit-Queue: Tobin Ehlis <tobine@google.com> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Jamie Madill 560bfbcb 2018-02-12T10:08:25 Vulkan: Add glslang validator to build. This binary will be used to generate internal shaders for clearing/blit/etc. Bug: angleproject:2339 Change-Id: I13db7d7a4f5a0155798c9b9a6d2972dd69a680ef Reviewed-on: https://chromium-review.googlesource.com/904683 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>
Yuly Novikov bac02d76 2018-02-07T20:36:07 Vulkan: Fix data_deps on layers Was broken by https://chromium-review.googlesource.com/900096 BUG=angleproject:2339 Change-Id: I3c28a38619d83e7dcbb2349565517feb1758976c Reviewed-on: https://chromium-review.googlesource.com/907959 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Jamie Madill a1134ba8 2018-02-07T15:24:47 Vulkan: Relocate third-party libraries. (2/2) This makes the BUILD.gn source lists a lot simpler, since they no longer need to use a special path variable, but instead can use the correct relative paths. This will lead to further simplifications so we can hopefully upstream the Vulkan tools BUILD.gn files. Second part updates the build files and removes the old repositories. Bug: angleproject:2339 Change-Id: I37f5b42a0854ca49448ecbbb32c19c24df57f452 Reviewed-on: https://chromium-review.googlesource.com/905894 Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
Tobin Ehlis b9d1daa0 2018-01-04T08:30:26 Add Vulkan mock_icd to the build Bug: angleproject:2159 Add Vulkan mock_icd from validation layer source to the standard Vulkan build. This can act as a NULL driver for Vulkan. Once the mock is built set VK_ICD_FILENAMES env variable to "<build_out_dir>/angledata/VkICD_mock_icd.json" to point loader to the mock driver and make sure the built mock icd library resides in the system's shared object search path. Change-Id: Iea86325cf076df75fa82a4974c8a3a6249cdf8e0 Reviewed-on: https://chromium-review.googlesource.com/850892 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Jamie Madill b62a1c2a 2018-02-06T09:54:02 Vulkan: Reorganize BUILD.gn files. This moves the SPIRV-Tools and glslang and Validation layers build files into the root of the dep folder. Requires an upstream Chrome change to allow for a different path to execute scrips in GN. Also removes the vulkan_support subdirectory. Bug: angleproject:2339 Change-Id: I457b5b05547c092a1e7fef6dd0aaadd8068e2143 Reviewed-on: https://chromium-review.googlesource.com/900096 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Frank Henigman 1955640a 2017-11-01T17:36:11 Support ozone/gbm back end in standalone gn build. This makes it possible to do a standalone gn build of the ozone/gbm back end by using the following gn args. use_ozone = true ozone_platform_gbm = true BUG=angleproject:1569 Change-Id: I70716b83943dae95df48b847ff8cca5e2c555c4a Reviewed-on: https://chromium-review.googlesource.com/749867 Commit-Queue: Frank Henigman <fjhenigman@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Frank Henigman d0ef13a2 2017-08-28T22:53:24 Stand-alone build with gn. This should do the same things as the stand-alone gyp build, but with gn. You should switch to gn as gyp support will go away. You need a recent enough version of gn. If yours is too old try this one: ./buildtools/linux64/gn If "gclient sync" or anything fails with an ImportError on gyp stuff, try running it with the following PYTHONPATH in the environment: PYTHONPATH=tools/gyp/pylib BUG=angleproject:1569 Change-Id: I56d19bec2d8b649a7bd65062c656cbfc69ea3dd8 Reviewed-on: https://chromium-review.googlesource.com/642588 Reviewed-by: Frank Henigman <fjhenigman@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Frank Henigman <fjhenigman@chromium.org>
Frank Henigman cc8e2738 2017-10-16T22:42:29 Move libpng into src subdirectory. DEPS libpng into third_party/libpng/src, instead if third_party/libpng. Then we'll be able to put its BUILD.gn into third_party/libpng instead of the more distant build/secondary/... location. BUG=angleproject:1569 Change-Id: I12b1c51d65682cba3954c26f1bd3f7491ac31b01 Reviewed-on: https://chromium-review.googlesource.com/722176 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
Frank Henigman 6b076a09 2017-10-11T13:28:22 Update and move gmock and gtest. Update to the version of googletest current in chromium. Googlemock has merged into googletest so we get rid of the separate DEPs entry and point everything inside googletest. We put it in 'third_party' instead of 'testing' to prepare for the upcoming stand-alone gn build which borrows chromium build files that require other stuff in the 'testing' directory. BUG=angleproject:1569 Change-Id: I51d1675efd5d0104bb6390721928010221a5d6fc Reviewed-on: https://chromium-review.googlesource.com/713466 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Frank Henigman <fjhenigman@chromium.org>
Jamie Madill 0448ec84 2016-12-23T13:41:47 Vulkan: Enable validation layers on request. Also adds the build files for the Vulkan layers. The layers are enabled by default for the tests. BUG=angleproject:1319 Change-Id: I0b442b36312a1299a932922e1c4e39f00801de49 Reviewed-on: https://chromium-review.googlesource.com/367751 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>
Jamie Madill 327ba857 2016-11-30T12:38:28 Vulkan: Hook up loader code. This integrates the build files for the loader SDK, and tests the compilation by calling InitInstance. There's no current way to test the runtime behaviour since there's no way for the tests to initialize the Vulkan back-end, that will come in the next CL. BUG=angleproject:1319 Change-Id: Ia8bf96ca068eaf40744c9753b59ffaaa5ada8a73 Reviewed-on: https://chromium-review.googlesource.com/367519 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>
Jamie Madill c7d6ea48 2016-04-21T16:02:57 Roll dEQP cc0ded6c77267b..cd361df193e7535b9 https://android.googlesource.com/platform/external/deqp/+log/cc0ded6c77267b..f4f3d8079e7a37d7 BUG=None Change-Id: I863f81d2c4c3f48862cb821b23c38266987a82a2 Reviewed-on: https://chromium-review.googlesource.com/340260 Reviewed-by: Geoff Lang <geofflang@chromium.org>