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

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: Fixed compilation error in mac and crash in linux/window that were reported by trybots. Created 6 years, 2 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 * Copyright (C) 2014 Opera Software ASA. All rights reserved.
7 * 8 *
8 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 11 * License as published by the Free Software Foundation; either
11 * version 2 of the License, or (at your option) any later version. 12 * version 2 of the License, or (at your option) any later version.
12 * 13 *
13 * This library is distributed in the hope that it will be useful, 14 * This library is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * Library General Public License for more details. 17 * Library General Public License for more details.
(...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin) const; 888 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin) const;
888 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin) const; 889 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin) const;
889 890
890 bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rar eNonInheritedData->m_maskBoxImage.hasImage(); } 891 bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rar eNonInheritedData->m_maskBoxImage.hasImage(); }
891 892
892 TextCombine textCombine() const { return static_cast<TextCombine>(rareNonInh eritedData->m_textCombine); } 893 TextCombine textCombine() const { return static_cast<TextCombine>(rareNonInh eritedData->m_textCombine); }
893 bool hasTextCombine() const { return textCombine() != TextCombineNone; } 894 bool hasTextCombine() const { return textCombine() != TextCombineNone; }
894 895
895 unsigned tabSize() const { return rareInheritedData->m_tabSize; } 896 unsigned tabSize() const { return rareInheritedData->m_tabSize; }
896 897
898 StyleNavigationValue navDown() const { return rareNonInheritedData->m_naviga tion->down(); }
899 StyleNavigationValue navLeft() const { return rareNonInheritedData->m_naviga tion->left(); }
900 StyleNavigationValue navRight() const { return rareNonInheritedData->m_navig ation->right(); }
901 StyleNavigationValue navUp() const { return rareNonInheritedData->m_navigati on->up(); }
902
897 // End CSS3 Getters 903 // End CSS3 Getters
898 904
899 WrapFlow wrapFlow() const { return static_cast<WrapFlow>(rareNonInheritedDat a->m_wrapFlow); } 905 WrapFlow wrapFlow() const { return static_cast<WrapFlow>(rareNonInheritedDat a->m_wrapFlow); }
900 WrapThrough wrapThrough() const { return static_cast<WrapThrough>(rareNonInh eritedData->m_wrapThrough); } 906 WrapThrough wrapThrough() const { return static_cast<WrapThrough>(rareNonInh eritedData->m_wrapThrough); }
901 907
902 // Apple-specific property getter methods 908 // Apple-specific property getter methods
903 EPointerEvents pointerEvents() const { return static_cast<EPointerEvents>(in herited_flags._pointerEvents); } 909 EPointerEvents pointerEvents() const { return static_cast<EPointerEvents>(in herited_flags._pointerEvents); }
904 const CSSAnimationData* animations() const { return rareNonInheritedData->m_ animations.get(); } 910 const CSSAnimationData* animations() const { return rareNonInheritedData->m_ animations.get(); }
905 const CSSTransitionData* transitions() const { return rareNonInheritedData-> m_transitions.get(); } 911 const CSSTransitionData* transitions() const { return rareNonInheritedData-> m_transitions.get(); }
906 912
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
1355 1361
1356 void setObjectFit(ObjectFit f) { SET_VAR(rareNonInheritedData, m_objectFit, f); } 1362 void setObjectFit(ObjectFit f) { SET_VAR(rareNonInheritedData, m_objectFit, f); }
1357 void setObjectPosition(LengthPoint position) { SET_VAR(rareNonInheritedData, m_objectPosition, position); } 1363 void setObjectPosition(LengthPoint position) { SET_VAR(rareNonInheritedData, m_objectPosition, position); }
1358 1364
1359 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); } 1365 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); }
1360 1366
1361 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); } 1367 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); }
1362 1368
1363 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; } 1369 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; }
1364 1370
1371 void setNavDown(const StyleNavigationValue& value) { SET_VAR_WITH_SETTER(rar eNonInheritedData.access()->m_navigation, down, setDown, value); }
1372 void setNavLeft(const StyleNavigationValue& value) { SET_VAR_WITH_SETTER(rar eNonInheritedData.access()->m_navigation, left, setLeft, value); }
1373 void setNavRight(const StyleNavigationValue& value) { SET_VAR_WITH_SETTER(ra reNonInheritedData.access()->m_navigation, right, setRight, value); }
1374 void setNavUp(const StyleNavigationValue& value) { SET_VAR_WITH_SETTER(rareN onInheritedData.access()->m_navigation, up, setUp, value); }
1365 // End CSS3 Setters 1375 // End CSS3 Setters
1366 1376
1367 void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFl ow, wrapFlow); } 1377 void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFl ow, wrapFlow); }
1368 void setWrapThrough(WrapThrough wrapThrough) { SET_VAR(rareNonInheritedData, m_wrapThrough, wrapThrough); } 1378 void setWrapThrough(WrapThrough wrapThrough) { SET_VAR(rareNonInheritedData, m_wrapThrough, wrapThrough); }
1369 1379
1370 // Apple-specific property setters 1380 // Apple-specific property setters
1371 void setPointerEvents(EPointerEvents p) { inherited_flags._pointerEvents = p ; } 1381 void setPointerEvents(EPointerEvents p) { inherited_flags._pointerEvents = p ; }
1372 1382
1373 void clearAnimations() 1383 void clearAnimations()
1374 { 1384 {
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
1681 static float initialImageResolution() { return 1; } 1691 static float initialImageResolution() { return 1; }
1682 static StyleImage* initialBorderImageSource() { return 0; } 1692 static StyleImage* initialBorderImageSource() { return 0; }
1683 static StyleImage* initialMaskBoxImageSource() { return 0; } 1693 static StyleImage* initialMaskBoxImageSource() { return 0; }
1684 static PrintColorAdjust initialPrintColorAdjust() { return PrintColorAdjustE conomy; } 1694 static PrintColorAdjust initialPrintColorAdjust() { return PrintColorAdjustE conomy; }
1685 static TouchAction initialTouchAction() { return TouchActionAuto; } 1695 static TouchAction initialTouchAction() { return TouchActionAuto; }
1686 static TouchActionDelay initialTouchActionDelay() { return TouchActionDelayS cript; } 1696 static TouchActionDelay initialTouchActionDelay() { return TouchActionDelayS cript; }
1687 static ShadowList* initialBoxShadow() { return 0; } 1697 static ShadowList* initialBoxShadow() { return 0; }
1688 static ShadowList* initialTextShadow() { return 0; } 1698 static ShadowList* initialTextShadow() { return 0; }
1689 static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorInstant ; } 1699 static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorInstant ; }
1690 1700
1691 // The initial value is 'none' for grid tracks. 1701 // The initial value is 'none' for grid trac ks.
1692 static Vector<GridTrackSize> initialGridTemplateColumns() { return Vector<Gr idTrackSize>(); } 1702 static Vector<GridTrackSize> initialGridTemplateColumns() { return Vector<Gr idTrackSize>(); }
1693 static Vector<GridTrackSize> initialGridTemplateRows() { return Vector<GridT rackSize>(); } 1703 static Vector<GridTrackSize> initialGridTemplateRows() { return Vector<GridT rackSize>(); }
1694 1704
1695 static GridAutoFlow initialGridAutoFlow() { return AutoFlowRow; } 1705 static GridAutoFlow initialGridAutoFlow() { return AutoFlowRow; }
1696 1706
1697 static GridTrackSize initialGridAutoColumns() { return GridTrackSize(Length( Auto)); } 1707 static GridTrackSize initialGridAutoColumns() { return GridTrackSize(Length( Auto)); }
1698 static GridTrackSize initialGridAutoRows() { return GridTrackSize(Length(Aut o)); } 1708 static GridTrackSize initialGridAutoRows() { return GridTrackSize(Length(Aut o)); }
1699 1709
1700 static NamedGridLinesMap initialNamedGridColumnLines() { return NamedGridLin esMap(); } 1710 static NamedGridLinesMap initialNamedGridColumnLines() { return NamedGridLin esMap(); }
1701 static NamedGridLinesMap initialNamedGridRowLines() { return NamedGridLinesM ap(); } 1711 static NamedGridLinesMap initialNamedGridRowLines() { return NamedGridLinesM ap(); }
(...skipping 10 matching lines...) Expand all
1712 static GridPosition initialGridRowStart() { return GridPosition(); } 1722 static GridPosition initialGridRowStart() { return GridPosition(); }
1713 static GridPosition initialGridRowEnd() { return GridPosition(); } 1723 static GridPosition initialGridRowEnd() { return GridPosition(); }
1714 1724
1715 static unsigned initialTabSize() { return 8; } 1725 static unsigned initialTabSize() { return 8; }
1716 1726
1717 static WrapFlow initialWrapFlow() { return WrapFlowAuto; } 1727 static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
1718 static WrapThrough initialWrapThrough() { return WrapThroughWrap; } 1728 static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
1719 1729
1720 static QuotesData* initialQuotes() { return 0; } 1730 static QuotesData* initialQuotes() { return 0; }
1721 1731
1732 static StyleNavigationValue initialStyleNavigation() { DEFINE_STATIC_LOCAL(S tyleNavigationValue, initialNavigation, ()); return initialNavigation; }
1733
1722 // Keep these at the end. 1734 // Keep these at the end.
1723 // FIXME: Why? Seems these should all be one big sorted list. 1735 // FIXME: Why? Seems these should all be one big sorted list.
1724 static LineClampValue initialLineClamp() { return LineClampValue(); } 1736 static LineClampValue initialLineClamp() { return LineClampValue(); }
1725 static ETextSecurity initialTextSecurity() { return TSNONE; } 1737 static ETextSecurity initialTextSecurity() { return TSNONE; }
1726 static Color initialTapHighlightColor(); 1738 static Color initialTapHighlightColor();
1727 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; } 1739 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; }
1728 static WebBlendMode initialBlendMode() { return WebBlendModeNormal; } 1740 static WebBlendMode initialBlendMode() { return WebBlendModeNormal; }
1729 static EIsolation initialIsolation() { return IsolationAuto; } 1741 static EIsolation initialIsolation() { return IsolationAuto; }
1730 private: 1742 private:
1731 void setVisitedLinkColor(const Color&); 1743 void setVisitedLinkColor(const Color&);
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
1929 inline bool RenderStyle::hasPseudoElementStyle() const 1941 inline bool RenderStyle::hasPseudoElementStyle() const
1930 { 1942 {
1931 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1943 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1932 } 1944 }
1933 1945
1934 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1946 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1935 1947
1936 } // namespace blink 1948 } // namespace blink
1937 1949
1938 #endif // RenderStyle_h 1950 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698