Attachment 151623 Details for Bug 85755 – 3rd attempt of a CSS3 ch unit patch

[patch] 3rd attempt of a CSS3 ch unit patch

0001-Added-support-for-the-drafted-CSS3-ch-unit.patch (text/plain), 25.01 KB, created by Sumedha Widyadharma on 2012-07-11 00:40:35 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sumedha Widyadharma

Created: 2012-07-11 00:40:35 PDT

Size: 25.01 KB

patch

obsolete

>From f48bc745f749ab9fcae9c5ba011a00eb584b56b3 Mon Sep 17 00:00:00 2001
>From: Sumedha Widyadharma <sumedha.widyadharma@basyskom.de>
>Date: Wed, 11 Jul 2012 08:56:49 +0200
>Subject: [PATCH] Added support for the drafted CSS3 'ch' unit.
>
>As per bug: https://bugs.webkit.org/show_bug.cgi?id=85755
>---
> LayoutTests/ChangeLog                              |   14 ++++++
> LayoutTests/fast/css/css3-ch-unit.html             |   33 +++++++++++++++
> .../fast/css/css3-ch-unit-expected.png             |  Bin 0 -> 5609 bytes
> .../fast/css/css3-ch-unit-expected.txt             |   16 +++++++
> .../platform/qt/fast/css/css3-ch-unit-expected.txt |   16 +++++++
> Source/WebCore/ChangeLog                           |   44 ++++++++++++++++++++
> Source/WebCore/css/CSSCalculationValue.cpp         |    1 +
> Source/WebCore/css/CSSGrammar.y                    |    4 +-
> Source/WebCore/css/CSSParser.cpp                   |    9 +++-
> Source/WebCore/css/CSSParserValues.cpp             |    2 +-
> Source/WebCore/css/CSSPrimitiveValue.cpp           |    9 ++++
> Source/WebCore/css/CSSPrimitiveValue.h             |   22 ++++++----
> Source/WebCore/platform/graphics/Font.h            |    1 +
> .../WebCore/platform/graphics/SimpleFontData.cpp   |    4 ++
> Source/WebCore/platform/graphics/SimpleFontData.h  |    5 ++
> .../platform/graphics/qt/SimpleFontDataQt.cpp      |    7 +++
> 16 files changed, 174 insertions(+), 13 deletions(-)
> create mode 100644 LayoutTests/fast/css/css3-ch-unit.html
> create mode 100644 LayoutTests/platform/chromium-linux/fast/css/css3-ch-unit-expected.png
> create mode 100644 LayoutTests/platform/chromium-linux/fast/css/css3-ch-unit-expected.txt
> create mode 100644 LayoutTests/platform/qt/fast/css/css3-ch-unit-expected.txt
>
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 1040317..0da4af3 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,17 @@
>+2012-07-10  Sumedha Widyadharma  <sumedha.widyadharma@basyskom.de>
>+
>+        Added tests for the CSS3 'ch' unit and expected results for
>+        chromium-linux and Qt.
>+        Chromium results created by Bruno Abinader
>+        https://bugs.webkit.org/show_bug.cgi?id=85755
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/css/css3-ch-unit.html: Added.
>+        * platform/chromium-linux/fast/css/css3-ch-unit-expected.png: Added.
>+        * platform/chromium-linux/fast/css/css3-ch-unit-expected.txt: Added.
>+        * platform/qt/fast/css/css3-ch-unit-expected.txt: Added.
>+
> 2012-07-05  Yoshifumi Inoue  <yosin@chromium.org>
> 
>         Unreviewed Chromium gardening - Rebaseline for r121917.
>diff --git a/LayoutTests/fast/css/css3-ch-unit.html b/LayoutTests/fast/css/css3-ch-unit.html
>new file mode 100644
>index 0000000..b27dcf3
>--- /dev/null
>+++ b/LayoutTests/fast/css/css3-ch-unit.html
>@@ -0,0 +1,33 @@
>+<html>
>+<head>
>+<style type="text/css">
>+	.box {
>+		font-family: monospace;
>+		font-height: 12px;
>+		overflow: hidden;
>+		height: 12px;
>+	}
>+
>+	.four {
>+		width: 4ch
>+	}
>+
>+	.zero {
>+		width: 0ch
>+	}
>+
>+	.pass {
>+		color: green
>+	}
>+
>+	.fail {
>+		color: red
>+	}
>+</style>	   
>+</head>
>+<body>
>+	<p>This is a test to make sure ch units work as intended.</p>
>+	<div class="box zero"><span class="fail">FAIL</span></div>
>+	<div class="box four"><span class="pass">PASS</span><span class="fail">FAIL</span></div>
>+</body>
>+</html>
>diff --git a/LayoutTests/platform/chromium-linux/fast/css/css3-ch-unit-expected.png b/LayoutTests/platform/chromium-linux/fast/css/css3-ch-unit-expected.png
>new file mode 100644
>index 0000000000000000000000000000000000000000..8ff4b147c838d877d57c1f66959c0250a74c7db6
>GIT binary patch
>literal 5609
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
>D<S%~H
>
>literal 0
>HcmV?d00001
>
>diff --git a/LayoutTests/platform/chromium-linux/fast/css/css3-ch-unit-expected.txt b/LayoutTests/platform/chromium-linux/fast/css/css3-ch-unit-expected.txt
>new file mode 100644
>index 0000000..3e8e1ef
>--- /dev/null
>+++ b/LayoutTests/platform/chromium-linux/fast/css/css3-ch-unit-expected.txt
>@@ -0,0 +1,16 @@
>+layer at (0,0) size 800x600
>+  RenderView at (0,0) size 800x600
>+layer at (0,0) size 800x600
>+  RenderBlock {HTML} at (0,0) size 800x600
>+    RenderBody {BODY} at (8,8) size 784x584
>+      RenderBlock {P} at (0,0) size 784x20
>+        RenderText {#text} at (0,0) size 317x19
>+          text run at (0,0) width 317: "This is a test to make sure ch units work as intended."
>+layer at (8,56) size 32x12 scrollWidth 64 scrollHeight 16
>+  RenderBlock {DIV} at (0,48) size 32x12
>+    RenderInline {SPAN} at (0,0) size 32x16 [color=#008000]
>+      RenderText {#text} at (0,0) size 32x16
>+        text run at (0,0) width 32: "PASS"
>+    RenderInline {SPAN} at (0,0) size 32x16 [color=#FF0000]
>+      RenderText {#text} at (32,0) size 32x16
>+        text run at (32,0) width 32: "FAIL"
>diff --git a/LayoutTests/platform/qt/fast/css/css3-ch-unit-expected.txt b/LayoutTests/platform/qt/fast/css/css3-ch-unit-expected.txt
>new file mode 100644
>index 0000000..d91a9c1
>--- /dev/null
>+++ b/LayoutTests/platform/qt/fast/css/css3-ch-unit-expected.txt
>@@ -0,0 +1,16 @@
>+layer at (0,0) size 800x600
>+  RenderView at (0,0) size 800x600
>+layer at (0,0) size 800x600
>+  RenderBlock {HTML} at (0,0) size 800x600
>+    RenderBody {BODY} at (8,8) size 784x584
>+      RenderBlock {P} at (0,0) size 784x21
>+        RenderText {#text} at (0,0) size 372x21
>+          text run at (0,0) width 372: "This is a test to make sure ch units work as intended."
>+layer at (8,57) size 28x12 scrollWidth 64 scrollHeight 17
>+  RenderBlock {DIV} at (0,49) size 28x12
>+    RenderInline {SPAN} at (0,0) size 36x17 [color=#008000]
>+      RenderText {#text} at (0,0) size 36x17
>+        text run at (0,0) width 36: "PASS"
>+    RenderInline {SPAN} at (0,0) size 28x17 [color=#FF0000]
>+      RenderText {#text} at (36,0) size 28x17
>+        text run at (36,0) width 28: "FAIL"
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 953eab8..277e41f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,47 @@
>+2012-07-10  Sumedha Widyadharma  <sumedha.widyadharma@basyskom.de>
>+
>+        [CSS3 Units] Add support for the drafted CSS3 'ch' unit in webkit.
>+        https://bugs.webkit.org/show_bug.cgi?id=85755
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: fast/css/css3-ch-unit.html
>+
>+        * css/CSSCalculationValue.cpp:
>+        (WebCore::unitCategory):
>+        * css/CSSGrammar.y:
>+        * css/CSSParser.cpp:
>+        (WebCore::CSSParser::validUnit):
>+        (WebCore::CSSParser::createPrimitiveNumericValue):
>+        (WebCore::unitFromString):
>+        (WebCore::CSSParser::parseValidPrimitive):
>+        (WebCore::CSSParser::detectNumberToken):
>+        * css/CSSParserValues.cpp:
>+        (WebCore::CSSParserValue::createCSSValue):
>+        * css/CSSPrimitiveValue.cpp:
>+        (WebCore::isValidCSSUnitTypeForDoubleConversion):
>+        (WebCore::CSSPrimitiveValue::cleanup):
>+        (WebCore::CSSPrimitiveValue::computeLengthDouble):
>+        (WebCore::CSSPrimitiveValue::customCssText):
>+        (WebCore::CSSPrimitiveValue::cloneForCSSOM):
>+        * css/CSSPrimitiveValue.h:
>+        (WebCore::CSSPrimitiveValue::isFontRelativeLength):
>+        (WebCore::CSSPrimitiveValue::isLength):
>+        * html/parser/HTMLTreeBuilder.cpp:
>+        (WebCore::HTMLTreeBuilder::HTMLTreeBuilder):
>+        * platform/graphics/Font.h:
>+        (WebCore::Font::zeroWidth):
>+        * platform/graphics/SimpleFontData.cpp:
>+        (WebCore::SimpleFontData::platformGlyphInit):
>+        * platform/graphics/SimpleFontData.h:
>+        (WebCore::SimpleFontData::zeroWidth):
>+        (WebCore::SimpleFontData::zeroGlyph):
>+        (WebCore::SimpleFontData::setZeroGlyph):
>+        (SimpleFontData):
>+        * platform/graphics/qt/SimpleFontDataQt.cpp:
>+        (WebCore::SimpleFontData::platformGlyphInit):
>+        (WebCore::SimpleFontData::platformInit):
>+
> 2012-07-05  Arnaud Renevier  <arno@renevier.net>
> 
>         [GTK] Showing the context menu in the Web Inspector can crash the browser
>diff --git a/Source/WebCore/css/CSSCalculationValue.cpp b/Source/WebCore/css/CSSCalculationValue.cpp
>index 54247e0..52c5869 100755
>--- a/Source/WebCore/css/CSSCalculationValue.cpp
>+++ b/Source/WebCore/css/CSSCalculationValue.cpp
>@@ -66,6 +66,7 @@ static CalculationCategory unitCategory(CSSPrimitiveValue::UnitTypes type)
>     case CSSPrimitiveValue::CSS_PT:
>     case CSSPrimitiveValue::CSS_PC:
>     case CSSPrimitiveValue::CSS_REMS:
>+    case CSSPrimitiveValue::CSS_CHS:
>         return CalcLength;
>     default:
>         return CalcOther;
>diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y
>index c7c10b5..d33a55c 100644
>--- a/Source/WebCore/css/CSSGrammar.y
>+++ b/Source/WebCore/css/CSSGrammar.y
>@@ -101,7 +101,7 @@ static int cssyylex(YYSTYPE* yylval, void* parser)
> 
> %}
> 
>-%expect 62
>+%expect 63
> 
> %nonassoc LOWEST_PREC
> 
>@@ -169,6 +169,7 @@ static int cssyylex(YYSTYPE* yylval, void* parser)
> %token MEDIA_AND
> 
> %token <number> REMS
>+%token <number> CHS
> %token <number> QEMS
> %token <number> EMS
> %token <number> EXS
>@@ -1549,6 +1550,7 @@ unary_term:
>       if (p->m_styleSheet)
>           p->m_styleSheet->parserSetUsesRemUnits(true);
>   }
>+  | CHS maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_CHS; }
>   | VW maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_VW; }
>   | VH maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_VH; }
>   | VMIN maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_VMIN; }
>diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
>index 015d930..bc941a5 100644
>--- a/Source/WebCore/css/CSSParser.cpp
>+++ b/Source/WebCore/css/CSSParser.cpp
>@@ -1436,6 +1436,7 @@ bool CSSParser::validUnit(CSSParserValue* value, Units unitflags, CSSParserMode
>     case CSSParserValue::Q_EMS:
>     case CSSPrimitiveValue::CSS_EMS:
>     case CSSPrimitiveValue::CSS_REMS:
>+    case CSSPrimitiveValue::CSS_CHS:
>     case CSSPrimitiveValue::CSS_EXS:
>     case CSSPrimitiveValue::CSS_PX:
>     case CSSPrimitiveValue::CSS_CM:
>@@ -1495,7 +1496,7 @@ inline PassRefPtr<CSSPrimitiveValue> CSSParser::createPrimitiveNumericValue(CSSP
>            || (value->unit >= CSSPrimitiveValue::CSS_DPPX && value->unit <= CSSPrimitiveValue::CSS_DPCM));
> #else
>     ASSERT((value->unit >= CSSPrimitiveValue::CSS_NUMBER && value->unit <= CSSPrimitiveValue::CSS_KHZ)
>-           || (value->unit >= CSSPrimitiveValue::CSS_TURN && value->unit <= CSSPrimitiveValue::CSS_REMS)
>+           || (value->unit >= CSSPrimitiveValue::CSS_TURN && value->unit <= CSSPrimitiveValue::CSS_CHS)
>            || (value->unit >= CSSPrimitiveValue::CSS_VW && value->unit <= CSSPrimitiveValue::CSS_VMIN));
> #endif
>     return cssValuePool().createValue(value->fValue, static_cast<CSSPrimitiveValue::UnitTypes>(value->unit));
>@@ -1516,6 +1517,8 @@ static int unitFromString(CSSParserValue* value)
>         return CSSPrimitiveValue::CSS_EMS;
>     if (equal(value->string, "rem"))
>         return CSSPrimitiveValue::CSS_REMS;
>+    if (equal(value->string, "ch"))
>+        return CSSPrimitiveValue::CSS_CHS;
>     if (equal(value->string, "ex"))
>         return CSSPrimitiveValue::CSS_EXS;
>     if (equal(value->string, "px"))
>@@ -1609,7 +1612,7 @@ inline PassRefPtr<CSSPrimitiveValue> CSSParser::parseValidPrimitive(int identifi
>         return createPrimitiveStringValue(value);
>     if (value->unit >= CSSPrimitiveValue::CSS_NUMBER && value->unit <= CSSPrimitiveValue::CSS_KHZ)
>         return createPrimitiveNumericValue(value);
>-    if (value->unit >= CSSPrimitiveValue::CSS_TURN && value->unit <= CSSPrimitiveValue::CSS_REMS)
>+    if (value->unit >= CSSPrimitiveValue::CSS_TURN && value->unit <= CSSPrimitiveValue::CSS_CHS)
>         return createPrimitiveNumericValue(value);
>     if (value->unit >= CSSPrimitiveValue::CSS_VW && value->unit <= CSSPrimitiveValue::CSS_VMIN)
>         return createPrimitiveNumericValue(value);
>@@ -8522,6 +8525,8 @@ inline void CSSParser::detectNumberToken(UChar* type, int length)
>     case 'c':
>         if (length == 2 && isASCIIAlphaCaselessEqual(type[1], 'm'))
>             m_token = CMS;
>+        else if (length == 2 && isASCIIAlphaCaselessEqual(type[1], 'h'))
>+            m_token = CHS;
>         return;
> 
>     case 'd':
>diff --git a/Source/WebCore/css/CSSParserValues.cpp b/Source/WebCore/css/CSSParserValues.cpp
>index 37a0d45..4e3aa96 100644
>--- a/Source/WebCore/css/CSSParserValues.cpp
>+++ b/Source/WebCore/css/CSSParserValues.cpp
>@@ -87,7 +87,7 @@ PassRefPtr<CSSValue> CSSParserValue::createCSSValue()
>         parsedValue = CSSPrimitiveValue::create(string, (CSSPrimitiveValue::UnitTypes)unit);
>     else if (unit >= CSSPrimitiveValue::CSS_NUMBER && unit <= CSSPrimitiveValue::CSS_KHZ)
>         parsedValue = CSSPrimitiveValue::create(fValue, (CSSPrimitiveValue::UnitTypes)unit);
>-    else if (unit >= CSSPrimitiveValue::CSS_TURN && unit <= CSSPrimitiveValue::CSS_REMS) // CSS3 Values and Units
>+    else if (unit >= CSSPrimitiveValue::CSS_TURN && unit <= CSSPrimitiveValue::CSS_CHS) // CSS3 Values and Units
>         parsedValue = CSSPrimitiveValue::create(fValue, (CSSPrimitiveValue::UnitTypes)unit);
>     else if (unit >= CSSParserValue::Q_EMS)
>         parsedValue = CSSPrimitiveValue::createAllowingMarginQuirk(fValue, CSSPrimitiveValue::CSS_EMS);
>diff --git a/Source/WebCore/css/CSSPrimitiveValue.cpp b/Source/WebCore/css/CSSPrimitiveValue.cpp
>index 5718180..6fa0452 100644
>--- a/Source/WebCore/css/CSSPrimitiveValue.cpp
>+++ b/Source/WebCore/css/CSSPrimitiveValue.cpp
>@@ -80,6 +80,7 @@ static inline bool isValidCSSUnitTypeForDoubleConversion(CSSPrimitiveValue::Unit
>     case CSSPrimitiveValue:: CSS_PX:
>     case CSSPrimitiveValue:: CSS_RAD:
>     case CSSPrimitiveValue:: CSS_REMS:
>+    case CSSPrimitiveValue:: CSS_CHS:
>     case CSSPrimitiveValue:: CSS_S:
>     case CSSPrimitiveValue:: CSS_TURN:
>     case CSSPrimitiveValue:: CSS_VW:
>@@ -406,6 +407,7 @@ void CSSPrimitiveValue::cleanup()
>     case CSS_EMS:
>     case CSS_EXS:
>     case CSS_REMS:
>+    case CSS_CHS:
>     case CSS_PX:
>     case CSS_CM:
>     case CSS_MM:
>@@ -514,6 +516,9 @@ double CSSPrimitiveValue::computeLengthDouble(RenderStyle* style, RenderStyle* r
>             else
>                 factor = 1.0;
>             break;
>+        case CSS_CHS:
>+            factor = style->font().primaryFont()->zeroWidth();
>+            break;
>         case CSS_PX:
>             factor = 1.0;
>             break;
>@@ -869,6 +874,9 @@ String CSSPrimitiveValue::customCssText() const
>         case CSS_REMS:
>             text = formatNumber(m_value.num) + "rem";
>             break;
>+        case CSS_CHS:
>+            text = formatNumber(m_value.num) + "ch";
>+            break;
>         case CSS_PX:
>             text = formatNumber(m_value.num) + "px";
>             break;
>@@ -1208,6 +1216,7 @@ PassRefPtr<CSSPrimitiveValue> CSSPrimitiveValue::cloneForCSSOM() const
>     case CSS_EMS:
>     case CSS_EXS:
>     case CSS_REMS:
>+    case CSS_CHS:
>     case CSS_PX:
>     case CSS_CM:
>     case CSS_MM:
>diff --git a/Source/WebCore/css/CSSPrimitiveValue.h b/Source/WebCore/css/CSSPrimitiveValue.h
>index 87069c0..76b1dd9 100644
>--- a/Source/WebCore/css/CSSPrimitiveValue.h
>+++ b/Source/WebCore/css/CSSPrimitiveValue.h
>@@ -113,22 +113,23 @@ public:
>         // These are from CSS3 Values and Units, but that isn't a finished standard yet
>         CSS_TURN = 107,
>         CSS_REMS = 108,
>+        CSS_CHS = 109,
> 
>         // This is used internally for counter names (as opposed to counter values)
>-        CSS_COUNTER_NAME = 109,
>+        CSS_COUNTER_NAME = 110,
> 
>         // This is used by the CSS Exclusions draft
>-        CSS_SHAPE = 110,
>+        CSS_SHAPE = 111,
> 
>         // Used by border images.
>-        CSS_QUAD = 111,
>+        CSS_QUAD = 112,
> 
>-        CSS_CALC = 112,
>-        CSS_CALC_PERCENTAGE_WITH_NUMBER = 113,
>-        CSS_CALC_PERCENTAGE_WITH_LENGTH = 114,
>+        CSS_CALC = 113,
>+        CSS_CALC_PERCENTAGE_WITH_NUMBER = 114,
>+        CSS_CALC_PERCENTAGE_WITH_LENGTH = 115,
> 
> #if ENABLE(CSS_VARIABLES)
>-        CSS_VARIABLE_NAME = 115,
>+        CSS_VARIABLE_NAME = 116,
> #endif
>     };
> 
>@@ -159,13 +160,16 @@ public:
>     bool isFontIndependentLength() const { return m_primitiveUnitType >= CSS_PX && m_primitiveUnitType <= CSS_PC; }
>     bool isFontRelativeLength() const
>     {
>-        return m_primitiveUnitType == CSS_EMS || m_primitiveUnitType == CSS_EXS || m_primitiveUnitType == CSS_REMS;
>+        return m_primitiveUnitType == CSS_EMS
>+               || m_primitiveUnitType == CSS_EXS
>+               || m_primitiveUnitType == CSS_REMS
>+               || m_primitiveUnitType == CSS_CHS;
>     }
>     bool isIdent() const { return m_primitiveUnitType == CSS_IDENT; }
>     bool isLength() const
>     {
>         unsigned short type = primitiveType();
>-        return (type >= CSS_EMS && type <= CSS_PC) || type == CSS_REMS;
>+        return (type >= CSS_EMS && type <= CSS_PC) || type == CSS_REMS || type == CSS_CHS;
>     }
>     bool isNumber() const { return primitiveType() == CSS_NUMBER; }
>     bool isPercentage() const { return primitiveType() == CSS_PERCENTAGE; }
>diff --git a/Source/WebCore/platform/graphics/Font.h b/Source/WebCore/platform/graphics/Font.h
>index d80660d..f554851 100644
>--- a/Source/WebCore/platform/graphics/Font.h
>+++ b/Source/WebCore/platform/graphics/Font.h
>@@ -160,6 +160,7 @@ public:
>     // Metrics that we query the FontFallbackList for.
>     const FontMetrics& fontMetrics() const { return primaryFont()->fontMetrics(); }
>     float spaceWidth() const { return primaryFont()->spaceWidth() + m_letterSpacing; }
>+    float zeroWidth() const { return primaryFont()->zeroWidth() + m_letterSpacing; }
>     float tabWidth(const SimpleFontData&, unsigned tabSize, float position) const;
>     float tabWidth(unsigned tabSize, float position) const { return tabWidth(*primaryFont(), tabSize, position); }
> 
>diff --git a/Source/WebCore/platform/graphics/SimpleFontData.cpp b/Source/WebCore/platform/graphics/SimpleFontData.cpp
>index 222e433..ee75e82 100644
>--- a/Source/WebCore/platform/graphics/SimpleFontData.cpp
>+++ b/Source/WebCore/platform/graphics/SimpleFontData.cpp
>@@ -98,6 +98,8 @@ void SimpleFontData::platformGlyphInit()
>         LOG_ERROR("Failed to get glyph page zero.");
>         m_spaceGlyph = 0;
>         m_spaceWidth = 0;
>+        m_zeroGlyph = 0;
>+        m_zeroWidth = 0;
>         m_adjustedSpaceWidth = 0;
>         determinePitch();
>         m_zeroWidthSpaceGlyph = 0;
>@@ -114,6 +116,8 @@ void SimpleFontData::platformGlyphInit()
>     m_spaceGlyph = glyphPageZero->glyphDataForCharacter(' ').glyph;
>     float width = widthForGlyph(m_spaceGlyph);
>     m_spaceWidth = width;
>+    m_zeroGlyph = glyphPageZero->glyphDataForCharacter('0').glyph;
>+    m_zeroWidth = widthForGlyph(m_zeroGlyph);
>     determinePitch();
>     m_adjustedSpaceWidth = m_treatAsFixedPitch ? ceilf(width) : roundf(width);
> 
>diff --git a/Source/WebCore/platform/graphics/SimpleFontData.h b/Source/WebCore/platform/graphics/SimpleFontData.h
>index 6fc918a..f7ffa79 100644
>--- a/Source/WebCore/platform/graphics/SimpleFontData.h
>+++ b/Source/WebCore/platform/graphics/SimpleFontData.h
>@@ -136,6 +136,7 @@ public:
>     float platformWidthForGlyph(Glyph) const;
> 
>     float spaceWidth() const { return m_spaceWidth; }
>+    float zeroWidth() const { return m_zeroWidth; }
>     float adjustedSpaceWidth() const { return m_adjustedSpaceWidth; }
>     void setSpaceWidth(float spaceWidth) { m_spaceWidth = spaceWidth; }
> 
>@@ -145,6 +146,8 @@ public:
> 
>     Glyph spaceGlyph() const { return m_spaceGlyph; }
>     void setSpaceGlyph(Glyph spaceGlyph) { m_spaceGlyph = spaceGlyph; }
>+    Glyph zeroGlyph() const { return m_zeroGlyph; }
>+    void setZeroGlyph(Glyph zeroGlyph) { m_zeroGlyph = zeroGlyph; }
>     void setZeroWidthSpaceGlyph(Glyph spaceGlyph) { m_zeroWidthSpaceGlyph = spaceGlyph; }
>     bool isZeroWidthSpaceGlyph(Glyph glyph) const { return glyph == m_zeroWidthSpaceGlyph && glyph; }
> 
>@@ -257,6 +260,8 @@ private:
>     
>     Glyph m_spaceGlyph;
>     float m_spaceWidth;
>+    Glyph m_zeroGlyph;
>+    float m_zeroWidth;
>     float m_adjustedSpaceWidth;
> 
>     Glyph m_zeroWidthSpaceGlyph;
>diff --git a/Source/WebCore/platform/graphics/qt/SimpleFontDataQt.cpp b/Source/WebCore/platform/graphics/qt/SimpleFontDataQt.cpp
>index 4c01f1d..3914e8b 100644
>--- a/Source/WebCore/platform/graphics/qt/SimpleFontDataQt.cpp
>+++ b/Source/WebCore/platform/graphics/qt/SimpleFontDataQt.cpp
>@@ -113,6 +113,7 @@ void SimpleFontData::platformGlyphInit()
>     if (!m_platformData.size())
>         return;
>     m_spaceGlyph = 0;
>+    m_zeroGlyph = 0;
>     m_adjustedSpaceWidth = m_spaceWidth;
>     determinePitch();
>     m_missingGlyphData.fontData = this;
>@@ -139,6 +140,10 @@ void SimpleFontData::platformInit()
>     QVector<quint32> indexes = rawFont.glyphIndexesForString(QLatin1String(" "));
>     QVector<QPointF> advances = rawFont.advancesForGlyphIndexes(indexes);
>     float spaceWidth = advances.at(0).x();
>+
>+    indexes = rawFont.glyphIndexesForString(QLatin1String("0"));
>+    advances = rawFont.advancesForGlyphIndexes(indexes);
>+    float zeroWidth = advances.at(0).x();
> #else
>     QFontMetricsF fm(m_platformData.font());
>     float descent = fm.descent();
>@@ -146,6 +151,7 @@ void SimpleFontData::platformInit()
>     float xHeight = fm.xHeight();
>     float lineSpacing = fm.lineSpacing();
>     float spaceWidth = fm.width(QLatin1Char(' '));
>+    float zeroWidth = fm.width(QLatin1Char('0'));
> #endif
> 
> #if !HAVE(QT5)
>@@ -171,6 +177,7 @@ void SimpleFontData::platformInit()
>     m_fontMetrics.setXHeight(xHeight);
>     m_fontMetrics.setLineGap(lineGap);
>     m_spaceWidth = spaceWidth;
>+    m_zeroWidth = zeroWidth;
> }
> 
> void SimpleFontData::platformCharWidthInit()
>-- 
>1.7.3.4
>

Actions: View | Formatted Diff | Diff

Attachments on bug 85755: 151038 | 151463 | 151616 | 151623 | 151630 | 153006 | 153012 | 157997 | 158001 | 158042 | 158067 | 174491 | 179815 | 183785 | 183832 | 184100 | 184102 | 184103 | 184214 | 184243 | 184510 | 184616 | 187182 | 187376 | 188399