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

Side by Side Diff: Source/core/layout/style/StyleBoxData.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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 | Annotate | Revision Log
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,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 * 19 *
20 */ 20 */
21 21
22 #include "config.h" 22 #include "config.h"
23 #include "core/layout/style/StyleBoxData.h" 23 #include "core/layout/style/StyleBoxData.h"
24 24
25 #include "core/layout/style/LayoutStyle.h" 25 #include "core/layout/style/ComputedStyle.h"
26 26
27 namespace blink { 27 namespace blink {
28 28
29 struct SameSizeAsStyleBoxData : public RefCounted<SameSizeAsStyleBoxData> { 29 struct SameSizeAsStyleBoxData : public RefCounted<SameSizeAsStyleBoxData> {
30 Length length[7]; 30 Length length[7];
31 int m_zIndex; 31 int m_zIndex;
32 uint32_t bitfields; 32 uint32_t bitfields;
33 }; 33 };
34 34
35 static_assert(sizeof(StyleBoxData) == sizeof(SameSizeAsStyleBoxData), "StyleBoxD ata should stay small"); 35 static_assert(sizeof(StyleBoxData) == sizeof(SameSizeAsStyleBoxData), "StyleBoxD ata should stay small");
36 36
37 StyleBoxData::StyleBoxData() 37 StyleBoxData::StyleBoxData()
38 : m_minWidth(LayoutStyle::initialMinSize()) 38 : m_minWidth(ComputedStyle::initialMinSize())
39 , m_maxWidth(LayoutStyle::initialMaxSize()) 39 , m_maxWidth(ComputedStyle::initialMaxSize())
40 , m_minHeight(LayoutStyle::initialMinSize()) 40 , m_minHeight(ComputedStyle::initialMinSize())
41 , m_maxHeight(LayoutStyle::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(CONTENT_BOX) 44 , m_boxSizing(CONTENT_BOX)
45 , m_boxDecorationBreak(DSLICE) 45 , m_boxDecorationBreak(DSLICE)
46 { 46 {
47 } 47 }
48 48
49 StyleBoxData::StyleBoxData(const StyleBoxData& o) 49 StyleBoxData::StyleBoxData(const StyleBoxData& o)
50 : RefCounted<StyleBoxData>() 50 : RefCounted<StyleBoxData>()
51 , m_width(o.m_width) 51 , m_width(o.m_width)
(...skipping 19 matching lines...) Expand all
71 && m_minHeight == o.m_minHeight 71 && m_minHeight == o.m_minHeight
72 && m_maxHeight == o.m_maxHeight 72 && m_maxHeight == o.m_maxHeight
73 && m_verticalAlign == o.m_verticalAlign 73 && m_verticalAlign == o.m_verticalAlign
74 && m_zIndex == o.m_zIndex 74 && m_zIndex == o.m_zIndex
75 && m_hasAutoZIndex == o.m_hasAutoZIndex 75 && m_hasAutoZIndex == o.m_hasAutoZIndex
76 && m_boxSizing == o.m_boxSizing 76 && m_boxSizing == o.m_boxSizing
77 && m_boxDecorationBreak == o.m_boxDecorationBreak; 77 && m_boxDecorationBreak == o.m_boxDecorationBreak;
78 } 78 }
79 79
80 } // namespace blink 80 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/style/StyleBoxData.h ('k') | Source/core/layout/style/StyleDeprecatedFlexibleBoxData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698