Changeset 136640 in webkit


Ignore:
Timestamp:
Dec 4, 2012, 10:18:22 PM (12 years ago)
Author:
mitz@apple.com
Message:

Support text-orientation: sideways-right (and sideways when it maps to sideways-right)
​https://bugs.webkit.org/show_bug.cgi?id=104035

Reviewed by Anders Carlsson.

Test: fast/text/orientation-sideways.html

  • GNUmakefile.list.am: Updated for rename of TextOrientation.h.
  • WebCore.gypi: Ditto.
  • WebCore.xcodeproj/project.pbxproj: Ditto.
  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): Changed to retrieve
text-orientation from RenderStyle rather than from the font description.

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue): Added sideways and sideways-right as acceptable
text-orientation values.

  • css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Added mappings for sideways and
sideways-right.
(WebCore::CSSPrimitiveValue::operator TextOrientation): Ditto.

  • css/CSSValueKeywords.in: Added sideways and sideways-right.
  • css/StyleBuilder.cpp:

(WebCore::StyleBuilder::StyleBuilder): Removed text-orientation property handler, as it is
now handled in CSSStyleResolver.

  • css/StyleResolver.cpp:

(WebCore::getFontAndGlyphOrientation): Added this helper function that determines the font
orientation and non-CJK glyph orientation based on writing-mode and text-orientation.
(WebCore::StyleResolver::styleForDocument): Added code to set the font orientation and
non-CJK glyph orientation in the document style.
(WebCore::checkForOrientationChange): Added. Sets the font orientation and non-CJK glyph
orientation in the child style if the difference between the parent and child styles requires
doing so.
(WebCore::StyleResolver::updateFont): Added call to checkForOrientationChange().
(WebCore::StyleResolver::applyProperty): Changed the writing-mode case to call the new
setWritingMode helper, which dirties the font as needed, rather than changing the font
here. Moved handling of text-orientation here, by calling setTextOrientation, which also
dirties the font as needed.

  • css/StyleResolver.h:

(WebCore::StyleResolver::setWritingMode): Added. Dirties the font if the writing mode changes.
(WebCore::StyleResolver::setTextOrientation): Ditto for text orientation.

  • platform/graphics/FontDescription.h:

(WebCore::FontDescription::FontDescription): Updated initializer for rename.
(WebCore::FontDescription::nonCJKGlyphOrientation): Renamed textOrientation to this.
(WebCore::FontDescription::setNonCJKGlyphOrientation): Renamed setTextOrientation to this.
(FontDescription): Renamed member variable m_textOrientation to m_nonCJKGlyphOrientation.
(WebCore::FontDescription::operator==): Updated for rename.

  • platform/graphics/FontFastPath.cpp:

(WebCore::glyphDataAndPageForNonCJKCharacterWithGlyphOrientation): Renamed
glyphDataAndPageForCharacterWithTextOrientation to this and changed the parameter type from
TextOrientation to NonCJKGlyphOrientation.
(WebCore::Font::glyphDataAndPageForCharacter): Updated for above rename.

  • platform/graphics/mac/FontComplexTextMac.cpp:

(WebCore::Font::fontDataForCombiningCharacterSequence): Updated for rename of
FontDescription::textOrientation().

  • platform/text/NonCJKGlyphOrientation.h: Renamed TextOrientation.h to this, and renamed

the enum and its values to better reflect that they describe how glyphs for non-CJK
characters are to be rendered in vertical text.

  • rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::requiresIdeographicBaseline): Updated for rename of
FontDescription::textOrientation().

  • rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff): Made text-orientation change a layout change.

  • rendering/style/RenderStyle.h:

(WebCore::RenderStyle::setTextOrientation): Added.

  • rendering/style/RenderStyleConstants.h: Added a new TextOrientation enum here.
  • rendering/style/StyleRareInheritedData.cpp:

(WebCore::StyleRareInheritedData::StyleRareInheritedData): Added initialization and copying
of m_textOrientation member variable.
(WebCore::StyleRareInheritedData::operator==): Added comparing of m_textOrientation.

  • rendering/style/StyleRareInheritedData.h:

(StyleRareInheritedData): Added m_textOrientation member variable.

Location:
trunk
Files:
3 added
21 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/platform/chromium/TestExpectations

    r136614 r136640  
    43374337# Flaky on mac debug since r136472 or earlier
    43384338webkit.org/b/104023 [ Mac Debug ] fast/dom/HTMLTemplateElement/inertContents.html [ Failure Pass ]
     4339
     4340# Needs platform-specific results
     4341webkit.org/b/104035 fast/text/orientation-sideways.html [ Missing ]

  • trunk/Source/WebCore/ChangeLog

    r136638 r136640  
     12012-12-04  Dan Bernstein  <mitz@apple.com>
     2
     3        Support text-orientation: sideways-right (and sideways when it maps to sideways-right)
     4        https://bugs.webkit.org/show_bug.cgi?id=104035
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Test: fast/text/orientation-sideways.html
     9
     10        * GNUmakefile.list.am: Updated for rename of TextOrientation.h.
     11
     12        * WebCore.gypi: Ditto.
     13
     14        * WebCore.xcodeproj/project.pbxproj: Ditto.
     15
     16        * css/CSSComputedStyleDeclaration.cpp:
     17        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): Changed to retrieve
     18        text-orientation from RenderStyle rather than from the font description.
     19
     20        * css/CSSParser.cpp:
     21        (WebCore::CSSParser::parseValue): Added sideways and sideways-right as acceptable
     22        text-orientation values.
     23
     24        * css/CSSPrimitiveValueMappings.h:
     25        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Added mappings for sideways and
     26        sideways-right.
     27        (WebCore::CSSPrimitiveValue::operator TextOrientation): Ditto.
     28
     29        * css/CSSValueKeywords.in: Added sideways and sideways-right.
     30
     31        * css/StyleBuilder.cpp:
     32        (WebCore::StyleBuilder::StyleBuilder): Removed text-orientation property handler, as it is
     33        now handled in CSSStyleResolver.
     34
     35        * css/StyleResolver.cpp:
     36        (WebCore::getFontAndGlyphOrientation): Added this helper function that determines the font
     37        orientation and non-CJK glyph orientation based on writing-mode and text-orientation.
     38        (WebCore::StyleResolver::styleForDocument): Added code to set the font orientation and
     39        non-CJK glyph orientation in the document style.
     40        (WebCore::checkForOrientationChange): Added. Sets the font orientation and non-CJK glyph
     41        orientation in the child style if the difference between the parent and child styles requires
     42        doing so.
     43        (WebCore::StyleResolver::updateFont): Added call to checkForOrientationChange().
     44        (WebCore::StyleResolver::applyProperty): Changed the writing-mode case to call the new
     45        setWritingMode helper, which dirties the font as needed, rather than changing the font
     46        here. Moved handling of text-orientation here, by calling setTextOrientation, which also
     47        dirties the font as needed.
     48
     49        * css/StyleResolver.h:
     50        (WebCore::StyleResolver::setWritingMode): Added. Dirties the font if the writing mode changes.
     51        (WebCore::StyleResolver::setTextOrientation): Ditto for text orientation.
     52
     53        * platform/graphics/FontDescription.h:
     54        (WebCore::FontDescription::FontDescription): Updated initializer for rename.
     55        (WebCore::FontDescription::nonCJKGlyphOrientation): Renamed textOrientation to this.
     56        (WebCore::FontDescription::setNonCJKGlyphOrientation): Renamed setTextOrientation to this.
     57        (FontDescription): Renamed member variable m_textOrientation to m_nonCJKGlyphOrientation.
     58        (WebCore::FontDescription::operator==): Updated for rename.
     59
     60        * platform/graphics/FontFastPath.cpp:
     61        (WebCore::glyphDataAndPageForNonCJKCharacterWithGlyphOrientation): Renamed
     62        glyphDataAndPageForCharacterWithTextOrientation to this and changed the parameter type from
     63        TextOrientation to NonCJKGlyphOrientation.
     64        (WebCore::Font::glyphDataAndPageForCharacter): Updated for above rename.
     65
     66        * platform/graphics/mac/FontComplexTextMac.cpp:
     67        (WebCore::Font::fontDataForCombiningCharacterSequence): Updated for rename of
     68        FontDescription::textOrientation().
     69
     70        * platform/text/NonCJKGlyphOrientation.h: Renamed TextOrientation.h to this, and renamed
     71        the enum and its values to better reflect that they describe how glyphs for non-CJK
     72        characters are to be rendered in vertical text.
     73
     74        * rendering/InlineFlowBox.cpp:
     75        (WebCore::InlineFlowBox::requiresIdeographicBaseline): Updated for rename of
     76        FontDescription::textOrientation().
     77
     78        * rendering/style/RenderStyle.cpp:
     79        (WebCore::RenderStyle::diff): Made text-orientation change a layout change.
     80
     81        * rendering/style/RenderStyle.h:
     82        (WebCore::RenderStyle::setTextOrientation): Added.
     83
     84        * rendering/style/RenderStyleConstants.h: Added a new TextOrientation enum here.
     85
     86        * rendering/style/StyleRareInheritedData.cpp:
     87        (WebCore::StyleRareInheritedData::StyleRareInheritedData): Added initialization and copying
     88        of m_textOrientation member variable.
     89        (WebCore::StyleRareInheritedData::operator==): Added comparing of m_textOrientation.
     90
     91        * rendering/style/StyleRareInheritedData.h:
     92        (StyleRareInheritedData): Added m_textOrientation member variable.
     93
    1942012-12-04  Kentaro Hara  <haraken@chromium.org>
    295

  • trunk/Source/WebCore/GNUmakefile.list.am

    r136613 r136640  
    58635863        Source/WebCore/platform/text/LocaleToScriptMapping.h \
    58645864        Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp \
     5865        Source/WebCore/platform/text/NonCJKGlyphOrientation.h \
    58655866        Source/WebCore/platform/text/ParserUtilities.h \
    58665867        Source/WebCore/platform/text/PlatformLocale.cpp \
    … …  
    58985899        Source/WebCore/platform/text/TextEncodingRegistry.cpp \
    58995900        Source/WebCore/platform/text/TextEncodingRegistry.h \
    5900         Source/WebCore/platform/text/TextOrientation.h \
    59015901        Source/WebCore/platform/text/TextStream.cpp \
    59025902        Source/WebCore/platform/text/TextStream.h \

  • trunk/Source/WebCore/WebCore.gypi

    r136613 r136640  
    516516            'platform/text/LineBreakIteratorPoolICU.h',
    517517            'platform/text/LineEnding.h',
     518            'platform/text/NonCJKGlyphOrientation.h',
    518519            'platform/text/QuotedPrintable.h',
    519520            'platform/text/RegularExpression.h',
    … …  
    532533            'platform/text/TextEncoding.h',
    533534            'platform/text/TextEncodingRegistry.h',
    534             'platform/text/TextOrientation.h',
    535535            'platform/text/TextStream.h',
    536536            'platform/text/UnicodeBidi.h',

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r136613 r136640  
    57025702                BCD0FBD00DBD625E00B2F630 /* DOMAbstractView.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCD0FBCF0DBD625E00B2F630 /* DOMAbstractView.mm */; };
    57035703                BCD0FC4F0DBD720B00B2F630 /* DOMRGBColorInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD0FC4E0DBD720B00B2F630 /* DOMRGBColorInternal.h */; };
    5704                 BCD3F9831326C93700098A60 /* TextOrientation.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD3F9821326C93700098A60 /* TextOrientation.h */; settings = {ATTRIBUTES = (Private, ); }; };
     5704                BCD3F9831326C93700098A60 /* NonCJKGlyphOrientation.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD3F9821326C93700098A60 /* NonCJKGlyphOrientation.h */; settings = {ATTRIBUTES = (Private, ); }; };
    57055705                BCD41ABB0C060DE800C0E446 /* JSHTMLFrameSetElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD41ABA0C060DE800C0E446 /* JSHTMLFrameSetElementCustom.cpp */; };
    57065706                BCD533640ED6848900887468 /* CachedScriptSourceProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD533630ED6848900887468 /* CachedScriptSourceProvider.h */; };
    … …  
    1311313113                BCD0FBCF0DBD625E00B2F630 /* DOMAbstractView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMAbstractView.mm; sourceTree = "<group>"; };
    1311413114                BCD0FC4E0DBD720B00B2F630 /* DOMRGBColorInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMRGBColorInternal.h; sourceTree = "<group>"; };
    13115                 BCD3F9821326C93700098A60 /* TextOrientation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextOrientation.h; sourceTree = "<group>"; };
     13115                BCD3F9821326C93700098A60 /* NonCJKGlyphOrientation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NonCJKGlyphOrientation.h; sourceTree = "<group>"; };
    1311613116                BCD41ABA0C060DE800C0E446 /* JSHTMLFrameSetElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLFrameSetElementCustom.cpp; sourceTree = "<group>"; };
    1311713117                BCD533630ED6848900887468 /* CachedScriptSourceProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedScriptSourceProvider.h; sourceTree = "<group>"; };
    … …  
    2026820268                                7633A72413D8B33A008501B6 /* LocaleToScriptMapping.h */,
    2026920269                                7633A72513D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp */,
     20270                                BCD3F9821326C93700098A60 /* NonCJKGlyphOrientation.h */,
    2027020271                                BC76AC110DD7AD5C00415F34 /* ParserUtilities.h */,
    2027120272                                F544F78615CFB2A800AF33A8 /* PlatformLocale.cpp */,
    … …  
    2030720308                                B2C3DA180D006C1D00EF6F26 /* TextEncodingRegistry.cpp */,
    2030820309                                B2C3DA190D006C1D00EF6F26 /* TextEncodingRegistry.h */,
    20309                                 BCD3F9821326C93700098A60 /* TextOrientation.h */,
    2031020310                                B2C3DA1A0D006C1D00EF6F26 /* TextStream.cpp */,
    2031120311                                B2C3DA1B0D006C1D00EF6F26 /* TextStream.h */,
    … …  
    2561725617                                93309E1C099E64920056E581 /* TextIterator.h in Headers */,
    2561825618                                BCEF45E90E687767001C1287 /* TextMetrics.h in Headers */,
    25619                                 BCD3F9831326C93700098A60 /* TextOrientation.h in Headers */,
     25619                                BCD3F9831326C93700098A60 /* NonCJKGlyphOrientation.h in Headers */,
    2562025620                                930FC68A1072B9280045293E /* TextRenderingMode.h in Headers */,
    2562125621                                93F198F608245E59001E9ABC /* TextResourceDecoder.h in Headers */,

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r136588 r136640  
    24872487            return cssValuePool().createValue(style->textCombine());
    24882488        case CSSPropertyWebkitTextOrientation:
    2489             return CSSPrimitiveValue::create(style->fontDescription().textOrientation());
     2489            return CSSPrimitiveValue::create(style->textOrientation());
    24902490        case CSSPropertyWebkitLineBoxContain:
    24912491            return createLineBoxContainValue(style->lineBoxContain());

  • trunk/Source/WebCore/css/CSSParser.cpp

    r136588 r136640  
    27202720
    27212721    case CSSPropertyWebkitTextOrientation:
    2722         // FIXME: For now just support upright and vertical-right.
    2723         if (id == CSSValueVerticalRight || id == CSSValueUpright)
     2722        // FIXME: For now just support sideways, sideways-right, upright and vertical-right.
     2723        if (id == CSSValueSideways || id == CSSValueSidewaysRight || id == CSSValueVerticalRight || id == CSSValueUpright)
    27242724            validPrimitive = true;
    27252725        break;

  • trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h

    r136380 r136640  
    4747#include "SVGRenderStyleDefs.h"
    4848#include "TextDirection.h"
    49 #include "TextOrientation.h"
    5049#include "TextRenderingMode.h"
    5150#include "ThemeTypes.h"
    … …  
    29852984    m_primitiveUnitType = CSS_IDENT;
    29862985    switch (e) {
     2986    case TextOrientationSideways:
     2987        m_value.ident = CSSValueSideways;
     2988        break;
     2989    case TextOrientationSidewaysRight:
     2990        m_value.ident = CSSValueSidewaysRight;
     2991        break;
    29872992    case TextOrientationVerticalRight:
    29882993        m_value.ident = CSSValueVerticalRight;
    … …  
    29973002{
    29983003    switch (m_value.ident) {
     3004    case CSSValueSideways:
     3005        return TextOrientationSideways;
     3006    case CSSValueSidewaysRight:
     3007        return TextOrientationSidewaysRight;
    29993008    case CSSValueVerticalRight:
    30003009        return TextOrientationVerticalRight;

  • trunk/Source/WebCore/css/CSSValueKeywords.in

    r136275 r136640  
    896896
    897897// -webkit-text-orientation
     898sideways
     899sideways-right
    898900upright
    899901vertical-right

  • trunk/Source/WebCore/css/StyleBuilder.cpp

    r136275 r136640  
    20562056    setPropertyHandler(CSSPropertyWebkitTextEmphasisStyle, ApplyPropertyTextEmphasisStyle::createHandler());
    20572057    setPropertyHandler(CSSPropertyWebkitTextFillColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textFillColor, &RenderStyle::setTextFillColor, &RenderStyle::setVisitedLinkTextFillColor, &RenderStyle::color>::createHandler());
    2058     setPropertyHandler(CSSPropertyWebkitTextOrientation, ApplyPropertyFont<TextOrientation, &FontDescription::textOrientation, &FontDescription::setTextOrientation, TextOrientationVerticalRight>::createHandler());
    20592058    setPropertyHandler(CSSPropertyWebkitTextSecurity, ApplyPropertyDefault<ETextSecurity, &RenderStyle::textSecurity, ETextSecurity, &RenderStyle::setTextSecurity, ETextSecurity, &RenderStyle::initialTextSecurity>::createHandler());
    20602059    setPropertyHandler(CSSPropertyWebkitTextStrokeColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textStrokeColor, &RenderStyle::setTextStrokeColor, &RenderStyle::setVisitedLinkTextStrokeColor, &RenderStyle::color>::createHandler());

  • trunk/Source/WebCore/css/StyleResolver.cpp

    r136629 r136640  
    14071407}
    14081408
     1409static void getFontAndGlyphOrientation(const RenderStyle* style, FontOrientation& fontOrientation, NonCJKGlyphOrientation& glyphOrientation)
     1410{
     1411    if (style->isHorizontalWritingMode()) {
     1412        fontOrientation = Horizontal;
     1413        glyphOrientation = NonCJKGlyphOrientationVerticalRight;
     1414        return;
     1415    }
     1416
     1417    switch (style->textOrientation()) {
     1418    case TextOrientationVerticalRight:
     1419        fontOrientation = Vertical;
     1420        glyphOrientation = NonCJKGlyphOrientationVerticalRight;
     1421        return;
     1422    case TextOrientationUpright:
     1423        fontOrientation = Vertical;
     1424        glyphOrientation = NonCJKGlyphOrientationUpright;
     1425        return;
     1426    case TextOrientationSideways:
     1427        if (style->writingMode() == LeftToRightWritingMode) {
     1428            // FIXME: This should map to sideways-left, which is not supported yet.
     1429            fontOrientation = Vertical;
     1430            glyphOrientation = NonCJKGlyphOrientationVerticalRight;
     1431            return;
     1432        }
     1433        fontOrientation = Horizontal;
     1434        glyphOrientation = NonCJKGlyphOrientationVerticalRight;
     1435        return;
     1436    case TextOrientationSidewaysRight:
     1437        fontOrientation = Horizontal;
     1438        glyphOrientation = NonCJKGlyphOrientationVerticalRight;
     1439        return;
     1440    }
     1441}
     1442
    14091443PassRefPtr<RenderStyle> StyleResolver::styleForDocument(Document* document, CSSFontSelector* fontSelector)
    14101444{
    … …  
    14871521    } else
    14881522        fontDescription.setUsePrinterFont(document->printing());
     1523
     1524    FontOrientation fontOrientation;
     1525    NonCJKGlyphOrientation glyphOrientation;
     1526    getFontAndGlyphOrientation(documentStyle.get(), fontOrientation, glyphOrientation);
     1527    fontDescription.setOrientation(fontOrientation);
     1528    fontDescription.setNonCJKGlyphOrientation(glyphOrientation);
    14891529
    14901530    documentStyle->setFontDescription(fontDescription);
    … …  
    21052145}
    21062146
     2147static void checkForOrientationChange(RenderStyle* style, const RenderStyle* parentStyle)
     2148{
     2149    FontOrientation childFontOrientation;
     2150    NonCJKGlyphOrientation childGlyphOrientation;
     2151    getFontAndGlyphOrientation(style, childFontOrientation, childGlyphOrientation);
     2152
     2153    FontOrientation parentFontOrientation;
     2154    NonCJKGlyphOrientation parentGlyphOrientation;
     2155    getFontAndGlyphOrientation(parentStyle, parentFontOrientation, parentGlyphOrientation);
     2156
     2157    if (childFontOrientation == parentFontOrientation && childGlyphOrientation == parentGlyphOrientation)
     2158        return;
     2159
     2160    const FontDescription& childFont = style->fontDescription();
     2161    FontDescription newFontDescription(childFont);
     2162    newFontDescription.setNonCJKGlyphOrientation(childGlyphOrientation);
     2163    newFontDescription.setOrientation(childFontOrientation);
     2164    style->setFontDescription(newFontDescription);
     2165}
     2166
    21072167void StyleResolver::updateFont()
    21082168{
    … …  
    21132173    checkForGenericFamilyChange(style(), m_parentStyle);
    21142174    checkForZoomChange(style(), m_parentStyle);
     2175    checkForOrientationChange(style(), m_parentStyle);
    21152176    m_style->font().update(m_fontSelector);
    21162177    m_fontDirty = false;
    … …  
    35373598       
    35383599        if (primitiveValue)
    3539             m_style->setWritingMode(*primitiveValue);
    3540        
     3600            setWritingMode(*primitiveValue);
     3601
    35413602        // FIXME: It is not ok to modify document state while applying style.
    35423603        if (m_element && m_element == m_element->document()->documentElement())
    35433604            m_element->document()->setWritingModeSetOnDocumentElement(true);
    3544         FontDescription fontDescription = m_style->fontDescription();
    3545         fontDescription.setOrientation(m_style->isHorizontalWritingMode() ? Horizontal : Vertical);
    3546         setFontDescription(fontDescription);
     3605
     3606        return;
     3607    }
     3608
     3609    case CSSPropertyWebkitTextOrientation: {
     3610        HANDLE_INHERIT_AND_INITIAL(textOrientation, TextOrientation);
     3611
     3612        if (primitiveValue)
     3613            setTextOrientation(*primitiveValue);
     3614
    35473615        return;
    35483616    }
    … …  
    38703938    case CSSPropertyWebkitTextEmphasisStyle:
    38713939    case CSSPropertyWebkitTextFillColor:
    3872     case CSSPropertyWebkitTextOrientation:
    38733940    case CSSPropertyWebkitTextSecurity:
    38743941    case CSSPropertyWebkitTextStrokeColor:

  • trunk/Source/WebCore/css/StyleResolver.h

    r136615 r136640  
    166166    void setEffectiveZoom(float f) { m_fontDirty |= style()->setEffectiveZoom(f); }
    167167    void setTextSizeAdjust(bool b) { m_fontDirty |= style()->setTextSizeAdjust(b); }
     168    void setWritingMode(WritingMode writingMode) { m_fontDirty |= style()->setWritingMode(writingMode); }
     169    void setTextOrientation(TextOrientation textOrientation) { m_fontDirty |= style()->setTextOrientation(textOrientation); }
    168170    bool hasParentNode() const { return m_parentNode; }
    169171

  • trunk/Source/WebCore/platform/graphics/FontDescription.h

    r117868 r136640  
    3333#include "FontTraitsMask.h"
    3434#include "FontWidthVariant.h"
    35 #include "TextOrientation.h"
     35#include "NonCJKGlyphOrientation.h"
    3636#include "TextRenderingMode.h"
    3737#include "WebKitFontFamilyNames.h"
    … …  
    8181        , m_computedSize(0)
    8282        , m_orientation(Horizontal)
    83         , m_textOrientation(TextOrientationVerticalRight)
     83        , m_nonCJKGlyphOrientation(NonCJKGlyphOrientationVerticalRight)
    8484        , m_widthVariant(RegularWidth)
    8585        , m_italic(FontItalicOff)
    … …  
    133133    bool isSpecifiedFont() const { return m_isSpecifiedFont; }
    134134    FontOrientation orientation() const { return static_cast<FontOrientation>(m_orientation); }
    135     TextOrientation textOrientation() const { return static_cast<TextOrientation>(m_textOrientation); }
     135    NonCJKGlyphOrientation nonCJKGlyphOrientation() const { return static_cast<NonCJKGlyphOrientation>(m_nonCJKGlyphOrientation); }
    136136    FontWidthVariant widthVariant() const { return static_cast<FontWidthVariant>(m_widthVariant); }
    137137    FontFeatureSettings* featureSettings() const { return m_featureSettings.get(); }
    … …  
    163163    void setIsSpecifiedFont(bool isSpecifiedFont) { m_isSpecifiedFont = isSpecifiedFont; }
    164164    void setOrientation(FontOrientation orientation) { m_orientation = orientation; }
    165     void setTextOrientation(TextOrientation textOrientation) { m_textOrientation = textOrientation; }
     165    void setNonCJKGlyphOrientation(NonCJKGlyphOrientation orientation) { m_nonCJKGlyphOrientation = orientation; }
    166166    void setWidthVariant(FontWidthVariant widthVariant) { m_widthVariant = widthVariant; }
    167167    void setScript(UScriptCode s) { m_script = s; }
    … …  
    177177
    178178    unsigned m_orientation : 1; // FontOrientation - Whether the font is rendering on a horizontal line or a vertical line.
    179     unsigned m_textOrientation : 1; // TextOrientation - Only used by vertical text. Determines the default orientation for non-ideograph glyphs.
     179    unsigned m_nonCJKGlyphOrientation : 1; // NonCJKGlyphOrientation - Only used by vertical text. Determines the default orientation for non-ideograph glyphs.
    180180
    181181    unsigned m_widthVariant : 2; // FontWidthVariant
    … …  
    227227        && m_isSpecifiedFont == other.m_isSpecifiedFont
    228228        && m_orientation == other.m_orientation
    229         && m_textOrientation == other.m_textOrientation
     229        && m_nonCJKGlyphOrientation == other.m_nonCJKGlyphOrientation
    230230        && m_widthVariant == other.m_widthVariant
    231231        && m_script == other.m_script

  • trunk/Source/WebCore/platform/graphics/FontFastPath.cpp

    r131468 r136640  
    4343namespace WebCore {
    4444
    45 static inline std::pair<GlyphData, GlyphPage*> glyphDataAndPageForCharacterWithTextOrientation(UChar32 character, TextOrientation orientation, GlyphData& data, GlyphPage* page, unsigned pageNumber)
    46 {
    47     if (orientation == TextOrientationVerticalRight) {
     45static inline std::pair<GlyphData, GlyphPage*> glyphDataAndPageForNonCJKCharacterWithGlyphOrientation(UChar32 character, NonCJKGlyphOrientation orientation, GlyphData& data, GlyphPage* page, unsigned pageNumber)
     46{
     47    if (orientation == NonCJKGlyphOrientationVerticalRight) {
    4848        RefPtr<SimpleFontData> verticalRightFontData = data.fontData->verticalRightOrientationFontData();
    4949        GlyphPageTreeNode* verticalRightNode = GlyphPageTreeNode::getRootChild(verticalRightFontData.get(), pageNumber);
    … …  
    5959                return make_pair(verticalRightData, verticalRightPage);
    6060        }
    61     } else if (orientation == TextOrientationUpright) {
     61    } else if (orientation == NonCJKGlyphOrientationUpright) {
    6262        RefPtr<SimpleFontData> uprightFontData = data.fontData->uprightOrientationFontData();
    6363        GlyphPageTreeNode* uprightNode = GlyphPageTreeNode::getRootChild(uprightFontData.get(), pageNumber);
    … …  
    126126                        }
    127127                    } else
    128                         return glyphDataAndPageForCharacterWithTextOrientation(c, m_fontDescription.textOrientation(), data, page, pageNumber);
     128                        return glyphDataAndPageForNonCJKCharacterWithGlyphOrientation(c, m_fontDescription.nonCJKGlyphOrientation(), data, page, pageNumber);
    129129
    130130                    return make_pair(data, page);
    … …  
    222222            data.fontData->setMaxGlyphPageTreeLevel(max(data.fontData->maxGlyphPageTreeLevel(), node->level()));
    223223            if (!isCJKIdeographOrSymbol(c) && data.fontData->platformData().orientation() != Horizontal && !data.fontData->isTextOrientationFallback())
    224                 return glyphDataAndPageForCharacterWithTextOrientation(c, m_fontDescription.textOrientation(), data, fallbackPage, pageNumber);
     224                return glyphDataAndPageForNonCJKCharacterWithGlyphOrientation(c, m_fontDescription.nonCJKGlyphOrientation(), data, fallbackPage, pageNumber);
    225225#endif
    226226        }

  • trunk/Source/WebCore/platform/graphics/mac/FontComplexTextMac.cpp

    r131703 r136640  
    193193                    variant = BrokenIdeographVariant;
    194194                    simpleFontData = simpleFontData->brokenIdeographFontData().get();
    195                 } else if (m_fontDescription.textOrientation() == TextOrientationVerticalRight) {
     195                } else if (m_fontDescription.nonCJKGlyphOrientation() == NonCJKGlyphOrientationVerticalRight) {
    196196                    SimpleFontData* verticalRightFontData = simpleFontData->verticalRightOrientationFontData().get();
    197197                    Glyph verticalRightGlyph = verticalRightFontData->glyphForCharacter(baseCharacter);

  • trunk/Source/WebCore/platform/text/NonCJKGlyphOrientation.h

    r136629 r136640  
    11/*
    2  * Copyright (C) 2011 Apple Computer, Inc. All rights reserved.
     2 * Copyright (C) 2011 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    1111 *    documentation and/or other materials provided with the distribution.
    1212 *
    13  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
    14  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
    15  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
    16  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
    17  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
    18  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
    19  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
    20  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
    21  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    22  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
     14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
     15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
     17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
     23 * THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
    2525
    26 #ifndef TextOrientation_h
    27 #define TextOrientation_h
     26#ifndef NonCJKGlyphOrientation_h
     27#define NonCJKGlyphOrientation_h
    2828
    2929namespace WebCore {
    3030
    31 enum TextOrientation { TextOrientationVerticalRight, TextOrientationUpright };
     31enum NonCJKGlyphOrientation { NonCJKGlyphOrientationVerticalRight, NonCJKGlyphOrientationUpright };
    3232
    3333}
    3434
    35 #endif
     35#endif // NonCJKGlyphOrientation_h

  • trunk/Source/WebCore/rendering/InlineFlowBox.cpp

    r136275 r136640  
    443443        return false;
    444444   
    445     if (renderer()->style(isFirstLineStyle())->fontDescription().textOrientation() == TextOrientationUpright
     445    if (renderer()->style(isFirstLineStyle())->fontDescription().nonCJKGlyphOrientation() == NonCJKGlyphOrientationUpright
    446446        || renderer()->style(isFirstLineStyle())->font().primaryFont()->hasVerticalGlyphs())
    447447        return true;

  • trunk/Source/WebCore/rendering/style/RenderStyle.cpp

    r136275 r136640  
    482482            || rareInheritedData->textEmphasisPosition != other->rareInheritedData->textEmphasisPosition
    483483            || rareInheritedData->textEmphasisCustomMark != other->rareInheritedData->textEmphasisCustomMark
     484            || rareInheritedData->m_textOrientation != other->rareInheritedData->m_textOrientation
    484485            || rareInheritedData->m_tabSize != other->rareInheritedData->m_tabSize
    485486            || rareInheritedData->m_lineBoxContain != other->rareInheritedData->m_lineBoxContain

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r136275 r136640  
    6565#include "StyleVisualData.h"
    6666#include "TextDirection.h"
    67 #include "TextOrientation.h"
    6867#include "ThemeTypes.h"
    6968#include "TransformOperations.h"
    … …  
    836835    TextEmphasisPosition textEmphasisPosition() const { return static_cast<TextEmphasisPosition>(rareInheritedData->textEmphasisPosition); }
    837836    const AtomicString& textEmphasisMarkString() const;
     837
     838    TextOrientation textOrientation() const { return static_cast<TextOrientation>(rareInheritedData->m_textOrientation); }
    838839   
    839840    // Return true if any transform related property (currently transform, transformStyle3D or perspective)
    … …  
    13001301    void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInheritedData, textEmphasisCustomMark, mark); }
    13011302    void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareInheritedData, textEmphasisPosition, position); }
     1303    bool setTextOrientation(TextOrientation);
    13021304
    13031305#if ENABLE(CSS_FILTERS)
    … …  
    14691471    }
    14701472
    1471     void setWritingMode(WritingMode v) { inherited_flags.m_writingMode = v; }
     1473    bool setWritingMode(WritingMode v)
     1474    {
     1475        if (v == writingMode())
     1476            return false;
     1477
     1478        inherited_flags.m_writingMode = v;
     1479        return true;
     1480    }
    14721481
    14731482    // A unique style is one that has matches something that makes it impossible to share.
    … …  
    17881797}
    17891798
     1799inline bool RenderStyle::setTextOrientation(TextOrientation textOrientation)
     1800{
     1801    if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
     1802        return false;
     1803
     1804    rareInheritedData.access()->m_textOrientation = textOrientation;
     1805    return true;
     1806}
     1807
    17901808} // namespace WebCore
    17911809

  • trunk/Source/WebCore/rendering/style/RenderStyleConstants.h

    r136378 r136640  
    455455enum TextEmphasisPosition { TextEmphasisPositionOver, TextEmphasisPositionUnder };
    456456
     457enum TextOrientation { TextOrientationVerticalRight, TextOrientationUpright, TextOrientationSideways, TextOrientationSidewaysRight };
     458
    457459enum TextOverflow { TextOverflowClip = 0, TextOverflowEllipsis };
    458460

  • trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp

    r136275 r136640  
    8686    , textEmphasisMark(TextEmphasisMarkNone)
    8787    , textEmphasisPosition(TextEmphasisPositionOver)
     88    , m_textOrientation(TextOrientationVerticalRight)
    8889    , m_lineBoxContain(RenderStyle::initialLineBoxContain())
    8990#if ENABLE(CSS_IMAGE_ORIENTATION)
    … …  
    152153    , textEmphasisMark(o.textEmphasisMark)
    153154    , textEmphasisPosition(o.textEmphasisPosition)
     155    , m_textOrientation(o.m_textOrientation)
    154156    , m_lineBoxContain(o.m_lineBoxContain)
    155157#if ENABLE(CSS_IMAGE_ORIENTATION)
    … …  
    242244        && textEmphasisMark == o.textEmphasisMark
    243245        && textEmphasisPosition == o.textEmphasisPosition
     246        && m_textOrientation == o.m_textOrientation
    244247        && m_lineBoxContain == o.m_lineBoxContain
    245248        && hyphenationString == o.hyphenationString

  • trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h

    r136275 r136640  
    9999    unsigned textEmphasisMark : 3; // TextEmphasisMark
    100100    unsigned textEmphasisPosition : 1; // TextEmphasisPosition
     101    unsigned m_textOrientation : 2; // TextOrientation
    101102    unsigned m_lineBoxContain: 7; // LineBoxContain
    102103    // CSS Image Values Level 3
Note: See TracChangeset for help on using the changeset viewer.