Commit 3e7d8e08 authored by thestig's avatar thestig Committed by Commit bot

Pull sfntly from GitHub instead of code.google.com.

- Pick up latest release
- Adjust build files
- Update README.chromium

BUG=497302

Review URL: https://codereview.chromium.org/1367323002

Cr-Commit-Position: refs/heads/master@{#351207}
parent 3937c527
...@@ -32,8 +32,17 @@ vars = { ...@@ -32,8 +32,17 @@ vars = {
# If you do not know, use the full path while defining your new deps entry. # If you do not know, use the full path while defining your new deps entry.
'googlecode_url': 'http://%s.googlecode.com/svn', 'googlecode_url': 'http://%s.googlecode.com/svn',
'chromium_git': 'https://chromium.googlesource.com', 'chromium_git': 'https://chromium.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling libvpx
# and whatever else without interference from each other.
'libvpx_revision': 'b33794b9132c8c1722206d6676c37177ccbaef2e', 'libvpx_revision': 'b33794b9132c8c1722206d6676c37177ccbaef2e',
'sfntly_revision': '1bdaae8fc788a5ac8936d68bf24f37d977a13dac', # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling sfntly
# and whatever else without interference from each other.
'sfntly_revision': '130f832eddf98467e6578b548cb74ce17d04a26d',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and whatever else without interference from each other.
'skia_revision': 'c9e190ddac3d193e89e580ea3819a55c28f15e61', 'skia_revision': 'c9e190ddac3d193e89e580ea3819a55c28f15e61',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling V8 # the commit queue can handle CLs rolling V8
...@@ -157,8 +166,8 @@ deps = { ...@@ -157,8 +166,8 @@ deps = {
'src/native_client': 'src/native_client':
Var('chromium_git') + '/native_client/src/native_client.git' + '@' + Var('nacl_revision'), Var('chromium_git') + '/native_client/src/native_client.git' + '@' + Var('nacl_revision'),
'src/third_party/sfntly/cpp/src': 'src/third_party/sfntly/src':
Var('chromium_git') + '/external/sfntly/cpp/src.git' + '@' + Var('sfntly_revision'), Var('chromium_git') + '/external/github.com/googlei18n/sfntly.git' + '@' + Var('sfntly_revision'),
'src/third_party/skia': 'src/third_party/skia':
Var('chromium_git') + '/skia.git' + '@' + Var('skia_revision'), Var('chromium_git') + '/skia.git' + '@' + Var('skia_revision'),
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
PDF documents. PDF documents.
*/ */
#define SK_SFNTLY_SUBSETTER \ #define SK_SFNTLY_SUBSETTER \
"third_party/sfntly/cpp/src/sample/chromium/font_subsetter.h" "third_party/sfntly/src/cpp/src/sample/chromium/font_subsetter.h"
/* To write debug messages to a console, skia will call SkDebugf(...) following /* To write debug messages to a console, skia will call SkDebugf(...) following
printf conventions (e.g. const char* format, ...). If you want to redirect printf conventions (e.g. const char* format, ...). If you want to redirect
......
This diff is collapsed.
Name: sfntly Name: sfntly
URL: http://code.google.com/p/sfntly/ URL: https://github.com/googlei18n/sfntly
Version: unknown Version: 130f832eddf98467e6578b548cb74ce17d04a26d
Revision: 111
Security Critical: yes Security Critical: yes
License: Apache 2.0 License: Apache 2.0
License File: COPYING.txt License File: COPYING.txt
...@@ -12,9 +11,4 @@ fonts (e.g. OpenType, TrueType). We use it to subset the embedded font in the ...@@ -12,9 +11,4 @@ fonts (e.g. OpenType, TrueType). We use it to subset the embedded font in the
PDF generated in print preview so that the result PDF documents are PDF generated in print preview so that the result PDF documents are
significantly smaller and loaded faster. significantly smaller and loaded faster.
Local files (not taken from upstream):
README.chromium
src/subsetter/*
COPYING.txt is the license file copied from upstream. COPYING.txt is the license file copied from upstream.
A sfntly.gyp file has been added for building with Chromium.
This diff is collapsed.
...@@ -428,6 +428,9 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { ...@@ -428,6 +428,9 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
'third_party/scons-2.0.1/engine/SCons': [ # http://crbug.com/98462 'third_party/scons-2.0.1/engine/SCons': [ # http://crbug.com/98462
'UNKNOWN', 'UNKNOWN',
], ],
'third_party/sfntly/src/java': [ # Apache 2.0, not shipped.
'UNKNOWN',
],
'third_party/simplejson': [ 'third_party/simplejson': [
'UNKNOWN', 'UNKNOWN',
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment