| 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 } | 89 } |
| 90 void clearSegments() { m_segments.clear(); } | 90 void clearSegments() { m_segments.clear(); } |
| 91 bool adjustLogicalLineTop(float minSegmentWidth); | 91 bool adjustLogicalLineTop(float minSegmentWidth); |
| 92 LayoutUnit computeFirstFitPositionForFloat(const FloatSize&) const; | 92 LayoutUnit computeFirstFitPositionForFloat(const FloatSize&) const; |
| 93 | 93 |
| 94 void setNeedsLayout(bool value) { m_needsLayout = value; } | 94 void setNeedsLayout(bool value) { m_needsLayout = value; } |
| 95 bool needsLayout() { return m_needsLayout; } | 95 bool needsLayout() { return m_needsLayout; } |
| 96 | 96 |
| 97 virtual bool lineOverlapsShapeBounds() const OVERRIDE | 97 virtual bool lineOverlapsShapeBounds() const OVERRIDE |
| 98 { | 98 { |
| 99 return computedShape()->lineOverlapsShapePaddingBounds(m_shapeLineTop, m
_lineHeight); | 99 return computedShape()->lineOverlapsShapePaddingBounds(m_referenceBoxLin
eTop, m_lineHeight); |
| 100 } | 100 } |
| 101 | 101 |
| 102 protected: | 102 protected: |
| 103 virtual LayoutBox resolvedLayoutBox() const OVERRIDE | 103 virtual LayoutBox referenceBox() const OVERRIDE |
| 104 { | 104 { |
| 105 if (shapeValue()->layoutBox() == BoxMissing) | 105 if (shapeValue()->layoutBox() == BoxMissing) |
| 106 return ContentBox; | 106 return ContentBox; |
| 107 return shapeValue()->layoutBox(); | 107 return shapeValue()->layoutBox(); |
| 108 } | 108 } |
| 109 virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return
computedShape()->shapePaddingLogicalBoundingBox(); } | 109 virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return
computedShape()->shapePaddingLogicalBoundingBox(); } |
| 110 virtual ShapeValue* shapeValue() const OVERRIDE; | 110 virtual ShapeValue* shapeValue() const OVERRIDE; |
| 111 virtual void getIntervals(LayoutUnit lineTop, LayoutUnit lineHeight, Segment
List& segments) const OVERRIDE | 111 virtual void getIntervals(LayoutUnit lineTop, LayoutUnit lineHeight, Segment
List& segments) const OVERRIDE |
| 112 { | 112 { |
| 113 return computedShape()->getIncludedIntervals(lineTop, lineHeight, segmen
ts); | 113 return computedShape()->getIncludedIntervals(lineTop, lineHeight, segmen
ts); |
| 114 } | 114 } |
| 115 | 115 |
| 116 private: | 116 private: |
| 117 ShapeInsideInfo(const RenderBlock* renderer) | 117 ShapeInsideInfo(const RenderBlock* renderer) |
| 118 : ShapeInfo<RenderBlock> (renderer) | 118 : ShapeInfo<RenderBlock> (renderer) |
| 119 , m_needsLayout(false) | 119 , m_needsLayout(false) |
| 120 { } | 120 { } |
| 121 | 121 |
| 122 SegmentRangeList m_segmentRanges; | 122 SegmentRangeList m_segmentRanges; |
| 123 bool m_needsLayout; | 123 bool m_needsLayout; |
| 124 SegmentList m_segments; | 124 SegmentList m_segments; |
| 125 }; | 125 }; |
| 126 | 126 |
| 127 } | 127 } |
| 128 #endif | 128 #endif |
| OLD | NEW |