Chromium Code Reviews| Index: third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp |
| diff --git a/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp b/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp |
| index f371ec5429aa1119f4af4f1177743dd8b01b23a9..b3aca55a7753fc2f938ba7197cb0a9ceabad94f0 100644 |
| --- a/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp |
| +++ b/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp |
| @@ -1,6 +1,8 @@ |
| /* |
| * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
| * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| + * Copyright (C) 2014 Opera Software ASA. All rights reserved. |
| + * Copyright (C) 2016 Samsung Electronics. All rights reserved. |
|
fs
2016/05/18 15:55:06
Ditto.
|
| * |
| * This library is free software; you can redistribute it and/or |
| * modify it under the terms of the GNU Library General Public |
| @@ -40,7 +42,7 @@ public: |
| LineClampValue lineClamps; |
| DraggableRegionMode draggableRegions; |
| - void* dataRefs[10]; |
| + void* dataRefs[11]; |
| void* ownPtrs[4]; |
| #if ENABLE(OILPAN) |
| Persistent<void*> persistentHandles[2]; |
| @@ -150,6 +152,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited |
| , m_grid(o.m_grid) |
| , m_gridItem(o.m_gridItem) |
| , m_scrollSnap(o.m_scrollSnap) |
| + , m_navigation(o.m_navigation) |
| , m_content(o.m_content ? o.m_content->clone() : nullptr) |
| , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr) |
| , m_animations(o.m_animations ? CSSAnimationData::create(*o.m_animations) : nullptr) |
| @@ -244,6 +247,7 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c |
| && m_grid == o.m_grid |
| && m_gridItem == o.m_gridItem |
| && m_scrollSnap == o.m_scrollSnap |
| + && m_navigation == o.m_navigation |
| && contentDataEquivalent(o) |
| && counterDataEquivalent(o) |
| && shadowDataEquivalent(o) |