commit | 750549e1e4da6cd83a434160cec376badf430cdc | [log] [tgz] |
---|---|---|
author | Oscar Johansson <oscarj@opera.com> | Fri Jul 27 11:12:32 2018 |
committer | Commit Bot <commit-bot@chromium.org> | Fri Jul 27 11:12:32 2018 |
tree | 951401246cfdcf2cc411578bbb27e2ce28b6b3ad | |
parent | 69f37c87a52efd7cc6c970e1cabce24b88f9110a [diff] |
Resolve function name conflict (media/filters) When building using jumbo, files merged and functions with the same name may end up in the same namespace/scope. This happens for the function OnError() that gets called by Bind(). OnError() is defined in: media/filters/audio_video_metadata_extractor.cc media/filters/media_file_checker.cc This commit solves the issue by renaming one of the functions to something more file specific. Bug: 867350 Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel Change-Id: I1b762e4f1c4b11751df2302874af53106889d085 Reviewed-on: https://chromium-review.googlesource.com/1151316 Commit-Queue: Chrome Cunningham (In Paris) <chcunningham@chromium.org> Reviewed-by: Chrome Cunningham (In Paris) <chcunningham@chromium.org> Cr-Commit-Position: refs/heads/master@{#578592}
Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.
The project's web site is https://www.chromium.org.
Documentation in the source is rooted in docs/README.md.
Learn how to Get Around the Chromium Source Code Directory Structure .