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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: third_party/WebKit/Source/core/style/StyleRareNonInheritedData.h

Issue 2481553002: Move outline out of StyleBackgroundData into StyleRareNonInheritedData (Closed)
Patch Set: - Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleDifference.h ('k') | third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 17 matching lines...) Expand all
28 #include "core/CoreExport.h" 28 #include "core/CoreExport.h"
29 #include "core/css/StyleColor.h" 29 #include "core/css/StyleColor.h"
30 #include "core/style/ClipPathOperation.h" 30 #include "core/style/ClipPathOperation.h"
31 #include "core/style/ComputedStyleConstants.h" 31 #include "core/style/ComputedStyleConstants.h"
32 #include "core/style/CounterDirectives.h" 32 #include "core/style/CounterDirectives.h"
33 #include "core/style/DataPersistent.h" 33 #include "core/style/DataPersistent.h"
34 #include "core/style/DataRef.h" 34 #include "core/style/DataRef.h"
35 #include "core/style/FillLayer.h" 35 #include "core/style/FillLayer.h"
36 #include "core/style/LineClampValue.h" 36 #include "core/style/LineClampValue.h"
37 #include "core/style/NinePieceImage.h" 37 #include "core/style/NinePieceImage.h"
38 #include "core/style/OutlineValue.h"
38 #include "core/style/ShapeValue.h" 39 #include "core/style/ShapeValue.h"
39 #include "core/style/StyleContentAlignmentData.h" 40 #include "core/style/StyleContentAlignmentData.h"
40 #include "core/style/StyleScrollSnapData.h" 41 #include "core/style/StyleScrollSnapData.h"
41 #include "core/style/StyleSelfAlignmentData.h" 42 #include "core/style/StyleSelfAlignmentData.h"
42 #include "platform/LengthPoint.h" 43 #include "platform/LengthPoint.h"
43 #include "wtf/PassRefPtr.h" 44 #include "wtf/PassRefPtr.h"
44 #include "wtf/RefCounted.h" 45 #include "wtf/RefCounted.h"
45 #include "wtf/Vector.h" 46 #include "wtf/Vector.h"
46 #include <memory> 47 #include <memory>
47 48
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 148
148 Persistent<ShapeValue> m_shapeOutside; 149 Persistent<ShapeValue> m_shapeOutside;
149 RefPtr<ClipPathOperation> m_clipPath; 150 RefPtr<ClipPathOperation> m_clipPath;
150 151
151 FillLayer m_mask; 152 FillLayer m_mask;
152 NinePieceImage m_maskBoxImage; 153 NinePieceImage m_maskBoxImage;
153 154
154 FloatSize m_pageSize; 155 FloatSize m_pageSize;
155 Length m_shapeMargin; 156 Length m_shapeMargin;
156 157
158 OutlineValue m_outline;
159
157 StyleColor m_textDecorationColor; 160 StyleColor m_textDecorationColor;
158 StyleColor m_visitedLinkTextDecorationColor; 161 StyleColor m_visitedLinkTextDecorationColor;
159 StyleColor m_visitedLinkBackgroundColor; 162 StyleColor m_visitedLinkBackgroundColor;
160 StyleColor m_visitedLinkOutlineColor; 163 StyleColor m_visitedLinkOutlineColor;
161 StyleColor m_visitedLinkBorderLeftColor; 164 StyleColor m_visitedLinkBorderLeftColor;
162 StyleColor m_visitedLinkBorderRightColor; 165 StyleColor m_visitedLinkBorderRightColor;
163 StyleColor m_visitedLinkBorderTopColor; 166 StyleColor m_visitedLinkBorderTopColor;
164 StyleColor m_visitedLinkBorderBottomColor; 167 StyleColor m_visitedLinkBorderBottomColor;
165 168
166 Vector<String> m_callbackSelectors; 169 Vector<String> m_callbackSelectors;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 unsigned m_hasAuthorBorder : 1; // Whether there is a author-defined border. 239 unsigned m_hasAuthorBorder : 1; // Whether there is a author-defined border.
237 240
238 private: 241 private:
239 StyleRareNonInheritedData(); 242 StyleRareNonInheritedData();
240 StyleRareNonInheritedData(const StyleRareNonInheritedData&); 243 StyleRareNonInheritedData(const StyleRareNonInheritedData&);
241 }; 244 };
242 245
243 } // namespace blink 246 } // namespace blink
244 247
245 #endif // StyleRareNonInheritedData_h 248 #endif // StyleRareNonInheritedData_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleDifference.h ('k') | third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698