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

Side by Side Diff: Source/core/rendering/style/StyleRareInheritedData.h

Issue 219633002: Proper support for multiple text decorations. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix jchaffraix' issues. Created 6 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
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 13 matching lines...) Expand all
24 24
25 #ifndef StyleRareInheritedData_h 25 #ifndef StyleRareInheritedData_h
26 #define StyleRareInheritedData_h 26 #define StyleRareInheritedData_h
27 27
28 #include "core/css/StyleColor.h" 28 #include "core/css/StyleColor.h"
29 #include "core/rendering/style/DataRef.h" 29 #include "core/rendering/style/DataRef.h"
30 #include "platform/Length.h" 30 #include "platform/Length.h"
31 #include "platform/graphics/Color.h" 31 #include "platform/graphics/Color.h"
32 #include "wtf/PassRefPtr.h" 32 #include "wtf/PassRefPtr.h"
33 #include "wtf/RefCounted.h" 33 #include "wtf/RefCounted.h"
34 #include "wtf/RefVector.h"
34 #include "wtf/text/AtomicString.h" 35 #include "wtf/text/AtomicString.h"
35 36
36 namespace WebCore { 37 namespace WebCore {
37 38
39 class AppliedTextDecoration;
38 class CursorList; 40 class CursorList;
39 class QuotesData; 41 class QuotesData;
40 class ShadowList; 42 class ShadowList;
41 class StyleImage; 43 class StyleImage;
42 44
45 typedef RefVector<AppliedTextDecoration> AppliedTextDecorationList;
46
43 // This struct is for rarely used inherited CSS3, CSS2, and WebKit-specific prop erties. 47 // This struct is for rarely used inherited CSS3, CSS2, and WebKit-specific prop erties.
44 // By grouping them together, we save space, and only allocate this object when someone 48 // By grouping them together, we save space, and only allocate this object when someone
45 // actually uses one of these properties. 49 // actually uses one of these properties.
46 class StyleRareInheritedData : public RefCounted<StyleRareInheritedData> { 50 class StyleRareInheritedData : public RefCounted<StyleRareInheritedData> {
47 public: 51 public:
48 static PassRefPtr<StyleRareInheritedData> create() { return adoptRef(new Sty leRareInheritedData); } 52 static PassRefPtr<StyleRareInheritedData> create() { return adoptRef(new Sty leRareInheritedData); }
49 PassRefPtr<StyleRareInheritedData> copy() const { return adoptRef(new StyleR areInheritedData(*this)); } 53 PassRefPtr<StyleRareInheritedData> copy() const { return adoptRef(new StyleR areInheritedData(*this)); }
50 ~StyleRareInheritedData(); 54 ~StyleRareInheritedData();
51 55
52 bool operator==(const StyleRareInheritedData& o) const; 56 bool operator==(const StyleRareInheritedData& o) const;
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 137
134 AtomicString locale; 138 AtomicString locale;
135 139
136 AtomicString textEmphasisCustomMark; 140 AtomicString textEmphasisCustomMark;
137 RefPtr<QuotesData> quotes; 141 RefPtr<QuotesData> quotes;
138 142
139 unsigned m_tabSize; 143 unsigned m_tabSize;
140 144
141 Color tapHighlightColor; 145 Color tapHighlightColor;
142 146
147 RefPtr<AppliedTextDecorationList> appliedTextDecorations;
148
143 private: 149 private:
144 StyleRareInheritedData(); 150 StyleRareInheritedData();
145 StyleRareInheritedData(const StyleRareInheritedData&); 151 StyleRareInheritedData(const StyleRareInheritedData&);
146 }; 152 };
147 153
148 } // namespace WebCore 154 } // namespace WebCore
149 155
150 #endif // StyleRareInheritedData_h 156 #endif // StyleRareInheritedData_h
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.cpp ('k') | Source/core/rendering/style/StyleRareInheritedData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698