| 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 return 0; | 89 return 0; |
| 90 ASSERT(m_segmentRanges.size() < m_segments.size()); | 90 ASSERT(m_segmentRanges.size() < m_segments.size()); |
| 91 return &m_segments[m_segmentRanges.size()]; | 91 return &m_segments[m_segmentRanges.size()]; |
| 92 } | 92 } |
| 93 bool adjustLogicalLineTop(float minSegmentWidth); | 93 bool adjustLogicalLineTop(float minSegmentWidth); |
| 94 | 94 |
| 95 void setNeedsLayout(bool value) { m_needsLayout = value; } | 95 void setNeedsLayout(bool value) { m_needsLayout = value; } |
| 96 bool needsLayout() { return m_needsLayout; } | 96 bool needsLayout() { return m_needsLayout; } |
| 97 | 97 |
| 98 protected: | 98 protected: |
| 99 virtual FloatRect computedShapeLogicalBoundingBox() const OVERRIDE { return
computedShape()->shapePaddingLogicalBoundingBox(); } | 99 virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return
computedShape()->shapePaddingLogicalBoundingBox(); } |
| 100 | 100 |
| 101 private: | 101 private: |
| 102 ExclusionShapeInsideInfo(const RenderBlock* renderer) | 102 ExclusionShapeInsideInfo(const RenderBlock* renderer) |
| 103 : ExclusionShapeInfo<RenderBlock, &RenderStyle::resolvedShapeInside, &Exclus
ionShape::getIncludedIntervals> (renderer) | 103 : ExclusionShapeInfo<RenderBlock, &RenderStyle::resolvedShapeInside, &Exclus
ionShape::getIncludedIntervals> (renderer) |
| 104 , m_needsLayout(false) | 104 , m_needsLayout(false) |
| 105 { } | 105 { } |
| 106 | 106 |
| 107 SegmentRangeList m_segmentRanges; | 107 SegmentRangeList m_segmentRanges; |
| 108 bool m_needsLayout; | 108 bool m_needsLayout; |
| 109 }; | 109 }; |
| 110 | 110 |
| 111 } | 111 } |
| 112 #endif | 112 #endif |
| OLD | NEW |