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

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

Issue 2893243002: Add missing data members in StyleRareNonInheritedData copy constructor. (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
« no previous file with comments | « no previous file | 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 // Page size type. 67 // Page size type.
68 // StyleRareNonInheritedData::page_size_ is meaningful only when 68 // StyleRareNonInheritedData::page_size_ is meaningful only when
69 // StyleRareNonInheritedData::page_size_type_ is PAGE_SIZE_RESOLVED. 69 // StyleRareNonInheritedData::page_size_type_ is PAGE_SIZE_RESOLVED.
70 enum PageSizeType { 70 enum PageSizeType {
71 PAGE_SIZE_AUTO, // size: auto 71 PAGE_SIZE_AUTO, // size: auto
72 PAGE_SIZE_AUTO_LANDSCAPE, // size: landscape 72 PAGE_SIZE_AUTO_LANDSCAPE, // size: landscape
73 PAGE_SIZE_AUTO_PORTRAIT, // size: portrait 73 PAGE_SIZE_AUTO_PORTRAIT, // size: portrait
74 PAGE_SIZE_RESOLVED // Size is fully resolved. 74 PAGE_SIZE_RESOLVED // Size is fully resolved.
75 }; 75 };
76 76
77 using PaintImages = Vector<Persistent<StyleImage>>;
meade_UTC10 2017/05/31 05:59:45 Do you expect PaintImages to be used by anything o
shend 2017/05/31 06:58:25 Done.
78
77 // This struct is for rarely used non-inherited CSS3, CSS2, and WebKit-specific 79 // This struct is for rarely used non-inherited CSS3, CSS2, and WebKit-specific
78 // properties. By grouping them together, we save space, and only allocate this 80 // properties. By grouping them together, we save space, and only allocate this
79 // object when someone actually uses one of these properties. 81 // object when someone actually uses one of these properties.
80 // TODO(sashab): Move this into a private class on ComputedStyle, and remove 82 // TODO(sashab): Move this into a private class on ComputedStyle, and remove
81 // all methods on it, merging them into copy/creation methods on ComputedStyle 83 // all methods on it, merging them into copy/creation methods on ComputedStyle
82 // instead. Keep the allocation logic, only allocating a new object if needed. 84 // instead. Keep the allocation logic, only allocating a new object if needed.
83 class CORE_EXPORT StyleRareNonInheritedData 85 class CORE_EXPORT StyleRareNonInheritedData
84 : public RefCounted<StyleRareNonInheritedData> { 86 : public RefCounted<StyleRareNonInheritedData> {
85 public: 87 public:
86 static PassRefPtr<StyleRareNonInheritedData> Create() { 88 static PassRefPtr<StyleRareNonInheritedData> Create() {
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 StyleColor visited_link_text_decoration_color_; 164 StyleColor visited_link_text_decoration_color_;
163 StyleColor visited_link_background_color_; 165 StyleColor visited_link_background_color_;
164 StyleColor visited_link_outline_color_; 166 StyleColor visited_link_outline_color_;
165 StyleColor visited_link_border_left_color_; 167 StyleColor visited_link_border_left_color_;
166 StyleColor visited_link_border_right_color_; 168 StyleColor visited_link_border_right_color_;
167 StyleColor visited_link_border_top_color_; 169 StyleColor visited_link_border_top_color_;
168 StyleColor visited_link_border_bottom_color_; 170 StyleColor visited_link_border_bottom_color_;
169 171
170 Vector<String> callback_selectors_; 172 Vector<String> callback_selectors_;
171 173
172 std::unique_ptr<Vector<Persistent<StyleImage>>> paint_images_; 174 std::unique_ptr<PaintImages> paint_images_;
173 175
174 std::unique_ptr<StyleNonInheritedVariables> variables_; 176 std::unique_ptr<StyleNonInheritedVariables> variables_;
175 177
176 StyleContentAlignmentData align_content_; 178 StyleContentAlignmentData align_content_;
177 StyleSelfAlignmentData align_items_; 179 StyleSelfAlignmentData align_items_;
178 StyleSelfAlignmentData align_self_; 180 StyleSelfAlignmentData align_self_;
179 StyleContentAlignmentData justify_content_; 181 StyleContentAlignmentData justify_content_;
180 StyleSelfAlignmentData justify_items_; 182 StyleSelfAlignmentData justify_items_;
181 StyleSelfAlignmentData justify_self_; 183 StyleSelfAlignmentData justify_self_;
182 184
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 unsigned has_author_border_ : 1; // Whether there is a author-defined border. 242 unsigned has_author_border_ : 1; // Whether there is a author-defined border.
241 243
242 private: 244 private:
243 StyleRareNonInheritedData(); 245 StyleRareNonInheritedData();
244 StyleRareNonInheritedData(const StyleRareNonInheritedData&); 246 StyleRareNonInheritedData(const StyleRareNonInheritedData&);
245 }; 247 };
246 248
247 } // namespace blink 249 } // namespace blink
248 250
249 #endif // StyleRareNonInheritedData_h 251 #endif // StyleRareNonInheritedData_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698