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

Side by Side Diff: third_party/WebKit/Source/core/style/StyleBackgroundData.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
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
11 * version 2 of the License, or (at your option) any later version. 11 * version 2 of the License, or (at your option) any later version.
12 * 12 *
13 * This library is distributed in the hope that it will be useful, 13 * This library is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * Library General Public License for more details. 16 * Library General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU Library General Public License 18 * You should have received a copy of the GNU Library General Public License
19 * along with this library; see the file COPYING.LIB. If not, write to 19 * along with this library; see the file COPYING.LIB. If not, write to
20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
21 * Boston, MA 02110-1301, USA. 21 * Boston, MA 02110-1301, USA.
22 * 22 *
23 */ 23 */
24 24
25 #ifndef StyleBackgroundData_h 25 #ifndef StyleBackgroundData_h
26 #define StyleBackgroundData_h 26 #define StyleBackgroundData_h
27 27
28 #include "core/css/StyleColor.h"
28 #include "core/style/FillLayer.h" 29 #include "core/style/FillLayer.h"
29 #include "core/style/OutlineValue.h"
30 #include "platform/graphics/Color.h" 30 #include "platform/graphics/Color.h"
31 #include "wtf/PassRefPtr.h" 31 #include "wtf/PassRefPtr.h"
32 #include "wtf/RefCounted.h" 32 #include "wtf/RefCounted.h"
33 33
34 namespace blink { 34 namespace blink {
35 35
36 // TODO(sashab): Move this into a private class on ComputedStyle, and remove 36 // TODO(sashab): Move this into a private class on ComputedStyle, and remove
37 // all methods on it, merging them into copy/creation methods on ComputedStyle 37 // all methods on it, merging them into copy/creation methods on ComputedStyle
38 // instead. Keep the allocation logic, only allocating a new object if needed. 38 // instead. Keep the allocation logic, only allocating a new object if needed.
39 class CORE_EXPORT StyleBackgroundData : public RefCounted<StyleBackgroundData> { 39 class CORE_EXPORT StyleBackgroundData : public RefCounted<StyleBackgroundData> {
40 public: 40 public:
41 static PassRefPtr<StyleBackgroundData> create() { 41 static PassRefPtr<StyleBackgroundData> create() {
42 return adoptRef(new StyleBackgroundData); 42 return adoptRef(new StyleBackgroundData);
43 } 43 }
44 PassRefPtr<StyleBackgroundData> copy() const { 44 PassRefPtr<StyleBackgroundData> copy() const {
45 return adoptRef(new StyleBackgroundData(*this)); 45 return adoptRef(new StyleBackgroundData(*this));
46 } 46 }
47 ~StyleBackgroundData() {} 47 ~StyleBackgroundData() {}
48 48
49 bool operator==(const StyleBackgroundData&) const; 49 bool operator==(const StyleBackgroundData&) const;
50 bool operator!=(const StyleBackgroundData& o) const { return !(*this == o); } 50 bool operator!=(const StyleBackgroundData& o) const { return !(*this == o); }
51 51
52 bool visuallyEqual(const StyleBackgroundData&) const;
53
54 const FillLayer& background() const { return m_background; } 52 const FillLayer& background() const { return m_background; }
55 const StyleColor& color() const { return m_color; } 53 const StyleColor& color() const { return m_color; }
56 const OutlineValue& outline() const { return m_outline; }
57 54
58 private: 55 private:
59 friend class ComputedStyle; 56 friend class ComputedStyle;
60 57
61 StyleBackgroundData(); 58 StyleBackgroundData();
62 StyleBackgroundData(const StyleBackgroundData&); 59 StyleBackgroundData(const StyleBackgroundData&);
63 60
64 FillLayer m_background; 61 FillLayer m_background;
65 StyleColor m_color; 62 StyleColor m_color;
66 OutlineValue m_outline;
67 }; 63 };
68 64
69 } // namespace blink 65 } // namespace blink
70 66
71 #endif // StyleBackgroundData_h 67 #endif // StyleBackgroundData_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.cpp ('k') | third_party/WebKit/Source/core/style/StyleBackgroundData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698