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

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

Issue 22336008: Use the runtime flag and remove '-webkit-' prefix for CSS3 text-indent. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 4 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
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 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 const Font& font() const; 524 const Font& font() const;
525 const FontMetrics& fontMetrics() const; 525 const FontMetrics& fontMetrics() const;
526 const FontDescription& fontDescription() const; 526 const FontDescription& fontDescription() const;
527 float specifiedFontSize() const; 527 float specifiedFontSize() const;
528 float computedFontSize() const; 528 float computedFontSize() const;
529 int fontSize() const; 529 int fontSize() const;
530 530
531 float textAutosizingMultiplier() const { return visual->m_textAutosizingMult iplier; } 531 float textAutosizingMultiplier() const { return visual->m_textAutosizingMult iplier; }
532 532
533 Length textIndent() const { return rareInheritedData->indent; } 533 Length textIndent() const { return rareInheritedData->indent; }
534 #if ENABLE(CSS3_TEXT)
535 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); } 534 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); }
536 #endif
537 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); } 535 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); }
538 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); } 536 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); }
539 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); } 537 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); }
540 TextDecoration textDecorationsInEffect() const { return static_cast<TextDeco ration>(inherited_flags._text_decorations); } 538 TextDecoration textDecorationsInEffect() const { return static_cast<TextDeco ration>(inherited_flags._text_decorations); }
541 TextDecoration textDecoration() const { return static_cast<TextDecoration>(v isual->textDecoration); } 539 TextDecoration textDecoration() const { return static_cast<TextDecoration>(v isual->textDecoration); }
542 #if ENABLE(CSS3_TEXT) 540 #if ENABLE(CSS3_TEXT)
543 TextUnderlinePosition textUnderlinePosition() const { return static_cast<Tex tUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); } 541 TextUnderlinePosition textUnderlinePosition() const { return static_cast<Tex tUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); }
544 #endif // CSS3_TEXT 542 #endif // CSS3_TEXT
545 TextDecorationStyle textDecorationStyle() const { return static_cast<TextDec orationStyle>(rareNonInheritedData->m_textDecorationStyle); } 543 TextDecorationStyle textDecorationStyle() const { return static_cast<TextDec orationStyle>(rareNonInheritedData->m_textDecorationStyle); }
546 float wordSpacing() const; 544 float wordSpacing() const;
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
1030 void setFontSize(float); 1028 void setFontSize(float);
1031 1029
1032 void setTextAutosizingMultiplier(float v) 1030 void setTextAutosizingMultiplier(float v)
1033 { 1031 {
1034 SET_VAR(visual, m_textAutosizingMultiplier, v); 1032 SET_VAR(visual, m_textAutosizingMultiplier, v);
1035 setFontSize(fontDescription().specifiedSize()); 1033 setFontSize(fontDescription().specifiedSize());
1036 } 1034 }
1037 1035
1038 void setColor(const StyleColor&); 1036 void setColor(const StyleColor&);
1039 void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); } 1037 void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); }
1040 #if ENABLE(CSS3_TEXT)
1041 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); } 1038 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); }
1042 #endif
1043 void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; } 1039 void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; }
1044 void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAl ignLast, v); } 1040 void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAl ignLast, v); }
1045 void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; } 1041 void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; }
1046 void addToTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_ decorations |= v; } 1042 void addToTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_ decorations |= v; }
1047 void setTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_de corations = v; } 1043 void setTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_de corations = v; }
1048 void setTextDecoration(TextDecoration v) { SET_VAR(visual, textDecoration, v ); } 1044 void setTextDecoration(TextDecoration v) { SET_VAR(visual, textDecoration, v ); }
1049 #if ENABLE(CSS3_TEXT) 1045 #if ENABLE(CSS3_TEXT)
1050 void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInherit edData, m_textUnderlinePosition, v); } 1046 void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInherit edData, m_textUnderlinePosition, v); }
1051 #endif // CSS3_TEXT 1047 #endif // CSS3_TEXT
1052 void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInherite dData, m_textDecorationStyle, v); } 1048 void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInherite dData, m_textDecorationStyle, v); }
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
1479 static unsigned short initialColumnRuleWidth() { return 3; } 1475 static unsigned short initialColumnRuleWidth() { return 3; }
1480 static unsigned short initialOutlineWidth() { return 3; } 1476 static unsigned short initialOutlineWidth() { return 3; }
1481 static float initialLetterWordSpacing() { return 0.0f; } 1477 static float initialLetterWordSpacing() { return 0.0f; }
1482 static Length initialSize() { return Length(); } 1478 static Length initialSize() { return Length(); }
1483 static Length initialMinSize() { return Length(Fixed); } 1479 static Length initialMinSize() { return Length(Fixed); }
1484 static Length initialMaxSize() { return Length(Undefined); } 1480 static Length initialMaxSize() { return Length(Undefined); }
1485 static Length initialOffset() { return Length(); } 1481 static Length initialOffset() { return Length(); }
1486 static Length initialMargin() { return Length(Fixed); } 1482 static Length initialMargin() { return Length(Fixed); }
1487 static Length initialPadding() { return Length(Fixed); } 1483 static Length initialPadding() { return Length(Fixed); }
1488 static Length initialTextIndent() { return Length(Fixed); } 1484 static Length initialTextIndent() { return Length(Fixed); }
1489 #if ENABLE(CSS3_TEXT)
1490 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; } 1485 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; }
1491 #endif
1492 static EVerticalAlign initialVerticalAlign() { return BASELINE; } 1486 static EVerticalAlign initialVerticalAlign() { return BASELINE; }
1493 static short initialWidows() { return 2; } 1487 static short initialWidows() { return 2; }
1494 static short initialOrphans() { return 2; } 1488 static short initialOrphans() { return 2; }
1495 static Length initialLineHeight() { return Length(-100.0, Percent); } 1489 static Length initialLineHeight() { return Length(-100.0, Percent); }
1496 static ETextAlign initialTextAlign() { return TASTART; } 1490 static ETextAlign initialTextAlign() { return TASTART; }
1497 static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; } 1491 static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
1498 static TextDecoration initialTextDecoration() { return TextDecorationNone; } 1492 static TextDecoration initialTextDecoration() { return TextDecorationNone; }
1499 #if ENABLE(CSS3_TEXT) 1493 #if ENABLE(CSS3_TEXT)
1500 static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnd erlinePositionAuto; } 1494 static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnd erlinePositionAuto; }
1501 #endif // CSS3_TEXT 1495 #endif // CSS3_TEXT
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
1746 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1740 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1747 return false; 1741 return false;
1748 1742
1749 rareInheritedData.access()->m_textOrientation = textOrientation; 1743 rareInheritedData.access()->m_textOrientation = textOrientation;
1750 return true; 1744 return true;
1751 } 1745 }
1752 1746
1753 } // namespace WebCore 1747 } // namespace WebCore
1754 1748
1755 #endif // RenderStyle_h 1749 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698