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

Side by Side Diff: Source/core/layout/style/StyleGridData.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) 2011 Google Inc. All Rights Reserved. 2 * Copyright (C) 2011 Google Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND A NY 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND A NY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR A NY 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR A NY
17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THI S 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THI S
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 * 23 *
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/layout/style/StyleGridData.h" 27 #include "core/layout/style/StyleGridData.h"
28 28
29 #include "core/layout/style/LayoutStyle.h" 29 #include "core/layout/style/ComputedStyle.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 StyleGridData::StyleGridData() 33 StyleGridData::StyleGridData()
34 : m_gridTemplateColumns(LayoutStyle::initialGridTemplateColumns()) 34 : m_gridTemplateColumns(ComputedStyle::initialGridTemplateColumns())
35 , m_gridTemplateRows(LayoutStyle::initialGridTemplateRows()) 35 , m_gridTemplateRows(ComputedStyle::initialGridTemplateRows())
36 , m_namedGridColumnLines(LayoutStyle::initialNamedGridColumnLines()) 36 , m_namedGridColumnLines(ComputedStyle::initialNamedGridColumnLines())
37 , m_namedGridRowLines(LayoutStyle::initialNamedGridRowLines()) 37 , m_namedGridRowLines(ComputedStyle::initialNamedGridRowLines())
38 , m_orderedNamedGridColumnLines(LayoutStyle::initialOrderedNamedGridColumnLi nes()) 38 , m_orderedNamedGridColumnLines(ComputedStyle::initialOrderedNamedGridColumn Lines())
39 , m_orderedNamedGridRowLines(LayoutStyle::initialOrderedNamedGridRowLines()) 39 , m_orderedNamedGridRowLines(ComputedStyle::initialOrderedNamedGridRowLines( ))
40 , m_gridAutoFlow(LayoutStyle::initialGridAutoFlow()) 40 , m_gridAutoFlow(ComputedStyle::initialGridAutoFlow())
41 , m_gridAutoRows(LayoutStyle::initialGridAutoRows()) 41 , m_gridAutoRows(ComputedStyle::initialGridAutoRows())
42 , m_gridAutoColumns(LayoutStyle::initialGridAutoColumns()) 42 , m_gridAutoColumns(ComputedStyle::initialGridAutoColumns())
43 , m_namedGridArea(LayoutStyle::initialNamedGridArea()) 43 , m_namedGridArea(ComputedStyle::initialNamedGridArea())
44 , m_namedGridAreaRowCount(LayoutStyle::initialNamedGridAreaCount()) 44 , m_namedGridAreaRowCount(ComputedStyle::initialNamedGridAreaCount())
45 , m_namedGridAreaColumnCount(LayoutStyle::initialNamedGridAreaCount()) 45 , m_namedGridAreaColumnCount(ComputedStyle::initialNamedGridAreaCount())
46 { 46 {
47 } 47 }
48 48
49 StyleGridData::StyleGridData(const StyleGridData& o) 49 StyleGridData::StyleGridData(const StyleGridData& o)
50 : RefCounted<StyleGridData>() 50 : RefCounted<StyleGridData>()
51 , m_gridTemplateColumns(o.m_gridTemplateColumns) 51 , m_gridTemplateColumns(o.m_gridTemplateColumns)
52 , m_gridTemplateRows(o.m_gridTemplateRows) 52 , m_gridTemplateRows(o.m_gridTemplateRows)
53 , m_namedGridColumnLines(o.m_namedGridColumnLines) 53 , m_namedGridColumnLines(o.m_namedGridColumnLines)
54 , m_namedGridRowLines(o.m_namedGridRowLines) 54 , m_namedGridRowLines(o.m_namedGridRowLines)
55 , m_orderedNamedGridColumnLines(o.m_orderedNamedGridColumnLines) 55 , m_orderedNamedGridColumnLines(o.m_orderedNamedGridColumnLines)
56 , m_orderedNamedGridRowLines(o.m_orderedNamedGridRowLines) 56 , m_orderedNamedGridRowLines(o.m_orderedNamedGridRowLines)
57 , m_gridAutoFlow(o.m_gridAutoFlow) 57 , m_gridAutoFlow(o.m_gridAutoFlow)
58 , m_gridAutoRows(o.m_gridAutoRows) 58 , m_gridAutoRows(o.m_gridAutoRows)
59 , m_gridAutoColumns(o.m_gridAutoColumns) 59 , m_gridAutoColumns(o.m_gridAutoColumns)
60 , m_namedGridArea(o.m_namedGridArea) 60 , m_namedGridArea(o.m_namedGridArea)
61 , m_namedGridAreaRowCount(o.m_namedGridAreaRowCount) 61 , m_namedGridAreaRowCount(o.m_namedGridAreaRowCount)
62 , m_namedGridAreaColumnCount(o.m_namedGridAreaColumnCount) 62 , m_namedGridAreaColumnCount(o.m_namedGridAreaColumnCount)
63 { 63 {
64 } 64 }
65 65
66 } // namespace blink 66 } // namespace blink
67 67
OLDNEW
« no previous file with comments | « Source/core/layout/style/StyleGridData.h ('k') | Source/core/layout/style/StyleGridItemData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698