Chromium Code Reviews| Index: Source/core/rendering/style/RenderStyle.h |
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h |
| index e922533fa407b05f926deb7d531b9171008a11b1..52005ba7bda48f39c660cb56c85daea15e57d5a7 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) 2013 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 |
| @@ -892,6 +893,7 @@ public: |
| unsigned tabSize() const { return rareInheritedData->m_tabSize; } |
| + StyleNavigationData* navigation() const { return rareNonInheritedData->m_navigation.get(); } |
| // End CSS3 Getters |
| WrapFlow wrapFlow() const { return static_cast<WrapFlow>(rareNonInheritedData->m_wrapFlow); } |
| @@ -1343,6 +1345,8 @@ public: |
| void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size); } |
| + 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.
|
| + void setNavigation(StyleNavigationData::NavigationDirection, const StyleNavigationValue&, bool add); |
| // End CSS3 Setters |
| void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFlow, wrapFlow); } |
| @@ -1688,6 +1692,8 @@ public: |
| static QuotesData* initialQuotes() { return 0; } |
| + static StyleNavigationValue initialStyleNavigation() { DEFINE_STATIC_LOCAL(StyleNavigationValue, initial_navigation, ()); return initial_navigation; } |
|
fs
2014/04/14 12:32:01
initial_navigation -> initialNavigation
Krzysztof Olczyk
2014/04/17 13:48:40
Done.
|
| + |
| // Keep these at the end. |
| // FIXME: Why? Seems these should all be one big sorted list. |
| static LineClampValue initialLineClamp() { return LineClampValue(); } |