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

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

Issue 2854183003: Clean up StyleBackgroundData. (Closed)
Patch Set: Rebase 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
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 18 matching lines...) Expand all
29 #include "core/style/FillLayer.h" 29 #include "core/style/FillLayer.h"
30 #include "platform/graphics/Color.h" 30 #include "platform/graphics/Color.h"
31 #include "platform/wtf/PassRefPtr.h" 31 #include "platform/wtf/PassRefPtr.h"
32 #include "platform/wtf/RefCounted.h" 32 #include "platform/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
40 : public RefCountedCopyable<StyleBackgroundData> {
40 public: 41 public:
41 static PassRefPtr<StyleBackgroundData> Create() { 42 static PassRefPtr<StyleBackgroundData> Create() {
42 return AdoptRef(new StyleBackgroundData); 43 return AdoptRef(new StyleBackgroundData);
43 } 44 }
44 PassRefPtr<StyleBackgroundData> Copy() const { 45 PassRefPtr<StyleBackgroundData> Copy() const {
45 return AdoptRef(new StyleBackgroundData(*this)); 46 return AdoptRef(new StyleBackgroundData(*this));
46 } 47 }
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 const FillLayer& Background() const { return background_; }
53 const StyleColor& GetColor() const { return color_; }
54
55 private: 52 private:
56 friend class ComputedStyle; 53 friend class ComputedStyle;
57 54
58 StyleBackgroundData(); 55 StyleBackgroundData();
59 StyleBackgroundData(const StyleBackgroundData&); 56 StyleBackgroundData(const StyleBackgroundData&) = default;
60 57
61 FillLayer background_; 58 FillLayer background_;
62 StyleColor color_; 59 StyleColor background_color_;
63 }; 60 };
64 61
65 } // namespace blink 62 } // namespace blink
66 63
67 #endif // StyleBackgroundData_h 64 #endif // StyleBackgroundData_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | third_party/WebKit/Source/core/style/StyleBackgroundData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698