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

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

Issue 17450016: Implementation of CSS3 nav-up/down/left/right properties from CSS3 UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Implementation of CSS3 nav-up/down/left/right properties from CSS3 UI Created 7 years, 6 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 822 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin) const; 833 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin) const;
834 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin) const; 834 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin) const;
835 835
836 bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rar eNonInheritedData->m_maskBoxImage.hasImage(); } 836 bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rar eNonInheritedData->m_maskBoxImage.hasImage(); }
837 837
838 TextCombine textCombine() const { return static_cast<TextCombine>(rareNonInh eritedData->m_textCombine); } 838 TextCombine textCombine() const { return static_cast<TextCombine>(rareNonInh eritedData->m_textCombine); }
839 bool hasTextCombine() const { return textCombine() != TextCombineNone; } 839 bool hasTextCombine() const { return textCombine() != TextCombineNone; }
840 840
841 unsigned tabSize() const { return rareInheritedData->m_tabSize; } 841 unsigned tabSize() const { return rareInheritedData->m_tabSize; }
842 842
843 StyleNavigationValue navDown() const { return rareNonInheritedData->m_nav.m_ down; }
844 StyleNavigationValue navLeft() const { return rareNonInheritedData->m_nav.m_ left; }
845 StyleNavigationValue navRight() const { return rareNonInheritedData->m_nav.m _right; }
846 StyleNavigationValue navUp() const { return rareNonInheritedData->m_nav.m_up ; }
847
843 // End CSS3 Getters 848 // End CSS3 Getters
844 849
845 const AtomicString& flowThread() const { return rareNonInheritedData->m_flow Thread; } 850 const AtomicString& flowThread() const { return rareNonInheritedData->m_flow Thread; }
846 const AtomicString& regionThread() const { return rareNonInheritedData->m_re gionThread; } 851 const AtomicString& regionThread() const { return rareNonInheritedData->m_re gionThread; }
847 RegionFragment regionFragment() const { return static_cast<RegionFragment>(r areNonInheritedData->m_regionFragment); } 852 RegionFragment regionFragment() const { return static_cast<RegionFragment>(r areNonInheritedData->m_regionFragment); }
848 853
849 const AtomicString& lineGrid() const { return rareInheritedData->m_lineGrid; } 854 const AtomicString& lineGrid() const { return rareInheritedData->m_lineGrid; }
850 LineSnap lineSnap() const { return static_cast<LineSnap>(rareInheritedData-> m_lineSnap); } 855 LineSnap lineSnap() const { return static_cast<LineSnap>(rareInheritedData-> m_lineSnap); }
851 LineAlign lineAlign() const { return static_cast<LineAlign>(rareInheritedDat a->m_lineAlign); } 856 LineAlign lineAlign() const { return static_cast<LineAlign>(rareInheritedDat a->m_lineAlign); }
852 857
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
1258 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); } 1263 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); }
1259 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); } 1264 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); }
1260 bool setTextOrientation(TextOrientation); 1265 bool setTextOrientation(TextOrientation);
1261 1266
1262 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); } 1267 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); }
1263 1268
1264 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); } 1269 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); }
1265 1270
1266 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; } 1271 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; }
1267 1272
1273 void setNavDown(StyleNavigationValue v) { SET_VAR(rareNonInheritedData, m_na v.m_down, v); }
1274 void setNavLeft(StyleNavigationValue v) { SET_VAR(rareNonInheritedData, m_na v.m_left, v); }
1275 void setNavRight(StyleNavigationValue v) { SET_VAR(rareNonInheritedData, m_n av.m_right, v); }
1276 void setNavUp(StyleNavigationValue v) { SET_VAR(rareNonInheritedData, m_nav. m_up, v); }
1277
1268 // End CSS3 Setters 1278 // End CSS3 Setters
1269 1279
1270 void setLineGrid(const AtomicString& lineGrid) { SET_VAR(rareInheritedData, m_lineGrid, lineGrid); } 1280 void setLineGrid(const AtomicString& lineGrid) { SET_VAR(rareInheritedData, m_lineGrid, lineGrid); }
1271 void setLineSnap(LineSnap lineSnap) { SET_VAR(rareInheritedData, m_lineSnap, lineSnap); } 1281 void setLineSnap(LineSnap lineSnap) { SET_VAR(rareInheritedData, m_lineSnap, lineSnap); }
1272 void setLineAlign(LineAlign lineAlign) { SET_VAR(rareInheritedData, m_lineAl ign, lineAlign); } 1282 void setLineAlign(LineAlign lineAlign) { SET_VAR(rareInheritedData, m_lineAl ign, lineAlign); }
1273 1283
1274 void setFlowThread(const AtomicString& flowThread) { SET_VAR(rareNonInherite dData, m_flowThread, flowThread); } 1284 void setFlowThread(const AtomicString& flowThread) { SET_VAR(rareNonInherite dData, m_flowThread, flowThread); }
1275 void setRegionThread(const AtomicString& regionThread) { SET_VAR(rareNonInhe ritedData, m_regionThread, regionThread); } 1285 void setRegionThread(const AtomicString& regionThread) { SET_VAR(rareNonInhe ritedData, m_regionThread, regionThread); }
1276 void setRegionFragment(RegionFragment regionFragment) { SET_VAR(rareNonInher itedData, m_regionFragment, regionFragment); } 1286 void setRegionFragment(RegionFragment regionFragment) { SET_VAR(rareNonInher itedData, m_regionFragment, regionFragment); }
1277 1287
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 static LineSnap initialLineSnap() { return LineSnapNone; } 1628 static LineSnap initialLineSnap() { return LineSnapNone; }
1619 static LineAlign initialLineAlign() { return LineAlignNone; } 1629 static LineAlign initialLineAlign() { return LineAlignNone; }
1620 1630
1621 static const AtomicString& initialFlowThread() { return nullAtom; } 1631 static const AtomicString& initialFlowThread() { return nullAtom; }
1622 static const AtomicString& initialRegionThread() { return nullAtom; } 1632 static const AtomicString& initialRegionThread() { return nullAtom; }
1623 static RegionFragment initialRegionFragment() { return AutoRegionFragment; } 1633 static RegionFragment initialRegionFragment() { return AutoRegionFragment; }
1624 1634
1625 static WrapFlow initialWrapFlow() { return WrapFlowAuto; } 1635 static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
1626 static WrapThrough initialWrapThrough() { return WrapThroughWrap; } 1636 static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
1627 1637
1638 static StyleNavigationValue initialStyleNavigation() { DEFINE_STATIC_LOCAL(S tyleNavigationValue, navi, ()); return navi; }
esprehn 2013/06/20 19:45:10 don't abbreviate, what is navi?
Krzysztof Olczyk 2013/07/22 14:14:16 Done.
1639
1628 // Keep these at the end. 1640 // Keep these at the end.
1629 static LineClampValue initialLineClamp() { return LineClampValue(); } 1641 static LineClampValue initialLineClamp() { return LineClampValue(); }
1630 static ETextSecurity initialTextSecurity() { return TSNONE; } 1642 static ETextSecurity initialTextSecurity() { return TSNONE; }
1631 static Color initialTapHighlightColor(); 1643 static Color initialTapHighlightColor();
1632 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; } 1644 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; }
1633 static BlendMode initialBlendMode() { return BlendModeNormal; } 1645 static BlendMode initialBlendMode() { return BlendModeNormal; }
1634 private: 1646 private:
1635 void setVisitedLinkColor(const Color&); 1647 void setVisitedLinkColor(const Color&);
1636 void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBackgroundColor, v); } 1648 void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBackgroundColor, v); }
1637 void setVisitedLinkBorderLeftColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBorderLeftColor, v); } 1649 void setVisitedLinkBorderLeftColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBorderLeftColor, v); }
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1754 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1766 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1755 return false; 1767 return false;
1756 1768
1757 rareInheritedData.access()->m_textOrientation = textOrientation; 1769 rareInheritedData.access()->m_textOrientation = textOrientation;
1758 return true; 1770 return true;
1759 } 1771 }
1760 1772
1761 } // namespace WebCore 1773 } // namespace WebCore
1762 1774
1763 #endif // RenderStyle_h 1775 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698