Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(443)

Side by Side Diff: Source/core/rendering/style/RenderStyle.h

Issue 18332019: Allow fractional letter- word-spacing values. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: *actually* add the file Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/platform/graphics/Font.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 #endif 542 #endif
543 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); } 543 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); }
544 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); } 544 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); }
545 TextDecoration textDecorationsInEffect() const { return static_cast<TextDeco ration>(inherited_flags._text_decorations); } 545 TextDecoration textDecorationsInEffect() const { return static_cast<TextDeco ration>(inherited_flags._text_decorations); }
546 TextDecoration textDecoration() const { return static_cast<TextDecoration>(v isual->textDecoration); } 546 TextDecoration textDecoration() const { return static_cast<TextDecoration>(v isual->textDecoration); }
547 #if ENABLE(CSS3_TEXT) 547 #if ENABLE(CSS3_TEXT)
548 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); } 548 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); }
549 TextUnderlinePosition textUnderlinePosition() const { return static_cast<Tex tUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); } 549 TextUnderlinePosition textUnderlinePosition() const { return static_cast<Tex tUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); }
550 #endif // CSS3_TEXT 550 #endif // CSS3_TEXT
551 TextDecorationStyle textDecorationStyle() const { return static_cast<TextDec orationStyle>(rareNonInheritedData->m_textDecorationStyle); } 551 TextDecorationStyle textDecorationStyle() const { return static_cast<TextDec orationStyle>(rareNonInheritedData->m_textDecorationStyle); }
552 int wordSpacing() const; 552 float wordSpacing() const;
553 int letterSpacing() const; 553 float letterSpacing() const;
554 554
555 float zoom() const { return visual->m_zoom; } 555 float zoom() const { return visual->m_zoom; }
556 float effectiveZoom() const { return rareInheritedData->m_effectiveZoom; } 556 float effectiveZoom() const { return rareInheritedData->m_effectiveZoom; }
557 557
558 TextDirection direction() const { return static_cast<TextDirection>(inherite d_flags._direction); } 558 TextDirection direction() const { return static_cast<TextDirection>(inherite d_flags._direction); }
559 bool isLeftToRightDirection() const { return direction() == LTR; } 559 bool isLeftToRightDirection() const { return direction() == LTR; }
560 560
561 Length specifiedLineHeight() const; 561 Length specifiedLineHeight() const;
562 Length lineHeight() const; 562 Length lineHeight() const;
563 int computedLineHeight(RenderView* = 0) const; 563 int computedLineHeight(RenderView* = 0) const;
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 void setDirection(TextDirection v) { inherited_flags._direction = v; } 1061 void setDirection(TextDirection v) { inherited_flags._direction = v; }
1062 void setLineHeight(Length specifiedLineHeight); 1062 void setLineHeight(Length specifiedLineHeight);
1063 bool setZoom(float); 1063 bool setZoom(float);
1064 void setZoomWithoutReturnValue(float f) { setZoom(f); } 1064 void setZoomWithoutReturnValue(float f) { setZoom(f); }
1065 bool setEffectiveZoom(float); 1065 bool setEffectiveZoom(float);
1066 1066
1067 void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_ima geRendering, v); } 1067 void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_ima geRendering, v); }
1068 1068
1069 void setWhiteSpace(EWhiteSpace v) { inherited_flags._white_space = v; } 1069 void setWhiteSpace(EWhiteSpace v) { inherited_flags._white_space = v; }
1070 1070
1071 void setWordSpacing(int); 1071 void setWordSpacing(float);
1072 void setLetterSpacing(int); 1072 void setLetterSpacing(float);
1073 1073
1074 void clearBackgroundLayers() { m_background.access()->m_background = FillLay er(BackgroundFillLayer); } 1074 void clearBackgroundLayers() { m_background.access()->m_background = FillLay er(BackgroundFillLayer); }
1075 void inheritBackgroundLayers(const FillLayer& parent) { m_background.access( )->m_background = parent; } 1075 void inheritBackgroundLayers(const FillLayer& parent) { m_background.access( )->m_background = parent; }
1076 1076
1077 void adjustBackgroundLayers() 1077 void adjustBackgroundLayers()
1078 { 1078 {
1079 if (backgroundLayers()->next()) { 1079 if (backgroundLayers()->next()) {
1080 accessBackgroundLayers()->cullEmptyLayers(); 1080 accessBackgroundLayers()->cullEmptyLayers();
1081 accessBackgroundLayers()->fillUnsetProperties(); 1081 accessBackgroundLayers()->fillUnsetProperties();
1082 } 1082 }
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
1481 static EVisibility initialVisibility() { return VISIBLE; } 1481 static EVisibility initialVisibility() { return VISIBLE; }
1482 static EWhiteSpace initialWhiteSpace() { return NORMAL; } 1482 static EWhiteSpace initialWhiteSpace() { return NORMAL; }
1483 static short initialHorizontalBorderSpacing() { return 0; } 1483 static short initialHorizontalBorderSpacing() { return 0; }
1484 static short initialVerticalBorderSpacing() { return 0; } 1484 static short initialVerticalBorderSpacing() { return 0; }
1485 static ECursor initialCursor() { return CURSOR_AUTO; } 1485 static ECursor initialCursor() { return CURSOR_AUTO; }
1486 static Color initialColor() { return Color::black; } 1486 static Color initialColor() { return Color::black; }
1487 static StyleImage* initialListStyleImage() { return 0; } 1487 static StyleImage* initialListStyleImage() { return 0; }
1488 static unsigned initialBorderWidth() { return 3; } 1488 static unsigned initialBorderWidth() { return 3; }
1489 static unsigned short initialColumnRuleWidth() { return 3; } 1489 static unsigned short initialColumnRuleWidth() { return 3; }
1490 static unsigned short initialOutlineWidth() { return 3; } 1490 static unsigned short initialOutlineWidth() { return 3; }
1491 static int initialLetterWordSpacing() { return 0; } 1491 static float initialLetterWordSpacing() { return 0.0f; }
1492 static Length initialSize() { return Length(); } 1492 static Length initialSize() { return Length(); }
1493 static Length initialMinSize() { return Length(Fixed); } 1493 static Length initialMinSize() { return Length(Fixed); }
1494 static Length initialMaxSize() { return Length(Undefined); } 1494 static Length initialMaxSize() { return Length(Undefined); }
1495 static Length initialOffset() { return Length(); } 1495 static Length initialOffset() { return Length(); }
1496 static Length initialMargin() { return Length(Fixed); } 1496 static Length initialMargin() { return Length(Fixed); }
1497 static Length initialPadding() { return Length(Fixed); } 1497 static Length initialPadding() { return Length(Fixed); }
1498 static Length initialTextIndent() { return Length(Fixed); } 1498 static Length initialTextIndent() { return Length(Fixed); }
1499 #if ENABLE(CSS3_TEXT) 1499 #if ENABLE(CSS3_TEXT)
1500 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; } 1500 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; }
1501 #endif 1501 #endif
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
1754 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1754 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1755 return false; 1755 return false;
1756 1756
1757 rareInheritedData.access()->m_textOrientation = textOrientation; 1757 rareInheritedData.access()->m_textOrientation = textOrientation;
1758 return true; 1758 return true;
1759 } 1759 }
1760 1760
1761 } // namespace WebCore 1761 } // namespace WebCore
1762 1762
1763 #endif // RenderStyle_h 1763 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/platform/graphics/Font.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698