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

Side by Side Diff: sky/engine/core/rendering/style/RenderStyle.h

Issue 869393002: Remove hasInlineTransform bit. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 EUserModify userModify() const { return static_cast<EUserModify>(rareInherit edData->userModify); } 699 EUserModify userModify() const { return static_cast<EUserModify>(rareInherit edData->userModify); }
700 EUserDrag userDrag() const { return static_cast<EUserDrag>(rareNonInheritedD ata->userDrag); } 700 EUserDrag userDrag() const { return static_cast<EUserDrag>(rareNonInheritedD ata->userDrag); }
701 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit edData->userSelect); } 701 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit edData->userSelect); }
702 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon InheritedData->textOverflow); } 702 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon InheritedData->textOverflow); }
703 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD ata->wordBreak); } 703 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD ata->wordBreak); }
704 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI nheritedData->overflowWrap); } 704 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI nheritedData->overflowWrap); }
705 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat a->lineBreak); } 705 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat a->lineBreak); }
706 const AtomicString& highlight() const { return rareInheritedData->highlight; } 706 const AtomicString& highlight() const { return rareInheritedData->highlight; }
707 const AtomicString& hyphenationString() const { return rareInheritedData->hy phenationString; } 707 const AtomicString& hyphenationString() const { return rareInheritedData->hy phenationString; }
708 const AtomicString& locale() const { return rareInheritedData->locale; } 708 const AtomicString& locale() const { return rareInheritedData->locale; }
709 bool hasInlineTransform() const { return rareNonInheritedData->m_hasInlineTr ansform; }
710 const TransformOperations& transform() const { return rareNonInheritedData-> m_transform->m_operations; } 709 const TransformOperations& transform() const { return rareNonInheritedData-> m_transform->m_operations; }
711 const Length& transformOriginX() const { return rareNonInheritedData->m_tran sform->m_x; } 710 const Length& transformOriginX() const { return rareNonInheritedData->m_tran sform->m_x; }
712 const Length& transformOriginY() const { return rareNonInheritedData->m_tran sform->m_y; } 711 const Length& transformOriginY() const { return rareNonInheritedData->m_tran sform->m_y; }
713 float transformOriginZ() const { return rareNonInheritedData->m_transform->m _z; } 712 float transformOriginZ() const { return rareNonInheritedData->m_transform->m _z; }
714 bool hasTransform() const { return !rareNonInheritedData->m_transform->m_ope rations.operations().isEmpty(); } 713 bool hasTransform() const { return !rareNonInheritedData->m_transform->m_ope rations.operations().isEmpty(); }
715 bool transformDataEquivalent(const RenderStyle& otherStyle) const { return r areNonInheritedData->m_transform == otherStyle.rareNonInheritedData->m_transform ; } 714 bool transformDataEquivalent(const RenderStyle& otherStyle) const { return r areNonInheritedData->m_transform == otherStyle.rareNonInheritedData->m_transform ; }
716 715
717 TextEmphasisFill textEmphasisFill() const { return static_cast<TextEmphasisF ill>(rareInheritedData->textEmphasisFill); } 716 TextEmphasisFill textEmphasisFill() const { return static_cast<TextEmphasisF ill>(rareInheritedData->textEmphasisFill); }
718 TextEmphasisMark textEmphasisMark() const; 717 TextEmphasisMark textEmphasisMark() const;
719 const AtomicString& textEmphasisCustomMark() const { return rareInheritedDat a->textEmphasisCustomMark; } 718 const AtomicString& textEmphasisCustomMark() const { return rareInheritedDat a->textEmphasisCustomMark; }
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
1058 void setUserDrag(EUserDrag d) { SET_VAR(rareNonInheritedData, userDrag, d); } 1057 void setUserDrag(EUserDrag d) { SET_VAR(rareNonInheritedData, userDrag, d); }
1059 void setUserSelect(EUserSelect s) { SET_VAR(rareInheritedData, userSelect, s ); } 1058 void setUserSelect(EUserSelect s) { SET_VAR(rareInheritedData, userSelect, s ); }
1060 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData, textOverflow, overflow); } 1059 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData, textOverflow, overflow); }
1061 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b); } 1060 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b); }
1062 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW rap, b); } 1061 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW rap, b); }
1063 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); } 1062 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); }
1064 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli ght, h); } 1063 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli ght, h); }
1065 void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); } 1064 void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); }
1066 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData , hyphenationString, h); } 1065 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData , hyphenationString, h); }
1067 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca le, locale); } 1066 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca le, locale); }
1068 void setHasInlineTransform(bool b) { SET_VAR(rareNonInheritedData, m_hasInli neTransform, b); }
1069 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited Data.access()->m_transform, m_operations, ops); } 1067 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited Data.access()->m_transform, m_operations, ops); }
1070 void setTransformOriginX(const Length& l) { SET_VAR(rareNonInheritedData.acc ess()->m_transform, m_x, l); } 1068 void setTransformOriginX(const Length& l) { SET_VAR(rareNonInheritedData.acc ess()->m_transform, m_x, l); }
1071 void setTransformOriginY(const Length& l) { SET_VAR(rareNonInheritedData.acc ess()->m_transform, m_y, l); } 1069 void setTransformOriginY(const Length& l) { SET_VAR(rareNonInheritedData.acc ess()->m_transform, m_y, l); }
1072 void setTransformOriginZ(float f) { SET_VAR(rareNonInheritedData.access()->m _transform, m_z, f); } 1070 void setTransformOriginZ(float f) { SET_VAR(rareNonInheritedData.access()->m _transform, m_z, f); }
1073 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); } 1071 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); }
1074 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD ata, m_textDecorationColor, c); } 1072 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD ata, m_textDecorationColor, c); }
1075 void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInh eritedData, textEmphasisColor, setTextEmphasisColor, c); } 1073 void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInh eritedData, textEmphasisColor, setTextEmphasisColor, c); }
1076 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); } 1074 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); }
1077 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); } 1075 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); }
1078 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); } 1076 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); }
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
1383 1381
1384 rareInheritedData.access()->m_textOrientation = textOrientation; 1382 rareInheritedData.access()->m_textOrientation = textOrientation;
1385 return true; 1383 return true;
1386 } 1384 }
1387 1385
1388 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1386 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1389 1387
1390 } // namespace blink 1388 } // namespace blink
1391 1389
1392 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_ 1390 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_
OLDNEW
« no previous file with comments | « sky/engine/core/dom/Element.cpp ('k') | sky/engine/core/rendering/style/StyleRareNonInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698