| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. | 2 * Copyright (C) 2012 Adobe Systems Incorporated. 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 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above | 8 * 1. Redistributions of source code must retain the above |
| 9 * copyright notice, this list of conditions and the following | 9 * copyright notice, this list of conditions and the following |
| 10 * disclaimer. | 10 * disclaimer. |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 } | 113 } |
| 114 LayoutUnit shapeLogicalWidth() const { | 114 LayoutUnit shapeLogicalWidth() const { |
| 115 return computedShape().shapeMarginLogicalBoundingBox().width(); | 115 return computedShape().shapeMarginLogicalBoundingBox().width(); |
| 116 } | 116 } |
| 117 LayoutUnit shapeLogicalHeight() const { | 117 LayoutUnit shapeLogicalHeight() const { |
| 118 return computedShape().shapeMarginLogicalBoundingBox().height(); | 118 return computedShape().shapeMarginLogicalBoundingBox().height(); |
| 119 } | 119 } |
| 120 | 120 |
| 121 static std::unique_ptr<ShapeOutsideInfo> createInfo( | 121 static std::unique_ptr<ShapeOutsideInfo> createInfo( |
| 122 const LayoutBox& layoutBox) { | 122 const LayoutBox& layoutBox) { |
| 123 return wrapUnique(new ShapeOutsideInfo(layoutBox)); | 123 return WTF::wrapUnique(new ShapeOutsideInfo(layoutBox)); |
| 124 } | 124 } |
| 125 static bool isEnabledFor(const LayoutBox&); | 125 static bool isEnabledFor(const LayoutBox&); |
| 126 | 126 |
| 127 ShapeOutsideDeltas computeDeltasForContainingBlockLine( | 127 ShapeOutsideDeltas computeDeltasForContainingBlockLine( |
| 128 const LineLayoutBlockFlow&, | 128 const LineLayoutBlockFlow&, |
| 129 const FloatingObject&, | 129 const FloatingObject&, |
| 130 LayoutUnit lineTop, | 130 LayoutUnit lineTop, |
| 131 LayoutUnit lineHeight); | 131 LayoutUnit lineHeight); |
| 132 | 132 |
| 133 static ShapeOutsideInfo& ensureInfo(const LayoutBox& key) { | 133 static ShapeOutsideInfo& ensureInfo(const LayoutBox& key) { |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 | 174 |
| 175 const LayoutBox& m_layoutBox; | 175 const LayoutBox& m_layoutBox; |
| 176 mutable std::unique_ptr<Shape> m_shape; | 176 mutable std::unique_ptr<Shape> m_shape; |
| 177 LayoutSize m_referenceBoxLogicalSize; | 177 LayoutSize m_referenceBoxLogicalSize; |
| 178 ShapeOutsideDeltas m_shapeOutsideDeltas; | 178 ShapeOutsideDeltas m_shapeOutsideDeltas; |
| 179 mutable bool m_isComputingShape; | 179 mutable bool m_isComputingShape; |
| 180 }; | 180 }; |
| 181 | 181 |
| 182 } // namespace blink | 182 } // namespace blink |
| 183 #endif | 183 #endif |
| OLD | NEW |