| Index: Source/core/rendering/style/RenderStyle.h
|
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
|
| index 6a27aaead144d0faca8f577e026e5d30c062ea33..2631c9abbc53480bb5c3383995b7d604916e27f0 100644
|
| --- a/Source/core/rendering/style/RenderStyle.h
|
| +++ b/Source/core/rendering/style/RenderStyle.h
|
| @@ -4,6 +4,7 @@
|
| * (C) 2000 Dirk Mueller (mueller@kde.org)
|
| * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
|
| * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
|
| + * Copyright (C) 2014 Opera Software ASA. All rights reserved.
|
| *
|
| * This library is free software; you can redistribute it and/or
|
| * modify it under the terms of the GNU Library General Public
|
| @@ -894,6 +895,11 @@ public:
|
|
|
| unsigned tabSize() const { return rareInheritedData->m_tabSize; }
|
|
|
| + StyleNavigationValue navDown() const { return rareNonInheritedData->m_navigation->down(); }
|
| + StyleNavigationValue navLeft() const { return rareNonInheritedData->m_navigation->left(); }
|
| + StyleNavigationValue navRight() const { return rareNonInheritedData->m_navigation->right(); }
|
| + StyleNavigationValue navUp() const { return rareNonInheritedData->m_navigation->up(); }
|
| +
|
| // End CSS3 Getters
|
|
|
| WrapFlow wrapFlow() const { return static_cast<WrapFlow>(rareNonInheritedData->m_wrapFlow); }
|
| @@ -1362,6 +1368,10 @@ public:
|
|
|
| void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size); }
|
|
|
| + void setNavDown(const StyleNavigationValue& value) { SET_VAR_WITH_SETTER(rareNonInheritedData.access()->m_navigation, down, setDown, value); }
|
| + void setNavLeft(const StyleNavigationValue& value) { SET_VAR_WITH_SETTER(rareNonInheritedData.access()->m_navigation, left, setLeft, value); }
|
| + void setNavRight(const StyleNavigationValue& value) { SET_VAR_WITH_SETTER(rareNonInheritedData.access()->m_navigation, right, setRight, value); }
|
| + void setNavUp(const StyleNavigationValue& value) { SET_VAR_WITH_SETTER(rareNonInheritedData.access()->m_navigation, up, setUp, value); }
|
| // End CSS3 Setters
|
|
|
| void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFlow, wrapFlow); }
|
| @@ -1688,7 +1698,7 @@ public:
|
| static ShadowList* initialTextShadow() { return 0; }
|
| static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorInstant; }
|
|
|
| - // The initial value is 'none' for grid tracks.
|
| + // The initial value is 'none' for grid trac ks.
|
| static Vector<GridTrackSize> initialGridTemplateColumns() { return Vector<GridTrackSize>(); }
|
| static Vector<GridTrackSize> initialGridTemplateRows() { return Vector<GridTrackSize>(); }
|
|
|
| @@ -1719,6 +1729,8 @@ public:
|
|
|
| static QuotesData* initialQuotes() { return 0; }
|
|
|
| + static StyleNavigationValue initialStyleNavigation() { DEFINE_STATIC_LOCAL(StyleNavigationValue, initialNavigation, ()); return initialNavigation; }
|
| +
|
| // Keep these at the end.
|
| // FIXME: Why? Seems these should all be one big sorted list.
|
| static LineClampValue initialLineClamp() { return LineClampValue(); }
|
|
|