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

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

Issue 381473002: Use reference for FillLayer if possible (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 EFillRepeat backgroundRepeatX() const { return static_cast<EFillRepeat>(m_ba ckground->background().repeatX()); } 644 EFillRepeat backgroundRepeatX() const { return static_cast<EFillRepeat>(m_ba ckground->background().repeatX()); }
645 EFillRepeat backgroundRepeatY() const { return static_cast<EFillRepeat>(m_ba ckground->background().repeatY()); } 645 EFillRepeat backgroundRepeatY() const { return static_cast<EFillRepeat>(m_ba ckground->background().repeatY()); }
646 CompositeOperator backgroundComposite() const { return static_cast<Composite Operator>(m_background->background().composite()); } 646 CompositeOperator backgroundComposite() const { return static_cast<Composite Operator>(m_background->background().composite()); }
647 EFillAttachment backgroundAttachment() const { return static_cast<EFillAttac hment>(m_background->background().attachment()); } 647 EFillAttachment backgroundAttachment() const { return static_cast<EFillAttac hment>(m_background->background().attachment()); }
648 EFillBox backgroundClip() const { return static_cast<EFillBox>(m_background- >background().clip()); } 648 EFillBox backgroundClip() const { return static_cast<EFillBox>(m_background- >background().clip()); }
649 EFillBox backgroundOrigin() const { return static_cast<EFillBox>(m_backgroun d->background().origin()); } 649 EFillBox backgroundOrigin() const { return static_cast<EFillBox>(m_backgroun d->background().origin()); }
650 const Length& backgroundXPosition() const { return m_background->background( ).xPosition(); } 650 const Length& backgroundXPosition() const { return m_background->background( ).xPosition(); }
651 const Length& backgroundYPosition() const { return m_background->background( ).yPosition(); } 651 const Length& backgroundYPosition() const { return m_background->background( ).yPosition(); }
652 EFillSizeType backgroundSizeType() const { return m_background->background() .sizeType(); } 652 EFillSizeType backgroundSizeType() const { return m_background->background() .sizeType(); }
653 const LengthSize& backgroundSizeLength() const { return m_background->backgr ound().sizeLength(); } 653 const LengthSize& backgroundSizeLength() const { return m_background->backgr ound().sizeLength(); }
654 FillLayer* accessBackgroundLayers() { return &(m_background.access()->m_back ground); } 654 FillLayer& accessBackgroundLayers() { return m_background.access()->m_backgr ound; }
655 const FillLayer* backgroundLayers() const { return &(m_background->backgroun d()); } 655 const FillLayer& backgroundLayers() const { return m_background->background( ); }
656 656
657 StyleImage* maskImage() const { return rareNonInheritedData->m_mask.image(); } 657 StyleImage* maskImage() const { return rareNonInheritedData->m_mask.image(); }
658 EFillRepeat maskRepeatX() const { return static_cast<EFillRepeat>(rareNonInh eritedData->m_mask.repeatX()); } 658 EFillRepeat maskRepeatX() const { return static_cast<EFillRepeat>(rareNonInh eritedData->m_mask.repeatX()); }
659 EFillRepeat maskRepeatY() const { return static_cast<EFillRepeat>(rareNonInh eritedData->m_mask.repeatY()); } 659 EFillRepeat maskRepeatY() const { return static_cast<EFillRepeat>(rareNonInh eritedData->m_mask.repeatY()); }
660 CompositeOperator maskComposite() const { return static_cast<CompositeOperat or>(rareNonInheritedData->m_mask.composite()); } 660 CompositeOperator maskComposite() const { return static_cast<CompositeOperat or>(rareNonInheritedData->m_mask.composite()); }
661 EFillBox maskClip() const { return static_cast<EFillBox>(rareNonInheritedDat a->m_mask.clip()); } 661 EFillBox maskClip() const { return static_cast<EFillBox>(rareNonInheritedDat a->m_mask.clip()); }
662 EFillBox maskOrigin() const { return static_cast<EFillBox>(rareNonInheritedD ata->m_mask.origin()); } 662 EFillBox maskOrigin() const { return static_cast<EFillBox>(rareNonInheritedD ata->m_mask.origin()); }
663 const Length& maskXPosition() const { return rareNonInheritedData->m_mask.xP osition(); } 663 const Length& maskXPosition() const { return rareNonInheritedData->m_mask.xP osition(); }
664 const Length& maskYPosition() const { return rareNonInheritedData->m_mask.yP osition(); } 664 const Length& maskYPosition() const { return rareNonInheritedData->m_mask.yP osition(); }
665 EFillSizeType maskSizeType() const { return rareNonInheritedData->m_mask.siz eType(); } 665 EFillSizeType maskSizeType() const { return rareNonInheritedData->m_mask.siz eType(); }
666 const LengthSize& maskSizeLength() const { return rareNonInheritedData->m_ma sk.sizeLength(); } 666 const LengthSize& maskSizeLength() const { return rareNonInheritedData->m_ma sk.sizeLength(); }
667 FillLayer* accessMaskLayers() { return &(rareNonInheritedData.access()->m_ma sk); } 667 FillLayer& accessMaskLayers() { return rareNonInheritedData.access()->m_mask ; }
668 const FillLayer* maskLayers() const { return &(rareNonInheritedData->m_mask) ; } 668 const FillLayer& maskLayers() const { return rareNonInheritedData->m_mask; }
669 669
670 const NinePieceImage& maskBoxImage() const { return rareNonInheritedData->m_ maskBoxImage; } 670 const NinePieceImage& maskBoxImage() const { return rareNonInheritedData->m_ maskBoxImage; }
671 StyleImage* maskBoxImageSource() const { return rareNonInheritedData->m_mask BoxImage.image(); } 671 StyleImage* maskBoxImageSource() const { return rareNonInheritedData->m_mask BoxImage.image(); }
672 const LengthBox& maskBoxImageSlices() const { return rareNonInheritedData->m _maskBoxImage.imageSlices(); } 672 const LengthBox& maskBoxImageSlices() const { return rareNonInheritedData->m _maskBoxImage.imageSlices(); }
673 bool maskBoxImageSlicesFill() const { return rareNonInheritedData->m_maskBox Image.fill(); } 673 bool maskBoxImageSlicesFill() const { return rareNonInheritedData->m_maskBox Image.fill(); }
674 const BorderImageLengthBox& maskBoxImageWidth() const { return rareNonInheri tedData->m_maskBoxImage.borderSlices(); } 674 const BorderImageLengthBox& maskBoxImageWidth() const { return rareNonInheri tedData->m_maskBoxImage.borderSlices(); }
675 const BorderImageLengthBox& maskBoxImageOutset() const { return rareNonInher itedData->m_maskBoxImage.outset(); } 675 const BorderImageLengthBox& maskBoxImageOutset() const { return rareNonInher itedData->m_maskBoxImage.outset(); }
676 676
677 EBorderCollapse borderCollapse() const { return static_cast<EBorderCollapse> (inherited_flags._border_collapse); } 677 EBorderCollapse borderCollapse() const { return static_cast<EBorderCollapse> (inherited_flags._border_collapse); }
678 short horizontalBorderSpacing() const; 678 short horizontalBorderSpacing() const;
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
1136 void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_ima geRendering, v); } 1136 void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_ima geRendering, v); }
1137 1137
1138 void setWhiteSpace(EWhiteSpace v) { inherited_flags._white_space = v; } 1138 void setWhiteSpace(EWhiteSpace v) { inherited_flags._white_space = v; }
1139 1139
1140 // FIXME: Remove these two and replace them with respective FontBuilder call s. 1140 // FIXME: Remove these two and replace them with respective FontBuilder call s.
1141 void setWordSpacing(float); 1141 void setWordSpacing(float);
1142 void setLetterSpacing(float); 1142 void setLetterSpacing(float);
1143 1143
1144 void adjustBackgroundLayers() 1144 void adjustBackgroundLayers()
1145 { 1145 {
1146 if (backgroundLayers()->next()) { 1146 if (backgroundLayers().next()) {
1147 accessBackgroundLayers()->cullEmptyLayers(); 1147 accessBackgroundLayers().cullEmptyLayers();
1148 accessBackgroundLayers()->fillUnsetProperties(); 1148 accessBackgroundLayers().fillUnsetProperties();
1149 } 1149 }
1150 } 1150 }
1151 1151
1152 void adjustMaskLayers() 1152 void adjustMaskLayers()
1153 { 1153 {
1154 if (maskLayers()->next()) { 1154 if (maskLayers().next()) {
1155 accessMaskLayers()->cullEmptyLayers(); 1155 accessMaskLayers().cullEmptyLayers();
1156 accessMaskLayers()->fillUnsetProperties(); 1156 accessMaskLayers().fillUnsetProperties();
1157 } 1157 }
1158 } 1158 }
1159 1159
1160 void setMaskImage(PassRefPtr<StyleImage> v) { rareNonInheritedData.access()- >m_mask.setImage(v); } 1160 void setMaskImage(PassRefPtr<StyleImage> v) { rareNonInheritedData.access()- >m_mask.setImage(v); }
1161 1161
1162 void setMaskBoxImage(const NinePieceImage& b) { SET_VAR(rareNonInheritedData , m_maskBoxImage, b); } 1162 void setMaskBoxImage(const NinePieceImage& b) { SET_VAR(rareNonInheritedData , m_maskBoxImage, b); }
1163 void setMaskBoxImageSource(PassRefPtr<StyleImage> v) { rareNonInheritedData. access()->m_maskBoxImage.setImage(v); } 1163 void setMaskBoxImageSource(PassRefPtr<StyleImage> v) { rareNonInheritedData. access()->m_maskBoxImage.setImage(v); }
1164 void setMaskBoxImageSlices(const LengthBox& slices) 1164 void setMaskBoxImageSlices(const LengthBox& slices)
1165 { 1165 {
1166 rareNonInheritedData.access()->m_maskBoxImage.setImageSlices(slices); 1166 rareNonInheritedData.access()->m_maskBoxImage.setImageSlices(slices);
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
1907 inline bool RenderStyle::hasPseudoElementStyle() const 1907 inline bool RenderStyle::hasPseudoElementStyle() const
1908 { 1908 {
1909 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1909 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1910 } 1910 }
1911 1911
1912 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1912 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1913 1913
1914 } // namespace WebCore 1914 } // namespace WebCore
1915 1915
1916 #endif // RenderStyle_h 1916 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/style/CachedUAStyle.h ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698