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

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

Issue 2884153002: Move RareInheritedData (Quotes|Shadow)DataEquivalent to ComputedStyle. (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 1682 matching lines...) Expand 10 before | Expand all | Expand 10 after
1693 } 1693 }
1694 void SetOverflowWrap(EOverflowWrap b) { 1694 void SetOverflowWrap(EOverflowWrap b) {
1695 SET_VAR(rare_inherited_data_, overflow_wrap_, b); 1695 SET_VAR(rare_inherited_data_, overflow_wrap_, b);
1696 } 1696 }
1697 1697
1698 // quotes 1698 // quotes
1699 static QuotesData* InitialQuotes() { return 0; } 1699 static QuotesData* InitialQuotes() { return 0; }
1700 QuotesData* Quotes() const { return rare_inherited_data_->quotes_.Get(); } 1700 QuotesData* Quotes() const { return rare_inherited_data_->quotes_.Get(); }
1701 void SetQuotes(PassRefPtr<QuotesData>); 1701 void SetQuotes(PassRefPtr<QuotesData>);
1702 1702
1703 bool QuotesDataEquivalent(const ComputedStyle&) const;
1704
1703 // line-height-step 1705 // line-height-step
1704 static uint8_t InitialLineHeightStep() { return 0; } 1706 static uint8_t InitialLineHeightStep() { return 0; }
1705 uint8_t LineHeightStep() const { 1707 uint8_t LineHeightStep() const {
1706 return rare_inherited_data_->line_height_step_; 1708 return rare_inherited_data_->line_height_step_;
1707 } 1709 }
1708 void SetLineHeightStep(uint8_t unit) { 1710 void SetLineHeightStep(uint8_t unit) {
1709 SET_VAR(rare_inherited_data_, line_height_step_, unit); 1711 SET_VAR(rare_inherited_data_, line_height_step_, unit);
1710 } 1712 }
1711 1713
1712 // speak 1714 // speak
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
1785 } 1787 }
1786 bool SetTextOrientation(TextOrientation); 1788 bool SetTextOrientation(TextOrientation);
1787 1789
1788 // text-shadow 1790 // text-shadow
1789 static ShadowList* InitialTextShadow() { return 0; } 1791 static ShadowList* InitialTextShadow() { return 0; }
1790 ShadowList* TextShadow() const { 1792 ShadowList* TextShadow() const {
1791 return rare_inherited_data_->text_shadow_.Get(); 1793 return rare_inherited_data_->text_shadow_.Get();
1792 } 1794 }
1793 void SetTextShadow(PassRefPtr<ShadowList>); 1795 void SetTextShadow(PassRefPtr<ShadowList>);
1794 1796
1797 bool TextShadowDataEquivalent(const ComputedStyle&) const;
1798
1795 // text-size-adjust (aka -webkit-text-size-adjust) 1799 // text-size-adjust (aka -webkit-text-size-adjust)
1796 static TextSizeAdjust InitialTextSizeAdjust() { 1800 static TextSizeAdjust InitialTextSizeAdjust() {
1797 return TextSizeAdjust::AdjustAuto(); 1801 return TextSizeAdjust::AdjustAuto();
1798 } 1802 }
1799 TextSizeAdjust GetTextSizeAdjust() const { 1803 TextSizeAdjust GetTextSizeAdjust() const {
1800 return rare_inherited_data_->text_size_adjust_; 1804 return rare_inherited_data_->text_size_adjust_;
1801 } 1805 }
1802 void SetTextSizeAdjust(TextSizeAdjust size_adjust) { 1806 void SetTextSizeAdjust(TextSizeAdjust size_adjust) {
1803 SET_VAR(rare_inherited_data_, text_size_adjust_, size_adjust); 1807 SET_VAR(rare_inherited_data_, text_size_adjust_, size_adjust);
1804 } 1808 }
(...skipping 1968 matching lines...) Expand 10 before | Expand all | Expand 10 after
3773 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); 3777 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
3774 } 3778 }
3775 3779
3776 inline bool ComputedStyle::HasPseudoElementStyle() const { 3780 inline bool ComputedStyle::HasPseudoElementStyle() const {
3777 return PseudoBitsInternal() & kElementPseudoIdMask; 3781 return PseudoBitsInternal() & kElementPseudoIdMask;
3778 } 3782 }
3779 3783
3780 } // namespace blink 3784 } // namespace blink
3781 3785
3782 #endif // ComputedStyle_h 3786 #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