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

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

Issue 17155007: [CSS3] Parsing the property, text-justify. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@parsingTextJustify
Patch Set: Created 7 years, 6 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 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 Length textIndent() const { return rareInheritedData->indent; } 539 Length textIndent() const { return rareInheritedData->indent; }
540 #if ENABLE(CSS3_TEXT) 540 #if ENABLE(CSS3_TEXT)
541 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); } 541 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); }
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 TextJustify textJustify() const { return static_cast<TextJustify>(rareInheri tedData->m_textJustify); }
549 TextUnderlinePosition textUnderlinePosition() const { return static_cast<Tex tUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); } 550 TextUnderlinePosition textUnderlinePosition() const { return static_cast<Tex tUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); }
550 #endif // CSS3_TEXT 551 #endif // CSS3_TEXT
551 TextDecorationStyle textDecorationStyle() const { return static_cast<TextDec orationStyle>(rareNonInheritedData->m_textDecorationStyle); } 552 TextDecorationStyle textDecorationStyle() const { return static_cast<TextDec orationStyle>(rareNonInheritedData->m_textDecorationStyle); }
552 int wordSpacing() const; 553 int wordSpacing() const;
553 int letterSpacing() const; 554 int letterSpacing() const;
554 555
555 float zoom() const { return visual->m_zoom; } 556 float zoom() const { return visual->m_zoom; }
556 float effectiveZoom() const { return rareInheritedData->m_effectiveZoom; } 557 float effectiveZoom() const { return rareInheritedData->m_effectiveZoom; }
557 558
558 TextDirection direction() const { return static_cast<TextDirection>(inherite d_flags._direction); } 559 TextDirection direction() const { return static_cast<TextDirection>(inherite d_flags._direction); }
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
1049 #if ENABLE(CSS3_TEXT) 1050 #if ENABLE(CSS3_TEXT)
1050 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); } 1051 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); }
1051 #endif 1052 #endif
1052 void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; } 1053 void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; }
1053 void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; } 1054 void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; }
1054 void addToTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_ decorations |= v; } 1055 void addToTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_ decorations |= v; }
1055 void setTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_de corations = v; } 1056 void setTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_de corations = v; }
1056 void setTextDecoration(TextDecoration v) { SET_VAR(visual, textDecoration, v ); } 1057 void setTextDecoration(TextDecoration v) { SET_VAR(visual, textDecoration, v ); }
1057 #if ENABLE(CSS3_TEXT) 1058 #if ENABLE(CSS3_TEXT)
1058 void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAl ignLast, v); } 1059 void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAl ignLast, v); }
1060 void setTextJustify(TextJustify v) { SET_VAR(rareInheritedData, m_textJustif y, v); }
1059 void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInherit edData, m_textUnderlinePosition, v); } 1061 void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInherit edData, m_textUnderlinePosition, v); }
1060 #endif // CSS3_TEXT 1062 #endif // CSS3_TEXT
1061 void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInherite dData, m_textDecorationStyle, v); } 1063 void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInherite dData, m_textDecorationStyle, v); }
1062 void setDirection(TextDirection v) { inherited_flags._direction = v; } 1064 void setDirection(TextDirection v) { inherited_flags._direction = v; }
1063 void setLineHeight(Length specifiedLineHeight); 1065 void setLineHeight(Length specifiedLineHeight);
1064 bool setZoom(float); 1066 bool setZoom(float);
1065 void setZoomWithoutReturnValue(float f) { setZoom(f); } 1067 void setZoomWithoutReturnValue(float f) { setZoom(f); }
1066 bool setEffectiveZoom(float); 1068 bool setEffectiveZoom(float);
1067 1069
1068 void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_ima geRendering, v); } 1070 void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_ima geRendering, v); }
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
1502 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; } 1504 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; }
1503 #endif 1505 #endif
1504 static EVerticalAlign initialVerticalAlign() { return BASELINE; } 1506 static EVerticalAlign initialVerticalAlign() { return BASELINE; }
1505 static short initialWidows() { return 2; } 1507 static short initialWidows() { return 2; }
1506 static short initialOrphans() { return 2; } 1508 static short initialOrphans() { return 2; }
1507 static Length initialLineHeight() { return Length(-100.0, Percent); } 1509 static Length initialLineHeight() { return Length(-100.0, Percent); }
1508 static ETextAlign initialTextAlign() { return TASTART; } 1510 static ETextAlign initialTextAlign() { return TASTART; }
1509 static TextDecoration initialTextDecoration() { return TextDecorationNone; } 1511 static TextDecoration initialTextDecoration() { return TextDecorationNone; }
1510 #if ENABLE(CSS3_TEXT) 1512 #if ENABLE(CSS3_TEXT)
1511 static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; } 1513 static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
1514 static TextJustify initialTextJustify() { return TextJustifyAuto; }
1512 static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnd erlinePositionAuto; } 1515 static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnd erlinePositionAuto; }
1513 #endif // CSS3_TEXT 1516 #endif // CSS3_TEXT
1514 static TextDecorationStyle initialTextDecorationStyle() { return TextDecorat ionStyleSolid; } 1517 static TextDecorationStyle initialTextDecorationStyle() { return TextDecorat ionStyleSolid; }
1515 static float initialZoom() { return 1.0f; } 1518 static float initialZoom() { return 1.0f; }
1516 static int initialOutlineOffset() { return 0; } 1519 static int initialOutlineOffset() { return 0; }
1517 static float initialOpacity() { return 1.0f; } 1520 static float initialOpacity() { return 1.0f; }
1518 static EBoxAlignment initialBoxAlign() { return BSTRETCH; } 1521 static EBoxAlignment initialBoxAlign() { return BSTRETCH; }
1519 static EBoxDecorationBreak initialBoxDecorationBreak() { return DSLICE; } 1522 static EBoxDecorationBreak initialBoxDecorationBreak() { return DSLICE; }
1520 static EBoxDirection initialBoxDirection() { return BNORMAL; } 1523 static EBoxDirection initialBoxDirection() { return BNORMAL; }
1521 static EBoxLines initialBoxLines() { return SINGLE; } 1524 static EBoxLines initialBoxLines() { return SINGLE; }
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
1757 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1760 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1758 return false; 1761 return false;
1759 1762
1760 rareInheritedData.access()->m_textOrientation = textOrientation; 1763 rareInheritedData.access()->m_textOrientation = textOrientation;
1761 return true; 1764 return true;
1762 } 1765 }
1763 1766
1764 } // namespace WebCore 1767 } // namespace WebCore
1765 1768
1766 #endif // RenderStyle_h 1769 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698