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

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

Issue 19041005: Introduce css3TextEnabled instead of CSS3_TEXT. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing 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
« no previous file with comments | « Source/core/page/UseCounter.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 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 float computedFontSize() const; 539 float computedFontSize() const;
540 int fontSize() const; 540 int fontSize() const;
541 541
542 float textAutosizingMultiplier() const { return visual->m_textAutosizingMult iplier; } 542 float textAutosizingMultiplier() const { return visual->m_textAutosizingMult iplier; }
543 543
544 Length textIndent() const { return rareInheritedData->indent; } 544 Length textIndent() const { return rareInheritedData->indent; }
545 #if ENABLE(CSS3_TEXT) 545 #if ENABLE(CSS3_TEXT)
546 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); } 546 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); }
547 #endif 547 #endif
548 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); } 548 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); }
549 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); }
549 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); } 550 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); }
550 TextDecoration textDecorationsInEffect() const { return static_cast<TextDeco ration>(inherited_flags._text_decorations); } 551 TextDecoration textDecorationsInEffect() const { return static_cast<TextDeco ration>(inherited_flags._text_decorations); }
551 TextDecoration textDecoration() const { return static_cast<TextDecoration>(v isual->textDecoration); } 552 TextDecoration textDecoration() const { return static_cast<TextDecoration>(v isual->textDecoration); }
552 #if ENABLE(CSS3_TEXT) 553 #if ENABLE(CSS3_TEXT)
553 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); }
554 TextUnderlinePosition textUnderlinePosition() const { return static_cast<Tex tUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); } 554 TextUnderlinePosition textUnderlinePosition() const { return static_cast<Tex tUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); }
555 #endif // CSS3_TEXT 555 #endif // CSS3_TEXT
556 TextDecorationStyle textDecorationStyle() const { return static_cast<TextDec orationStyle>(rareNonInheritedData->m_textDecorationStyle); } 556 TextDecorationStyle textDecorationStyle() const { return static_cast<TextDec orationStyle>(rareNonInheritedData->m_textDecorationStyle); }
557 float wordSpacing() const; 557 float wordSpacing() const;
558 float letterSpacing() const; 558 float letterSpacing() const;
559 559
560 float zoom() const { return visual->m_zoom; } 560 float zoom() const { return visual->m_zoom; }
561 float effectiveZoom() const { return rareInheritedData->m_effectiveZoom; } 561 float effectiveZoom() const { return rareInheritedData->m_effectiveZoom; }
562 562
563 TextDirection direction() const { return static_cast<TextDirection>(inherite d_flags._direction); } 563 TextDirection direction() const { return static_cast<TextDirection>(inherite d_flags._direction); }
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
1047 SET_VAR(visual, m_textAutosizingMultiplier, v); 1047 SET_VAR(visual, m_textAutosizingMultiplier, v);
1048 setFontSize(fontDescription().specifiedSize()); 1048 setFontSize(fontDescription().specifiedSize());
1049 } 1049 }
1050 1050
1051 void setColor(const Color&); 1051 void setColor(const Color&);
1052 void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); } 1052 void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); }
1053 #if ENABLE(CSS3_TEXT) 1053 #if ENABLE(CSS3_TEXT)
1054 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); } 1054 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); }
1055 #endif 1055 #endif
1056 void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; } 1056 void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; }
1057 void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAl ignLast, v); }
1057 void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; } 1058 void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; }
1058 void addToTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_ decorations |= v; } 1059 void addToTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_ decorations |= v; }
1059 void setTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_de corations = v; } 1060 void setTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_de corations = v; }
1060 void setTextDecoration(TextDecoration v) { SET_VAR(visual, textDecoration, v ); } 1061 void setTextDecoration(TextDecoration v) { SET_VAR(visual, textDecoration, v ); }
1061 #if ENABLE(CSS3_TEXT) 1062 #if ENABLE(CSS3_TEXT)
1062 void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAl ignLast, v); }
1063 void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInherit edData, m_textUnderlinePosition, v); } 1063 void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInherit edData, m_textUnderlinePosition, v); }
1064 #endif // CSS3_TEXT 1064 #endif // CSS3_TEXT
1065 void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInherite dData, m_textDecorationStyle, v); } 1065 void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInherite dData, m_textDecorationStyle, v); }
1066 void setDirection(TextDirection v) { inherited_flags._direction = v; } 1066 void setDirection(TextDirection v) { inherited_flags._direction = v; }
1067 void setLineHeight(Length specifiedLineHeight); 1067 void setLineHeight(Length specifiedLineHeight);
1068 bool setZoom(float); 1068 bool setZoom(float);
1069 void setZoomWithoutReturnValue(float f) { setZoom(f); } 1069 void setZoomWithoutReturnValue(float f) { setZoom(f); }
1070 bool setEffectiveZoom(float); 1070 bool setEffectiveZoom(float);
1071 1071
1072 void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_ima geRendering, v); } 1072 void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_ima geRendering, v); }
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
1505 static Length initialPadding() { return Length(Fixed); } 1505 static Length initialPadding() { return Length(Fixed); }
1506 static Length initialTextIndent() { return Length(Fixed); } 1506 static Length initialTextIndent() { return Length(Fixed); }
1507 #if ENABLE(CSS3_TEXT) 1507 #if ENABLE(CSS3_TEXT)
1508 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; } 1508 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; }
1509 #endif 1509 #endif
1510 static EVerticalAlign initialVerticalAlign() { return BASELINE; } 1510 static EVerticalAlign initialVerticalAlign() { return BASELINE; }
1511 static short initialWidows() { return 2; } 1511 static short initialWidows() { return 2; }
1512 static short initialOrphans() { return 2; } 1512 static short initialOrphans() { return 2; }
1513 static Length initialLineHeight() { return Length(-100.0, Percent); } 1513 static Length initialLineHeight() { return Length(-100.0, Percent); }
1514 static ETextAlign initialTextAlign() { return TASTART; } 1514 static ETextAlign initialTextAlign() { return TASTART; }
1515 static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
1515 static TextDecoration initialTextDecoration() { return TextDecorationNone; } 1516 static TextDecoration initialTextDecoration() { return TextDecorationNone; }
1516 #if ENABLE(CSS3_TEXT) 1517 #if ENABLE(CSS3_TEXT)
1517 static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
1518 static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnd erlinePositionAuto; } 1518 static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnd erlinePositionAuto; }
1519 #endif // CSS3_TEXT 1519 #endif // CSS3_TEXT
1520 static TextDecorationStyle initialTextDecorationStyle() { return TextDecorat ionStyleSolid; } 1520 static TextDecorationStyle initialTextDecorationStyle() { return TextDecorat ionStyleSolid; }
1521 static float initialZoom() { return 1.0f; } 1521 static float initialZoom() { return 1.0f; }
1522 static int initialOutlineOffset() { return 0; } 1522 static int initialOutlineOffset() { return 0; }
1523 static float initialOpacity() { return 1.0f; } 1523 static float initialOpacity() { return 1.0f; }
1524 static EBoxAlignment initialBoxAlign() { return BSTRETCH; } 1524 static EBoxAlignment initialBoxAlign() { return BSTRETCH; }
1525 static EBoxDecorationBreak initialBoxDecorationBreak() { return DSLICE; } 1525 static EBoxDecorationBreak initialBoxDecorationBreak() { return DSLICE; }
1526 static EBoxDirection initialBoxDirection() { return BNORMAL; } 1526 static EBoxDirection initialBoxDirection() { return BNORMAL; }
1527 static EBoxLines initialBoxLines() { return SINGLE; } 1527 static EBoxLines initialBoxLines() { return SINGLE; }
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
1765 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1765 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1766 return false; 1766 return false;
1767 1767
1768 rareInheritedData.access()->m_textOrientation = textOrientation; 1768 rareInheritedData.access()->m_textOrientation = textOrientation;
1769 return true; 1769 return true;
1770 } 1770 }
1771 1771
1772 } // namespace WebCore 1772 } // namespace WebCore
1773 1773
1774 #endif // RenderStyle_h 1774 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/page/UseCounter.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698