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

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: Rebased once again to master, fixed layout test. Created 6 years, 8 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) 2013 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 868 matching lines...) Expand 10 before | Expand all | Expand 10 after
885 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin) const; 886 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin) const;
886 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin) const; 887 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin) const;
887 888
888 bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rar eNonInheritedData->m_maskBoxImage.hasImage(); } 889 bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rar eNonInheritedData->m_maskBoxImage.hasImage(); }
889 890
890 TextCombine textCombine() const { return static_cast<TextCombine>(rareNonInh eritedData->m_textCombine); } 891 TextCombine textCombine() const { return static_cast<TextCombine>(rareNonInh eritedData->m_textCombine); }
891 bool hasTextCombine() const { return textCombine() != TextCombineNone; } 892 bool hasTextCombine() const { return textCombine() != TextCombineNone; }
892 893
893 unsigned tabSize() const { return rareInheritedData->m_tabSize; } 894 unsigned tabSize() const { return rareInheritedData->m_tabSize; }
894 895
896 StyleNavigationData* navigation() const { return rareNonInheritedData->m_nav igation.get(); }
895 // End CSS3 Getters 897 // End CSS3 Getters
896 898
897 WrapFlow wrapFlow() const { return static_cast<WrapFlow>(rareNonInheritedDat a->m_wrapFlow); } 899 WrapFlow wrapFlow() const { return static_cast<WrapFlow>(rareNonInheritedDat a->m_wrapFlow); }
898 WrapThrough wrapThrough() const { return static_cast<WrapThrough>(rareNonInh eritedData->m_wrapThrough); } 900 WrapThrough wrapThrough() const { return static_cast<WrapThrough>(rareNonInh eritedData->m_wrapThrough); }
899 901
900 // Apple-specific property getter methods 902 // Apple-specific property getter methods
901 EPointerEvents pointerEvents() const { return static_cast<EPointerEvents>(in herited_flags._pointerEvents); } 903 EPointerEvents pointerEvents() const { return static_cast<EPointerEvents>(in herited_flags._pointerEvents); }
902 const CSSAnimationDataList* animations() const { return rareNonInheritedData ->m_animations.get(); } 904 const CSSAnimationDataList* animations() const { return rareNonInheritedData ->m_animations.get(); }
903 const CSSAnimationDataList* transitions() const { return rareNonInheritedDat a->m_transitions.get(); } 905 const CSSAnimationDataList* transitions() const { return rareNonInheritedDat a->m_transitions.get(); }
904 906
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
1336 1338
1337 void setObjectFit(ObjectFit f) { SET_VAR(rareNonInheritedData, m_objectFit, f); } 1339 void setObjectFit(ObjectFit f) { SET_VAR(rareNonInheritedData, m_objectFit, f); }
1338 void setObjectPosition(LengthPoint position) { SET_VAR(rareNonInheritedData, m_objectPosition, position); } 1340 void setObjectPosition(LengthPoint position) { SET_VAR(rareNonInheritedData, m_objectPosition, position); }
1339 1341
1340 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); } 1342 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); }
1341 1343
1342 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); } 1344 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); }
1343 1345
1344 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; } 1346 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; }
1345 1347
1348 void setNavigation(const StyleNavigationData&);
fs 2014/04/14 12:32:01 I think it might end up easier to just have one se
Krzysztof Olczyk 2014/04/17 13:48:40 Done.
1349 void setNavigation(StyleNavigationData::NavigationDirection, const StyleNavi gationValue&, bool add);
1346 // End CSS3 Setters 1350 // End CSS3 Setters
1347 1351
1348 void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFl ow, wrapFlow); } 1352 void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFl ow, wrapFlow); }
1349 void setWrapThrough(WrapThrough wrapThrough) { SET_VAR(rareNonInheritedData, m_wrapThrough, wrapThrough); } 1353 void setWrapThrough(WrapThrough wrapThrough) { SET_VAR(rareNonInheritedData, m_wrapThrough, wrapThrough); }
1350 1354
1351 // Apple-specific property setters 1355 // Apple-specific property setters
1352 void setPointerEvents(EPointerEvents p) { inherited_flags._pointerEvents = p ; } 1356 void setPointerEvents(EPointerEvents p) { inherited_flags._pointerEvents = p ; }
1353 1357
1354 void clearAnimations() 1358 void clearAnimations()
1355 { 1359 {
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
1681 static GridPosition initialGridRowStart() { return GridPosition(); } 1685 static GridPosition initialGridRowStart() { return GridPosition(); }
1682 static GridPosition initialGridRowEnd() { return GridPosition(); } 1686 static GridPosition initialGridRowEnd() { return GridPosition(); }
1683 1687
1684 static unsigned initialTabSize() { return 8; } 1688 static unsigned initialTabSize() { return 8; }
1685 1689
1686 static WrapFlow initialWrapFlow() { return WrapFlowAuto; } 1690 static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
1687 static WrapThrough initialWrapThrough() { return WrapThroughWrap; } 1691 static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
1688 1692
1689 static QuotesData* initialQuotes() { return 0; } 1693 static QuotesData* initialQuotes() { return 0; }
1690 1694
1695 static StyleNavigationValue initialStyleNavigation() { DEFINE_STATIC_LOCAL(S tyleNavigationValue, initial_navigation, ()); return initial_navigation; }
fs 2014/04/14 12:32:01 initial_navigation -> initialNavigation
Krzysztof Olczyk 2014/04/17 13:48:40 Done.
1696
1691 // Keep these at the end. 1697 // Keep these at the end.
1692 // FIXME: Why? Seems these should all be one big sorted list. 1698 // FIXME: Why? Seems these should all be one big sorted list.
1693 static LineClampValue initialLineClamp() { return LineClampValue(); } 1699 static LineClampValue initialLineClamp() { return LineClampValue(); }
1694 static ETextSecurity initialTextSecurity() { return TSNONE; } 1700 static ETextSecurity initialTextSecurity() { return TSNONE; }
1695 static Color initialTapHighlightColor(); 1701 static Color initialTapHighlightColor();
1696 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; } 1702 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; }
1697 static blink::WebBlendMode initialBlendMode() { return blink::WebBlendModeNo rmal; } 1703 static blink::WebBlendMode initialBlendMode() { return blink::WebBlendModeNo rmal; }
1698 static EIsolation initialIsolation() { return IsolationAuto; } 1704 static EIsolation initialIsolation() { return IsolationAuto; }
1699 private: 1705 private:
1700 void setVisitedLinkColor(const Color&); 1706 void setVisitedLinkColor(const Color&);
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
1858 inline bool RenderStyle::hasPseudoElementStyle() const 1864 inline bool RenderStyle::hasPseudoElementStyle() const
1859 { 1865 {
1860 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK; 1866 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK;
1861 } 1867 }
1862 1868
1863 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1869 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1864 1870
1865 } // namespace WebCore 1871 } // namespace WebCore
1866 1872
1867 #endif // RenderStyle_h 1873 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698