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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2882373002: Rename StyleRareInheritedData::indent_ to text_indent_. (Closed)
Patch Set: Created 3 years, 7 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 | « no previous file | third_party/WebKit/Source/core/style/ComputedStyle.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 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1729 matching lines...) Expand 10 before | Expand all | Expand 10 after
1740 return static_cast<TextCombine>(rare_inherited_data_->text_combine_); 1740 return static_cast<TextCombine>(rare_inherited_data_->text_combine_);
1741 } 1741 }
1742 void SetTextCombine(TextCombine v) { 1742 void SetTextCombine(TextCombine v) {
1743 SET_VAR(rare_inherited_data_, text_combine_, v); 1743 SET_VAR(rare_inherited_data_, text_combine_, v);
1744 } 1744 }
1745 1745
1746 // text-indent 1746 // text-indent
1747 static Length InitialTextIndent() { return Length(kFixed); } 1747 static Length InitialTextIndent() { return Length(kFixed); }
1748 static TextIndentLine InitialTextIndentLine() { return kTextIndentFirstLine; } 1748 static TextIndentLine InitialTextIndentLine() { return kTextIndentFirstLine; }
1749 static TextIndentType InitialTextIndentType() { return kTextIndentNormal; } 1749 static TextIndentType InitialTextIndentType() { return kTextIndentNormal; }
1750 const Length& TextIndent() const { return rare_inherited_data_->indent_; } 1750 const Length& TextIndent() const {
1751 return rare_inherited_data_->text_indent_;
1752 }
1751 TextIndentLine GetTextIndentLine() const { 1753 TextIndentLine GetTextIndentLine() const {
1752 return static_cast<TextIndentLine>(rare_inherited_data_->text_indent_line_); 1754 return static_cast<TextIndentLine>(rare_inherited_data_->text_indent_line_);
1753 } 1755 }
1754 TextIndentType GetTextIndentType() const { 1756 TextIndentType GetTextIndentType() const {
1755 return static_cast<TextIndentType>(rare_inherited_data_->text_indent_type_); 1757 return static_cast<TextIndentType>(rare_inherited_data_->text_indent_type_);
1756 } 1758 }
1757 void SetTextIndent(const Length& v) { 1759 void SetTextIndent(const Length& v) {
1758 SET_VAR(rare_inherited_data_, indent_, v); 1760 SET_VAR(rare_inherited_data_, text_indent_, v);
1759 } 1761 }
1760 void SetTextIndentLine(TextIndentLine v) { 1762 void SetTextIndentLine(TextIndentLine v) {
1761 SET_VAR(rare_inherited_data_, text_indent_line_, v); 1763 SET_VAR(rare_inherited_data_, text_indent_line_, v);
1762 } 1764 }
1763 void SetTextIndentType(TextIndentType v) { 1765 void SetTextIndentType(TextIndentType v) {
1764 SET_VAR(rare_inherited_data_, text_indent_type_, v); 1766 SET_VAR(rare_inherited_data_, text_indent_type_, v);
1765 } 1767 }
1766 1768
1767 // text-justify 1769 // text-justify
1768 static TextJustify InitialTextJustify() { return kTextJustifyAuto; } 1770 static TextJustify InitialTextJustify() { return kTextJustifyAuto; }
(...skipping 2002 matching lines...) Expand 10 before | Expand all | Expand 10 after
3771 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); 3773 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
3772 } 3774 }
3773 3775
3774 inline bool ComputedStyle::HasPseudoElementStyle() const { 3776 inline bool ComputedStyle::HasPseudoElementStyle() const {
3775 return PseudoBitsInternal() & kElementPseudoIdMask; 3777 return PseudoBitsInternal() & kElementPseudoIdMask;
3776 } 3778 }
3777 3779
3778 } // namespace blink 3780 } // namespace blink
3779 3781
3780 #endif // ComputedStyle_h 3782 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698