diff options
author | Jim Van Verth <jvanverth@google.com> | 2018-03-23 14:39:42 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-23 14:39:51 +0000 |
commit | af78a942179143e4646871fc797e2ce17c23a594 (patch) | |
tree | e1df52c03c579436005b1098a500a3523c816000 /resources | |
parent | 8c53d465e3ceb3898f8037b61046c198bbec2fca (diff) |
Revert "Add color fonts."
This reverts commit c912d6133c66df7cde3d64adc76941856a12da64.
Reason for revert: Causing TSAN issues.
Original change's description:
> Add color fonts.
>
> BUG=skia:7624
>
> Change-Id: Id2b7449048591892ff802484d5e3745a7e1402bb
> Reviewed-on: https://skia-review.googlesource.com/109521
> Commit-Queue: Ben Wagner <bungeman@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>
> Reviewed-by: Herb Derby <herb@google.com>
TBR=mtklein@google.com,bungeman@google.com,herb@google.com
Change-Id: I2ccd1f00e91bb92b7059323c95da0dd3de954164
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7624
Reviewed-on: https://skia-review.googlesource.com/116141
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'resources')
-rw-r--r-- | resources/fonts/cbdt.ttf | bin | 18020 -> 0 bytes | |||
-rw-r--r-- | resources/fonts/colr.ttf | bin | 2996 -> 0 bytes | |||
-rw-r--r-- | resources/fonts/sbix.ttf | bin | 17956 -> 0 bytes | |||
-rw-r--r-- | resources/fonts/svg/diamond.svg | 22 | ||||
-rw-r--r-- | resources/fonts/svg/empty.svg | 10 | ||||
-rw-r--r-- | resources/fonts/svg/notdef.svg | 29 | ||||
-rw-r--r-- | resources/fonts/svg/smile.svg | 44 |
7 files changed, 0 insertions, 105 deletions
diff --git a/resources/fonts/cbdt.ttf b/resources/fonts/cbdt.ttf Binary files differdeleted file mode 100644 index bed498f07e..0000000000 --- a/resources/fonts/cbdt.ttf +++ /dev/null diff --git a/resources/fonts/colr.ttf b/resources/fonts/colr.ttf Binary files differdeleted file mode 100644 index 42e2a08096..0000000000 --- a/resources/fonts/colr.ttf +++ /dev/null diff --git a/resources/fonts/sbix.ttf b/resources/fonts/sbix.ttf Binary files differdeleted file mode 100644 index 5eed8a917b..0000000000 --- a/resources/fonts/sbix.ttf +++ /dev/null diff --git a/resources/fonts/svg/diamond.svg b/resources/fonts/svg/diamond.svg deleted file mode 100644 index 826cb749f3..0000000000 --- a/resources/fonts/svg/diamond.svg +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- The default glyf will be much smaller than the colr glyf layers. --> -<svg - version="1.1" - viewBox="0 0 158.75 211.66667" - height="800" - width="600"> - <g - transform="translate(0,-85.333351)" - id="layer1"> - <path - transform="matrix(1,0,0,1.3773044,0.80180858,-33.549844)" - d="m 79.11178,236.39392 c -5.497887,0 -73.0286729,-67.53078 -73.028673,-73.02867 -2e-7,-5.49789 67.530782,-73.028671 73.028669,-73.028672 5.497888,0 73.028674,67.530782 73.028674,73.028672 0,5.49789 -67.530782,73.02867 -73.02867,73.02867 z" - id="path5299" - style="fill:#ff2a2a;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - transform="matrix(0.60436993,0,0,0.81236352,32.100808,58.741857)" - d="m 79.11178,236.39392 c -5.497887,0 -73.0286729,-67.53078 -73.028673,-73.02867 -2e-7,-5.49789 67.530782,-73.028671 73.028669,-73.028672 5.497888,0 73.028674,67.530782 73.028674,73.028672 0,5.49789 -67.530782,73.02867 -73.02867,73.02867 z" - id="path5299-5" - style="fill:none;stroke:#2b0000;stroke-width:14.19605827;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> -</svg> diff --git a/resources/fonts/svg/empty.svg b/resources/fonts/svg/empty.svg deleted file mode 100644 index d470cc5a4c..0000000000 --- a/resources/fonts/svg/empty.svg +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Empty, so will not produce a glyf or bitmap entry. --> -<svg - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - version="1.1" - viewBox="0 0 0 0" - height="0" - width="0"> -</svg> diff --git a/resources/fonts/svg/notdef.svg b/resources/fonts/svg/notdef.svg deleted file mode 100644 index 3fbb9a02ff..0000000000 --- a/resources/fonts/svg/notdef.svg +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- In the colr format should be filled with the current paint. --> -<svg - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - version="1.1" - viewBox="0 0 158.75 211.66667" - height="800" - width="600"> - <g - transform="translate(0,-85.333351)" - id="layer1"> - <rect - y="97.374527" - x="4.3011618" - height="195.32433" - width="150.42305" - id="rect4639" - style="fill:none;stroke:#2b0000;stroke-width:6.61458349;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path5186" - d="M 14.967094,109.37681 144.05828,283.63654" - style="fill:none;stroke:#2b0000;stroke-width:6.61458349;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path5188" - d="M 146.19643,107.77319 14.699822,282.83473" - style="fill:none;stroke:#2b0000;stroke-width:6.61458349;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> -</svg> diff --git a/resources/fonts/svg/smile.svg b/resources/fonts/svg/smile.svg deleted file mode 100644 index 41d26b5e29..0000000000 --- a/resources/fonts/svg/smile.svg +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- In the colr format the eyes and mouth should be filled with the current paint. --> -<svg - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - version="1.1" - viewBox="0 0 211.66666 211.66667" - height="800" - width="800"> - <g - transform="translate(0,-85.333317)" - id="layer1"> - <circle - r="98.273819" - cy="192.76852" - cx="104.81271" - id="path10" - style="fill:#000000;stroke-width:0.3084828" /> - <circle - r="90.782074" - cy="192.32785" - cx="104.37203" - id="path12" - style="fill:#ffcc00;stroke-width:0.3084828" /> - <ellipse - ry="20.032738" - rx="20.410715" - cy="159.88458" - cx="74.574615" - id="path62" - style="fill:#2b0000;stroke-width:0.26458332" /> - <ellipse - ry="20.032738" - rx="20.410715" - cy="158.13309" - cx="138.02272" - id="path62-7" - style="fill:#2b0000;stroke-width:0.26458332" /> - <path - d="m 163.09897,220.67157 a 58.248119,31.234499 0 0 1 -26.87407,29.28648 58.248119,31.234499 0 0 1 -60.863188,0.45572 58.248119,31.234499 0 0 1 -28.388544,-28.87269 l 58.126712,2.01564 z" - id="path113" - style="fill:#2b0000;stroke-width:0.26458332" /> - </g> -</svg> |