| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 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 |
| 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. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 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 #include "core/layout/LayoutGrid.h" | 26 #include "core/layout/LayoutGrid.h" |
| 27 | 27 |
| 28 #include <algorithm> |
| 29 #include <memory> |
| 28 #include "core/frame/UseCounter.h" | 30 #include "core/frame/UseCounter.h" |
| 29 #include "core/layout/LayoutState.h" | 31 #include "core/layout/LayoutState.h" |
| 30 #include "core/layout/TextAutosizer.h" | 32 #include "core/layout/TextAutosizer.h" |
| 31 #include "core/paint/GridPainter.h" | 33 #include "core/paint/GridPainter.h" |
| 32 #include "core/paint/PaintLayer.h" | 34 #include "core/paint/PaintLayer.h" |
| 33 #include "core/style/ComputedStyle.h" | 35 #include "core/style/ComputedStyle.h" |
| 34 #include "core/style/GridArea.h" | 36 #include "core/style/GridArea.h" |
| 35 #include "platform/LengthFunctions.h" | 37 #include "platform/LengthFunctions.h" |
| 36 #include "wtf/PtrUtil.h" | 38 #include "wtf/PtrUtil.h" |
| 37 #include <algorithm> | |
| 38 #include <memory> | |
| 39 | 39 |
| 40 namespace blink { | 40 namespace blink { |
| 41 | 41 |
| 42 struct ContentAlignmentData { | 42 struct ContentAlignmentData { |
| 43 STACK_ALLOCATED(); | 43 STACK_ALLOCATED(); |
| 44 | 44 |
| 45 public: | 45 public: |
| 46 ContentAlignmentData(){}; | 46 ContentAlignmentData(){}; |
| 47 ContentAlignmentData(LayoutUnit position, LayoutUnit distribution) | 47 ContentAlignmentData(LayoutUnit position, LayoutUnit distribution) |
| 48 : positionOffset(position), distributionOffset(distribution) {} | 48 : positionOffset(position), distributionOffset(distribution) {} |
| (...skipping 2042 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2091 if (direction == ForRows) | 2091 if (direction == ForRows) |
| 2092 return grid.numTracks(ForRows); | 2092 return grid.numTracks(ForRows); |
| 2093 | 2093 |
| 2094 return grid.numTracks(ForRows) | 2094 return grid.numTracks(ForRows) |
| 2095 ? grid.numTracks(ForColumns) | 2095 ? grid.numTracks(ForColumns) |
| 2096 : GridPositionsResolver::explicitGridColumnCount( | 2096 : GridPositionsResolver::explicitGridColumnCount( |
| 2097 styleRef(), grid.autoRepeatTracks(ForColumns)); | 2097 styleRef(), grid.autoRepeatTracks(ForColumns)); |
| 2098 } | 2098 } |
| 2099 | 2099 |
| 2100 } // namespace blink | 2100 } // namespace blink |
| OLD | NEW |