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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 1919813002: Implementation of CSS3 nav-up/down/left/right properties from CSS3 UI Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "core/style/StyleContentAlignmentData.h" 44 #include "core/style/StyleContentAlignmentData.h"
45 #include "core/style/StyleDeprecatedFlexibleBoxData.h" 45 #include "core/style/StyleDeprecatedFlexibleBoxData.h"
46 #include "core/style/StyleDifference.h" 46 #include "core/style/StyleDifference.h"
47 #include "core/style/StyleFilterData.h" 47 #include "core/style/StyleFilterData.h"
48 #include "core/style/StyleFlexibleBoxData.h" 48 #include "core/style/StyleFlexibleBoxData.h"
49 #include "core/style/StyleGridData.h" 49 #include "core/style/StyleGridData.h"
50 #include "core/style/StyleGridItemData.h" 50 #include "core/style/StyleGridItemData.h"
51 #include "core/style/StyleInheritedData.h" 51 #include "core/style/StyleInheritedData.h"
52 #include "core/style/StyleMotionRotation.h" 52 #include "core/style/StyleMotionRotation.h"
53 #include "core/style/StyleMultiColData.h" 53 #include "core/style/StyleMultiColData.h"
54 #include "core/style/StyleNavigationData.h"
54 #include "core/style/StyleRareInheritedData.h" 55 #include "core/style/StyleRareInheritedData.h"
55 #include "core/style/StyleRareNonInheritedData.h" 56 #include "core/style/StyleRareNonInheritedData.h"
56 #include "core/style/StyleReflection.h" 57 #include "core/style/StyleReflection.h"
57 #include "core/style/StyleScrollSnapData.h" 58 #include "core/style/StyleScrollSnapData.h"
58 #include "core/style/StyleSelfAlignmentData.h" 59 #include "core/style/StyleSelfAlignmentData.h"
59 #include "core/style/StyleSurroundData.h" 60 #include "core/style/StyleSurroundData.h"
60 #include "core/style/StyleTransformData.h" 61 #include "core/style/StyleTransformData.h"
61 #include "core/style/StyleVisualData.h" 62 #include "core/style/StyleVisualData.h"
62 #include "core/style/StyleWillChangeData.h" 63 #include "core/style/StyleWillChangeData.h"
63 #include "core/style/TransformOrigin.h" 64 #include "core/style/TransformOrigin.h"
(...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after
947 TextCombine getTextCombine() const { return static_cast<TextCombine>(rareInh eritedData->m_textCombine); } 948 TextCombine getTextCombine() const { return static_cast<TextCombine>(rareInh eritedData->m_textCombine); }
948 bool hasTextCombine() const { return getTextCombine() != TextCombineNone; } 949 bool hasTextCombine() const { return getTextCombine() != TextCombineNone; }
949 950
950 uint8_t snapHeightPosition() const { return rareInheritedData->m_snapHeightP osition; } 951 uint8_t snapHeightPosition() const { return rareInheritedData->m_snapHeightP osition; }
951 uint8_t snapHeightUnit() const { return rareInheritedData->m_snapHeightUnit; } 952 uint8_t snapHeightUnit() const { return rareInheritedData->m_snapHeightUnit; }
952 953
953 TabSize getTabSize() const { return rareInheritedData->m_tabSize; } 954 TabSize getTabSize() const { return rareInheritedData->m_tabSize; }
954 955
955 RespectImageOrientationEnum respectImageOrientation() const { return static_ cast<RespectImageOrientationEnum>(rareInheritedData->m_respectImageOrientation); } 956 RespectImageOrientationEnum respectImageOrientation() const { return static_ cast<RespectImageOrientationEnum>(rareInheritedData->m_respectImageOrientation); }
956 957
958 StyleNavigationValue navDown() const { return rareNonInheritedData->m_naviga tion->down(); }
959 StyleNavigationValue navLeft() const { return rareNonInheritedData->m_naviga tion->left(); }
960 StyleNavigationValue navRight() const { return rareNonInheritedData->m_navig ation->right(); }
961 StyleNavigationValue navUp() const { return rareNonInheritedData->m_navigati on->up(); }
fs 2016/05/18 15:55:05 const StyleNavigationValue&?
962
957 // End CSS3 Getters 963 // End CSS3 Getters
958 964
959 // Apple-specific property getter methods 965 // Apple-specific property getter methods
960 EPointerEvents pointerEvents() const { return static_cast<EPointerEvents>(in herited_flags._pointerEvents); } 966 EPointerEvents pointerEvents() const { return static_cast<EPointerEvents>(in herited_flags._pointerEvents); }
961 const CSSAnimationData* animations() const { return rareNonInheritedData->m_ animations.get(); } 967 const CSSAnimationData* animations() const { return rareNonInheritedData->m_ animations.get(); }
962 const CSSTransitionData* transitions() const { return rareNonInheritedData-> m_transitions.get(); } 968 const CSSTransitionData* transitions() const { return rareNonInheritedData-> m_transitions.get(); }
963 969
964 CSSAnimationData& accessAnimations(); 970 CSSAnimationData& accessAnimations();
965 CSSTransitionData& accessTransitions(); 971 CSSTransitionData& accessTransitions();
966 972
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
1450 void setFilter(const FilterOperations& ops) { SET_NESTED_VAR(rareNonInherite dData, m_filter, m_operations, ops); } 1456 void setFilter(const FilterOperations& ops) { SET_NESTED_VAR(rareNonInherite dData, m_filter, m_operations, ops); }
1451 void setBackdropFilter(const FilterOperations& ops) { SET_NESTED_VAR(rareNon InheritedData, m_backdropFilter, m_operations, ops); } 1457 void setBackdropFilter(const FilterOperations& ops) { SET_NESTED_VAR(rareNon InheritedData, m_backdropFilter, m_operations, ops); }
1452 1458
1453 void setSnapHeightPosition(uint8_t position) { SET_VAR(rareInheritedData, m_ snapHeightPosition, position); } 1459 void setSnapHeightPosition(uint8_t position) { SET_VAR(rareInheritedData, m_ snapHeightPosition, position); }
1454 void setSnapHeightUnit(uint8_t unit) { SET_VAR(rareInheritedData, m_snapHeig htUnit, unit); } 1460 void setSnapHeightUnit(uint8_t unit) { SET_VAR(rareInheritedData, m_snapHeig htUnit, unit); }
1455 1461
1456 void setTabSize(TabSize size) { SET_VAR(rareInheritedData, m_tabSize, size); } 1462 void setTabSize(TabSize size) { SET_VAR(rareInheritedData, m_tabSize, size); }
1457 1463
1458 void setRespectImageOrientation(RespectImageOrientationEnum v) { SET_VAR(rar eInheritedData, m_respectImageOrientation, v); } 1464 void setRespectImageOrientation(RespectImageOrientationEnum v) { SET_VAR(rar eInheritedData, m_respectImageOrientation, v); }
1459 1465
1466 void setNavDown(const StyleNavigationValue& value) { SET_VAR_WITH_SETTER(rar eNonInheritedData.access()->m_navigation, down, setDown, value); }
1467 void setNavLeft(const StyleNavigationValue& value) { SET_VAR_WITH_SETTER(rar eNonInheritedData.access()->m_navigation, left, setLeft, value); }
1468 void setNavRight(const StyleNavigationValue& value) { SET_VAR_WITH_SETTER(ra reNonInheritedData.access()->m_navigation, right, setRight, value); }
1469 void setNavUp(const StyleNavigationValue& value) { SET_VAR_WITH_SETTER(rareN onInheritedData.access()->m_navigation, up, setUp, value); }
1470
1460 // End CSS3 Setters 1471 // End CSS3 Setters
1461 1472
1462 void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFl ow, wrapFlow); } 1473 void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFl ow, wrapFlow); }
1463 void setWrapThrough(WrapThrough wrapThrough) { SET_VAR(rareNonInheritedData, m_wrapThrough, wrapThrough); } 1474 void setWrapThrough(WrapThrough wrapThrough) { SET_VAR(rareNonInheritedData, m_wrapThrough, wrapThrough); }
1464 1475
1465 // Apple-specific property setters 1476 // Apple-specific property setters
1466 void setPointerEvents(EPointerEvents p) { inherited_flags._pointerEvents = p ; } 1477 void setPointerEvents(EPointerEvents p) { inherited_flags._pointerEvents = p ; }
1467 1478
1468 void setTransformStyle3D(ETransformStyle3D b) { SET_VAR(rareNonInheritedData , m_transformStyle3D, b); } 1479 void setTransformStyle3D(ETransformStyle3D b) { SET_VAR(rareNonInheritedData , m_transformStyle3D, b); }
1469 void setBackfaceVisibility(EBackfaceVisibility b) { SET_VAR(rareNonInherited Data, m_backfaceVisibility, b); } 1480 void setBackfaceVisibility(EBackfaceVisibility b) { SET_VAR(rareNonInherited Data, m_backfaceVisibility, b); }
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
1840 static GridPosition initialGridRowStart() { return GridPosition(); } 1851 static GridPosition initialGridRowStart() { return GridPosition(); }
1841 static GridPosition initialGridRowEnd() { return GridPosition(); } 1852 static GridPosition initialGridRowEnd() { return GridPosition(); }
1842 1853
1843 static TabSize initialTabSize() { return TabSize(8); } 1854 static TabSize initialTabSize() { return TabSize(8); }
1844 1855
1845 static WrapFlow initialWrapFlow() { return WrapFlowAuto; } 1856 static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
1846 static WrapThrough initialWrapThrough() { return WrapThroughWrap; } 1857 static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
1847 1858
1848 static QuotesData* initialQuotes() { return 0; } 1859 static QuotesData* initialQuotes() { return 0; }
1849 1860
1861 static StyleNavigationValue initialStyleNavigation() { DEFINE_STATIC_LOCAL(S tyleNavigationValue, initialNavigation, ()); return initialNavigation; }
1862
1850 // Keep these at the end. 1863 // Keep these at the end.
1851 // FIXME: Why? Seems these should all be one big sorted list. 1864 // FIXME: Why? Seems these should all be one big sorted list.
1852 static LineClampValue initialLineClamp() { return LineClampValue(); } 1865 static LineClampValue initialLineClamp() { return LineClampValue(); }
1853 static ETextSecurity initialTextSecurity() { return TSNONE; } 1866 static ETextSecurity initialTextSecurity() { return TSNONE; }
1854 static Color initialTapHighlightColor(); 1867 static Color initialTapHighlightColor();
1855 #if ENABLE(OILPAN) 1868 #if ENABLE(OILPAN)
1856 static const FilterOperations& initialFilter(); 1869 static const FilterOperations& initialFilter();
1857 static const FilterOperations& initialBackdropFilter(); 1870 static const FilterOperations& initialBackdropFilter();
1858 #else 1871 #else
1859 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; } 1872 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; }
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
2051 } 2064 }
2052 2065
2053 inline bool ComputedStyle::hasPseudoElementStyle() const 2066 inline bool ComputedStyle::hasPseudoElementStyle() const
2054 { 2067 {
2055 return noninherited_flags.pseudoBits & ElementPseudoIdMask; 2068 return noninherited_flags.pseudoBits & ElementPseudoIdMask;
2056 } 2069 }
2057 2070
2058 } // namespace blink 2071 } // namespace blink
2059 2072
2060 #endif // ComputedStyle_h 2073 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698