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

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

Issue 22839023: Add support for the object-position CSS property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
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
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 801 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 TextEmphasisMark textEmphasisMark() const; 812 TextEmphasisMark textEmphasisMark() const;
813 const AtomicString& textEmphasisCustomMark() const { return rareInheritedDat a->textEmphasisCustomMark; } 813 const AtomicString& textEmphasisCustomMark() const { return rareInheritedDat a->textEmphasisCustomMark; }
814 TextEmphasisPosition textEmphasisPosition() const { return static_cast<TextE mphasisPosition>(rareInheritedData->textEmphasisPosition); } 814 TextEmphasisPosition textEmphasisPosition() const { return static_cast<TextE mphasisPosition>(rareInheritedData->textEmphasisPosition); }
815 const AtomicString& textEmphasisMarkString() const; 815 const AtomicString& textEmphasisMarkString() const;
816 816
817 RubyPosition rubyPosition() const { return static_cast<RubyPosition>(rareInh eritedData->m_rubyPosition); } 817 RubyPosition rubyPosition() const { return static_cast<RubyPosition>(rareInh eritedData->m_rubyPosition); }
818 818
819 TextOrientation textOrientation() const { return static_cast<TextOrientation >(rareInheritedData->m_textOrientation); } 819 TextOrientation textOrientation() const { return static_cast<TextOrientation >(rareInheritedData->m_textOrientation); }
820 820
821 ObjectFit objectFit() const { return static_cast<ObjectFit>(rareNonInherited Data->m_objectFit); } 821 ObjectFit objectFit() const { return static_cast<ObjectFit>(rareNonInherited Data->m_objectFit); }
822 LengthPoint objectPosition() const { return rareNonInheritedData->m_objectPo sition; }
822 823
823 // Return true if any transform related property (currently transform, trans formStyle3D or perspective) 824 // Return true if any transform related property (currently transform, trans formStyle3D or perspective)
824 // indicates that we are transforming 825 // indicates that we are transforming
825 bool hasTransformRelatedProperty() const { return hasTransform() || preserve s3D() || hasPerspective(); } 826 bool hasTransformRelatedProperty() const { return hasTransform() || preserve s3D() || hasPerspective(); }
826 827
827 enum ApplyTransformOrigin { IncludeTransformOrigin, ExcludeTransformOrigin } ; 828 enum ApplyTransformOrigin { IncludeTransformOrigin, ExcludeTransformOrigin } ;
828 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin) const; 829 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin) const;
829 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin) const; 830 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin) const;
830 831
831 bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rar eNonInheritedData->m_maskBoxImage.hasImage(); } 832 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
1247 void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCom bine, v); } 1248 void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCom bine, v); }
1248 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD ata, m_textDecorationColor, c); } 1249 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD ata, m_textDecorationColor, c); }
1249 void setTextEmphasisColor(const StyleColor& c) { SET_VAR(rareInheritedData, textEmphasisColor, c); } 1250 void setTextEmphasisColor(const StyleColor& c) { SET_VAR(rareInheritedData, textEmphasisColor, c); }
1250 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); } 1251 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); }
1251 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); } 1252 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); }
1252 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); } 1253 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); }
1253 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); } 1254 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); }
1254 bool setTextOrientation(TextOrientation); 1255 bool setTextOrientation(TextOrientation);
1255 1256
1256 void setObjectFit(ObjectFit f) { SET_VAR(rareNonInheritedData, m_objectFit, f); } 1257 void setObjectFit(ObjectFit f) { SET_VAR(rareNonInheritedData, m_objectFit, f); }
1258 void setObjectPosition(LengthPoint position) { SET_VAR(rareNonInheritedData, m_objectPosition, position); }
1257 1259
1258 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); } 1260 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); }
1259 1261
1260 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); } 1262 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); }
1261 1263
1262 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; } 1264 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; }
1263 1265
1264 // End CSS3 Setters 1266 // End CSS3 Setters
1265 1267
1266 void setLineGrid(const AtomicString& lineGrid) { SET_VAR(rareInheritedData, m_lineGrid, lineGrid); } 1268 void setLineGrid(const AtomicString& lineGrid) { SET_VAR(rareInheritedData, m_lineGrid, lineGrid); }
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
1454 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed) , Length(0, Fixed)); } 1456 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed) , Length(0, Fixed)); }
1455 static ECaptionSide initialCaptionSide() { return CAPTOP; } 1457 static ECaptionSide initialCaptionSide() { return CAPTOP; }
1456 static EClear initialClear() { return CNONE; } 1458 static EClear initialClear() { return CNONE; }
1457 static ColumnAxis initialColumnAxis() { return AutoColumnAxis; } 1459 static ColumnAxis initialColumnAxis() { return AutoColumnAxis; }
1458 static ColumnProgression initialColumnProgression() { return NormalColumnPro gression; } 1460 static ColumnProgression initialColumnProgression() { return NormalColumnPro gression; }
1459 static TextDirection initialDirection() { return LTR; } 1461 static TextDirection initialDirection() { return LTR; }
1460 static WritingMode initialWritingMode() { return TopToBottomWritingMode; } 1462 static WritingMode initialWritingMode() { return TopToBottomWritingMode; }
1461 static TextCombine initialTextCombine() { return TextCombineNone; } 1463 static TextCombine initialTextCombine() { return TextCombineNone; }
1462 static TextOrientation initialTextOrientation() { return TextOrientationVert icalRight; } 1464 static TextOrientation initialTextOrientation() { return TextOrientationVert icalRight; }
1463 static ObjectFit initialObjectFit() { return ObjectFitFill; } 1465 static ObjectFit initialObjectFit() { return ObjectFitFill; }
1466 static LengthPoint initialObjectPosition() { return LengthPoint(Length(50.0, Percent), Length(50.0, Percent)); }
1464 static EDisplay initialDisplay() { return INLINE; } 1467 static EDisplay initialDisplay() { return INLINE; }
1465 static EEmptyCell initialEmptyCells() { return SHOW; } 1468 static EEmptyCell initialEmptyCells() { return SHOW; }
1466 static EFloat initialFloating() { return NoFloat; } 1469 static EFloat initialFloating() { return NoFloat; }
1467 static EListStylePosition initialListStylePosition() { return OUTSIDE; } 1470 static EListStylePosition initialListStylePosition() { return OUTSIDE; }
1468 static EListStyleType initialListStyleType() { return Disc; } 1471 static EListStyleType initialListStyleType() { return Disc; }
1469 static EOverflow initialOverflowX() { return OVISIBLE; } 1472 static EOverflow initialOverflowX() { return OVISIBLE; }
1470 static EOverflow initialOverflowY() { return OVISIBLE; } 1473 static EOverflow initialOverflowY() { return OVISIBLE; }
1471 static EPageBreak initialPageBreak() { return PBAUTO; } 1474 static EPageBreak initialPageBreak() { return PBAUTO; }
1472 static EPosition initialPosition() { return StaticPosition; } 1475 static EPosition initialPosition() { return StaticPosition; }
1473 static ETableLayout initialTableLayout() { return TAUTO; } 1476 static ETableLayout initialTableLayout() { return TAUTO; }
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
1752 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1755 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1753 return false; 1756 return false;
1754 1757
1755 rareInheritedData.access()->m_textOrientation = textOrientation; 1758 rareInheritedData.access()->m_textOrientation = textOrientation;
1756 return true; 1759 return true;
1757 } 1760 }
1758 1761
1759 } // namespace WebCore 1762 } // namespace WebCore
1760 1763
1761 #endif // RenderStyle_h 1764 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698