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

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

Issue 22482004: Add support for the object-fit CSS property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Oops, sorry! Forgot to update UseCounter.cpp Created 7 years, 4 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 800 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 TextEmphasisFill textEmphasisFill() const { return static_cast<TextEmphasisF ill>(rareInheritedData->textEmphasisFill); } 811 TextEmphasisFill textEmphasisFill() const { return static_cast<TextEmphasisF ill>(rareInheritedData->textEmphasisFill); }
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 EObjectFit objectFit() const { return static_cast<EObjectFit>(rareNonInherit edData->m_objectFit); }
822
821 // Return true if any transform related property (currently transform, trans formStyle3D or perspective) 823 // Return true if any transform related property (currently transform, trans formStyle3D or perspective)
822 // indicates that we are transforming 824 // indicates that we are transforming
823 bool hasTransformRelatedProperty() const { return hasTransform() || preserve s3D() || hasPerspective(); } 825 bool hasTransformRelatedProperty() const { return hasTransform() || preserve s3D() || hasPerspective(); }
824 826
825 enum ApplyTransformOrigin { IncludeTransformOrigin, ExcludeTransformOrigin } ; 827 enum ApplyTransformOrigin { IncludeTransformOrigin, ExcludeTransformOrigin } ;
826 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin) const; 828 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin) const;
827 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin) const; 829 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin) const;
828 830
829 bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rar eNonInheritedData->m_maskBoxImage.hasImage(); } 831 bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rar eNonInheritedData->m_maskBoxImage.hasImage(); }
830 832
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); } 1246 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); }
1245 void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCom bine, v); } 1247 void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCom bine, v); }
1246 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD ata, m_textDecorationColor, c); } 1248 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD ata, m_textDecorationColor, c); }
1247 void setTextEmphasisColor(const StyleColor& c) { SET_VAR(rareInheritedData, textEmphasisColor, c); } 1249 void setTextEmphasisColor(const StyleColor& c) { SET_VAR(rareInheritedData, textEmphasisColor, c); }
1248 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); } 1250 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); }
1249 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); } 1251 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); }
1250 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); } 1252 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); }
1251 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); } 1253 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); }
1252 bool setTextOrientation(TextOrientation); 1254 bool setTextOrientation(TextOrientation);
1253 1255
1256 void setObjectFit(EObjectFit f) { SET_VAR(rareNonInheritedData, m_objectFit, f); }
1257
1254 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); } 1258 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); }
1255 1259
1256 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); } 1260 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); }
1257 1261
1258 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; } 1262 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; }
1259 1263
1260 // End CSS3 Setters 1264 // End CSS3 Setters
1261 1265
1262 void setLineGrid(const AtomicString& lineGrid) { SET_VAR(rareInheritedData, m_lineGrid, lineGrid); } 1266 void setLineGrid(const AtomicString& lineGrid) { SET_VAR(rareInheritedData, m_lineGrid, lineGrid); }
1263 void setLineSnap(LineSnap lineSnap) { SET_VAR(rareInheritedData, m_lineSnap, lineSnap); } 1267 void setLineSnap(LineSnap lineSnap) { SET_VAR(rareInheritedData, m_lineSnap, lineSnap); }
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
1447 static NinePieceImage initialNinePieceImage() { return NinePieceImage(); } 1451 static NinePieceImage initialNinePieceImage() { return NinePieceImage(); }
1448 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed) , Length(0, Fixed)); } 1452 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed) , Length(0, Fixed)); }
1449 static ECaptionSide initialCaptionSide() { return CAPTOP; } 1453 static ECaptionSide initialCaptionSide() { return CAPTOP; }
1450 static EClear initialClear() { return CNONE; } 1454 static EClear initialClear() { return CNONE; }
1451 static ColumnAxis initialColumnAxis() { return AutoColumnAxis; } 1455 static ColumnAxis initialColumnAxis() { return AutoColumnAxis; }
1452 static ColumnProgression initialColumnProgression() { return NormalColumnPro gression; } 1456 static ColumnProgression initialColumnProgression() { return NormalColumnPro gression; }
1453 static TextDirection initialDirection() { return LTR; } 1457 static TextDirection initialDirection() { return LTR; }
1454 static WritingMode initialWritingMode() { return TopToBottomWritingMode; } 1458 static WritingMode initialWritingMode() { return TopToBottomWritingMode; }
1455 static TextCombine initialTextCombine() { return TextCombineNone; } 1459 static TextCombine initialTextCombine() { return TextCombineNone; }
1456 static TextOrientation initialTextOrientation() { return TextOrientationVert icalRight; } 1460 static TextOrientation initialTextOrientation() { return TextOrientationVert icalRight; }
1461 static EObjectFit initialObjectFit() { return ObjectFitFill; }
1457 static EDisplay initialDisplay() { return INLINE; } 1462 static EDisplay initialDisplay() { return INLINE; }
1458 static EEmptyCell initialEmptyCells() { return SHOW; } 1463 static EEmptyCell initialEmptyCells() { return SHOW; }
1459 static EFloat initialFloating() { return NoFloat; } 1464 static EFloat initialFloating() { return NoFloat; }
1460 static EListStylePosition initialListStylePosition() { return OUTSIDE; } 1465 static EListStylePosition initialListStylePosition() { return OUTSIDE; }
1461 static EListStyleType initialListStyleType() { return Disc; } 1466 static EListStyleType initialListStyleType() { return Disc; }
1462 static EOverflow initialOverflowX() { return OVISIBLE; } 1467 static EOverflow initialOverflowX() { return OVISIBLE; }
1463 static EOverflow initialOverflowY() { return OVISIBLE; } 1468 static EOverflow initialOverflowY() { return OVISIBLE; }
1464 static EPageBreak initialPageBreak() { return PBAUTO; } 1469 static EPageBreak initialPageBreak() { return PBAUTO; }
1465 static EPosition initialPosition() { return StaticPosition; } 1470 static EPosition initialPosition() { return StaticPosition; }
1466 static ETableLayout initialTableLayout() { return TAUTO; } 1471 static ETableLayout initialTableLayout() { return TAUTO; }
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
1744 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1749 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1745 return false; 1750 return false;
1746 1751
1747 rareInheritedData.access()->m_textOrientation = textOrientation; 1752 rareInheritedData.access()->m_textOrientation = textOrientation;
1748 return true; 1753 return true;
1749 } 1754 }
1750 1755
1751 } // namespace WebCore 1756 } // namespace WebCore
1752 1757
1753 #endif // RenderStyle_h 1758 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698