| OLD | NEW |
| 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/StyleFlexibleBoxData.h" | 27 #include "core/layout/style/StyleFlexibleBoxData.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 StyleFlexibleBoxData::StyleFlexibleBoxData() | 33 StyleFlexibleBoxData::StyleFlexibleBoxData() |
| 34 : m_flexGrow(LayoutStyle::initialFlexGrow()) | 34 : m_flexGrow(ComputedStyle::initialFlexGrow()) |
| 35 , m_flexShrink(LayoutStyle::initialFlexShrink()) | 35 , m_flexShrink(ComputedStyle::initialFlexShrink()) |
| 36 , m_flexBasis(LayoutStyle::initialFlexBasis()) | 36 , m_flexBasis(ComputedStyle::initialFlexBasis()) |
| 37 , m_flexDirection(LayoutStyle::initialFlexDirection()) | 37 , m_flexDirection(ComputedStyle::initialFlexDirection()) |
| 38 , m_flexWrap(LayoutStyle::initialFlexWrap()) | 38 , m_flexWrap(ComputedStyle::initialFlexWrap()) |
| 39 { | 39 { |
| 40 } | 40 } |
| 41 | 41 |
| 42 StyleFlexibleBoxData::StyleFlexibleBoxData(const StyleFlexibleBoxData& o) | 42 StyleFlexibleBoxData::StyleFlexibleBoxData(const StyleFlexibleBoxData& o) |
| 43 : RefCounted<StyleFlexibleBoxData>() | 43 : RefCounted<StyleFlexibleBoxData>() |
| 44 , m_flexGrow(o.m_flexGrow) | 44 , m_flexGrow(o.m_flexGrow) |
| 45 , m_flexShrink(o.m_flexShrink) | 45 , m_flexShrink(o.m_flexShrink) |
| 46 , m_flexBasis(o.m_flexBasis) | 46 , m_flexBasis(o.m_flexBasis) |
| 47 , m_flexDirection(o.m_flexDirection) | 47 , m_flexDirection(o.m_flexDirection) |
| 48 , m_flexWrap(o.m_flexWrap) | 48 , m_flexWrap(o.m_flexWrap) |
| 49 { | 49 { |
| 50 } | 50 } |
| 51 | 51 |
| 52 bool StyleFlexibleBoxData::operator==(const StyleFlexibleBoxData& o) const | 52 bool StyleFlexibleBoxData::operator==(const StyleFlexibleBoxData& o) const |
| 53 { | 53 { |
| 54 return m_flexGrow == o.m_flexGrow && m_flexShrink == o.m_flexShrink && m_fle
xBasis == o.m_flexBasis | 54 return m_flexGrow == o.m_flexGrow && m_flexShrink == o.m_flexShrink && m_fle
xBasis == o.m_flexBasis |
| 55 && m_flexDirection == o.m_flexDirection && m_flexWrap == o.m_flexWrap; | 55 && m_flexDirection == o.m_flexDirection && m_flexWrap == o.m_flexWrap; |
| 56 } | 56 } |
| 57 | 57 |
| 58 } | 58 } |
| OLD | NEW |