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

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

Issue 2890733002: Make EBorderStyle an enum class. (Closed)
Patch Set: Build for Mac 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/OutlineValueTest.cpp ('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 30 matching lines...) Expand all
41 return AdoptRef(new StyleMultiColData); 41 return AdoptRef(new StyleMultiColData);
42 } 42 }
43 PassRefPtr<StyleMultiColData> Copy() const { 43 PassRefPtr<StyleMultiColData> Copy() const {
44 return AdoptRef(new StyleMultiColData(*this)); 44 return AdoptRef(new StyleMultiColData(*this));
45 } 45 }
46 46
47 bool operator==(const StyleMultiColData&) const; 47 bool operator==(const StyleMultiColData&) const;
48 bool operator!=(const StyleMultiColData& o) const { return !(*this == o); } 48 bool operator!=(const StyleMultiColData& o) const { return !(*this == o); }
49 49
50 unsigned short RuleWidth() const { 50 unsigned short RuleWidth() const {
51 if (rule_.Style() == kBorderStyleNone || 51 if (rule_.Style() == EBorderStyle::kNone ||
52 rule_.Style() == kBorderStyleHidden) 52 rule_.Style() == EBorderStyle::kHidden)
53 return 0; 53 return 0;
54 return rule_.Width(); 54 return rule_.Width();
55 } 55 }
56 56
57 float width_; 57 float width_;
58 unsigned short count_; 58 unsigned short count_;
59 float gap_; 59 float gap_;
60 BorderValue rule_; 60 BorderValue rule_;
61 StyleColor visited_link_column_rule_color_; 61 StyleColor visited_link_column_rule_color_;
62 62
63 unsigned auto_width_ : 1; 63 unsigned auto_width_ : 1;
64 unsigned auto_count_ : 1; 64 unsigned auto_count_ : 1;
65 unsigned normal_gap_ : 1; 65 unsigned normal_gap_ : 1;
66 unsigned fill_ : 1; // ColumnFill 66 unsigned fill_ : 1; // ColumnFill
67 unsigned column_span_ : 1; 67 unsigned column_span_ : 1;
68 68
69 private: 69 private:
70 StyleMultiColData(); 70 StyleMultiColData();
71 StyleMultiColData(const StyleMultiColData&); 71 StyleMultiColData(const StyleMultiColData&);
72 }; 72 };
73 73
74 } // namespace blink 74 } // namespace blink
75 75
76 #endif // StyleMultiColData_h 76 #endif // StyleMultiColData_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/OutlineValueTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698