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

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

Issue 23465021: Revert 157745 "Add support for the object-position CSS property." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
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 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 TextEmphasisMark textEmphasisMark() const; 822 TextEmphasisMark textEmphasisMark() const;
823 const AtomicString& textEmphasisCustomMark() const { return rareInheritedDat a->textEmphasisCustomMark; } 823 const AtomicString& textEmphasisCustomMark() const { return rareInheritedDat a->textEmphasisCustomMark; }
824 TextEmphasisPosition textEmphasisPosition() const { return static_cast<TextE mphasisPosition>(rareInheritedData->textEmphasisPosition); } 824 TextEmphasisPosition textEmphasisPosition() const { return static_cast<TextE mphasisPosition>(rareInheritedData->textEmphasisPosition); }
825 const AtomicString& textEmphasisMarkString() const; 825 const AtomicString& textEmphasisMarkString() const;
826 826
827 RubyPosition rubyPosition() const { return static_cast<RubyPosition>(rareInh eritedData->m_rubyPosition); } 827 RubyPosition rubyPosition() const { return static_cast<RubyPosition>(rareInh eritedData->m_rubyPosition); }
828 828
829 TextOrientation textOrientation() const { return static_cast<TextOrientation >(rareInheritedData->m_textOrientation); } 829 TextOrientation textOrientation() const { return static_cast<TextOrientation >(rareInheritedData->m_textOrientation); }
830 830
831 ObjectFit objectFit() const { return static_cast<ObjectFit>(rareNonInherited Data->m_objectFit); } 831 ObjectFit objectFit() const { return static_cast<ObjectFit>(rareNonInherited Data->m_objectFit); }
832 LengthPoint objectPosition() const { return rareNonInheritedData->m_objectPo sition; }
833 832
834 // Return true if any transform related property (currently transform, trans formStyle3D or perspective) 833 // Return true if any transform related property (currently transform, trans formStyle3D or perspective)
835 // indicates that we are transforming 834 // indicates that we are transforming
836 bool hasTransformRelatedProperty() const { return hasTransform() || preserve s3D() || hasPerspective(); } 835 bool hasTransformRelatedProperty() const { return hasTransform() || preserve s3D() || hasPerspective(); }
837 836
838 enum ApplyTransformOrigin { IncludeTransformOrigin, ExcludeTransformOrigin } ; 837 enum ApplyTransformOrigin { IncludeTransformOrigin, ExcludeTransformOrigin } ;
839 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin) const; 838 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin) const;
840 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin) const; 839 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin) const;
841 840
842 bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rar eNonInheritedData->m_maskBoxImage.hasImage(); } 841 bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rar eNonInheritedData->m_maskBoxImage.hasImage(); }
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
1258 void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCom bine, v); } 1257 void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCom bine, v); }
1259 void setTextDecorationColor(const Color& c) { SET_VAR(rareNonInheritedData, m_textDecorationColor, c); } 1258 void setTextDecorationColor(const Color& c) { SET_VAR(rareNonInheritedData, m_textDecorationColor, c); }
1260 void setTextEmphasisColor(const Color& c) { SET_VAR(rareInheritedData, textE mphasisColor, c); } 1259 void setTextEmphasisColor(const Color& c) { SET_VAR(rareInheritedData, textE mphasisColor, c); }
1261 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); } 1260 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); }
1262 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); } 1261 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); }
1263 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); } 1262 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); }
1264 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); } 1263 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); }
1265 bool setTextOrientation(TextOrientation); 1264 bool setTextOrientation(TextOrientation);
1266 1265
1267 void setObjectFit(ObjectFit f) { SET_VAR(rareNonInheritedData, m_objectFit, f); } 1266 void setObjectFit(ObjectFit f) { SET_VAR(rareNonInheritedData, m_objectFit, f); }
1268 void setObjectPosition(LengthPoint position) { SET_VAR(rareNonInheritedData, m_objectPosition, position); }
1269 1267
1270 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); } 1268 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); }
1271 1269
1272 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); } 1270 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); }
1273 1271
1274 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; } 1272 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; }
1275 1273
1276 // End CSS3 Setters 1274 // End CSS3 Setters
1277 1275
1278 void setLineGrid(const AtomicString& lineGrid) { SET_VAR(rareInheritedData, m_lineGrid, lineGrid); } 1276 void setLineGrid(const AtomicString& lineGrid) { SET_VAR(rareInheritedData, m_lineGrid, lineGrid); }
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
1469 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed) , Length(0, Fixed)); } 1467 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed) , Length(0, Fixed)); }
1470 static ECaptionSide initialCaptionSide() { return CAPTOP; } 1468 static ECaptionSide initialCaptionSide() { return CAPTOP; }
1471 static EClear initialClear() { return CNONE; } 1469 static EClear initialClear() { return CNONE; }
1472 static ColumnAxis initialColumnAxis() { return AutoColumnAxis; } 1470 static ColumnAxis initialColumnAxis() { return AutoColumnAxis; }
1473 static ColumnProgression initialColumnProgression() { return NormalColumnPro gression; } 1471 static ColumnProgression initialColumnProgression() { return NormalColumnPro gression; }
1474 static TextDirection initialDirection() { return LTR; } 1472 static TextDirection initialDirection() { return LTR; }
1475 static WritingMode initialWritingMode() { return TopToBottomWritingMode; } 1473 static WritingMode initialWritingMode() { return TopToBottomWritingMode; }
1476 static TextCombine initialTextCombine() { return TextCombineNone; } 1474 static TextCombine initialTextCombine() { return TextCombineNone; }
1477 static TextOrientation initialTextOrientation() { return TextOrientationVert icalRight; } 1475 static TextOrientation initialTextOrientation() { return TextOrientationVert icalRight; }
1478 static ObjectFit initialObjectFit() { return ObjectFitFill; } 1476 static ObjectFit initialObjectFit() { return ObjectFitFill; }
1479 static LengthPoint initialObjectPosition() { return LengthPoint(Length(50.0, Percent), Length(50.0, Percent)); }
1480 static EDisplay initialDisplay() { return INLINE; } 1477 static EDisplay initialDisplay() { return INLINE; }
1481 static EEmptyCell initialEmptyCells() { return SHOW; } 1478 static EEmptyCell initialEmptyCells() { return SHOW; }
1482 static EFloat initialFloating() { return NoFloat; } 1479 static EFloat initialFloating() { return NoFloat; }
1483 static EListStylePosition initialListStylePosition() { return OUTSIDE; } 1480 static EListStylePosition initialListStylePosition() { return OUTSIDE; }
1484 static EListStyleType initialListStyleType() { return Disc; } 1481 static EListStyleType initialListStyleType() { return Disc; }
1485 static EOverflow initialOverflowX() { return OVISIBLE; } 1482 static EOverflow initialOverflowX() { return OVISIBLE; }
1486 static EOverflow initialOverflowY() { return OVISIBLE; } 1483 static EOverflow initialOverflowY() { return OVISIBLE; }
1487 static EPageBreak initialPageBreak() { return PBAUTO; } 1484 static EPageBreak initialPageBreak() { return PBAUTO; }
1488 static EPosition initialPosition() { return StaticPosition; } 1485 static EPosition initialPosition() { return StaticPosition; }
1489 static ETableLayout initialTableLayout() { return TAUTO; } 1486 static ETableLayout initialTableLayout() { return TAUTO; }
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
1768 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1765 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1769 return false; 1766 return false;
1770 1767
1771 rareInheritedData.access()->m_textOrientation = textOrientation; 1768 rareInheritedData.access()->m_textOrientation = textOrientation;
1772 return true; 1769 return true;
1773 } 1770 }
1774 1771
1775 } // namespace WebCore 1772 } // namespace WebCore
1776 1773
1777 #endif // RenderStyle_h 1774 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « trunk/Source/core/rendering/RenderReplaced.cpp ('k') | trunk/Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698