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

Unified Diff: Source/core/rendering/style/StyleRareNonInheritedData.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: Applied code review suggestions. Also rebased. 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/style/StyleRareNonInheritedData.h
diff --git a/Source/core/rendering/style/StyleRareNonInheritedData.h b/Source/core/rendering/style/StyleRareNonInheritedData.h
index 034c3a81eb287943a6499dd72959c373bd6ab66d..35503983cd54c3055df80fcee8d6123be4ec11b1 100644
--- a/Source/core/rendering/style/StyleRareNonInheritedData.h
+++ b/Source/core/rendering/style/StyleRareNonInheritedData.h
@@ -4,6 +4,7 @@
* (C) 2000 Dirk Mueller (mueller@kde.org)
* Copyright (C) 2003, 2005, 2006, 2007, 2008 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
@@ -36,6 +37,7 @@
#include "core/rendering/style/NinePieceImage.h"
#include "core/rendering/style/RenderStyleConstants.h"
#include "core/rendering/style/ShapeValue.h"
+#include "core/rendering/style/StyleNavigationData.h"
#include "platform/LengthPoint.h"
#include "wtf/OwnPtr.h"
#include "wtf/PassRefPtr.h"
@@ -86,10 +88,21 @@ public:
bool shadowDataEquivalent(const StyleRareNonInheritedData&) const;
bool reflectionDataEquivalent(const StyleRareNonInheritedData&) const;
bool animationDataEquivalent(const StyleRareNonInheritedData&) const;
+ bool navigationDataEquivalent(const StyleRareNonInheritedData&) const;
bool transitionDataEquivalent(const StyleRareNonInheritedData&) const;
bool hasFilters() const;
bool hasOpacity() const { return opacity < 1; }
+ StyleNavigationValue navDown() const;
+ StyleNavigationValue navLeft() const;
+ StyleNavigationValue navRight() const;
+ StyleNavigationValue navUp() const;
+
+ void setNavDown(const StyleNavigationValue&);
+ void setNavLeft(const StyleNavigationValue&);
+ void setNavRight(const StyleNavigationValue&);
+ void setNavUp(const StyleNavigationValue&);
+
float opacity; // Whether or not we're transparent.
float m_aspectRatioDenominator;
@@ -127,6 +140,8 @@ public:
FillLayer m_mask;
NinePieceImage m_maskBoxImage;
+ OwnPtrWillBePersistent<StyleNavigationData> m_navigation;
+
LengthSize m_pageSize;
RefPtr<ShapeValue> m_shapeOutside;
@@ -200,6 +215,8 @@ public:
private:
StyleRareNonInheritedData();
StyleRareNonInheritedData(const StyleRareNonInheritedData&);
+
+ void setNavigation(StyleNavigationData::NavigationDirection, const StyleNavigationValue&);
};
} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698