Skip to content

GitLab

T
tangled
Commit 898cdc96 authored by h.joshi@samsung.com's avatar h.joshi@samsung.com
Browse files
Options

Initial patch for FontVariant, this is to support HalfWidth, 

ThirdWidth, QuarterWidth and will take complex path
while rendering.

BUG=350404

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

git-svn-id: svn://svn.chromium.org/blink/trunk@180241 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent fbe0f7f1
Hide whitespace changes
Inline Side-by-side
Showing with 214 additions and 0 deletions
third_party/WebKit/LayoutTests/TestExpectations
View file @ 898cdc96
...@@ -1304,3 +1304,9 @@ crbug.com/402379 [ Win7 Debug ] storage/indexeddb/cursor-continue-validity.html ...@@ -1304,3 +1304,9 @@ crbug.com/402379 [ Win7 Debug ] storage/indexeddb/cursor-continue-validity.html
crbug.com/402379 [ Win7 Debug ] storage/indexeddb/mozilla/indexes.html [ Pass Slow ] crbug.com/402379 [ Win7 Debug ] storage/indexeddb/mozilla/indexes.html [ Pass Slow ]
crbug.com/402801 [ XP Release ] http/tests/misc/location-replace-crossdomain.html [ Pass Slow ] crbug.com/402801 [ XP Release ] http/tests/misc/location-replace-crossdomain.html [ Pass Slow ]
# Following test needs to be rebase lines after https://codereview.chromium.org/263363005
crbug.com/350404 [ Mac Win ] fast/text/font-variant-width.html [ NeedsRebaseline ]
crbug.com/350404 fast/text/international/spaces-combined-in-vertical-text.html [ NeedsRebaseline ]
crbug.com/350404 [ Mac Win ] virtual/antialiasedtext/fast/text/font-variant-width.html [ NeedsRebaseline ]
crbug.com/350404 [ Mac Win ] virtual/antialiasedtext/fast/text/international/spaces-combined-in-vertical-text.html [ NeedsRebaseline ]
third_party/WebKit/LayoutTests/fast/text/font-variant-width-expected.txt 0 → 100644
View file @ 898cdc96




111
999
1234
1111
9999
This is a testharness.js-based test.
PASS Numbers expected to be laid out in one combining block
PASS Numbers expected to be laid out in one combining block
PASS Numbers expected to be laid out in one combining block
PASS Numbers expected to be laid out in one combining block
PASS Number laid out vertically, not combined.
PASS Number laid out vertically, not combined.
PASS Number laid out vertically, not combined.
PASS Number laid out vertically, not combined.
PASS Number laid out vertically, not combined.
Harness: the test ran to completion.
third_party/WebKit/LayoutTests/fast/text/font-variant-width.html 0 → 100644
View file @ 898cdc96
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
<title>Font Width Variant Text Combine</title>
<style>
@font-face {
font-family: CSSHWOrientationTest;
src: url(../../third_party/CSSOrientationTest/CSSHWOrientationTest.ttf) format("truetype");
}
.vertical {
font-family: "CSSHWOrientationTest";
font-size: 24px;
text-rendering: geometricPrecision;
-webkit-writing-mode: vertical-lr;
line-height: 100%;
margin: 0;
padding: 0px;
}
.combine {
-webkit-text-combine: horizontal;
}
</style>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script type="text/javascript">
setup({ explicit_done: true });
function testWidthVariant() {
var EXPECTED_COMBINED_UNTIL = 4;
var EXPECTED_LINE_HEIGHT = 24;
var NUM_TESTS = 9;
for (var testId = 0; testId < NUM_TESTS; testId++) {
rectHeight = document.getElementsByClassName("combine")[testId].getBoundingClientRect().height;
if (testId < EXPECTED_COMBINED_UNTIL) {
test(function() {
assert_equals(rectHeight, EXPECTED_LINE_HEIGHT, "Numbers laid out in one combining block.");
}, "Numbers expected to be laid out in one combining block");
} else {
test(function() {
assert_true(rectHeight > EXPECTED_LINE_HEIGHT, EXPECTED_LINE_HEIGHT, "Number laid out vertically, not combined.");
}, "Number laid out vertically, not combined.");
}
}
done();
}
</script>
</head>
<body onload="testWidthVariant();">
<div class="vertical">
<!-- horizontally combined -->
<div><span class="combine">1</span></div>
<div><span class="combine">9</span></div>
<div><span class="combine">11</span></div>
<div><span class="combine">99</span></div>
<!-- vertical -->
<div><span class="combine">111</span></div>
<div><span class="combine">999</span></div>
<div><span class="combine">1234</span></div>
<div><span class="combine">1111</span></div>
<div><span class="combine">9999</span></div>
</div>
<div id="log"></div>
</body>
</html>
third_party/WebKit/LayoutTests/third_party/CSSOrientationTest/LICENSE.txt 0 → 100644
View file @ 898cdc96
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.
third_party/WebKit/LayoutTests/third_party/CSSOrientationTest/README.chromium 0 → 100644
View file @ 898cdc96
CSS Orientation Test OpenType Fonts:
1. Source Origin
http://sourceforge.net/projects/csso9ntestfonts.adobe/
2. LICENSE AND OPENSOURCE
For license information, see the LICENSE.txt file
3. Reason:
Font file included as a real-world example for testing fonts with half-width feature for
LayoutTests/fast/text/font-variant-width.html test case
third_party/WebKit/Source/platform/fonts/Font.cpp
View file @ 898cdc96
...@@ -253,6 +253,9 @@ CodePath Font::codePath(const TextRun& run) const ...@@ -253,6 +253,9 @@ CodePath Font::codePath(const TextRun& run) const
if (m_fontDescription.featureSettings() && m_fontDescription.featureSettings()->size() > 0 && m_fontDescription.letterSpacing() == 0) if (m_fontDescription.featureSettings() && m_fontDescription.featureSettings()->size() > 0 && m_fontDescription.letterSpacing() == 0)
return ComplexPath; return ComplexPath;
if (m_fontDescription.widthVariant() != RegularWidth)
return ComplexPath;
if (run.length() > 1 && fontDescription().typesettingFeatures()) if (run.length() > 1 && fontDescription().typesettingFeatures())
return ComplexPath; return ComplexPath;
......
third_party/WebKit/Source/platform/fonts/harfbuzz/HarfBuzzShaper.cpp
View file @ 898cdc96
...@@ -522,6 +522,23 @@ void HarfBuzzShaper::setFontFeatures() ...@@ -522,6 +522,23 @@ void HarfBuzzShaper::setFontFeatures()
break; break;
} }
static hb_feature_t hwid = { HB_TAG('h', 'w', 'i', 'd'), 1, 0, static_cast<unsigned>(-1) };
static hb_feature_t twid = { HB_TAG('t', 'w', 'i', 'd'), 1, 0, static_cast<unsigned>(-1) };
static hb_feature_t qwid = { HB_TAG('d', 'w', 'i', 'd'), 1, 0, static_cast<unsigned>(-1) };
switch (description.widthVariant()) {
case HalfWidth:
m_features.append(hwid);
break;
case ThirdWidth:
m_features.append(twid);
break;
case QuarterWidth:
m_features.append(qwid);
break;
case RegularWidth:
break;
}
FontFeatureSettings* settings = description.featureSettings(); FontFeatureSettings* settings = description.featureSettings();
if (!settings) if (!settings)
return; return;
......
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