summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornyquist <nyquist@chromium.org>2016-03-08 17:42:13 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-09 01:43:26 +0000
commitb4fd57023ade2863e463d3380456968dca6c8bcf (patch)
tree0fe1426dadfbb0b4cf7c816d8b6c60216f215a19
parentddab530d959c07bf6eac7e8dd4218fe9af83d319 (diff)
downloadchromium_src-b4fd57023ade2863e463d3380456968dca6c8bcf.zip
chromium_src-b4fd57023ade2863e463d3380456968dca6c8bcf.tar.gz
chromium_src-b4fd57023ade2863e463d3380456968dca6c8bcf.tar.bz2
Add Android fonts to blimp engine
The blimp engine is currently using Linux fonts, which works well for Linux clients. However, for Android clients, Skia should be instructed to use Android fonts instead to ensure that the font rendering works correctly. This CL adds a starting set of fonts to be used, ensures that they are part of the engine bundle, and provides documentation for how to use them in locally hosted engines and also for how to keep the fonts up to date. This also updates the engine manifest and starts loading a new dynamic library while running the engine plus fixes the documentation for running the engine as a container. Initial CL: https://codereview.chromium.org/1735783002/ Revert: https://codereview.chromium.org/1772343003/ BUG=585668, 588929 Review URL: https://codereview.chromium.org/1776133002 Cr-Commit-Position: refs/heads/master@{#380022}
-rw-r--r--DEPS12
-rw-r--r--blimp/README.md5
-rw-r--r--blimp/docs/container.md6
-rw-r--r--blimp/docs/fonts.md35
-rw-r--r--blimp/docs/running.md3
-rw-r--r--blimp/engine/BUILD.gn1
-rw-r--r--blimp/engine/DEPS1
-rw-r--r--blimp/engine/Dockerfile4
-rw-r--r--blimp/engine/engine-manifest.txt209
-rwxr-xr-xblimp/engine/start_engine.sh3
-rw-r--r--blimp/tools/manifest-blacklist.txt4
-rw-r--r--third_party/blimp_fonts/.gitignore2
-rw-r--r--third_party/blimp_fonts/BUILD.gn217
-rw-r--r--third_party/blimp_fonts/LICENSE232
-rw-r--r--third_party/blimp_fonts/LICENSE.Apache201
-rw-r--r--third_party/blimp_fonts/LICENSE.OFL92
-rw-r--r--third_party/blimp_fonts/OWNERS5
-rw-r--r--third_party/blimp_fonts/README.chromium49
-rw-r--r--third_party/blimp_fonts/font_bundle.tar.gz.sha11
19 files changed, 1071 insertions, 11 deletions
diff --git a/DEPS b/DEPS
index 5a95a57..a0066bd 100644
--- a/DEPS
+++ b/DEPS
@@ -815,6 +815,18 @@ hooks = [
],
},
{
+ 'name': 'blimp_fonts',
+ 'pattern': '.',
+ 'action': [ 'download_from_google_storage',
+ '--no_resume',
+ '--platform=linux*',
+ '--extract',
+ '--no_auth',
+ '--bucket', 'chromium-fonts',
+ '-s', 'src/third_party/blimp_fonts/font_bundle.tar.gz.sha1',
+ ],
+ },
+ {
# Pull sanitizer-instrumented third-party libraries if requested via
# GYP_DEFINES.
'name': 'instrumented_libraries',
diff --git a/blimp/README.md b/blimp/README.md
index adff5d3..3ed48f9 100644
--- a/blimp/README.md
+++ b/blimp/README.md
@@ -14,7 +14,10 @@ For testing blimp, read more at [testing](docs/test.md).
For running blimp, read more at [running](docs/running.md).
+## Updating Fonts
+
+For updating the fonts that blimp supports, read more at [fonts](docs/fonts.md).
+
## New to Markdown?
For learning more about Markdown, read more at [markdown](docs/markdown.md).
-
diff --git a/blimp/docs/container.md b/blimp/docs/container.md
index 31adc80..6cec582 100644
--- a/blimp/docs/container.md
+++ b/blimp/docs/container.md
@@ -56,7 +56,7 @@ dependencies.
Using the tarfile you can create a Docker image:
```bash
-docker build -t blimp_engine - < ./out-linux/Debug/blimp_engine_bundle.tar
+docker build -t blimp_engine - < ./out-linux/Debug/blimp_engine_bundle.tar.gz
```
## Running the Engine in a Docker Container
@@ -74,7 +74,8 @@ few files that are not provided by the container. You need:
public certificate. Permissions should be set to 644.
* `$CONFIG_DIR/client_token`: A file with a non-empty string used as the
client token (the shared secret between the client and the engine).
- Persmissions should also be set to 644.
+ Permissions should also be set to 644. See [running](running.md) for how
+ to get the default token from the source code.
This setup step is only required once and can be reused for all the rest of the
runs of the engine.
@@ -94,4 +95,3 @@ docker run ... blimp_engine --with-my-flags
```
See the [blimp engine `Dockerfile`](../engine/Dockerfile) to find out what flags
are passed by default.
-
diff --git a/blimp/docs/fonts.md b/blimp/docs/fonts.md
new file mode 100644
index 0000000..379a5df
--- /dev/null
+++ b/blimp/docs/fonts.md
@@ -0,0 +1,35 @@
+# Updating Blimp Fonts
+
+1. Clone the git-repositories listed in
+ `//third_party/blimp_fonts/README.chromium`, and roll forward to the commit
+ you want.
+1. Copy the necessary files to `//third_party/blimp_fonts/font_bundle`.
+1. Verify that the `fonts.xml` file include the correct fonts.
+1. Verify that the `LICENSE` file is still up to date and lists all relevant
+ licenses and which fonts use which license.
+1. Update the `//third_party/blimp_fonts` target to include all the
+ current fonts and their license files.
+1. Update the engine dependencies using
+ `//blimp/tools/generate-engine-manifest.py`. This step is documented in
+ `//blimp/docs/container.md`.
+1. Run the `upload_to_google_storage.py` (from depot_tools) script to upload
+ the files. You must do this in the `//third_party/blimp_fonts` directory.
+ To do this, execute:
+
+ ```bash
+ upload_to_google_storage.py --archive -b chromium-fonts font_bundle
+ ```
+
+1. Add all the `font_bundle.tar.gz.sha1` file to the chromium src repository,
+ by executing the following command:
+
+ ```bash
+ git add ./third_party/blimp_fonts/font_bundle.tar.gz.sha1
+ ```
+
+1. Commit and upload the change for review:
+
+ ```bash
+ git commit
+ git cl upload
+ ```
diff --git a/blimp/docs/running.md b/blimp/docs/running.md
index 8accd3e..bb92199 100644
--- a/blimp/docs/running.md
+++ b/blimp/docs/running.md
@@ -100,6 +100,8 @@ also start a new shell and keep the following command running:
compositor.
* `--disable-cached-picture-raster`: Ensures that rasterized content is not
destroyed before serialization.
+* `--android-fonts-path=$PATH`: Path to where the fonts are located.
+ Typically this would be `out-linux/Debug/gen/third_party/blimp_fonts`.
#### Typical invocation
When the client connects to a manually specified engine instead of using the
@@ -122,6 +124,7 @@ out-linux/Debug/blimp_engine_app \
--disable-cached-picture-raster \
--blimp-client-token-path=/tmp/blimpengine-token \
--user-data-dir=/tmp/blimpengine \
+ --android-fonts-path=out-linux/Debug/gen/third_party/blimp_fonts \
--enable-logging=stderr \
--vmodule="blimp*=1"
```
diff --git a/blimp/engine/BUILD.gn b/blimp/engine/BUILD.gn
index 5bd4c21..a19eb10 100644
--- a/blimp/engine/BUILD.gn
+++ b/blimp/engine/BUILD.gn
@@ -223,6 +223,7 @@ if (is_linux) {
":blimp_engine_app",
":pak",
"//sandbox/linux:chrome_sandbox",
+ "//third_party/blimp_fonts",
]
# List dependencies as both deps and data_deps to ensure changes trigger a
diff --git a/blimp/engine/DEPS b/blimp/engine/DEPS
index e4ebc4e..5c16370 100644
--- a/blimp/engine/DEPS
+++ b/blimp/engine/DEPS
@@ -6,6 +6,7 @@ include_rules = [
"+components/web_cache/renderer",
"+content/public",
"+net",
+ "+third_party/blimp_fonts",
"+third_party/khronos/GLES2/gl2.h",
"+third_party/WebKit/public/web/WebInputEvent.h",
"+ui/aura",
diff --git a/blimp/engine/Dockerfile b/blimp/engine/Dockerfile
index 0410cf8..7e3cbba 100644
--- a/blimp/engine/Dockerfile
+++ b/blimp/engine/Dockerfile
@@ -13,7 +13,10 @@ RUN mkdir /engine
RUN useradd -ms /bin/bash blimp_user
+# The glob below expands to all files, but does not add directories
+# recursively.
ADD * /engine/
+ADD gen/third_party/blimp_fonts /engine/fonts
RUN mv /engine/chrome_sandbox /engine/chrome-sandbox
RUN chown -R blimp_user /engine
@@ -21,4 +24,3 @@ USER blimp_user
WORKDIR "/engine"
ENTRYPOINT ["/engine/start_engine.sh"]
-
diff --git a/blimp/engine/engine-manifest.txt b/blimp/engine/engine-manifest.txt
index d84b8f9..285e9c2 100644
--- a/blimp/engine/engine-manifest.txt
+++ b/blimp/engine/engine-manifest.txt
@@ -1,7 +1,7 @@
# Runtime dependencies for the Blimp Engine
#
# This file was generated by running:
-# generate-engine-manifest.py --build-dir out/Linux --target //blimp/engine:blimp_engine --output blimp/engine/engine-manifest.txt
+# generate-engine-manifest.py --build-dir out-chromeos/Debug --target //blimp/engine:blimp_engine --output blimp/engine/engine-manifest.txt
#
# Note: Any unnecessary dependencies should be added to
# manifest-blacklist.txt and this file should be regenerated.
@@ -9,4 +9,209 @@
icudtl.dat
natives_blob.bin
blimp_engine.pak
-./chrome_sandbox \ No newline at end of file
+./chrome_sandbox
+gen/third_party/blimp_fonts/LICENSE
+gen/third_party/blimp_fonts/LICENSE.Apache
+gen/third_party/blimp_fonts/LICENSE.OFL
+gen/third_party/blimp_fonts/AndroidClock.ttf
+gen/third_party/blimp_fonts/AndroidClock_Highlight.ttf
+gen/third_party/blimp_fonts/AndroidClock_Solid.ttf
+gen/third_party/blimp_fonts/CarroisGothicSC-Regular.ttf
+gen/third_party/blimp_fonts/Clockopia.ttf
+gen/third_party/blimp_fonts/ComingSoon.ttf
+gen/third_party/blimp_fonts/CutiveMono.ttf
+gen/third_party/blimp_fonts/DancingScript-Bold.ttf
+gen/third_party/blimp_fonts/DancingScript-Regular.ttf
+gen/third_party/blimp_fonts/DroidSansFallback.ttf
+gen/third_party/blimp_fonts/DroidSansFallbackFull.ttf
+gen/third_party/blimp_fonts/DroidSansMono.ttf
+gen/third_party/blimp_fonts/MTLc3m.ttf
+gen/third_party/blimp_fonts/MTLmr3m.ttf
+gen/third_party/blimp_fonts/NanumGothic.ttf
+gen/third_party/blimp_fonts/NanumGothicBold.ttf
+gen/third_party/blimp_fonts/NotoColorEmoji.ttf
+gen/third_party/blimp_fonts/NotoKufiArabic-Bold.ttf
+gen/third_party/blimp_fonts/NotoKufiArabic-Regular.ttf
+gen/third_party/blimp_fonts/NotoNaskhArabic-Bold.ttf
+gen/third_party/blimp_fonts/NotoNaskhArabic-Regular.ttf
+gen/third_party/blimp_fonts/NotoNaskhArabicUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoNaskhArabicUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSans-Bold.ttf
+gen/third_party/blimp_fonts/NotoSans-BoldItalic.ttf
+gen/third_party/blimp_fonts/NotoSans-Italic.ttf
+gen/third_party/blimp_fonts/NotoSans-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansArmenian-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansArmenian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansAvestan-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBalinese-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBamum-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBatak-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBengali-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansBengali-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBengaliUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansBengaliUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBrahmi-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBuginese-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBuhid-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansCanadianAboriginal-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansCarian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansCham-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansCham-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansCherokee-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansCoptic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansCuneiform-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansCypriot-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansDeseret-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansDevanagari-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansDevanagari-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansDevanagariUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansDevanagariUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansEgyptianHieroglyphs-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansEthiopic-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansEthiopic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansGeorgian-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansGeorgian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansGlagolitic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansGothic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansGujarati-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansGujarati-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansGujaratiUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansGujaratiUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansGurmukhi-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansGurmukhi-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansGurmukhiUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansGurmukhiUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansHanunoo-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansHebrew-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansHebrew-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansImperialAramaic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansInscriptionalPahlavi-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansInscriptionalParthian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansJP-Regular-Subsetted.otf
+gen/third_party/blimp_fonts/NotoSansJP-Regular.otf
+gen/third_party/blimp_fonts/NotoSansJavanese-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansKR-Regular.otf
+gen/third_party/blimp_fonts/NotoSansKaithi-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansKannada-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansKannada-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansKannadaUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansKannadaUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansKayahLi-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansKharoshthi-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansKhmer-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansKhmer-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansKhmerUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansKhmerUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLao-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansLao-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLaoUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansLaoUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLepcha-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLimbu-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLinearB-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLisu-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLycian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLydian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansMalayalam-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansMalayalam-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansMalayalamUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansMalayalamUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansMandaic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansMeeteiMayek-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansMongolian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansMyanmar-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansMyanmar-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansMyanmarUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansMyanmarUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansNKo-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansNewTaiLue-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOgham-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOlChiki-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOldItalic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOldPersian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOldSouthArabian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOldTurkic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOriya-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansOriya-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOriyaUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansOriyaUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOsmanya-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansPhagsPa-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansPhoenician-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansRejang-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansRunic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSC-Regular.otf
+gen/third_party/blimp_fonts/NotoSansSamaritan-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSaurashtra-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansShavian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSinhala-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansSinhala-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSundanese-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSylotiNagri-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSymbols-Regular-Subsetted.ttf
+gen/third_party/blimp_fonts/NotoSansSymbols-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSyriacEastern-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSyriacEstrangela-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSyriacWestern-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTC-Regular.otf
+gen/third_party/blimp_fonts/NotoSansTagalog-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTagbanwa-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTaiLe-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTaiTham-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTaiViet-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTamil-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansTamil-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTamilUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansTamilUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTelugu-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansTelugu-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTeluguUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansTeluguUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansThaana-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansThaana-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansThai-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansThai-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansThaiUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansThaiUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTibetan-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTifinagh-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansUI-BoldItalic.ttf
+gen/third_party/blimp_fonts/NotoSansUI-Italic.ttf
+gen/third_party/blimp_fonts/NotoSansUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansUgaritic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansVai-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansYi-Regular.ttf
+gen/third_party/blimp_fonts/NotoSerif-Bold.ttf
+gen/third_party/blimp_fonts/NotoSerif-BoldItalic.ttf
+gen/third_party/blimp_fonts/NotoSerif-Italic.ttf
+gen/third_party/blimp_fonts/NotoSerif-Regular.ttf
+gen/third_party/blimp_fonts/NotoSerifArmenian-Bold.ttf
+gen/third_party/blimp_fonts/NotoSerifArmenian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSerifGeorgian-Bold.ttf
+gen/third_party/blimp_fonts/NotoSerifGeorgian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSerifKhmer-Bold.ttf
+gen/third_party/blimp_fonts/NotoSerifKhmer-Regular.ttf
+gen/third_party/blimp_fonts/NotoSerifLao-Bold.ttf
+gen/third_party/blimp_fonts/NotoSerifLao-Regular.ttf
+gen/third_party/blimp_fonts/NotoSerifThai-Bold.ttf
+gen/third_party/blimp_fonts/NotoSerifThai-Regular.ttf
+gen/third_party/blimp_fonts/Roboto-Black.ttf
+gen/third_party/blimp_fonts/Roboto-BlackItalic.ttf
+gen/third_party/blimp_fonts/Roboto-Bold.ttf
+gen/third_party/blimp_fonts/Roboto-BoldItalic.ttf
+gen/third_party/blimp_fonts/Roboto-Italic.ttf
+gen/third_party/blimp_fonts/Roboto-Light.ttf
+gen/third_party/blimp_fonts/Roboto-LightItalic.ttf
+gen/third_party/blimp_fonts/Roboto-Medium.ttf
+gen/third_party/blimp_fonts/Roboto-MediumItalic.ttf
+gen/third_party/blimp_fonts/Roboto-Regular.ttf
+gen/third_party/blimp_fonts/Roboto-Thin.ttf
+gen/third_party/blimp_fonts/Roboto-ThinItalic.ttf
+gen/third_party/blimp_fonts/RobotoCondensed-Bold.ttf
+gen/third_party/blimp_fonts/RobotoCondensed-BoldItalic.ttf
+gen/third_party/blimp_fonts/RobotoCondensed-Italic.ttf
+gen/third_party/blimp_fonts/RobotoCondensed-Light.ttf
+gen/third_party/blimp_fonts/RobotoCondensed-LightItalic.ttf
+gen/third_party/blimp_fonts/RobotoCondensed-Regular.ttf
+gen/third_party/blimp_fonts/fonts.xml \ No newline at end of file
diff --git a/blimp/engine/start_engine.sh b/blimp/engine/start_engine.sh
index f507c24..a9cf193 100755
--- a/blimp/engine/start_engine.sh
+++ b/blimp/engine/start_engine.sh
@@ -8,11 +8,12 @@ stunnel \
-p /engine/data/stunnel.pem \
-P /engine/stunnel.pid \
-d 25466 -r 25467 -f &
-/engine/blimp_engine_app \
+LD_LIBRARY_PATH=/engine/ /engine/blimp_engine_app \
--disable-gpu \
--use-remote-compositing \
--disable-cached-picture-raster \
--blimp-client-token-path=/engine/data/client_token \
+ --android-fonts-path=/engine/fonts \
$@ &
# Stop execution if either stunnel or blimp_engine_app die.
diff --git a/blimp/tools/manifest-blacklist.txt b/blimp/tools/manifest-blacklist.txt
index ce4c1c9b..d21b052 100644
--- a/blimp/tools/manifest-blacklist.txt
+++ b/blimp/tools/manifest-blacklist.txt
@@ -2,13 +2,11 @@
# Wildcards (* or ?) are allowed.
*.mojo
+*mojom.js
./libfont_service_library.so
./libtracing_library.so
./libmus_library.so
./libosmesa.so
./libresource_provider_library.so
./mojo_runner
-gen/*
-mus/mus.mojo
snapshot_blob.bin
-
diff --git a/third_party/blimp_fonts/.gitignore b/third_party/blimp_fonts/.gitignore
new file mode 100644
index 0000000..dfa02a1
--- /dev/null
+++ b/third_party/blimp_fonts/.gitignore
@@ -0,0 +1,2 @@
+font_bundle/
+font_bundle.tar.gz
diff --git a/third_party/blimp_fonts/BUILD.gn b/third_party/blimp_fonts/BUILD.gn
new file mode 100644
index 0000000..96c1926
--- /dev/null
+++ b/third_party/blimp_fonts/BUILD.gn
@@ -0,0 +1,217 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+copy("blimp_fonts") {
+ sources = [
+ "LICENSE",
+ "LICENSE.Apache",
+ "LICENSE.OFL",
+ "font_bundle/AndroidClock.ttf",
+ "font_bundle/AndroidClock_Highlight.ttf",
+ "font_bundle/AndroidClock_Solid.ttf",
+ "font_bundle/CarroisGothicSC-Regular.ttf",
+ "font_bundle/Clockopia.ttf",
+ "font_bundle/ComingSoon.ttf",
+ "font_bundle/CutiveMono.ttf",
+ "font_bundle/DancingScript-Bold.ttf",
+ "font_bundle/DancingScript-Regular.ttf",
+ "font_bundle/DroidSansFallback.ttf",
+ "font_bundle/DroidSansFallbackFull.ttf",
+ "font_bundle/DroidSansMono.ttf",
+ "font_bundle/MTLc3m.ttf",
+ "font_bundle/MTLmr3m.ttf",
+ "font_bundle/NanumGothic.ttf",
+ "font_bundle/NanumGothicBold.ttf",
+ "font_bundle/NotoColorEmoji.ttf",
+ "font_bundle/NotoKufiArabic-Bold.ttf",
+ "font_bundle/NotoKufiArabic-Regular.ttf",
+ "font_bundle/NotoNaskhArabic-Bold.ttf",
+ "font_bundle/NotoNaskhArabic-Regular.ttf",
+ "font_bundle/NotoNaskhArabicUI-Bold.ttf",
+ "font_bundle/NotoNaskhArabicUI-Regular.ttf",
+ "font_bundle/NotoSans-Bold.ttf",
+ "font_bundle/NotoSans-BoldItalic.ttf",
+ "font_bundle/NotoSans-Italic.ttf",
+ "font_bundle/NotoSans-Regular.ttf",
+ "font_bundle/NotoSansArmenian-Bold.ttf",
+ "font_bundle/NotoSansArmenian-Regular.ttf",
+ "font_bundle/NotoSansAvestan-Regular.ttf",
+ "font_bundle/NotoSansBalinese-Regular.ttf",
+ "font_bundle/NotoSansBamum-Regular.ttf",
+ "font_bundle/NotoSansBatak-Regular.ttf",
+ "font_bundle/NotoSansBengali-Bold.ttf",
+ "font_bundle/NotoSansBengali-Regular.ttf",
+ "font_bundle/NotoSansBengaliUI-Bold.ttf",
+ "font_bundle/NotoSansBengaliUI-Regular.ttf",
+ "font_bundle/NotoSansBrahmi-Regular.ttf",
+ "font_bundle/NotoSansBuginese-Regular.ttf",
+ "font_bundle/NotoSansBuhid-Regular.ttf",
+ "font_bundle/NotoSansCanadianAboriginal-Regular.ttf",
+ "font_bundle/NotoSansCarian-Regular.ttf",
+ "font_bundle/NotoSansCham-Bold.ttf",
+ "font_bundle/NotoSansCham-Regular.ttf",
+ "font_bundle/NotoSansCherokee-Regular.ttf",
+ "font_bundle/NotoSansCoptic-Regular.ttf",
+ "font_bundle/NotoSansCuneiform-Regular.ttf",
+ "font_bundle/NotoSansCypriot-Regular.ttf",
+ "font_bundle/NotoSansDeseret-Regular.ttf",
+ "font_bundle/NotoSansDevanagari-Bold.ttf",
+ "font_bundle/NotoSansDevanagari-Regular.ttf",
+ "font_bundle/NotoSansDevanagariUI-Bold.ttf",
+ "font_bundle/NotoSansDevanagariUI-Regular.ttf",
+ "font_bundle/NotoSansEgyptianHieroglyphs-Regular.ttf",
+ "font_bundle/NotoSansEthiopic-Bold.ttf",
+ "font_bundle/NotoSansEthiopic-Regular.ttf",
+ "font_bundle/NotoSansGeorgian-Bold.ttf",
+ "font_bundle/NotoSansGeorgian-Regular.ttf",
+ "font_bundle/NotoSansGlagolitic-Regular.ttf",
+ "font_bundle/NotoSansGothic-Regular.ttf",
+ "font_bundle/NotoSansGujarati-Bold.ttf",
+ "font_bundle/NotoSansGujarati-Regular.ttf",
+ "font_bundle/NotoSansGujaratiUI-Bold.ttf",
+ "font_bundle/NotoSansGujaratiUI-Regular.ttf",
+ "font_bundle/NotoSansGurmukhi-Bold.ttf",
+ "font_bundle/NotoSansGurmukhi-Regular.ttf",
+ "font_bundle/NotoSansGurmukhiUI-Bold.ttf",
+ "font_bundle/NotoSansGurmukhiUI-Regular.ttf",
+ "font_bundle/NotoSansHanunoo-Regular.ttf",
+ "font_bundle/NotoSansHebrew-Bold.ttf",
+ "font_bundle/NotoSansHebrew-Regular.ttf",
+ "font_bundle/NotoSansImperialAramaic-Regular.ttf",
+ "font_bundle/NotoSansInscriptionalPahlavi-Regular.ttf",
+ "font_bundle/NotoSansInscriptionalParthian-Regular.ttf",
+ "font_bundle/NotoSansJP-Regular-Subsetted.otf",
+ "font_bundle/NotoSansJP-Regular.otf",
+ "font_bundle/NotoSansJavanese-Regular.ttf",
+ "font_bundle/NotoSansKR-Regular.otf",
+ "font_bundle/NotoSansKaithi-Regular.ttf",
+ "font_bundle/NotoSansKannada-Bold.ttf",
+ "font_bundle/NotoSansKannada-Regular.ttf",
+ "font_bundle/NotoSansKannadaUI-Bold.ttf",
+ "font_bundle/NotoSansKannadaUI-Regular.ttf",
+ "font_bundle/NotoSansKayahLi-Regular.ttf",
+ "font_bundle/NotoSansKharoshthi-Regular.ttf",
+ "font_bundle/NotoSansKhmer-Bold.ttf",
+ "font_bundle/NotoSansKhmer-Regular.ttf",
+ "font_bundle/NotoSansKhmerUI-Bold.ttf",
+ "font_bundle/NotoSansKhmerUI-Regular.ttf",
+ "font_bundle/NotoSansLao-Bold.ttf",
+ "font_bundle/NotoSansLao-Regular.ttf",
+ "font_bundle/NotoSansLaoUI-Bold.ttf",
+ "font_bundle/NotoSansLaoUI-Regular.ttf",
+ "font_bundle/NotoSansLepcha-Regular.ttf",
+ "font_bundle/NotoSansLimbu-Regular.ttf",
+ "font_bundle/NotoSansLinearB-Regular.ttf",
+ "font_bundle/NotoSansLisu-Regular.ttf",
+ "font_bundle/NotoSansLycian-Regular.ttf",
+ "font_bundle/NotoSansLydian-Regular.ttf",
+ "font_bundle/NotoSansMalayalam-Bold.ttf",
+ "font_bundle/NotoSansMalayalam-Regular.ttf",
+ "font_bundle/NotoSansMalayalamUI-Bold.ttf",
+ "font_bundle/NotoSansMalayalamUI-Regular.ttf",
+ "font_bundle/NotoSansMandaic-Regular.ttf",
+ "font_bundle/NotoSansMeeteiMayek-Regular.ttf",
+ "font_bundle/NotoSansMongolian-Regular.ttf",
+ "font_bundle/NotoSansMyanmar-Bold.ttf",
+ "font_bundle/NotoSansMyanmar-Regular.ttf",
+ "font_bundle/NotoSansMyanmarUI-Bold.ttf",
+ "font_bundle/NotoSansMyanmarUI-Regular.ttf",
+ "font_bundle/NotoSansNKo-Regular.ttf",
+ "font_bundle/NotoSansNewTaiLue-Regular.ttf",
+ "font_bundle/NotoSansOgham-Regular.ttf",
+ "font_bundle/NotoSansOlChiki-Regular.ttf",
+ "font_bundle/NotoSansOldItalic-Regular.ttf",
+ "font_bundle/NotoSansOldPersian-Regular.ttf",
+ "font_bundle/NotoSansOldSouthArabian-Regular.ttf",
+ "font_bundle/NotoSansOldTurkic-Regular.ttf",
+ "font_bundle/NotoSansOriya-Bold.ttf",
+ "font_bundle/NotoSansOriya-Regular.ttf",
+ "font_bundle/NotoSansOriyaUI-Bold.ttf",
+ "font_bundle/NotoSansOriyaUI-Regular.ttf",
+ "font_bundle/NotoSansOsmanya-Regular.ttf",
+ "font_bundle/NotoSansPhagsPa-Regular.ttf",
+ "font_bundle/NotoSansPhoenician-Regular.ttf",
+ "font_bundle/NotoSansRejang-Regular.ttf",
+ "font_bundle/NotoSansRunic-Regular.ttf",
+ "font_bundle/NotoSansSC-Regular.otf",
+ "font_bundle/NotoSansSamaritan-Regular.ttf",
+ "font_bundle/NotoSansSaurashtra-Regular.ttf",
+ "font_bundle/NotoSansShavian-Regular.ttf",
+ "font_bundle/NotoSansSinhala-Bold.ttf",
+ "font_bundle/NotoSansSinhala-Regular.ttf",
+ "font_bundle/NotoSansSundanese-Regular.ttf",
+ "font_bundle/NotoSansSylotiNagri-Regular.ttf",
+ "font_bundle/NotoSansSymbols-Regular-Subsetted.ttf",
+ "font_bundle/NotoSansSymbols-Regular.ttf",
+ "font_bundle/NotoSansSyriacEastern-Regular.ttf",
+ "font_bundle/NotoSansSyriacEstrangela-Regular.ttf",
+ "font_bundle/NotoSansSyriacWestern-Regular.ttf",
+ "font_bundle/NotoSansTC-Regular.otf",
+ "font_bundle/NotoSansTagalog-Regular.ttf",
+ "font_bundle/NotoSansTagbanwa-Regular.ttf",
+ "font_bundle/NotoSansTaiLe-Regular.ttf",
+ "font_bundle/NotoSansTaiTham-Regular.ttf",
+ "font_bundle/NotoSansTaiViet-Regular.ttf",
+ "font_bundle/NotoSansTamil-Bold.ttf",
+ "font_bundle/NotoSansTamil-Regular.ttf",
+ "font_bundle/NotoSansTamilUI-Bold.ttf",
+ "font_bundle/NotoSansTamilUI-Regular.ttf",
+ "font_bundle/NotoSansTelugu-Bold.ttf",
+ "font_bundle/NotoSansTelugu-Regular.ttf",
+ "font_bundle/NotoSansTeluguUI-Bold.ttf",
+ "font_bundle/NotoSansTeluguUI-Regular.ttf",
+ "font_bundle/NotoSansThaana-Bold.ttf",
+ "font_bundle/NotoSansThaana-Regular.ttf",
+ "font_bundle/NotoSansThai-Bold.ttf",
+ "font_bundle/NotoSansThai-Regular.ttf",
+ "font_bundle/NotoSansThaiUI-Bold.ttf",
+ "font_bundle/NotoSansThaiUI-Regular.ttf",
+ "font_bundle/NotoSansTibetan-Regular.ttf",
+ "font_bundle/NotoSansTifinagh-Regular.ttf",
+ "font_bundle/NotoSansUI-Bold.ttf",
+ "font_bundle/NotoSansUI-BoldItalic.ttf",
+ "font_bundle/NotoSansUI-Italic.ttf",
+ "font_bundle/NotoSansUI-Regular.ttf",
+ "font_bundle/NotoSansUgaritic-Regular.ttf",
+ "font_bundle/NotoSansVai-Regular.ttf",
+ "font_bundle/NotoSansYi-Regular.ttf",
+ "font_bundle/NotoSerif-Bold.ttf",
+ "font_bundle/NotoSerif-BoldItalic.ttf",
+ "font_bundle/NotoSerif-Italic.ttf",
+ "font_bundle/NotoSerif-Regular.ttf",
+ "font_bundle/NotoSerifArmenian-Bold.ttf",
+ "font_bundle/NotoSerifArmenian-Regular.ttf",
+ "font_bundle/NotoSerifGeorgian-Bold.ttf",
+ "font_bundle/NotoSerifGeorgian-Regular.ttf",
+ "font_bundle/NotoSerifKhmer-Bold.ttf",
+ "font_bundle/NotoSerifKhmer-Regular.ttf",
+ "font_bundle/NotoSerifLao-Bold.ttf",
+ "font_bundle/NotoSerifLao-Regular.ttf",
+ "font_bundle/NotoSerifThai-Bold.ttf",
+ "font_bundle/NotoSerifThai-Regular.ttf",
+ "font_bundle/Roboto-Black.ttf",
+ "font_bundle/Roboto-BlackItalic.ttf",
+ "font_bundle/Roboto-Bold.ttf",
+ "font_bundle/Roboto-BoldItalic.ttf",
+ "font_bundle/Roboto-Italic.ttf",
+ "font_bundle/Roboto-Light.ttf",
+ "font_bundle/Roboto-LightItalic.ttf",
+ "font_bundle/Roboto-Medium.ttf",
+ "font_bundle/Roboto-MediumItalic.ttf",
+ "font_bundle/Roboto-Regular.ttf",
+ "font_bundle/Roboto-Thin.ttf",
+ "font_bundle/Roboto-ThinItalic.ttf",
+ "font_bundle/RobotoCondensed-Bold.ttf",
+ "font_bundle/RobotoCondensed-BoldItalic.ttf",
+ "font_bundle/RobotoCondensed-Italic.ttf",
+ "font_bundle/RobotoCondensed-Light.ttf",
+ "font_bundle/RobotoCondensed-LightItalic.ttf",
+ "font_bundle/RobotoCondensed-Regular.ttf",
+ "font_bundle/fonts.xml",
+ ]
+
+ outputs = [
+ "$target_gen_dir/{{source_file_part}}",
+ ]
+}
diff --git a/third_party/blimp_fonts/LICENSE b/third_party/blimp_fonts/LICENSE
new file mode 100644
index 0000000..3d6049f
--- /dev/null
+++ b/third_party/blimp_fonts/LICENSE
@@ -0,0 +1,232 @@
+All the font files are available in the font_bundle subdirectory.
+
+Fonts under Apache License Version 2.0 license:
+
+AndroidClock.ttf
+AndroidClock_Highlight.ttf
+AndroidClock_Solid.ttf
+Clockopia.ttf
+ComingSoon.ttf
+DroidSansFallback.ttf
+DroidSansFallbackFull.ttf
+DroidSansMono.ttf
+MTLc3m.ttf
+MTLmr3m.ttf
+NotoColorEmoji.ttf
+NotoKufiArabic-Bold.ttf
+NotoKufiArabic-Regular.ttf
+NotoNaskhArabic-Bold.ttf
+NotoNaskhArabic-Regular.ttf
+NotoNaskhArabicUI-Bold.ttf
+NotoNaskhArabicUI-Regular.ttf
+NotoSansArmenian-Bold.ttf
+NotoSansArmenian-Regular.ttf
+NotoSansAvestan-Regular.ttf
+NotoSansBalinese-Regular.ttf
+NotoSansBamum-Regular.ttf
+NotoSansBatak-Regular.ttf
+NotoSansBengali-Bold.ttf
+NotoSansBengali-Regular.ttf
+NotoSansBengaliUI-Bold.ttf
+NotoSansBengaliUI-Regular.ttf
+NotoSans-BoldItalic.ttf
+NotoSans-Bold.ttf
+NotoSansBrahmi-Regular.ttf
+NotoSansBuginese-Regular.ttf
+NotoSansBuhid-Regular.ttf
+NotoSansCanadianAboriginal-Regular.ttf
+NotoSansCarian-Regular.ttf
+NotoSansCham-Bold.ttf
+NotoSansCham-Regular.ttf
+NotoSansCherokee-Regular.ttf
+NotoSansCoptic-Regular.ttf
+NotoSansCuneiform-Regular.ttf
+NotoSansCypriot-Regular.ttf
+NotoSansDeseret-Regular.ttf
+NotoSansDevanagari-Bold.ttf
+NotoSansDevanagari-Regular.ttf
+NotoSansDevanagariUI-Bold.ttf
+NotoSansDevanagariUI-Regular.ttf
+NotoSansEgyptianHieroglyphs-Regular.ttf
+NotoSansEthiopic-Bold.ttf
+NotoSansEthiopic-Regular.ttf
+NotoSansGeorgian-Bold.ttf
+NotoSansGeorgian-Regular.ttf
+NotoSansGlagolitic-Regular.ttf
+NotoSansGothic-Regular.ttf
+NotoSansGujarati-Bold.ttf
+NotoSansGujarati-Regular.ttf
+NotoSansGujaratiUI-Bold.ttf
+NotoSansGujaratiUI-Regular.ttf
+NotoSansGurmukhi-Bold.ttf
+NotoSansGurmukhi-Regular.ttf
+NotoSansGurmukhiUI-Bold.ttf
+NotoSansGurmukhiUI-Regular.ttf
+NotoSansHanunoo-Regular.ttf
+NotoSansHebrew-Bold.ttf
+NotoSansHebrew-Regular.ttf
+NotoSansImperialAramaic-Regular.ttf
+NotoSansInscriptionalPahlavi-Regular.ttf
+NotoSansInscriptionalParthian-Regular.ttf
+NotoSans-Italic.ttf
+NotoSansJavanese-Regular.ttf
+NotoSansKaithi-Regular.ttf
+NotoSansKannada-Bold.ttf
+NotoSansKannada-Regular.ttf
+NotoSansKannadaUI-Bold.ttf
+NotoSansKannadaUI-Regular.ttf
+NotoSansKayahLi-Regular.ttf
+NotoSansKharoshthi-Regular.ttf
+NotoSansKhmer-Bold.ttf
+NotoSansKhmer-Regular.ttf
+NotoSansKhmerUI-Bold.ttf
+NotoSansKhmerUI-Regular.ttf
+NotoSansLao-Bold.ttf
+NotoSansLao-Regular.ttf
+NotoSansLaoUI-Bold.ttf
+NotoSansLaoUI-Regular.ttf
+NotoSansLepcha-Regular.ttf
+NotoSansLimbu-Regular.ttf
+NotoSansLinearB-Regular.ttf
+NotoSansLisu-Regular.ttf
+NotoSansLycian-Regular.ttf
+NotoSansLydian-Regular.ttf
+NotoSansMalayalam-Bold.ttf
+NotoSansMalayalam-Regular.ttf
+NotoSansMalayalamUI-Bold.ttf
+NotoSansMalayalamUI-Regular.ttf
+NotoSansMandaic-Regular.ttf
+NotoSansMeeteiMayek-Regular.ttf
+NotoSansMongolian-Regular.ttf
+NotoSansMyanmar-Bold.ttf
+NotoSansMyanmar-Regular.ttf
+NotoSansMyanmarUI-Bold.ttf
+NotoSansMyanmarUI-Regular.ttf
+NotoSansNewTaiLue-Regular.ttf
+NotoSansNKo-Regular.ttf
+NotoSansOgham-Regular.ttf
+NotoSansOlChiki-Regular.ttf
+NotoSansOldItalic-Regular.ttf
+NotoSansOldPersian-Regular.ttf
+NotoSansOldSouthArabian-Regular.ttf
+NotoSansOldTurkic-Regular.ttf
+NotoSansOriya-Bold.ttf
+NotoSansOriya-Regular.ttf
+NotoSansOriyaUI-Bold.ttf
+NotoSansOriyaUI-Regular.ttf
+NotoSansOsmanya-Regular.ttf
+NotoSansPhagsPa-Regular.ttf
+NotoSansPhoenician-Regular.ttf
+NotoSans-Regular.ttf
+NotoSansRejang-Regular.ttf
+NotoSansRunic-Regular.ttf
+NotoSansSamaritan-Regular.ttf
+NotoSansSaurashtra-Regular.ttf
+NotoSansShavian-Regular.ttf
+NotoSansSinhala-Bold.ttf
+NotoSansSinhala-Regular.ttf
+NotoSansSundanese-Regular.ttf
+NotoSansSylotiNagri-Regular.ttf
+NotoSansSymbols-Regular-Subsetted.ttf
+NotoSansSymbols-Regular.ttf
+NotoSansSyriacEastern-Regular.ttf
+NotoSansSyriacEstrangela-Regular.ttf
+NotoSansSyriacWestern-Regular.ttf
+NotoSansTagalog-Regular.ttf
+NotoSansTagbanwa-Regular.ttf
+NotoSansTaiLe-Regular.ttf
+NotoSansTaiTham-Regular.ttf
+NotoSansTaiViet-Regular.ttf
+NotoSansTamil-Bold.ttf
+NotoSansTamil-Regular.ttf
+NotoSansTamilUI-Bold.ttf
+NotoSansTamilUI-Regular.ttf
+NotoSansTelugu-Bold.ttf
+NotoSansTelugu-Regular.ttf
+NotoSansTeluguUI-Bold.ttf
+NotoSansTeluguUI-Regular.ttf
+NotoSansThaana-Bold.ttf
+NotoSansThaana-Regular.ttf
+NotoSansThai-Bold.ttf
+NotoSansThai-Regular.ttf
+NotoSansThaiUI-Bold.ttf
+NotoSansThaiUI-Regular.ttf
+NotoSansTibetan-Regular.ttf
+NotoSansTifinagh-Regular.ttf
+NotoSansUgaritic-Regular.ttf
+NotoSansUI-BoldItalic.ttf
+NotoSansUI-Bold.ttf
+NotoSansUI-Italic.ttf
+NotoSansUI-Regular.ttf
+NotoSansVai-Regular.ttf
+NotoSansYi-Regular.ttf
+NotoSerifArmenian-Bold.ttf
+NotoSerifArmenian-Regular.ttf
+NotoSerif-BoldItalic.ttf
+NotoSerif-Bold.ttf
+NotoSerifGeorgian-Bold.ttf
+NotoSerifGeorgian-Regular.ttf
+NotoSerif-Italic.ttf
+NotoSerifKhmer-Bold.ttf
+NotoSerifKhmer-Regular.ttf
+NotoSerifLao-Bold.ttf
+NotoSerifLao-Regular.ttf
+NotoSerif-Regular.ttf
+NotoSerifThai-Bold.ttf
+NotoSerifThai-Regular.ttf
+Roboto-BlackItalic.ttf
+Roboto-Black.ttf
+Roboto-BoldItalic.ttf
+Roboto-Bold.ttf
+RobotoCondensed-BoldItalic.ttf
+RobotoCondensed-Bold.ttf
+RobotoCondensed-Italic.ttf
+RobotoCondensed-LightItalic.ttf
+RobotoCondensed-Light.ttf
+RobotoCondensed-Regular.ttf
+Roboto-Italic.ttf
+Roboto-LightItalic.ttf
+Roboto-Light.ttf
+Roboto-MediumItalic.ttf
+Roboto-Medium.ttf
+Roboto-Regular.ttf
+Roboto-ThinItalic.ttf
+Roboto-Thin.ttf
+
+
+Fonts under SIL Open Font License, Version 1.1:
+(Full license in LICENSE.OFL)
+
+NotoSansJP-Regular.otf
+NotoSansJP-Regular-Subsetted.otf
+NotoSansKR-Regular.otf
+NotoSansSC-Regular.otf
+NotoSansTC-Regular.otf
+
+
+Copyright (c) 2011 by Ralph du Carrois, with Reserved Font Name 'Carrois'
+This Font Software is licensed under the SIL Open Font License, Version 1.1
+(Full license in LICENSE.OFL)
+CarroisGothicSC-Regular.ttf
+
+
+Copyright (c) 2010, Pablo Impallari (www.impallari.com|impallari@gmail.com),
+Copyright (c) 2010, Igino Marini. (www.ikern.com|mail@iginomarini.com),
+with Reserved Font Name Dancing Script.
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+(Full license in LICENSE.OFL)
+
+DancingScript-Bold.ttf
+DancingScript-Regular.ttf
+CutiveMono.ttf
+
+
+Copyright (c) 2010, NHN Corporation (http://www.nhncorp.com),
+ (http://hangeul.naver.com/font)
+with Reserved Font Name Nanum, Naver Nanum, NanumGothic, Naver NanumGothic, NanumMyeongjo, Naver NanumMyeongjo, NanumBrush, Naver NanumBrush, NanumPen, Naver NanumPen, Naver NanumGothicEco, NanumGothicEco, Naver NanumMyeongjoEco, NanumMyeongjoEco, Naver NanumGothicLight, NanumGothicLight
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+(Full license in LICENSE.OFL)
+
+NanumGothicBold.ttf
+NanumGothic.ttf
diff --git a/third_party/blimp_fonts/LICENSE.Apache b/third_party/blimp_fonts/LICENSE.Apache
new file mode 100644
index 0000000..a3711ba
--- /dev/null
+++ b/third_party/blimp_fonts/LICENSE.Apache
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/third_party/blimp_fonts/LICENSE.OFL b/third_party/blimp_fonts/LICENSE.OFL
new file mode 100644
index 0000000..d952d62
--- /dev/null
+++ b/third_party/blimp_fonts/LICENSE.OFL
@@ -0,0 +1,92 @@
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/third_party/blimp_fonts/OWNERS b/third_party/blimp_fonts/OWNERS
new file mode 100644
index 0000000..d7dfb92
--- /dev/null
+++ b/third_party/blimp_fonts/OWNERS
@@ -0,0 +1,5 @@
+dtrainor@chromium.org
+haibinlu@chromium.org
+kmarshall@chromium.org
+nyquist@chromium.org
+wez@chromium.org
diff --git a/third_party/blimp_fonts/README.chromium b/third_party/blimp_fonts/README.chromium
new file mode 100644
index 0000000..380be7c
--- /dev/null
+++ b/third_party/blimp_fonts/README.chromium
@@ -0,0 +1,49 @@
+Name: blimp_fonts
+URL: See below
+Version: unknown
+License: Apache Version 2.0 and SIL Open Font License, Version 1.1
+Security Critical: yes
+
+Description:
+A collection of fonts that are necessary to bundle with the blimp engine to be
+able to render the correct fonts for different clients.
+
+How to update:
+See //blimp/docs/fonts.md.
+
+Local Modifications:
+Not all files from the external repositories are used.
+- *.otf, *.ttf: From the various repositories.
+- .gitignore: Added.
+- BUILD.gn: Added.
+- LICENSE: Added.
+- LICENSE.*: Extracted from license files in the various repositories.
+- README.md: Added.
+- fonts.xml: From this repository:
+ https://android.googlesource.com/platform/frameworks/base.git
+
+Fonts are pulled from the following repositories:
+- Git repo: https://android.googlesource.com/platform/frameworks/base.git
+ Commit: 6a278db4c4a144829353e81420f28dcf2105f767
+ Directory: data/fonts/
+- Git repo: https://android.googlesource.com/platform/external/noto-fonts.git
+ Commit: eb0883544dd538edbfb52cce9a2481509ca5ee9f
+ Directory: cjk/, other/
+- Git repo: https://android.googlesource.com/platform/external/roboto-fonts.git
+ Commit: f5cf79102af594c746627b392b4f98eedd254571
+ Directory: .
+- Git repo: https://android.googlesource.com/platform/external/google-fonts/dancing-script.git
+ Commit: 7b6623bd54cee3e48ae8a4f477f616366643cc78
+ Directory: .
+- Git repo: https://android.googlesource.com/platform/external/google-fonts/cutive-mono.git
+ Commit: bce2136662854076023066602526ba299e6556b2
+ Directory: .
+- Git repo: https://android.googlesource.com/platform/external/google-fonts/coming-soon.git
+ Commit: 2c5cb418c690815545bbb0316eae5fd33b9fc859
+ Directory: .
+- Git repo: https://android.googlesource.com/platform/external/google-fonts/carrois-gothic-sc.git
+ Commit: 0062a10458d4c357f3082d66bcb129d11913aaae
+ Directory: .
+- Git repo: https://android.googlesource.com/platform/external/naver-fonts.git
+ Commit: 91e6e9f94d1d769a8f742649674149ba98ce7d45
+ Directory: .
diff --git a/third_party/blimp_fonts/font_bundle.tar.gz.sha1 b/third_party/blimp_fonts/font_bundle.tar.gz.sha1
new file mode 100644
index 0000000..6f9580b
--- /dev/null
+++ b/third_party/blimp_fonts/font_bundle.tar.gz.sha1
@@ -0,0 +1 @@
+984e9006270dc2f2a1f54265fb5761d267824930 \ No newline at end of file