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

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

Issue 2880963003: Revert of Move AppliedTextDecorationList to its own file. (Closed)
Patch Set: Created 3 years, 7 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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/core/style/AppliedTextDecorationList.h ('k') | no next file » | 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 10 matching lines...) Expand all
21 * Boston, MA 02110-1301, USA. 21 * Boston, MA 02110-1301, USA.
22 * 22 *
23 */ 23 */
24 24
25 #ifndef StyleRareInheritedData_h 25 #ifndef StyleRareInheritedData_h
26 #define StyleRareInheritedData_h 26 #define StyleRareInheritedData_h
27 27
28 #include "core/CoreExport.h" 28 #include "core/CoreExport.h"
29 #include "core/css/StyleAutoColor.h" 29 #include "core/css/StyleAutoColor.h"
30 #include "core/css/StyleColor.h" 30 #include "core/css/StyleColor.h"
31 #include "core/style/AppliedTextDecorationList.h"
32 #include "core/style/TextSizeAdjust.h" 31 #include "core/style/TextSizeAdjust.h"
33 #include "platform/Length.h" 32 #include "platform/Length.h"
34 #include "platform/graphics/Color.h" 33 #include "platform/graphics/Color.h"
35 #include "platform/heap/Handle.h" 34 #include "platform/heap/Handle.h"
36 #include "platform/text/TabSize.h" 35 #include "platform/text/TabSize.h"
37 #include "platform/wtf/PassRefPtr.h" 36 #include "platform/wtf/PassRefPtr.h"
38 #include "platform/wtf/RefCounted.h" 37 #include "platform/wtf/RefCounted.h"
39 #include "platform/wtf/RefVector.h" 38 #include "platform/wtf/RefVector.h"
40 #include "platform/wtf/text/AtomicString.h" 39 #include "platform/wtf/text/AtomicString.h"
41 40
42 namespace blink { 41 namespace blink {
43 42
43 class AppliedTextDecoration;
44 class CursorData; 44 class CursorData;
45 class QuotesData; 45 class QuotesData;
46 class ShadowList; 46 class ShadowList;
47 class StyleImage; 47 class StyleImage;
48 class StyleInheritedVariables; 48 class StyleInheritedVariables;
49 49
50 typedef RefVector<AppliedTextDecoration> AppliedTextDecorationList;
50 typedef HeapVector<CursorData> CursorList; 51 typedef HeapVector<CursorData> CursorList;
51 52
52 // This struct is for rarely used inherited CSS3, CSS2, and WebKit-specific 53 // This struct is for rarely used inherited CSS3, CSS2, and WebKit-specific
53 // properties. By grouping them together, we save space, and only allocate this 54 // properties. By grouping them together, we save space, and only allocate this
54 // object when someone actually uses one of these properties. 55 // object when someone actually uses one of these properties.
55 // TODO(sashab): Move this into a private class on ComputedStyle, and remove 56 // TODO(sashab): Move this into a private class on ComputedStyle, and remove
56 // all methods on it, merging them into copy/creation methods on ComputedStyle 57 // all methods on it, merging them into copy/creation methods on ComputedStyle
57 // instead. Keep the allocation logic, only allocating a new object if needed. 58 // instead. Keep the allocation logic, only allocating a new object if needed.
58 class CORE_EXPORT StyleRareInheritedData 59 class CORE_EXPORT StyleRareInheritedData
59 : public RefCounted<StyleRareInheritedData> { 60 : public RefCounted<StyleRareInheritedData> {
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 TextSizeAdjust text_size_adjust_; 166 TextSizeAdjust text_size_adjust_;
166 167
167 private: 168 private:
168 StyleRareInheritedData(); 169 StyleRareInheritedData();
169 StyleRareInheritedData(const StyleRareInheritedData&); 170 StyleRareInheritedData(const StyleRareInheritedData&);
170 }; 171 };
171 172
172 } // namespace blink 173 } // namespace blink
173 174
174 #endif // StyleRareInheritedData_h 175 #endif // StyleRareInheritedData_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/AppliedTextDecorationList.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698