Index: Source/core/rendering/style/StyleRareNonInheritedData.cpp |
diff --git a/Source/core/rendering/style/StyleRareNonInheritedData.cpp b/Source/core/rendering/style/StyleRareNonInheritedData.cpp |
index a9f24c783702fe4f50fa915ddea9065b9c3da337..454e7198ac5ad2c853752ee0c9d8c42f3d83e97d 100644 |
--- a/Source/core/rendering/style/StyleRareNonInheritedData.cpp |
+++ b/Source/core/rendering/style/StyleRareNonInheritedData.cpp |
@@ -1,6 +1,7 @@ |
/* |
* Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
* Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
+ * 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 |
@@ -115,6 +116,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited |
, m_transitions(o.m_transitions ? adoptPtrWillBeNoop(new CSSAnimationDataList(*o.m_transitions)) : nullptr) |
, m_mask(o.m_mask) |
, m_maskBoxImage(o.m_maskBoxImage) |
+ , m_navigation(o.m_navigation ? adoptPtr(new StyleNavigationData(*o.m_navigation)) : nullptr) |
, m_pageSize(o.m_pageSize) |
, m_shapeOutside(o.m_shapeOutside) |
, m_shapeMargin(o.m_shapeMargin) |
@@ -193,6 +195,7 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c |
&& reflectionDataEquivalent(o) |
&& animationDataEquivalent(o) |
&& transitionDataEquivalent(o) |
+ && navigationDataEquivalent(o) |
&& m_mask == o.m_mask |
&& m_maskBoxImage == o.m_maskBoxImage |
&& m_pageSize == o.m_pageSize |
@@ -254,6 +257,14 @@ bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite |
return !a && !b; |
} |
+bool StyleRareNonInheritedData::navigationDataEquivalent(const StyleRareNonInheritedData& o) const |
+{ |
+ StyleNavigationData* a = m_navigation.get(); |
+ StyleNavigationData* b = o.m_navigation.get(); |
+ |
+ return a && b && *a == *b; |
+} |
+ |
bool StyleRareNonInheritedData::counterDataEquivalent(const StyleRareNonInheritedData& o) const |
{ |
if (m_counterDirectives.get() == o.m_counterDirectives.get()) |