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

Side by Side Diff: Source/core/layout/style/StyleDeprecatedFlexibleBoxData.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/StyleDeprecatedFlexibleBoxData.h" 23 #include "core/layout/style/StyleDeprecatedFlexibleBoxData.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 StyleDeprecatedFlexibleBoxData::StyleDeprecatedFlexibleBoxData() 29 StyleDeprecatedFlexibleBoxData::StyleDeprecatedFlexibleBoxData()
30 : flex(LayoutStyle::initialBoxFlex()) 30 : flex(ComputedStyle::initialBoxFlex())
31 , flexGroup(LayoutStyle::initialBoxFlexGroup()) 31 , flexGroup(ComputedStyle::initialBoxFlexGroup())
32 , ordinalGroup(LayoutStyle::initialBoxOrdinalGroup()) 32 , ordinalGroup(ComputedStyle::initialBoxOrdinalGroup())
33 , align(LayoutStyle::initialBoxAlign()) 33 , align(ComputedStyle::initialBoxAlign())
34 , pack(LayoutStyle::initialBoxPack()) 34 , pack(ComputedStyle::initialBoxPack())
35 , orient(LayoutStyle::initialBoxOrient()) 35 , orient(ComputedStyle::initialBoxOrient())
36 , lines(LayoutStyle::initialBoxLines()) 36 , lines(ComputedStyle::initialBoxLines())
37 { 37 {
38 } 38 }
39 39
40 StyleDeprecatedFlexibleBoxData::StyleDeprecatedFlexibleBoxData(const StyleDeprec atedFlexibleBoxData& o) 40 StyleDeprecatedFlexibleBoxData::StyleDeprecatedFlexibleBoxData(const StyleDeprec atedFlexibleBoxData& o)
41 : RefCounted<StyleDeprecatedFlexibleBoxData>() 41 : RefCounted<StyleDeprecatedFlexibleBoxData>()
42 , flex(o.flex) 42 , flex(o.flex)
43 , flexGroup(o.flexGroup) 43 , flexGroup(o.flexGroup)
44 , ordinalGroup(o.ordinalGroup) 44 , ordinalGroup(o.ordinalGroup)
45 , align(o.align) 45 , align(o.align)
46 , pack(o.pack) 46 , pack(o.pack)
47 , orient(o.orient) 47 , orient(o.orient)
48 , lines(o.lines) 48 , lines(o.lines)
49 { 49 {
50 } 50 }
51 51
52 bool StyleDeprecatedFlexibleBoxData::operator==(const StyleDeprecatedFlexibleBox Data& o) const 52 bool StyleDeprecatedFlexibleBoxData::operator==(const StyleDeprecatedFlexibleBox Data& o) const
53 { 53 {
54 return flex == o.flex && flexGroup == o.flexGroup && ordinalGroup == o.ordin alGroup && align == o.align && pack == o.pack && orient == o.orient && lines == o.lines; 54 return flex == o.flex && flexGroup == o.flexGroup && ordinalGroup == o.ordin alGroup && align == o.align && pack == o.pack && orient == o.orient && lines == o.lines;
55 } 55 }
56 56
57 } // namespace blink 57 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/style/StyleBoxData.cpp ('k') | Source/core/layout/style/StyleFlexibleBoxData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698