diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-18 14:10:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-18 13:53:24 +0000 |
| commit | 813fbf95af77a531c57a8c497345ad2c61d475b3 (patch) | |
| tree | 821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/third_party/fontconfig | |
| parent | af6588f8d723931a298c995fa97259bb7f7deb55 (diff) | |
| download | qtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz | |
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/third_party/fontconfig')
| -rw-r--r-- | chromium/third_party/fontconfig/BUILD.gn | 2 | ||||
| -rw-r--r-- | chromium/third_party/fontconfig/OWNERS | 3 | ||||
| -rw-r--r-- | chromium/third_party/fontconfig/chromium/empty.cc | 0 | ||||
| -rw-r--r-- | chromium/third_party/fontconfig/fontconfig.gyp | 1 |
4 files changed, 3 insertions, 3 deletions
diff --git a/chromium/third_party/fontconfig/BUILD.gn b/chromium/third_party/fontconfig/BUILD.gn index 21f42ce8f93..9af485fe517 100644 --- a/chromium/third_party/fontconfig/BUILD.gn +++ b/chromium/third_party/fontconfig/BUILD.gn @@ -36,8 +36,8 @@ component("fontconfig") { "src/src/fcstat.c", "src/src/fcstr.c", "src/src/fcxml.c", - "src/src/ftglue.h", "src/src/ftglue.c", + "src/src/ftglue.h", ] include_dirs = [ diff --git a/chromium/third_party/fontconfig/OWNERS b/chromium/third_party/fontconfig/OWNERS index 7e5af1dba56..82160d5ef52 100644 --- a/chromium/third_party/fontconfig/OWNERS +++ b/chromium/third_party/fontconfig/OWNERS @@ -1,3 +1,2 @@ spang@chromium.org -rjkroege@chromium.org -spang@chromium.org +dnicoara@chromium.org diff --git a/chromium/third_party/fontconfig/chromium/empty.cc b/chromium/third_party/fontconfig/chromium/empty.cc new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/chromium/third_party/fontconfig/chromium/empty.cc diff --git a/chromium/third_party/fontconfig/fontconfig.gyp b/chromium/third_party/fontconfig/fontconfig.gyp index c3b350cc6b2..3565a7f77f2 100644 --- a/chromium/third_party/fontconfig/fontconfig.gyp +++ b/chromium/third_party/fontconfig/fontconfig.gyp @@ -26,6 +26,7 @@ }], ], 'sources': [ + 'chromium/empty.cc', 'src/src/fcarch.h', 'src/src/fcatomic.c', 'src/src/fcblanks.c', |