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

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: Added tests 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 815 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin) const; 826 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin) const;
827 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin) const; 827 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin) const;
828 828
829 bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rar eNonInheritedData->m_maskBoxImage.hasImage(); } 829 bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rar eNonInheritedData->m_maskBoxImage.hasImage(); }
830 830
831 TextCombine textCombine() const { return static_cast<TextCombine>(rareNonInh eritedData->m_textCombine); } 831 TextCombine textCombine() const { return static_cast<TextCombine>(rareNonInh eritedData->m_textCombine); }
832 bool hasTextCombine() const { return textCombine() != TextCombineNone; } 832 bool hasTextCombine() const { return textCombine() != TextCombineNone; }
833 833
834 unsigned tabSize() const { return rareInheritedData->m_tabSize; } 834 unsigned tabSize() const { return rareInheritedData->m_tabSize; }
835 835
836 StyleNavigationValue navDown() const { return rareNonInheritedData->m_naviga tion.m_down; }
837 StyleNavigationValue navLeft() const { return rareNonInheritedData->m_naviga tion.m_left; }
838 StyleNavigationValue navRight() const { return rareNonInheritedData->m_navig ation.m_right; }
839 StyleNavigationValue navUp() const { return rareNonInheritedData->m_navigati on.m_up; }
840
836 // End CSS3 Getters 841 // End CSS3 Getters
837 842
838 const AtomicString& flowThread() const { return rareNonInheritedData->m_flow Thread; } 843 const AtomicString& flowThread() const { return rareNonInheritedData->m_flow Thread; }
839 const AtomicString& regionThread() const { return rareNonInheritedData->m_re gionThread; } 844 const AtomicString& regionThread() const { return rareNonInheritedData->m_re gionThread; }
840 RegionFragment regionFragment() const { return static_cast<RegionFragment>(r areNonInheritedData->m_regionFragment); } 845 RegionFragment regionFragment() const { return static_cast<RegionFragment>(r areNonInheritedData->m_regionFragment); }
841 846
842 const AtomicString& lineGrid() const { return rareInheritedData->m_lineGrid; } 847 const AtomicString& lineGrid() const { return rareInheritedData->m_lineGrid; }
843 LineSnap lineSnap() const { return static_cast<LineSnap>(rareInheritedData-> m_lineSnap); } 848 LineSnap lineSnap() const { return static_cast<LineSnap>(rareInheritedData-> m_lineSnap); }
844 LineAlign lineAlign() const { return static_cast<LineAlign>(rareInheritedDat a->m_lineAlign); } 849 LineAlign lineAlign() const { return static_cast<LineAlign>(rareInheritedDat a->m_lineAlign); }
845 850
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
1250 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); } 1255 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); }
1251 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); } 1256 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); }
1252 bool setTextOrientation(TextOrientation); 1257 bool setTextOrientation(TextOrientation);
1253 1258
1254 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); } 1259 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); }
1255 1260
1256 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); } 1261 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); }
1257 1262
1258 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; } 1263 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; }
1259 1264
1265 void setNavDown(StyleNavigationValue v) { SET_VAR(rareNonInheritedData, m_na vigation.m_down, v); }
1266 void setNavLeft(StyleNavigationValue v) { SET_VAR(rareNonInheritedData, m_na vigation.m_left, v); }
1267 void setNavRight(StyleNavigationValue v) { SET_VAR(rareNonInheritedData, m_n avigation.m_right, v); }
1268 void setNavUp(StyleNavigationValue v) { SET_VAR(rareNonInheritedData, m_navi gation.m_up, v); }
1269
1260 // End CSS3 Setters 1270 // End CSS3 Setters
1261 1271
1262 void setLineGrid(const AtomicString& lineGrid) { SET_VAR(rareInheritedData, m_lineGrid, lineGrid); } 1272 void setLineGrid(const AtomicString& lineGrid) { SET_VAR(rareInheritedData, m_lineGrid, lineGrid); }
1263 void setLineSnap(LineSnap lineSnap) { SET_VAR(rareInheritedData, m_lineSnap, lineSnap); } 1273 void setLineSnap(LineSnap lineSnap) { SET_VAR(rareInheritedData, m_lineSnap, lineSnap); }
1264 void setLineAlign(LineAlign lineAlign) { SET_VAR(rareInheritedData, m_lineAl ign, lineAlign); } 1274 void setLineAlign(LineAlign lineAlign) { SET_VAR(rareInheritedData, m_lineAl ign, lineAlign); }
1265 1275
1266 void setFlowThread(const AtomicString& flowThread) { SET_VAR(rareNonInherite dData, m_flowThread, flowThread); } 1276 void setFlowThread(const AtomicString& flowThread) { SET_VAR(rareNonInherite dData, m_flowThread, flowThread); }
1267 void setRegionThread(const AtomicString& regionThread) { SET_VAR(rareNonInhe ritedData, m_regionThread, regionThread); } 1277 void setRegionThread(const AtomicString& regionThread) { SET_VAR(rareNonInhe ritedData, m_regionThread, regionThread); }
1268 void setRegionFragment(RegionFragment regionFragment) { SET_VAR(rareNonInher itedData, m_regionFragment, regionFragment); } 1278 void setRegionFragment(RegionFragment regionFragment) { SET_VAR(rareNonInher itedData, m_regionFragment, regionFragment); }
1269 1279
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1607 1617
1608 static const AtomicString& initialFlowThread() { return nullAtom; } 1618 static const AtomicString& initialFlowThread() { return nullAtom; }
1609 static const AtomicString& initialRegionThread() { return nullAtom; } 1619 static const AtomicString& initialRegionThread() { return nullAtom; }
1610 static RegionFragment initialRegionFragment() { return AutoRegionFragment; } 1620 static RegionFragment initialRegionFragment() { return AutoRegionFragment; }
1611 1621
1612 static WrapFlow initialWrapFlow() { return WrapFlowAuto; } 1622 static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
1613 static WrapThrough initialWrapThrough() { return WrapThroughWrap; } 1623 static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
1614 1624
1615 static QuotesData* initialQuotes() { return 0; } 1625 static QuotesData* initialQuotes() { return 0; }
1616 1626
1627 static StyleNavigationValue initialStyleNavigation() { DEFINE_STATIC_LOCAL(S tyleNavigationValue, initial_navigation, ()); return initial_navigation; }
1628
1617 // Keep these at the end. 1629 // Keep these at the end.
1618 // FIXME: Why? Seems these should all be one big sorted list. 1630 // FIXME: Why? Seems these should all be one big sorted list.
1619 static LineClampValue initialLineClamp() { return LineClampValue(); } 1631 static LineClampValue initialLineClamp() { return LineClampValue(); }
1620 static ETextSecurity initialTextSecurity() { return TSNONE; } 1632 static ETextSecurity initialTextSecurity() { return TSNONE; }
1621 static Color initialTapHighlightColor(); 1633 static Color initialTapHighlightColor();
1622 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; } 1634 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; }
1623 static BlendMode initialBlendMode() { return BlendModeNormal; } 1635 static BlendMode initialBlendMode() { return BlendModeNormal; }
1624 private: 1636 private:
1625 void setVisitedLinkColor(const StyleColor&); 1637 void setVisitedLinkColor(const StyleColor&);
1626 void setVisitedLinkBackgroundColor(const StyleColor& v) { SET_VAR(rareNonInh eritedData, m_visitedLinkBackgroundColor, v); } 1638 void setVisitedLinkBackgroundColor(const StyleColor& v) { SET_VAR(rareNonInh eritedData, m_visitedLinkBackgroundColor, v); }
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1744 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1756 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1745 return false; 1757 return false;
1746 1758
1747 rareInheritedData.access()->m_textOrientation = textOrientation; 1759 rareInheritedData.access()->m_textOrientation = textOrientation;
1748 return true; 1760 return true;
1749 } 1761 }
1750 1762
1751 } // namespace WebCore 1763 } // namespace WebCore
1752 1764
1753 #endif // RenderStyle_h 1765 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698