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

Side by Side Diff: third_party/WebKit/Source/core/style/StyleBoxData.cpp

Issue 2635143002: Changed EBoxSizing to an enum class and renamed its members (Closed)
Patch Set: Aded k prefix Created 3 years, 11 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/ComputedStyleConstants.h ('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) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 23 matching lines...) Expand all
34 static_assert(sizeof(StyleBoxData) == sizeof(SameSizeAsStyleBoxData), 34 static_assert(sizeof(StyleBoxData) == sizeof(SameSizeAsStyleBoxData),
35 "StyleBoxData should stay small"); 35 "StyleBoxData should stay small");
36 36
37 StyleBoxData::StyleBoxData() 37 StyleBoxData::StyleBoxData()
38 : m_minWidth(ComputedStyle::initialMinSize()), 38 : m_minWidth(ComputedStyle::initialMinSize()),
39 m_maxWidth(ComputedStyle::initialMaxSize()), 39 m_maxWidth(ComputedStyle::initialMaxSize()),
40 m_minHeight(ComputedStyle::initialMinSize()), 40 m_minHeight(ComputedStyle::initialMinSize()),
41 m_maxHeight(ComputedStyle::initialMaxSize()), 41 m_maxHeight(ComputedStyle::initialMaxSize()),
42 m_zIndex(0), 42 m_zIndex(0),
43 m_hasAutoZIndex(true), 43 m_hasAutoZIndex(true),
44 m_boxSizing(BoxSizingContentBox), 44 m_boxSizing(static_cast<unsigned>(ComputedStyle::initialBoxSizing())),
45 m_boxDecorationBreak(BoxDecorationBreakSlice) {} 45 m_boxDecorationBreak(BoxDecorationBreakSlice) {}
46 46
47 StyleBoxData::StyleBoxData(const StyleBoxData& o) 47 StyleBoxData::StyleBoxData(const StyleBoxData& o)
48 : RefCounted<StyleBoxData>(), 48 : RefCounted<StyleBoxData>(),
49 m_width(o.m_width), 49 m_width(o.m_width),
50 m_height(o.m_height), 50 m_height(o.m_height),
51 m_minWidth(o.m_minWidth), 51 m_minWidth(o.m_minWidth),
52 m_maxWidth(o.m_maxWidth), 52 m_maxWidth(o.m_maxWidth),
53 m_minHeight(o.m_minHeight), 53 m_minHeight(o.m_minHeight),
54 m_maxHeight(o.m_maxHeight), 54 m_maxHeight(o.m_maxHeight),
55 m_verticalAlign(o.m_verticalAlign), 55 m_verticalAlign(o.m_verticalAlign),
56 m_zIndex(o.m_zIndex), 56 m_zIndex(o.m_zIndex),
57 m_hasAutoZIndex(o.m_hasAutoZIndex), 57 m_hasAutoZIndex(o.m_hasAutoZIndex),
58 m_boxSizing(o.m_boxSizing), 58 m_boxSizing(o.m_boxSizing),
59 m_boxDecorationBreak(o.m_boxDecorationBreak) {} 59 m_boxDecorationBreak(o.m_boxDecorationBreak) {}
60 60
61 bool StyleBoxData::operator==(const StyleBoxData& o) const { 61 bool StyleBoxData::operator==(const StyleBoxData& o) const {
62 return m_width == o.m_width && m_height == o.m_height && 62 return m_width == o.m_width && m_height == o.m_height &&
63 m_minWidth == o.m_minWidth && m_maxWidth == o.m_maxWidth && 63 m_minWidth == o.m_minWidth && m_maxWidth == o.m_maxWidth &&
64 m_minHeight == o.m_minHeight && m_maxHeight == o.m_maxHeight && 64 m_minHeight == o.m_minHeight && m_maxHeight == o.m_maxHeight &&
65 m_verticalAlign == o.m_verticalAlign && m_zIndex == o.m_zIndex && 65 m_verticalAlign == o.m_verticalAlign && m_zIndex == o.m_zIndex &&
66 m_hasAutoZIndex == o.m_hasAutoZIndex && m_boxSizing == o.m_boxSizing && 66 m_hasAutoZIndex == o.m_hasAutoZIndex && m_boxSizing == o.m_boxSizing &&
67 m_boxDecorationBreak == o.m_boxDecorationBreak; 67 m_boxDecorationBreak == o.m_boxDecorationBreak;
68 } 68 }
69 69
70 } // namespace blink 70 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyleConstants.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698