| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2010, 2011 Apple 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 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #ifndef ColumnInfo_h | 26 #ifndef ColumnInfo_h |
| 27 #define ColumnInfo_h | 27 #define ColumnInfo_h |
| 28 | 28 |
| 29 #include "platform/LayoutUnit.h" | 29 #include "platform/LayoutUnit.h" |
| 30 #include "wtf/FastAllocBase.h" | 30 #include "wtf/FastAllocBase.h" |
| 31 #include "wtf/Noncopyable.h" | 31 #include "wtf/Noncopyable.h" |
| 32 #include <algorithm> |
| 32 | 33 |
| 33 namespace blink { | 34 namespace blink { |
| 34 | 35 |
| 35 class ColumnInfo { | 36 class ColumnInfo { |
| 36 WTF_MAKE_NONCOPYABLE(ColumnInfo); WTF_MAKE_FAST_ALLOCATED(ColumnInfo); | 37 WTF_MAKE_NONCOPYABLE(ColumnInfo); WTF_MAKE_FAST_ALLOCATED(ColumnInfo); |
| 37 public: | 38 public: |
| 38 ColumnInfo() | 39 ColumnInfo() |
| 39 : m_desiredColumnWidth(0) | 40 : m_desiredColumnWidth(0) |
| 40 , m_desiredColumnCount(1) | 41 , m_desiredColumnCount(1) |
| 41 , m_progressionAxis(InlineAxis) | 42 , m_progressionAxis(InlineAxis) |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 LayoutUnit m_columnHeight; | 104 LayoutUnit m_columnHeight; |
| 104 LayoutUnit m_minimumColumnHeight; | 105 LayoutUnit m_minimumColumnHeight; |
| 105 int m_forcedBreaks; // FIXME: We will ultimately need to cache more informat
ion to balance around forced breaks properly. | 106 int m_forcedBreaks; // FIXME: We will ultimately need to cache more informat
ion to balance around forced breaks properly. |
| 106 LayoutUnit m_maximumDistanceBetweenForcedBreaks; | 107 LayoutUnit m_maximumDistanceBetweenForcedBreaks; |
| 107 LayoutUnit m_forcedBreakOffset; | 108 LayoutUnit m_forcedBreakOffset; |
| 108 }; | 109 }; |
| 109 | 110 |
| 110 } | 111 } |
| 111 | 112 |
| 112 #endif | 113 #endif |
| OLD | NEW |