diff options
| author | brettw <brettw@chromium.org> | 2016-01-28 15:57:29 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-28 23:58:27 +0000 |
| commit | f94a6cd48ef99bb585a8724801040300c4937854 (patch) | |
| tree | 9db6e714c824bda530f88a8552d6df3d14cae65d /content/content_child.gypi | |
| parent | dfdb514788168bbf29a56c9f0d85b2c43d4fa1e9 (diff) | |
| download | chromium_src-f94a6cd48ef99bb585a8724801040300c4937854.zip chromium_src-f94a6cd48ef99bb585a8724801040300c4937854.tar.gz chromium_src-f94a6cd48ef99bb585a8724801040300c4937854.tar.bz2 | |
Move font_warmup_win, fix webrtc dep.
font_warmup_win.cc depends on Blink code but is linked into content/common. This file is not needed outside of child processes, so it can go in content/child and avoid the blink-in-browser usage.
Removes the linux conditional on libjingle_webrtc and make it apply whenever webrtc is being used. This code is called by socket_host.cc whenever webrtc is enabled. This is necessary for a future patch that removes Blink's linking into content/browser. Blink is currently bringing in webrtc which is why the code links today.
BUG=582206
Review URL: https://codereview.chromium.org/1642213002
Cr-Commit-Position: refs/heads/master@{#372210}
Diffstat (limited to 'content/content_child.gypi')
| -rw-r--r-- | content/content_child.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/content_child.gypi b/content/content_child.gypi index 5198c91..62d84ec 100644 --- a/content/content_child.gypi +++ b/content/content_child.gypi @@ -98,6 +98,8 @@ 'child/fileapi/webfilewriter_base.h', 'child/fileapi/webfilewriter_impl.cc', 'child/fileapi/webfilewriter_impl.h', + 'child/font_warmup_win.cc', + 'child/font_warmup_win.h', 'child/ftp_directory_listing_response_delegate.cc', 'child/ftp_directory_listing_response_delegate.h', 'child/geofencing/geofencing_dispatcher.cc', |