diff options
| author | tfarina <tfarina@chromium.org> | 2015-04-28 12:04:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-28 19:04:55 +0000 |
| commit | 15525c4fa7633018873aa4fec407a14c5cf64840 (patch) | |
| tree | fd85c6b087a7c9a2c08494970703058bce25a992 /content/gpu/gpu_main.cc | |
| parent | cd4ff3af3ba883510a0fe1f802c35210c44247cb (diff) | |
| download | chromium_src-15525c4fa7633018873aa4fec407a14c5cf64840.zip chromium_src-15525c4fa7633018873aa4fec407a14c5cf64840.tar.gz chromium_src-15525c4fa7633018873aa4fec407a14c5cf64840.tar.bz2 | |
gpu: Fix dependency cycle between service_sources and config_sources.
ERROR Dependency cycle:
//gpu/command_buffer/service:service_sources ->
//gpu/config:config_sources ->
//gpu/command_buffer/service:service_sources
The problem was that gpu/command_buffer/service already include from
gpu/config, but gpu/config were also including from
gpu/command_buffer/service for gpu_switches.h, creating the above
dependency cycle.
By moving the required switch down to gpu/config, we broke this
dependency cycle.
With that 'gn check' passes for gpu/config with the following command
lines:
$ gn gen out-gn/Debug
$ gn check out-gn/Debug //gpu/config/*
gpu/command_buffer/service needs more work to pass 'gn check' though.
BUG=367595,376000
TEST=see above
R=sievers@chromium.org
Review URL: https://codereview.chromium.org/1103403002
Cr-Commit-Position: refs/heads/master@{#327344}
Diffstat (limited to 'content/gpu/gpu_main.cc')
| -rw-r--r-- | content/gpu/gpu_main.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 1b16afe..eebb732 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -35,6 +35,7 @@ #include "content/public/common/main_function_params.h" #include "gpu/command_buffer/service/gpu_switches.h" #include "gpu/config/gpu_info_collector.h" +#include "gpu/config/gpu_switches.h" #include "gpu/config/gpu_util.h" #include "ui/events/platform/platform_event_source.h" #include "ui/gl/gl_implementation.h" |